embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/pipeline/webpackProcess.js
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,14 +42,6 @@ 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 versions;
if (err) {
console.error(err);
versions = [];
} else {
versions = files;
}
let defaultOptions = { let defaultOptions = {
mode: self.env === 'production' ? 'production' : 'none', mode: self.env === 'production' ? 'production' : 'none',
// devtool: self.env === 'development' ? 'source-map' : false, // devtool: self.env === 'development' ? 'source-map' : false,
@ -71,9 +62,8 @@ class WebpackProcess extends ProcessWrapper {
resolve: { resolve: {
alias: importsList, alias: importsList,
modules: [ modules: [
fs.dappPath('node_modules'), fs.embarkPath('node_modules'),
...versions, fs.dappPath('node_modules')
fs.embarkPath('node_modules')
] ]
}, },
plugins: [ plugins: [
@ -110,7 +100,7 @@ class WebpackProcess extends ProcessWrapper {
{ {
test: /\.js$/, test: /\.js$/,
loader: "babel-loader", loader: "babel-loader",
exclude: /(node_modules|bower_components|\.embark\/versions)/, exclude: /(node_modules|bower_components)/,
options: { options: {
presets: [ presets: [
[ [
@ -132,8 +122,8 @@ class WebpackProcess extends ProcessWrapper {
} }
}), }),
plugins: [ plugins: [
"babel-plugin-webpack-aliases", "@babel/plugin-transform-runtime",
"@babel/plugin-transform-runtime" "babel-plugin-webpack-aliases"
].map(require.resolve), ].map(require.resolve),
compact: false compact: false
} }
@ -190,7 +180,6 @@ class WebpackProcess extends ProcessWrapper {
callback(err); callback(err);
}); });
}); });
});
} }
} }

1
package.json
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",

2
test_apps/test_app/package.json
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",