Confronta il testo

Trova la differenza tra due file di testo

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Strumenti

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Comparing sensitive data, confidential files or internal emails?

Most legal and privacy policies prohibit uploading sensitive data online. Diffchecker Desktop ensures your confidential information never leaves your computer. Work offline and compare documents securely.

Download Diffchecker Desktop Learn more

Untitled diff

Created 8 years agoDiff never expires

2 removals

130 lines

5 additions

133 lines

var fs = require('fs'),

path = require('path'),

techs = {

// essential

fileProvider: require('enb/techs/file-provider'),

fileMerge: require('enb/techs/file-merge'),

// optimization

borschik: require('enb-borschik/techs/borschik'),

// css

postcss: require('enb-postcss/techs/enb-postcss'),

postcssPlugins: [

require('postcss-import')(),

require('postcss-each'),

require('postcss-for'),

require('postcss-simple-vars')(),

require('postcss-calc')(),

require('postcss-nested'),

require('rebem-css'),

require('postcss-url')({ url: 'inline' }),

require('autoprefixer')(),

require('postcss-reporter')()

// js

browserJs: require('enb-js/techs/browser-js'),

// bemtree

// bemtree: require('enb-bemxjst/techs/bemtree'),

// bemhtml

bemhtml: require('enb-bemxjst/techs/bemhtml'),

bemjsonToHtml: require('enb-bemxjst/techs/bemjson-to-html')

bemjsonToHtml: require('enb-bemxjst/techs/bemjson-to-html'),

htmlBeautify: require('enb-beautify/techs/enb-beautify-html')

enbBemTechs = require('enb-bem-techs'),

merged = require('./techs/merged'),

levels = [

{ path: 'node_modules/bem-core/common.blocks', check: false },

{ path: 'node_modules/bem-core/desktop.blocks', check: false },

{ path: 'node_modules/bem-components/common.blocks', check: false },

{ path: 'node_modules/bem-components/desktop.blocks', check: false },

{ path: 'node_modules/bem-components/design/common.blocks', check: false },

{ path: 'node_modules/bem-components/design/desktop.blocks', check: false },

'common.blocks',

'desktop.blocks'

];

module.exports = function(config) {

var isProd = process.env.YENV === 'production',

mergedBundleName = 'merged',

pathToMargedBundle = path.join('desktop.bundles', mergedBundleName);

fs.existsSync(pathToMargedBundle) || fs.mkdirSync(pathToMargedBundle);

merged(config, pathToMargedBundle);

config.nodes('*.bundles/*', function(nodeConfig) {

var isMergedNode = path.basename(nodeConfig.getPath()) === mergedBundleName;

isMergedNode || nodeConfig.addTechs([

[techs.fileProvider, { target: '?.bemjson.js' }],

[enbBemTechs.bemjsonToBemdecl]

]);

nodeConfig.addTechs([

// essential

[enbBemTechs.levels, { levels: levels }],

[enbBemTechs.deps],

[enbBemTechs.files],

// css

[techs.postcss, {

target: '?.css',

oneOfSourceSuffixes: ['post.css', 'css'],

plugins: techs.postcssPlugins

}],

// bemtree

// [techs.bemtree, { sourceSuffixes: ['bemtree', 'bemtree.js'] }],

// bemhtml

[techs.bemhtml, {

sourceSuffixes: ['bemhtml', 'bemhtml.js'],

forceBaseTemplates: true,

engineOptions : { elemJsInstances : true }

}],

// html

[techs.bemjsonToHtml],

[techs.htmlBeautify],

// client bemhtml

[enbBemTechs.depsByTechToBemdecl, {

target: '?.bemhtml.bemdecl.js',

sourceTech: 'js',

destTech: 'bemhtml'

}],

[enbBemTechs.deps, {

target: '?.bemhtml.deps.js',

bemdeclFile: '?.bemhtml.bemdecl.js'

}],

[enbBemTechs.files, {

depsFile: '?.bemhtml.deps.js',

filesTarget: '?.bemhtml.files',

dirsTarget: '?.bemhtml.dirs'

}],

[techs.bemhtml, {

target: '?.browser.bemhtml.js',

filesTarget: '?.bemhtml.files',

sourceSuffixes: ['bemhtml', 'bemhtml.js'],

engineOptions : { elemJsInstances : true }

}],

// js

[techs.browserJs, { includeYM: true }],

[techs.fileMerge, {

target: '?.js',

sources: ['?.browser.js', '?.browser.bemhtml.js']

}],

// borschik

[techs.borschik, { source: '?.js', target: '?.min.js', minify: isProd }],

[techs.borschik, { source: '?.css', target: '?.min.css', minify: isProd }]

]);

nodeConfig.addTargets([/* '?.bemtree.js', */ '?.min.css', '?.min.js']);

isMergedNode || nodeConfig.addTargets(['?.html']);

});

};

Diff salvati

Testo originale

Open file

var fs = require('fs'),
    path = require('path'),
    techs = {
        // essential
        fileProvider: require('enb/techs/file-provider'),
        fileMerge: require('enb/techs/file-merge'),

// optimization
        borschik: require('enb-borschik/techs/borschik'),

// css
        postcss: require('enb-postcss/techs/enb-postcss'),
        postcssPlugins: [
            require('postcss-import')(),
            require('postcss-each'),
            require('postcss-for'),
            require('postcss-simple-vars')(),
            require('postcss-calc')(),
            require('postcss-nested'),
            require('rebem-css'),
            require('postcss-url')({ url: 'inline' }),
            require('autoprefixer')(),
            require('postcss-reporter')()
        ],

// js
        browserJs: require('enb-js/techs/browser-js'),

// bemtree
        // bemtree: require('enb-bemxjst/techs/bemtree'),

// bemhtml
        bemhtml: require('enb-bemxjst/techs/bemhtml'),
        bemjsonToHtml: require('enb-bemxjst/techs/bemjson-to-html')
    },
    enbBemTechs = require('enb-bem-techs'),
    merged = require('./techs/merged'),
    levels = [
        { path: 'node_modules/bem-core/common.blocks', check: false },
        { path: 'node_modules/bem-core/desktop.blocks', check: false },
        { path: 'node_modules/bem-components/common.blocks', check: false },
        { path: 'node_modules/bem-components/desktop.blocks', check: false },
        { path: 'node_modules/bem-components/design/common.blocks', check: false },
        { path: 'node_modules/bem-components/design/desktop.blocks', check: false },
        'common.blocks',
        'desktop.blocks'
    ];

module.exports = function(config) {
    var isProd = process.env.YENV === 'production',
        mergedBundleName = 'merged',
        pathToMargedBundle = path.join('desktop.bundles', mergedBundleName);

fs.existsSync(pathToMargedBundle) || fs.mkdirSync(pathToMargedBundle);

merged(config, pathToMargedBundle);

config.nodes('*.bundles/*', function(nodeConfig) {
        var isMergedNode = path.basename(nodeConfig.getPath()) === mergedBundleName;

isMergedNode || nodeConfig.addTechs([
            [techs.fileProvider, { target: '?.bemjson.js' }],
            [enbBemTechs.bemjsonToBemdecl]
        ]);

nodeConfig.addTechs([
            // essential
            [enbBemTechs.levels, { levels: levels }],
            [enbBemTechs.deps],
            [enbBemTechs.files],

// css
            [techs.postcss, {
                target: '?.css',
                oneOfSourceSuffixes: ['post.css', 'css'],
                plugins: techs.postcssPlugins
            }],

// bemtree
            // [techs.bemtree, { sourceSuffixes: ['bemtree', 'bemtree.js'] }],

// bemhtml
            [techs.bemhtml, {
                sourceSuffixes: ['bemhtml', 'bemhtml.js'],
                forceBaseTemplates: true,
                engineOptions : { elemJsInstances : true }
            }],

// html
            [techs.bemjsonToHtml],

// client bemhtml
            [enbBemTechs.depsByTechToBemdecl, {
                target: '?.bemhtml.bemdecl.js',
                sourceTech: 'js',
                destTech: 'bemhtml'
            }],
            [enbBemTechs.deps, {
                target: '?.bemhtml.deps.js',
                bemdeclFile: '?.bemhtml.bemdecl.js'
            }],
            [enbBemTechs.files, {
                depsFile: '?.bemhtml.deps.js',
                filesTarget: '?.bemhtml.files',
                dirsTarget: '?.bemhtml.dirs'
            }],
            [techs.bemhtml, {
                target: '?.browser.bemhtml.js',
                filesTarget: '?.bemhtml.files',
                sourceSuffixes: ['bemhtml', 'bemhtml.js'],
                engineOptions : { elemJsInstances : true }
            }],

// js
            [techs.browserJs, { includeYM: true }],
            [techs.fileMerge, {
                target: '?.js',
                sources: ['?.browser.js', '?.browser.bemhtml.js']
            }],

// borschik
            [techs.borschik, { source: '?.js', target: '?.min.js', minify: isProd }],
            [techs.borschik, { source: '?.css', target: '?.min.css', minify: isProd }]
        ]);

nodeConfig.addTargets([/* '?.bemtree.js', */ '?.min.css', '?.min.js']);
        isMergedNode || nodeConfig.addTargets(['?.html']);
    });
};

Testo modificato

Open file

var fs = require('fs'),
    path = require('path'),
    techs = {
        // essential
        fileProvider: require('enb/techs/file-provider'),
        fileMerge: require('enb/techs/file-merge'),

// optimization
        borschik: require('enb-borschik/techs/borschik'),

// js
        browserJs: require('enb-js/techs/browser-js'),

// bemtree
        // bemtree: require('enb-bemxjst/techs/bemtree'),

// bemhtml
        bemhtml: require('enb-bemxjst/techs/bemhtml'),
        bemjsonToHtml: require('enb-bemxjst/techs/bemjson-to-html'),
        
        htmlBeautify: require('enb-beautify/techs/enb-beautify-html')
    },
    enbBemTechs = require('enb-bem-techs'),
    merged = require('./techs/merged'),
    levels = [
        { path: 'node_modules/bem-core/common.blocks', check: false },
        { path: 'node_modules/bem-core/desktop.blocks', check: false },
        { path: 'node_modules/bem-components/common.blocks', check: false },
        { path: 'node_modules/bem-components/desktop.blocks', check: false },
        { path: 'node_modules/bem-components/design/common.blocks', check: false },
        { path: 'node_modules/bem-components/design/desktop.blocks', check: false },
        'common.blocks',
        'desktop.blocks'
    ];

fs.existsSync(pathToMargedBundle) || fs.mkdirSync(pathToMargedBundle);

merged(config, pathToMargedBundle);

config.nodes('*.bundles/*', function(nodeConfig) {
        var isMergedNode = path.basename(nodeConfig.getPath()) === mergedBundleName;

isMergedNode || nodeConfig.addTechs([
            [techs.fileProvider, { target: '?.bemjson.js' }],
            [enbBemTechs.bemjsonToBemdecl]
        ]);

nodeConfig.addTechs([
            // essential
            [enbBemTechs.levels, { levels: levels }],
            [enbBemTechs.deps],
            [enbBemTechs.files],

// css
            [techs.postcss, {
                target: '?.css',
                oneOfSourceSuffixes: ['post.css', 'css'],
                plugins: techs.postcssPlugins
            }],

// bemtree
            // [techs.bemtree, { sourceSuffixes: ['bemtree', 'bemtree.js'] }],

// html
            [techs.bemjsonToHtml],
            [techs.htmlBeautify],

// borschik
            [techs.borschik, { source: '?.js', target: '?.min.js', minify: isProd }],
            [techs.borschik, { source: '?.css', target: '?.min.css', minify: isProd }]
        ]);
        
        nodeConfig.addTargets([/* '?.bemtree.js', */ '?.min.css', '?.min.js']);
        isMergedNode || nodeConfig.addTargets(['?.html']);
    });
};