make Electrode internal webpack config a little easier to override

packages/webpack-config-composer/lib/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+
+module.exports = {
+  PARTIALS: Symbol("partials"),
+  PROFILES: Symbol("profiles")
+};

packages/webpack-config-composer/lib/index.js

@@ -7,11 +7,13 @@ const Partial = require("./partial");
 const Profile = require("./profile");
 const { getConcatMethod } = require("./concat-method");
 
+const { PARTIALS, PROFILES } = require("./constants");
+
 class WebpackConfigComposer {
   constructor(options) {
     options = options || {};
-    this._profiles = {};
-    this._partials = {};
+    this[PROFILES] = {};
+    this[PARTIALS] = {};
     if (options.profiles) {
       this.addProfiles(options.profiles);
     }
@@ -22,11 +24,11 @@ class WebpackConfigComposer {
   }
 
   get profiles() {
-    return this._profiles;
+    return this[PROFILES];
   }
 
   get partials() {
-    return this._partials;
+    return this[PARTIALS];
   }
 
   addProfiles(profiles) {
@@ -53,7 +55,7 @@ class WebpackConfigComposer {
       profile = new Profile(name, partials);
     }
 
-    this._profiles[name] = profile;
+    this[PROFILES][name] = profile;
 
     return profile;
   }
@@ -82,10 +84,10 @@ class WebpackConfigComposer {
   }
 
   _addPartial(name, data, addOpt) {
-    const exist = this._partials[name];
+    const exist = this[PARTIALS][name];
 
     if (!exist || _.get(addOpt, "method") === "replace") {
-      this._partials[name] = new Partial(name, data);
+      this[PARTIALS][name] = data instanceof Partial ? data : new Partial(name, data);
     } else {
       exist.merge(data, _.get(addOpt, "concatArray"));
     }
@@ -102,11 +104,18 @@ class WebpackConfigComposer {
   }
 
   getPartial(name) {
-    return this._partials[name];
+    return this[PARTIALS][name];
+  }
+
+  enablePartial(name, flag) {
+    const partial = this.getPartial(name);
+    if (partial) {
+      partial.enable = flag;
+    }
   }
 
   getProfile(name) {
-    return this._profiles[name];
+    return this[PROFILES][name];
   }
 
   compose(options, ...profiles) {

packages/webpack-config-composer/lib/partial.js

@@ -2,34 +2,49 @@
 
 const _ = require("lodash");
 const { getConcatMethod } = require("./concat-method");
+const assert = require("assert");
+
+const OVERRIDE = Symbol("override webpack config partial");
+const DATA = Symbol("webpack partial data");
 
 class Partial {
   constructor(name, data) {
     this._name = name;
-    this._data = Object.assign({ config: {}, options: {} }, data);
+    if (typeof data === "function") {
+      this[DATA] = { config: data };
+    } else {
+      this[DATA] = Object.assign({ config: {}, options: {} }, data);
+    }
+    this.setOverride();
   }
 
   set config(config) {
-    this._data.config = config;
+    this[DATA].config = config;
   }
 
   get config() {
-    return this._data.config;
+    return this[DATA].config;
   }
 
   set options(options) {
-    this._data.options = Object.assign({}, options);
+    this[DATA].options = Object.assign({}, options);
   }
 
   get options() {
-    return this._data.options;
+    return this[DATA].options;
   }
 
   merge(data, concatArray) {
-    _.mergeWith(this._data, data, getConcatMethod(concatArray));
+    _.mergeWith(this[DATA], data, getConcatMethod(concatArray));
+  }
+
+  setOverride(fn) {
+    this[OVERRIDE] = fn || _.identity;
   }
 
   compose(options) {
+    options = Object.assign({}, this.options, options);
+
     const config = this.config;
     const configType = typeof config;
 
@@ -38,7 +53,6 @@ class Partial {
     if (configType === "object") {
       ret = config;
     } else if (configType === "function") {
-      options = Object.assign({}, this.options, options);
       ret = config(options);
       if (typeof ret === "function") {
         ret = ret(options);
@@ -47,7 +61,9 @@ class Partial {
       throw new Error(`can't process config from Partial ${this._name}`);
     }
 
-    return ret;
+    const override = this[OVERRIDE](ret, options);
+
+    return override || ret;
   }
 }
 

packages/webpack-config-composer/lib/profile.js

@@ -1,29 +1,31 @@
 "use strict";
 
+const { PARTIALS } = require("./constants");
+
 class Profile {
   constructor(name, partials) {
     this._name = name;
-    this._partials = partials || {};
+    this[PARTIALS] = partials || {};
   }
 
   get name() {
     return this._name;
   }
 
   get partials() {
-    return this._partials;
+    return this[PARTIALS];
   }
 
   setPartial(name, options) {
-    this._partials[name] = options || {};
+    this[PARTIALS][name] = options || {};
   }
 
   getPartial(name) {
-    return this._partials[name];
+    return this[PARTIALS][name];
   }
 
   delPartial(name) {
-    delete this._partials[name];
+    delete this[PARTIALS][name];
   }
 }
 

packages/xarc-app-dev/config/webpack/index.js

@@ -17,5 +17,6 @@ module.exports = {
   initWebpackConfigComposer,
   compose: generateConfig,
   env: profile,
-  options
+  options,
+  partials: require("./partials")
 };

packages/xarc-app-dev/config/webpack/partials/dll-entry.js

@@ -5,6 +5,6 @@ const AppMode = archetype.AppMode;
 const Path = require("path");
 const clientDllConfig = require(Path.resolve(AppMode.src.client, "dll.config.js"));
 
-module.exports = {
+module.exports = () => ({
   entry: clientDllConfig
-};
+});

packages/xarc-app-dev/config/webpack/partials/dll-output.js

@@ -2,10 +2,10 @@
 
 const Path = require("path");
 
-module.exports = {
+module.exports = () => ({
   output: {
     path: Path.resolve("dll/js"),
     filename: "[name].bundle.[hash].js",
     library: "[name]_[hash]"
   }
-};
+});

packages/xarc-app-dev/config/webpack/partials/entry.js

@@ -211,4 +211,4 @@ if (module.hot) {
   return partial;
 }
 
-module.exports = makeEntryPartial();
+module.exports = makeEntryPartial;

packages/xarc-app-dev/config/webpack/partials/index.js

@@ -2,6 +2,7 @@
 
 const Fs = require("fs");
 const assert = require("assert");
+const Partial = require("webpack-config-composer/lib/partial");
 
 //
 // This specifies a general order of partials to be applied.
@@ -50,12 +51,11 @@ const files = Fs.readdirSync(__dirname)
   .filter(x => x !== "index.js")
   .map(x => x.substr(0, x.length - 3));
 
-module.exports = {
-  orders,
-  partials: files.reduce((a, p) => {
-    const k = `_${p}`;
-    assert(orders.indexOf(k) >= 0, `No default order specified for partial ${p}`);
-    a[k] = { config: () => require(`./${p}`) };
-    return a;
-  }, {})
-};
+const partials = files.reduce((a, p) => {
+  const k = `_${p}`;
+  assert(orders.indexOf(k) >= 0, `No default order specified for partial ${p}`);
+  a[k] = new Partial(k, { config: () => require(`./${p}`) });
+  return a;
+}, {});
+
+module.exports = partials;

packages/xarc-app-dev/config/webpack/partials/output.js

@@ -26,7 +26,7 @@ const getOutputPath = () => {
   }
 };
 
-module.exports = {
+module.exports = () => ({
   output: {
     path: getOutputPath(),
     pathinfo: inspectpack, // Enable path information for inspectpack
@@ -36,4 +36,4 @@ module.exports = {
       : "[contenthash].[name].js",
     filename: getOutputFilename()
   }
-};
+});

packages/xarc-app-dev/config/webpack/partials/resolve-loader.js

@@ -5,12 +5,12 @@ const Path = require("path");
 const ModuleResolver = require("electrode-node-resolver/lib/webpack-plugin");
 const archetype = require("@xarc/app/config/archetype");
 
-module.exports = {
+module.exports = () => ({
   resolveLoader: {
     symlinks: !archetype.webpack.preserveSymlinks,
     modules: [Path.resolve("lib"), process.cwd()]
       .concat(archetype.webpack.loaderDirectories)
       .filter(identity),
     plugins: [new ModuleResolver("module", "resolve", archetype.devDir, undefined)]
   }
-};
+});

packages/xarc-app-dev/config/webpack/partials/resolve.js

@@ -53,4 +53,4 @@ if (AppMode.hasSubApps) {
   resolve.mainFields = ["module", "browser", "main"];
 }
 
-module.exports = { resolve };
+module.exports = () => ({ resolve });