Merge branch 'develop' into feature/server

Author: birdofpreyru

config/jest/default.js

@@ -8,6 +8,7 @@ module.exports = {
     '\\.(scss|css)$': 'identity-obj-proxy',
   },
   rootDir: '../..',
+  testMatch: ['**/__tests__/**/*.js?(x)'],
   testPathIgnorePatterns: [
     '/node_modules/',
   ],

config/webpack/app-base.js

@@ -110,7 +110,10 @@ module.exports = function configFactory(ops) {
       rules: [{
         /* Loads font resources from "src/assets/fonts" folder. */
         test: /\.(eot|otf|svg|ttf|woff2?)$/,
-        include: [/src[/\\]assets[/\\]fonts/],
+        include: [
+          /node_modules/,
+          /src[/\\]assets[/\\]fonts/,
+        ],
         loader: 'file-loader',
         options: {
           outputPath: '/fonts/',

config/webpack/app-development.js

@@ -38,6 +38,7 @@ module.exports = function configFactory(ops) {
         'process.env': {
           BABEL_ENV: JSON.stringify('development'),
           DEV_TOOLS: JSON.stringify(true),
+          NODE_ENV: JSON.stringify('development'),
         },
       }),
       new webpack.HotModuleReplacementPlugin(),

config/webpack/app-production.js

@@ -36,6 +36,7 @@ module.exports = function configFactory(ops) {
       new webpack.DefinePlugin({
         'process.env': {
           BABEL_ENV: JSON.stringify('production'),
+          NODE_ENV: JSON.stringify('production'),
         },
       }),
 

config/webpack/lib-base.js

@@ -64,7 +64,10 @@ module.exports = function configFactory(ops) {
          * the original location of the font assets in
          * the library being build. */
         test: /\.(eot|otf|svg|ttf|woff2?)$/,
-        include: [/src[/\\]assets[/\\]fonts/],
+        include: [
+          /node_modules/,
+          /src[/\\]assets[/\\]fonts/,
+        ],
         loader: 'file-loader',
         options: {
           emitFile: false,

docs/webpack-config.md

@@ -114,9 +114,10 @@ mutation of the config object.
     - [`webpack-hot-middleware/client?reload=true`](https://github.com/glenjamin/webpack-hot-middleware)
   - Emulates the following environment variables:
     - **`BABEL_ENV`** — It is set to *development* to inform any
-      interested code that it is running in dev mode.
+      interested code that it is running in dev mode;
     - **`DEV_TOOLS`** — It is set to *true* to signal the code that
       Redux dev tools should be enabled;
+    - **`NODE_ENV`** — It is set to *development*.
   - Adds the following plugins:
     - [HotModuleReplacementPlugin](https://webpack.js.org/plugins/hot-module-replacement-plugin/);
     - [NoEmitOnErrorsPlugin](https://webpack.js.org/plugins/no-emit-on-errors-plugin/);
@@ -128,7 +129,8 @@ mutation of the config object.
   it differs from that in the following:
   - *production* Babel environment is enforced;
   - Emulates the following environment variables:
-    - **`BABEL_ENV`** — It is set to *production*.
+    - **`BABEL_ENV`** — It is set to *production*;
+    - **`NODE_ENV`** — It is set to *production*.
   - Adds the following plugins:
     - [OptimizeCssAssetsPlugin](https://www.npmjs.com/package/optimize-css-assets-webpack-plugin);
     - [UglifyJsPlugin](https://webpack.js.org/plugins/uglifyjs-webpack-plugin/).

package-lock.json

@@ -104,5 +104,5 @@
     "prepublishOnly": "npm run build",
     "test": "npm run lint && npm run jest"
   },
-  "version": "0.2.0"
+  "version": "0.2.2"
 }