update deps

remove unused commands
default config do not exist anymore -> config is added to config.js file from the template
fixed cdn not working

package.json

@@ -23,7 +23,7 @@
   "author": "Armaldio <armaldio@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "deepmerge": "^3.2.0",
+    "deepmerge": "^4.0.0",
     "dotenv": "^8.0.0",
     "dumper.js": "^1.3.1",
     "electron-builder": "^20.40.2",

src/actions/index.js

@@ -10,8 +10,6 @@ const minify = require('./minify');
 const _new = require('./new');
 const preview = require('./preview');
 const reportAnIssue = require('./report-an-issue');
-const ui = require('./ui');
-const login = require('./login');
 
 module.exports = {
   build,
@@ -26,6 +24,4 @@ module.exports = {
   _new,
   preview,
   reportAnIssue,
-  ui,
-  login,
 };

src/app.js

@@ -1,11 +1,10 @@
 const fs = require('fs');
 const path = require('path');
-const deepmerge = require('deepmerge');
 const mri = require('mri');
+const deepmerge = require('deepmerge');
 const rollbar = require('./ErrorReport');
 
 const USER_CONFIG = path.join(process.cwd(), 'config.js');
-const base = require('./DefaultConfig');
 const PluginManager = require('./PluginManager');
 
 const logger = require('./utils/console').normal('system');
@@ -41,8 +40,6 @@ module.exports = async () => {
       config.env = 'development';
     }
 
-    const baseConfig = base(config.env === 'production');
-
     let userConfig = {};
     if (fs.existsSync(USER_CONFIG)) {
       const usrConfig = require(USER_CONFIG);
@@ -56,10 +53,13 @@ module.exports = async () => {
 
     // mix only plugins
     const userPlugins = [];
-    if (userConfig && userConfig.plugins) {
+    const defaultPlugins = [
+      'build', 'preview', 'debug', 'donate', 'new', 'report-issue', 'help',
+    ];
+    if (userConfig.plugins) {
       userPlugins.push(...userConfig.plugins);
     }
-    userPlugins.push(...baseConfig.plugins);
+    userPlugins.push(...defaultPlugins);
 
     await pm.loadDefaultCommands(userPlugins);
     // if (isReady) await pm.loadCustomCommands();
@@ -69,7 +69,7 @@ module.exports = async () => {
       pluginsConfig = deepmerge(pluginsConfig, { [command.name]: command.config || {} });
     });
 
-    config = deepmerge.all([config, baseConfig, pluginsConfig, userConfig]);
+    config = deepmerge.all([config, pluginsConfig, userConfig]);
 
     pm.setModules();
 

src/new-project-template/config.js

@@ -1,5 +1,35 @@
-// Happy with ElectronForConstruct ? ► Donate: https://armaldio.xyz/#/donations ♥
+// Happy with ElectronForConstruct ? ► Donate: https://armaldio.xyz/donations ♥
 
 module.exports = isProd => ({
   // add your own configuration
+
+  electron: '6.0.1',
+  errorLogging: true,
+  singleInstance: false,
+  window: {
+    width: 800,
+    height: 600,
+    fullscreen: isProd,
+    frame: true,
+    transparent: false,
+    toolbar: true,
+    alwaysOnTop: false,
+  },
+  debug: {
+    showConfig: false,
+  },
+  developer: {
+    showConstructDevTools: !isProd,
+    autoClose: !isProd,
+    autoReload: !isProd,
+    showChromeDevTools: !isProd,
+    overlay: null,
+  },
+  project: {
+    name: 'MyName',
+    description: 'MyDescription',
+    author: 'Me',
+    version: '0.0.0',
+  },
+  switches: [],
 });

src/template/config.js

@@ -1,6 +1,3 @@
-const deepmerge = require('deepmerge');
+const user = require('./user');
 
-const base = require('./config-base');
-const user = require('./config-user');
-
-module.exports = deepmerge(base, user(base.env === 'production'));
+module.exports = user;

src/template/package.json

@@ -5,10 +5,9 @@
   "license": "UNLICENSED",
   "private": true,
   "devDependencies": {
-    "electron": "5.0.1"
+    "electron": "6.0.1"
   },
   "dependencies": {
-    "deepmerge": "^3.2.0",
     "fs-extra": "^7.0.1",
     "get-port": "^4.2.0",
     "serve-handler": "^5.0.8"

src/template/preload.js

@@ -74,7 +74,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
       console.log('adding vue');
 
-      return _appendScript('https://gitcdn.xyz/repo/ElectronForConstruct/construct-devtool/master/dist/construct-devtool.min.js');
+      return _appendScript('https://cdn.jsdelivr.net/gh/ElectronForConstruct/construct-devtool/dist/construct-devtool.min.js');
     })
     .then(() => {
       const dt = document.createElement('construct-devtool');

src/utils/setupDir.js

@@ -45,9 +45,9 @@ module.exports = async (settings, zipFile = null, mode) => {
   shelljs.cp(path.join(__dirname, '../', 'template', 'preload.js'), tmpDir.name);
   shelljs.cp(path.join(__dirname, '../', 'template', 'package.json'), tmpDir.name);
 
-  shelljs.cp(path.join(process.cwd(), 'config.js'), path.join(tmpDir.name, 'config-user.js'));
+  // shelljs.cp(path.join(process.cwd(), 'config.js'), path.join(tmpDir.name, 'user.js'));
 
-  fs.writeFileSync(path.join(tmpDir.name, 'config-base.js'), `module.exports = ${JSON.stringify(settings, null, '  ')}`, 'utf8');
+  fs.writeFileSync(path.join(tmpDir.name, 'user.js'), `module.exports = ${JSON.stringify(settings, null, '  ')}`, 'utf8');
 
   if (zipFile) {
     await extractZip(zipFile, tmpDir.name);

yarn.lock

@@ -860,9 +860,10 @@ deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
-deepmerge@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e"
+deepmerge@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.0.0.tgz#3e3110ca29205f120d7cb064960a39c3d2087c09"
+  integrity sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww==
 
 defer-to-connect@^1.0.1:
   version "1.0.2"