Adds cdnPublicPath option to the standard Webpack cofnig for apps

birdofpreyru · birdofpreyru · commit 9faeeca55c2e · 2018-04-29T17:54:44.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Topcoder React Utils Changelog
 
+### v0.3.5
+- `cdnPublicPath` option added to the standard Webpack config for apps to support
+  assets loading via CDN.
+
 ### v0.3.4
 - Small fixes in the client / server setup.
 - `createActions(..)` alias added to `redux` utils, to use that function without
diff --git a/config/webpack/app-base.js b/config/webpack/app-base.js
@@ -25,6 +25,11 @@ const webpack = require('webpack');
  *
  * @param {String} ops.babelEnv BABEL_ENV to use for Babel during the build.
  *
+ * @param {String} ops.cdnPublicPath Optional. If provided, it will be used in
+ *  the frontend bundle instead of publicPath, to direct all asset request to
+ *  CDN. The publicPath still will be used by the server as the path to serve
+ *  the assets for CDN requests.
+ *
  * @param {String} ops.context Base URL for resolution of relative
  *  config paths.
  *
@@ -50,9 +55,10 @@ const webpack = require('webpack');
 module.exports = function configFactory(ops) {
   const o = _.defaults(_.clone(ops), {
     cssLocalIdent: '[hash:base64:6]',
-    publicPath: '',
   });
 
+  const publicPath = o.cdnPublicPath || o.publicPath || '';
+
   let buildInfo;
   const buildInfoUrl = path.resolve(o.context, '.build-info');
   /* If build-info file is found, we reuse those data. */
@@ -97,7 +103,7 @@ module.exports = function configFactory(ops) {
       chunkFilename: '[name].js',
       filename: '[name].js',
       path: path.resolve(__dirname, o.context, 'build'),
-      publicPath: `${o.publicPath}/`,
+      publicPath: `${publicPath}/`,
     },
     plugins: [
       new ExtractCssChunks({
@@ -129,7 +135,7 @@ module.exports = function configFactory(ops) {
         loader: 'file-loader',
         options: {
           outputPath: '/fonts/',
-          publicPath: `${o.publicPath}/fonts`,
+          publicPath: `${publicPath}/fonts`,
         },
       }, {
         /* Loads JS and JSX moudles, and inlines SVG assets. */
@@ -147,7 +153,7 @@ module.exports = function configFactory(ops) {
         loader: 'file-loader',
         options: {
           outputPath: '/images/',
-          publicPath: `${o.publicPath}/images`,
+          publicPath: `${publicPath}/images`,
         },
       }, {
         /* Loads SCSS stylesheets. */
diff --git a/docs/webpack-config.md b/docs/webpack-config.md
@@ -37,6 +37,10 @@ mutation of the config object.
   - Config factory handles the following fields in the options object:
     - **`babelEnv`** &mdash; *String* &mdash; Babel environment to use for
       the Babel compilation step;
+    - **`cdnPublicPath`** &mdash; *String* &mdash; Optional. If provided,
+      it will be used in the frontend bundle instead of `publicPath`, to direct
+      all asset request to CDN. The `publicPath` still will be used by the server
+      as the path to serve the assets for CDN requests;
     - **`context`** &mdash; *String* &mdash; Base URL for the resolution of
       relative config paths;
     - **`cssLocalIdent`** &mdash; *String* &mdash; Optional. The template for
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -111,5 +111,5 @@
     "prepublishOnly": "npm run build",
     "test": "npm run lint && npm run jest"
   },
-  "version": "0.3.4"
+  "version": "0.3.5"
 }

Original file line number	Diff line number	Diff line change
`@@ -111,5 +111,5 @@`
`111`	`111`	`"prepublishOnly": "npm run build",`
`112`	`112`	`"test": "npm run lint && npm run jest"`
`113`	`113`	`},`
`114`		`- "version": "0.3.4"`
	`114`	`+ "version": "0.3.5"`
`115`	`115`	`}`