embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-01-23 12:11:16 +00:00
Code Issues Projects Releases Wiki Activity

fix(@embark/cmd_controller): use the correct path for eject-webpack

Browse Source
This commit is contained in:
Michael Bradley, Jr 2019-09-17 15:47:44 -05:00 committed by Michael Bradley
parent ff75fe98a1
commit 98400dcef7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/embark/src/cmd/cmd_controller.js
View File

@ -1,6 +1,5 @@
import {__} from 'embark-i18n'; import {__} from 'embark-i18n';
import {dappPath, embarkPath} from 'embark-utils'; import {dappPath, embarkPath} from 'embark-utils';
import findUp from 'find-up';
let async = require('async'); let async = require('async');
const constants = require('embark-core/constants'); const constants = require('embark-core/constants');
const Logger = require('embark-logger'); const Logger = require('embark-logger');
@ -514,12 +513,12 @@ simulator(_options) {
} }
ejectWebpack() { ejectWebpack() {
const embarkConfig = (findUp.sync('node_modules/embark-pipeline/dist/webpack.config.js', {cwd: embarkPath()}) || embarkPath("node_modules/embark-pipeline/dist/webpack.config.js")); const embarkConfig = embarkPath("dist/lib/modules/basic-pipeline/webpack.config.js");
const dappConfig = dappPath('webpack.config.js'); const dappConfig = dappPath('webpack.config.js');
fs.copyPreserve(embarkConfig, dappConfig); fs.copyPreserve(embarkConfig, dappConfig);
console.log(__('webpack config ejected to:').dim.yellow); console.log(__('webpack config ejected to:').dim.yellow);
console.log(`${dappConfig}`.green); console.log(`${dappConfig}`.green);
const embarkOverrides = (findUp.sync('node_modules/embark-pipeline/dist/babel-loader-overrides.js', {cwd: embarkPath()}) || embarkPath("node_modules/embark-pipeline/dist/babel-loader-overrides.js")); const embarkOverrides = embarkPath("dist/lib/modules/basic-pipeline/babel-loader-overrides.js");
const dappOverrides = dappPath('babel-loader-overrides.js'); const dappOverrides = dappPath('babel-loader-overrides.js');
fs.copyPreserve(embarkOverrides, dappOverrides); fs.copyPreserve(embarkOverrides, dappOverrides);
console.log(__('webpack overrides ejected to:').dim.yellow); console.log(__('webpack overrides ejected to:').dim.yellow);