fix config in wrong env

ElectronForConstruct · Apr 27, 2019 · a82f191 · a82f191
1 parent 64c408a
commit a82f191
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/template/config.js b/src/template/config.js
@@ -0,0 +1,6 @@
+const deepmerge = require('deepmerge');
+
+const base = require('./config-base');
+const user = require('./config-user');
+
+module.exports = deepmerge(base, user(base.env === 'production'));
diff --git a/src/template/package.json b/src/template/package.json
@@ -8,6 +8,7 @@
     "electron": "3.1.6"
   },
   "dependencies": {
+    "deepmerge": "^3.2.0",
     "fs-extra": "^7.0.1",
     "get-port": "^4.2.0",
     "serve-handler": "^5.0.8"

diff --git a/src/template/yarn.lock b/src/template/yarn.lock
@@ -2,13 +2,6 @@
 # yarn lockfile v1
 
 
-"@efc/core@latest":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@efc/core/-/core-0.0.2.tgz#12a83f6d71014d8dcb5378cf632f3a83c8c6e513"
-  integrity sha512-WcCWRQzbCY2EVRNL4Y4TESeQWvQP/VuYbbf5c1Mn27iHDU/4DjgcF6eVXsWf1MkRmYYqZUPszDR4sYu4pCOxTQ==
-  dependencies:
-    deepmerge "^3.2.0"
-
 "@types/node@^8.0.24":
   version "8.10.45"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.45.tgz#4c49ba34106bc7dced77ff6bae8eb6543cde8351"

diff --git a/src/utils/setupDir.js b/src/utils/setupDir.js
@@ -21,7 +21,6 @@ const extractZip = async (from, to) => new Promise((resolve, reject) => {
 /**
  * Prepare a sandboxed environment in tmp
  * @param {Object} settings
- * @param {function} log
  * @param zipFile
  * @returns {Promise<string>}
  */
@@ -42,10 +41,15 @@ module.exports = async (settings, zipFile = null) => {
 
   // copy local files from template to tmpdir
   shelljs.cp(path.join(__dirname, '../', 'template', 'main.js'), tmpDir.name);
+  shelljs.cp(path.join(__dirname, '../', 'template', 'config.js'), tmpDir.name);
   shelljs.cp(path.join(__dirname, '../', 'template', 'preload.js'), tmpDir.name);
   shelljs.cp(path.join(__dirname, '../', 'template', 'package.json'), tmpDir.name);
 
-  fs.writeFileSync(path.join(tmpDir.name, 'config.js'), `module.exports = ${JSON.stringify(settings, null, '  ')}`, 'utf8');
+  console.log(tmpDir.name);
+
+  shelljs.cp(path.join(process.cwd(), 'config.js'), path.join(tmpDir.name, 'config-user.js'));
+
+  fs.writeFileSync(path.join(tmpDir.name, 'config-base.js'), `module.exports = ${JSON.stringify(settings, null, '  ')}`, 'utf8');
 
   if (zipFile) {
     await extractZip(zipFile, tmpDir.name);
@@ -54,8 +58,6 @@ module.exports = async (settings, zipFile = null) => {
     shelljs.cp('-R', path.join(process.cwd(), 'app', '*'), tmpDir.name);
   }
 
-  // shelljs.cp(path.join(process.cwd(), 'config.js'), tmpDir.name);
-
   // editing package.json
   const pkg = fs.readFileSync(path.join(tmpDir.name, 'package.json'), 'utf8');
   const pkgJson = JSON.parse(pkg);