Merge pull request #26 from stoikerty/feature/change-customization-fe…

…atures

Feature/change customization features

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="/dev-toolkit-logo.png" alt="universal-dev-toolkit-logo" height='42'><sub><strong>v5.3.1</strong></sub>
+  <img src="/dev-toolkit-logo.png" alt="universal-dev-toolkit-logo" height='42'><sub><strong>v5.3.2</strong></sub>
 </p>
 <p align="center">
   Jump-start your <code>react</code>-powered Web App.<br/>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dev-toolkit",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "description": "Javascript development toolkit for power users [ ES6, React, node-sass ]",
   "main": "index.js",
   "scripts": {

toolkit/_userSettings.js

@@ -35,7 +35,7 @@ export const overrideConfig = requireOrNull(
     rootForRequire,
     pkg.toolkitSettings.webpackConfigPath ?
       pkg.toolkitSettings.webpackConfigPath : 'customWebpackConfig.js'
-  )) || {};
+  ));
 debug('overrideConfig', overrideConfig);
 
 // eslint-disable-next-line global-require

toolkit/webpack/config.js

@@ -7,6 +7,8 @@ import stats from './config/stats';
 
 import {
   PATHS,
+  env,
+  currentScript,
   vendor,
   overrideConfig,
   namingConvention,
@@ -16,9 +18,18 @@ import {
 cssHook();
 filesHook();
 
+// This is an escape-hatch for overriding the webpack config with your custom one.
+// NOTE: There's limited support for using these custom config escape hatches. You're on your own!
+const createConfig = (config) => {
+  const override = overrideConfig && overrideConfig.default ?
+    overrideConfig.default : overrideConfig;
+  return typeof override === 'function' ?
+    override({ config, paths: PATHS, env, currentScript }) : config;
+};
+
 // Resulting webpack config
 // ---
-export default {
+export default createConfig({
   // The entry and ouput configuration for the bundle(s)
   entry: {
     app: [PATHS.clientAppEntryPoint],
@@ -59,8 +70,4 @@ export default {
     mkdirp: 'empty',
     fileExists: 'empty',
   },
-
-  // NOTE: There's limited support for using these custom config escape hatches. You're on your own!
-  //   This is an escape-hatch for overriding the webpack config with your custom one.
-  ...(overrideConfig.default ? overrideConfig.default : overrideConfig),
-};
+});

toolkit/webpack/config/plugins.js

@@ -97,11 +97,11 @@ const productionPlugins = [
 ];
 
 // TODO: extract out
-if (process.env.COMPRESS) {
+if (process.env.USE_COMPRESSION_PLUGIN) {
   productionPlugins.push(
     new CompressionPlugin({
       asset: '[path]',
-      test: new RegExp(process.env.GZIP_UPLOAD_PATTERN),
+      test: new RegExp(process.env.COMPRESSION_PLUGIN_REGEX),
       minRatio: 0,
     })
   );