embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-01-09 13:26:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #666 from embark-framework/bug_fix/dot.embark_versions_modules_2

Browse Source 
.embark/versions modules — round 2
This commit is contained in:
Iuri Matias 2018-07-31 08:41:16 -04:00 committed by GitHub
commit a42c58026f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 149 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/pipeline/webpackProcess.js
View File

@ -6,6 +6,7 @@ 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;
@ -42,6 +43,14 @@ 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,
@ -62,8 +71,9 @@ class WebpackProcess extends ProcessWrapper {
resolve: { resolve: {
alias: importsList, alias: importsList,
modules: [ modules: [
fs.embarkPath('node_modules'), fs.dappPath('node_modules'),
fs.dappPath('node_modules') ...versions,
fs.embarkPath('node_modules')
] ]
}, },
plugins: [ plugins: [
@ -100,7 +110,7 @@ class WebpackProcess extends ProcessWrapper {
{ {
test: /\.js$/, test: /\.js$/,
loader: "babel-loader", loader: "babel-loader",
exclude: /(node_modules|bower_components)/, exclude: /(node_modules|bower_components|\.embark[\\/]versions)/,
options: { options: {
presets: [ presets: [
[ [
@ -122,8 +132,8 @@ class WebpackProcess extends ProcessWrapper {
} }
}), }),
plugins: [ plugins: [
"@babel/plugin-transform-runtime", "babel-plugin-webpack-aliases",
"babel-plugin-webpack-aliases" "@babel/plugin-transform-runtime"
].map(require.resolve), ].map(require.resolve),
compact: false compact: false
} }
@ -180,6 +190,7 @@ class WebpackProcess extends ProcessWrapper {
callback(err); callback(err);
}); });
}); });
});
} }
} }

10
package.json
View File

@ -21,10 +21,11 @@
"url": "https://github.com/embark-framework/embark.git" "url": "https://github.com/embark-framework/embark.git"
}, },
"dependencies": { "dependencies": {
"@babel/core": "7.0.0-beta.54", "@babel/core": "^7.0.0-beta.54",
"@babel/plugin-transform-runtime": "7.0.0-beta.54", "@babel/plugin-transform-runtime": "^7.0.0-beta.54",
"@babel/preset-env": "7.0.0-beta.54", "@babel/preset-env": "^7.0.0-beta.54",
"@babel/preset-react": "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", "ascii-table": "0.0.9",
"async": "^2.0.1", "async": "^2.0.1",
"babel-loader": "^8.0.0-beta.4", "babel-loader": "^8.0.0-beta.4",
@ -47,6 +48,7 @@
"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": "^6.26.0" "@babel/code-frame": "^7.0.0-beta.54"
}, },
"dependencies": { "dependencies": {
"bootstrap": "^3.3.6", "bootstrap": "^3.3.6",