archetype-react-app: only enable DLL if dll.config.js exist in client (…

…#165)
electrode-io · Feb 10, 2017 · fd9f632 · fd9f632
1 parent 9237886
commit fd9f632
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/packages/electrode-archetype-react-app-dev/config/webpack/webpack.config.dll.js b/packages/electrode-archetype-react-app-dev/config/webpack/webpack.config.dll.js
@@ -8,16 +8,7 @@ var getRootConfig = require("./get-root-config");
 var archetype = require("../archetype");
 var Path = archetype.Path;
 var AppMode = archetype.AppMode;
-
-/* eslint-disable func-style */
-
-function getDllEntry() {
-  try {
-    return require(Path.resolve(AppMode.src.client, "dll.config.js")); // eslint-disable-line global-require
-  } catch (err) {
-    return {};
-  }
-}
+var dllConfig = require(Path.resolve(AppMode.src.client, "dll.config.js"));
 
 var extensions = {};
 var baseConfigPath = require.resolve("./webpack.config");
@@ -36,13 +27,12 @@ extensions[baseConfigPath] = function (config) {
 
   statsPlugin.opts.filename = "../../dll/server/stats.dll.json";
   isomorphicPlugin.options.assetsFile = "../../dll/isomorphic-assets.dll.json";
-  config.entry = {};
 
   return config;
 };
 
 var dllConfig = new WebpackConfig().extend(extensions).merge({
-  entry: getDllEntry(),
+  entry: dllConfig,
   output: {
     path: Path.resolve("dll/js"),
     filename: "[name].bundle.[hash].js",

diff --git a/packages/electrode-archetype-react-app/arch-gulpfile.js b/packages/electrode-archetype-react-app/arch-gulpfile.js
@@ -288,9 +288,8 @@ function makeTasks(gulp) {
       task: [".clean.dist", "build-dist-dev-static"]
     },
 
-    // TODO: fix DLL for webpack 2.0
     "build-dist": [".clean.dist", ".clean.dll", "build-dist-min", "build-dist-dll", "build-dist:flatten-l10n",
-     "build-dist:merge-isomorphic-assets", "copy-dll", "build-dist:clean-tmp"],
+      "build-dist:merge-isomorphic-assets", "copy-dll", "build-dist:clean-tmp"],
 
     "build-dist-dev-static": {
       desc: false,
@@ -310,11 +309,8 @@ function makeTasks(gulp) {
       task: [[".ss-prod-react", ".ss-prod-react-dom"]]
     },
 
-    "build-dist-dll": () => {
-      setProductionEnv();
-      createGitIgnoreDir(Path.resolve("dll"), "Webpack DLL Output dir");
-      return exec(`webpack --config ${config.webpack}/webpack.config.dll.js --colors`)
-    },
+    "build-dist-dll": () => undefined,
+    "copy-dll": () => undefined,
 
     "build-dist-min": {
       dep: [".production-env"],
@@ -391,8 +387,6 @@ INFO: Individual .babelrc files were generated for you in src/client and src/ser
     ".clean.etmp": () => shell.rm("-rf", eTmpDir),
     ".clean.dll": () => shell.rm("-rf", "dll"),
 
-    "copy-dll": () => shell.cp("-r", "dll/*", "dist"),
-
     "cov-frontend": () => checkFrontendCov(),
     "cov-frontend-50": () => checkFrontendCov("50"),
     "cov-frontend-70": () => checkFrontendCov("70"),
@@ -605,7 +599,17 @@ INFO: Individual .babelrc files were generated for you in src/client and src/ser
         task: ["build-lib:client", "build-lib:server", ".build-lib:app-mode"]
       }
     });
+  }
 
+  if (Fs.existsSync(Path.resolve(AppMode.src.client, "dll.config.js"))) {
+    tasks = Object.assign(tasks, {
+      "build-dist-dll": () => {
+        setProductionEnv();
+        createGitIgnoreDir(Path.resolve("dll"), "Webpack DLL Output dir");
+        return exec(`webpack --config ${config.webpack}/webpack.config.dll.js --colors`)
+      },
+      "copy-dll": () => shell.cp("-r", "dll/*", "dist")
+    });
   }
 
   return tasks;