Revert ".embark/versions modules"

This commit is contained in:
Iuri Matias 2018-07-30 12:57:58 -04:00
parent 9900db1535
commit 63b01a32d4
3 changed files with 131 additions and 143 deletions

View File

@ -6,7 +6,6 @@ const constants = require('../constants');
const HardSourceWebpackPlugin = require('hard-source-webpack-plugin'); const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
const ProcessWrapper = require('../core/processes/processWrapper'); const ProcessWrapper = require('../core/processes/processWrapper');
const path = require('path'); const path = require('path');
const glob = require('glob');
let webpackProcess; let webpackProcess;
@ -43,152 +42,142 @@ class WebpackProcess extends ProcessWrapper {
webpackRun(filename, options, includeModules, importsList, detectErrors, realCwd, callback) { webpackRun(filename, options, includeModules, importsList, detectErrors, realCwd, callback) {
const self = this; const self = this;
glob(fs.dappPath('.embark/versions') + '/*/*', (err, files) => { let defaultOptions = {
let versions; mode: self.env === 'production' ? 'production' : 'none',
if (err) { // devtool: self.env === 'development' ? 'source-map' : false,
console.error(err); // pipeline would need to copy .map files to dist/ target dir
versions = []; // note: generating full source maps ('source-map') roughly doubles build time
} else { entry: fs.dappPath(filename),
versions = files; output: {
} globalObject: 'typeof self !== \'undefined\' ? self : this',
let defaultOptions = { libraryExport: 'default',
mode: self.env === 'production' ? 'production' : 'none', libraryTarget: 'umd',
// devtool: self.env === 'development' ? 'source-map' : false, path: fs.dappPath('.embark'),
// pipeline would need to copy .map files to dist/ target dir filename: filename,
// note: generating full source maps ('source-map') roughly doubles build time umdNamedDefine: true
entry: fs.dappPath(filename), },
output: { // profile: true,
globalObject: 'typeof self !== \'undefined\' ? self : this', // stats: 'verbose',
libraryExport: 'default', // note: generating and writing to disk verbose stats increases build time
libraryTarget: 'umd', resolve: {
path: fs.dappPath('.embark'), alias: importsList,
filename: filename, modules: [
umdNamedDefine: true fs.embarkPath('node_modules'),
}, fs.dappPath('node_modules')
// profile: true, ]
// stats: 'verbose', },
// note: generating and writing to disk verbose stats increases build time plugins: [
resolve: { new HardSourceWebpackPlugin({
alias: importsList, cacheDirectory: fs.dappPath('node_modules/.cache/hard-source'),
modules: [ // ufglify (wp mode: production) will still save its cache in embark's node_modules/.cache/
fs.dappPath('node_modules'), environmentHash: {
...versions, root: fs.dappPath()
fs.embarkPath('node_modules') }
] }),
}, new HardSourceWebpackPlugin.ExcludeModulePlugin(
plugins: [ [{test: /app[\\/]|contracts[\\/]/}]
new HardSourceWebpackPlugin({ )
cacheDirectory: fs.dappPath('node_modules/.cache/hard-source'), ]
// ufglify (wp mode: production) will still save its cache in embark's node_modules/.cache/ };
environmentHash: {
root: fs.dappPath() let webpackOptions = utils.recursiveMerge(defaultOptions, options);
if (includeModules) {
webpackOptions.module = {
rules: [
{
test: /\.css$/,
use: [{loader: "style-loader"}, {loader: "css-loader"}]
},
{
test: /\.scss$/,
use: [{loader: "style-loader"}, {loader: "css-loader"}]
},
{
test: /\.(png|woff|woff2|eot|ttf|svg)$/,
loader: 'url-loader?limit=100000'
},
{
test: /\.js$/,
loader: "babel-loader",
exclude: /(node_modules|bower_components)/,
options: {
presets: [
[
"@babel/preset-env", {
modules: false,
targets: {
browsers: ["last 1 version", "not dead", "> 0.2%"]
}
}
],
"@babel/preset-react"
].map(pkg => {
if (Array.isArray(pkg)) {
let _pkg = pkg[0];
pkg[0] = require.resolve(_pkg);
return pkg;
} else {
return require.resolve(pkg);
}
}),
plugins: [
"@babel/plugin-transform-runtime",
"babel-plugin-webpack-aliases"
].map(require.resolve),
compact: false
} }
}), }
new HardSourceWebpackPlugin.ExcludeModulePlugin(
[{test: /app[\\/]|contracts[\\/]/}]
)
] ]
}; };
let webpackOptions = utils.recursiveMerge(defaultOptions, options); let dappBabelrc = path.join(realCwd, '.babelrc');
if (fs.existsSync(dappBabelrc)) {
if (includeModules) { webpackOptions.module.rules[3].options.extends = dappBabelrc;
webpackOptions.module = {
rules: [
{
test: /\.css$/,
use: [{loader: "style-loader"}, {loader: "css-loader"}]
},
{
test: /\.scss$/,
use: [{loader: "style-loader"}, {loader: "css-loader"}]
},
{
test: /\.(png|woff|woff2|eot|ttf|svg)$/,
loader: 'url-loader?limit=100000'
},
{
test: /\.js$/,
loader: "babel-loader",
exclude: /(node_modules|bower_components|\.embark\/versions)/,
options: {
presets: [
[
"@babel/preset-env", {
modules: false,
targets: {
browsers: ["last 1 version", "not dead", "> 0.2%"]
}
}
],
"@babel/preset-react"
].map(pkg => {
if (Array.isArray(pkg)) {
let _pkg = pkg[0];
pkg[0] = require.resolve(_pkg);
return pkg;
} else {
return require.resolve(pkg);
}
}),
plugins: [
"babel-plugin-webpack-aliases",
"@babel/plugin-transform-runtime"
].map(require.resolve),
compact: false
}
}
]
};
let dappBabelrc = path.join(realCwd, '.babelrc');
if (fs.existsSync(dappBabelrc)) {
webpackOptions.module.rules[3].options.extends = dappBabelrc;
}
} }
}
webpack(webpackOptions).run((err, stats) => { webpack(webpackOptions).run((err, stats) => {
async.waterfall([ async.waterfall([
function checkStatsError(next) { function checkStatsError(next) {
if (err) { if (err) {
console.error(err); console.error(err);
return next(err); return next(err);
} }
if (!detectErrors) { if (!detectErrors) {
return next(); return next();
} }
if (stats.hasErrors()) { if (stats.hasErrors()) {
return next( return next(
stats.toJson(webpackOptions.stats).errors.join("\n") stats.toJson(webpackOptions.stats).errors.join("\n")
); );
} }
next(); next();
}//, }//,
// function writeStatsReport(next) { // function writeStatsReport(next) {
// if (detectErrors) { // if (detectErrors) {
// self._log('info', 'writing file '+ ('.embark/stats.report').bold.dim); // self._log('info', 'writing file '+ ('.embark/stats.report').bold.dim);
// } // }
// fs.writeFile( // fs.writeFile(
// path.join(fs.dappPath('.embark'), 'stats.report'), // path.join(fs.dappPath('.embark'), 'stats.report'),
// stats.toString(webpackOptions.stats), // stats.toString(webpackOptions.stats),
// next // next
// ); // );
// }, // },
// function writeStatsJSON(next) { // function writeStatsJSON(next) {
// if (detectErrors) { // if (detectErrors) {
// self._log('info','writing file '+ ('.embark/stats.json').bold.dim); // self._log('info','writing file '+ ('.embark/stats.json').bold.dim);
// } // }
// fs.writeFile( // fs.writeFile(
// path.join(fs.dappPath('.embark'), 'stats.json'), // path.join(fs.dappPath('.embark'), 'stats.json'),
// JSON.stringify(stats.toJson(webpackOptions.stats)), // JSON.stringify(stats.toJson(webpackOptions.stats)),
// next // next
// ); // );
// } // }
// note: to visualize the stats info in a browser, do... // note: to visualize the stats info in a browser, do...
// `npx webpack-bundle-analyzer <dapp_dir>/.embark/stats.json` // `npx webpack-bundle-analyzer <dapp_dir>/.embark/stats.json`
], (err) => { ], (err) => {
callback(err); callback(err);
});
}); });
}); });
} }

View File

@ -48,7 +48,6 @@
"follow-redirects": "^1.2.4", "follow-redirects": "^1.2.4",
"fs-extra": "^2.0.0", "fs-extra": "^2.0.0",
"ganache-cli": "6.1.0", "ganache-cli": "6.1.0",
"glob": "^7.1.2",
"globule": "^1.1.0", "globule": "^1.1.0",
"hard-source-webpack-plugin": "^0.11.1", "hard-source-webpack-plugin": "^0.11.1",
"http-proxy": "^1.17.0", "http-proxy": "^1.17.0",

View File

@ -10,7 +10,7 @@
"license": "ISC", "license": "ISC",
"homepage": "", "homepage": "",
"devDependencies": { "devDependencies": {
"@babel/code-frame": "^7.0.0-beta.54" "babel-code-frame": "^6.26.0"
}, },
"dependencies": { "dependencies": {
"bootstrap": "^3.3.6", "bootstrap": "^3.3.6",