mirror of https://github.com/embarklabs/embark.git
Revert "Merge pull request #663 from embark-framework/revert-656-bug_fix/dot.embark_versions_modules"
This reverts commit7859c384ca, reversing changes made toa58f21c303.
This commit is contained in:
Michael Bradley, Jr
Iuri Matias
parent
5179eea56f
commit
314edadb57
|
|
@ -6,6 +6,7 @@ const constants = require('../constants');
|
|||
const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
|
||||
const ProcessWrapper = require('../core/processes/processWrapper');
|
||||
const path = require('path');
|
||||
const glob = require('glob');
|
||||
|
||||
let webpackProcess;
|
||||
|
||||
|
|
@ -42,142 +43,152 @@ class WebpackProcess extends ProcessWrapper {
|
|||
|
||||
webpackRun(filename, options, includeModules, importsList, detectErrors, realCwd, callback) {
|
||||
const self = this;
|
||||
let defaultOptions = {
|
||||
mode: self.env === 'production' ? 'production' : 'none',
|
||||
// devtool: self.env === 'development' ? 'source-map' : false,
|
||||
// pipeline would need to copy .map files to dist/ target dir
|
||||
// note: generating full source maps ('source-map') roughly doubles build time
|
||||
entry: fs.dappPath(filename),
|
||||
output: {
|
||||
globalObject: 'typeof self !== \'undefined\' ? self : this',
|
||||
libraryExport: 'default',
|
||||
libraryTarget: 'umd',
|
||||
path: fs.dappPath('.embark'),
|
||||
filename: filename,
|
||||
umdNamedDefine: true
|
||||
},
|
||||
// profile: true,
|
||||
// stats: 'verbose',
|
||||
// note: generating and writing to disk verbose stats increases build time
|
||||
resolve: {
|
||||
alias: importsList,
|
||||
modules: [
|
||||
fs.embarkPath('node_modules'),
|
||||
fs.dappPath('node_modules')
|
||||
]
|
||||
},
|
||||
plugins: [
|
||||
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()
|
||||
}
|
||||
}),
|
||||
new HardSourceWebpackPlugin.ExcludeModulePlugin(
|
||||
[{test: /app[\\/]|contracts[\\/]/}]
|
||||
)
|
||||
]
|
||||
};
|
||||
|
||||
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
|
||||
glob(fs.dappPath('.embark/versions') + '/*/*', (err, files) => {
|
||||
let versions;
|
||||
if (err) {
|
||||
console.error(err);
|
||||
versions = [];
|
||||
} else {
|
||||
versions = files;
|
||||
}
|
||||
let defaultOptions = {
|
||||
mode: self.env === 'production' ? 'production' : 'none',
|
||||
// devtool: self.env === 'development' ? 'source-map' : false,
|
||||
// pipeline would need to copy .map files to dist/ target dir
|
||||
// note: generating full source maps ('source-map') roughly doubles build time
|
||||
entry: fs.dappPath(filename),
|
||||
output: {
|
||||
globalObject: 'typeof self !== \'undefined\' ? self : this',
|
||||
libraryExport: 'default',
|
||||
libraryTarget: 'umd',
|
||||
path: fs.dappPath('.embark'),
|
||||
filename: filename,
|
||||
umdNamedDefine: true
|
||||
},
|
||||
// profile: true,
|
||||
// stats: 'verbose',
|
||||
// note: generating and writing to disk verbose stats increases build time
|
||||
resolve: {
|
||||
alias: importsList,
|
||||
modules: [
|
||||
fs.dappPath('node_modules'),
|
||||
...versions,
|
||||
fs.embarkPath('node_modules')
|
||||
]
|
||||
},
|
||||
plugins: [
|
||||
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()
|
||||
}
|
||||
}
|
||||
}),
|
||||
new HardSourceWebpackPlugin.ExcludeModulePlugin(
|
||||
[{test: /app[\\/]|contracts[\\/]/}]
|
||||
)
|
||||
]
|
||||
};
|
||||
|
||||
let dappBabelrc = path.join(realCwd, '.babelrc');
|
||||
if (fs.existsSync(dappBabelrc)) {
|
||||
webpackOptions.module.rules[3].options.extends = dappBabelrc;
|
||||
}
|
||||
}
|
||||
let webpackOptions = utils.recursiveMerge(defaultOptions, options);
|
||||
|
||||
webpack(webpackOptions).run((err, stats) => {
|
||||
async.waterfall([
|
||||
function checkStatsError(next) {
|
||||
if (err) {
|
||||
console.error(err);
|
||||
return next(err);
|
||||
}
|
||||
if (!detectErrors) {
|
||||
return next();
|
||||
}
|
||||
if (stats.hasErrors()) {
|
||||
return next(
|
||||
stats.toJson(webpackOptions.stats).errors.join("\n")
|
||||
);
|
||||
}
|
||||
next();
|
||||
}//,
|
||||
// function writeStatsReport(next) {
|
||||
// if (detectErrors) {
|
||||
// self._log('info', 'writing file '+ ('.embark/stats.report').bold.dim);
|
||||
// }
|
||||
// fs.writeFile(
|
||||
// path.join(fs.dappPath('.embark'), 'stats.report'),
|
||||
// stats.toString(webpackOptions.stats),
|
||||
// next
|
||||
// );
|
||||
// },
|
||||
// function writeStatsJSON(next) {
|
||||
// if (detectErrors) {
|
||||
// self._log('info','writing file '+ ('.embark/stats.json').bold.dim);
|
||||
// }
|
||||
// fs.writeFile(
|
||||
// path.join(fs.dappPath('.embark'), 'stats.json'),
|
||||
// JSON.stringify(stats.toJson(webpackOptions.stats)),
|
||||
// next
|
||||
// );
|
||||
// }
|
||||
// note: to visualize the stats info in a browser, do...
|
||||
// `npx webpack-bundle-analyzer <dapp_dir>/.embark/stats.json`
|
||||
], (err) => {
|
||||
callback(err);
|
||||
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|\.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) => {
|
||||
async.waterfall([
|
||||
function checkStatsError(next) {
|
||||
if (err) {
|
||||
console.error(err);
|
||||
return next(err);
|
||||
}
|
||||
if (!detectErrors) {
|
||||
return next();
|
||||
}
|
||||
if (stats.hasErrors()) {
|
||||
return next(
|
||||
stats.toJson(webpackOptions.stats).errors.join("\n")
|
||||
);
|
||||
}
|
||||
next();
|
||||
}//,
|
||||
// function writeStatsReport(next) {
|
||||
// if (detectErrors) {
|
||||
// self._log('info', 'writing file '+ ('.embark/stats.report').bold.dim);
|
||||
// }
|
||||
// fs.writeFile(
|
||||
// path.join(fs.dappPath('.embark'), 'stats.report'),
|
||||
// stats.toString(webpackOptions.stats),
|
||||
// next
|
||||
// );
|
||||
// },
|
||||
// function writeStatsJSON(next) {
|
||||
// if (detectErrors) {
|
||||
// self._log('info','writing file '+ ('.embark/stats.json').bold.dim);
|
||||
// }
|
||||
// fs.writeFile(
|
||||
// path.join(fs.dappPath('.embark'), 'stats.json'),
|
||||
// JSON.stringify(stats.toJson(webpackOptions.stats)),
|
||||
// next
|
||||
// );
|
||||
// }
|
||||
// note: to visualize the stats info in a browser, do...
|
||||
// `npx webpack-bundle-analyzer <dapp_dir>/.embark/stats.json`
|
||||
], (err) => {
|
||||
callback(err);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
10
package.json
10
package.json
|
|
@ -21,10 +21,11 @@
|
|||
"url": "https://github.com/embark-framework/embark.git"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/core": "7.0.0-beta.54",
|
||||
"@babel/plugin-transform-runtime": "7.0.0-beta.54",
|
||||
"@babel/preset-env": "7.0.0-beta.54",
|
||||
"@babel/preset-react": "7.0.0-beta.54",
|
||||
"@babel/core": "^7.0.0-beta.54",
|
||||
"@babel/plugin-transform-runtime": "^7.0.0-beta.54",
|
||||
"@babel/preset-env": "^7.0.0-beta.54",
|
||||
"@babel/preset-react": "^7.0.0-beta.54",
|
||||
"@babel/runtime": "^7.0.0-beta.54",
|
||||
"ascii-table": "0.0.9",
|
||||
"async": "^2.0.1",
|
||||
"babel-loader": "^8.0.0-beta.4",
|
||||
|
|
@ -47,6 +48,7 @@
|
|||
"follow-redirects": "^1.2.4",
|
||||
"fs-extra": "^2.0.0",
|
||||
"ganache-cli": "6.1.0",
|
||||
"glob": "^7.1.2",
|
||||
"globule": "^1.1.0",
|
||||
"hard-source-webpack-plugin": "^0.11.1",
|
||||
"http-proxy": "^1.17.0",
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
"license": "ISC",
|
||||
"homepage": "",
|
||||
"devDependencies": {
|
||||
"babel-code-frame": "^6.26.0"
|
||||
"@babel/code-frame": "^7.0.0-beta.54"
|
||||
},
|
||||
"dependencies": {
|
||||
"bootstrap": "^3.3.6",
|
||||
|
|
|
|||
Loading…
Reference in New Issue