Update ReactReduxSpa to Webpack 2 (plus awesome-typescript-loader)

templates/ReactReduxSpa/package.json

@@ -9,14 +9,13 @@
     "@types/react-router": "^2.0.30",
     "@types/react-router-redux": "^4.0.30",
     "@types/redux": "3.5.27",
-    "@types/source-map": "^0.1.28",
+    "@types/webpack": "^2.2.0",
-    "@types/uglify-js": "^2.0.27",
+    "@types/webpack-env": "^1.13.0",
-    "@types/webpack": "^1.12.35",
-    "@types/webpack-env": "^1.12.1",
     "@types/whatwg-fetch": "0.0.28",
     "aspnet-prerendering": "^2.0.0",
-    "aspnet-webpack": "^1.0.17",
+    "aspnet-webpack": "^1.0.27",
-    "aspnet-webpack-react": "^1.0.2",
+    "aspnet-webpack-react": "^1.0.4",
+    "awesome-typescript-loader": "3.0.0-beta.13 || ^3.0.0",
     "babel-core": "^6.5.2",
     "babel-loader": "^6.2.3",
     "babel-preset-es2015": "^6.5.0",
@@ -25,7 +24,7 @@
     "css-loader": "^0.23.1",
     "domain-task": "^2.0.1",
     "event-source-polyfill": "^0.0.7",
-    "extract-text-webpack-plugin": "^1.0.1",
+    "extract-text-webpack-plugin": "^2.0.0-rc",
     "file-loader": "^0.8.5",
     "jquery": "^2.2.1",
     "json-loader": "^0.5.4",
@@ -38,10 +37,9 @@
     "redux": "^3.6.0",
     "redux-thunk": "^2.2.0",
     "style-loader": "^0.13.0",
-    "ts-loader": "^0.8.1",
     "typescript": "^2.0.3",
     "url-loader": "^0.5.7",
-    "webpack": "^1.13.2",
+    "webpack": "^2.2.0",
     "webpack-hot-middleware": "^2.12.2",
     "webpack-merge": "^0.14.1"
   }

templates/ReactReduxSpa/webpack.config.js

@@ -1,33 +1,37 @@
-var isDevBuild = process.argv.indexOf('--env.prod') < 0;
+const path = require('path');
-var path = require('path');
+const webpack = require('webpack');
-var webpack = require('webpack');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
+const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin;
-var merge = require('webpack-merge');
+const merge = require('webpack-merge');
 
-// Configuration in common to both client-side and server-side bundles
+module.exports = (env) => {
-var sharedConfig = () => ({
+    const isDevBuild = !(env && env.prod);
-    resolve: { extensions: [ '', '.js', '.jsx', '.ts', '.tsx' ] },
+
+    // Configuration in common to both client-side and server-side bundles
+    const sharedConfig = () => ({
+        stats: { modules: false },
+        resolve: { extensions: [ '.js', '.jsx', '.ts', '.tsx' ] },
         output: {
             filename: '[name].js',
             publicPath: '/dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix
         },
         module: {
-        loaders: [
+            rules: [
-            { test: /\.tsx?$/, include: /ClientApp/, loader: 'babel-loader' },
+                { test: /\.tsx?$/, include: /ClientApp/, use: 'babel-loader' },
-            { test: /\.tsx?$/, include: /ClientApp/, loader: 'ts-loader', query: { silent: true } },
+                { test: /\.tsx?$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' }
-            { test: /\.json$/, loader: 'json-loader' }
             ]
-    }
+        },
-});
+        plugins: [new CheckerPlugin()]
+    });
 
-// Configuration for client-side bundle suitable for running in browsers
+    // Configuration for client-side bundle suitable for running in browsers
-var clientBundleOutputDir = './wwwroot/dist';
+    const clientBundleOutputDir = './wwwroot/dist';
-var clientBundleConfig = merge(sharedConfig(), {
+    const clientBundleConfig = merge(sharedConfig(), {
         entry: { 'main-client': './ClientApp/boot-client.tsx' },
         module: {
-        loaders: [
+            rules: [
-            { test: /\.css$/, loader: ExtractTextPlugin.extract(['css-loader']) },
+                { test: /\.css$/, use: ExtractTextPlugin.extract({ loader: 'css-loader' }) },
-            { test: /\.(png|jpg|jpeg|gif|svg)$/, loader: 'url-loader', query: { limit: 25000 } }
+                { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' }
             ]
         },
         output: { path: path.join(__dirname, clientBundleOutputDir) },
@@ -45,14 +49,13 @@ var clientBundleConfig = merge(sharedConfig(), {
             })
         ] : [
             // Plugins that apply in production builds only
-        new webpack.optimize.OccurenceOrderPlugin(),
+            new webpack.optimize.UglifyJsPlugin()
-        new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } })
         ])
-});
+    });
 
-// Configuration for server-side (prerendering) bundle suitable for running in Node
+    // Configuration for server-side (prerendering) bundle suitable for running in Node
-var serverBundleConfig = merge(sharedConfig(), {
+    const serverBundleConfig = merge(sharedConfig(), {
-    resolve: { packageMains: ['main'] },
+        resolve: { mainFields: ['main'] },
         entry: { 'main-server': './ClientApp/boot-server.tsx' },
         plugins: [
             new webpack.DllReferencePlugin({
@@ -68,6 +71,7 @@ var serverBundleConfig = merge(sharedConfig(), {
         },
         target: 'node',
         devtool: 'inline-source-map'
-});
+    });
 
-module.exports = [clientBundleConfig, serverBundleConfig];
+    return [clientBundleConfig, serverBundleConfig];
+};

templates/ReactReduxSpa/webpack.config.vendor.js

@@ -1,16 +1,18 @@
-var isDevBuild = process.argv.indexOf('--env.prod') < 0;
+const path = require('path');
-var path = require('path');
+const webpack = require('webpack');
-var webpack = require('webpack');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
+const merge = require('webpack-merge');
-var merge = require('webpack-merge');
-var extractCSS = new ExtractTextPlugin('vendor.css');
 
-var sharedConfig = {
+module.exports = (env) => {
-    resolve: { extensions: [ '', '.js' ] },
+    const isDevBuild = !(env && env.prod);
+    const extractCSS = new ExtractTextPlugin('vendor.css');
+
+    const sharedConfig = {
+        stats: { modules: false },
+        resolve: { extensions: [ '.js' ] },
         module: {
-        loaders: [
+            rules: [
-            { test: /\.json$/, loader: require.resolve('json-loader') },
+                { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' }
-            { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, loader: 'url-loader?limit=100000' }
             ]
         },
         entry: {
@@ -42,13 +44,13 @@ var sharedConfig = {
                 'process.env.NODE_ENV': isDevBuild ? '"development"' : '"production"'
             })
         ]
-};
+    };
 
-var clientBundleConfig = merge(sharedConfig, {
+    const clientBundleConfig = merge(sharedConfig, {
         output: { path: path.join(__dirname, 'wwwroot', 'dist') },
         module: {
-        loaders: [
+            rules: [
-            { test: /\.css(\?|$)/, loader: extractCSS.extract(['css-loader']) }
+                { test: /\.css(\?|$)/, use: extractCSS.extract({ loader: 'css-loader' }) }
             ]
         },
         plugins: [
@@ -58,20 +60,19 @@ var clientBundleConfig = merge(sharedConfig, {
                 name: '[name]_[hash]'
             })
         ].concat(isDevBuild ? [] : [
-        new webpack.optimize.OccurenceOrderPlugin(),
+            new webpack.optimize.UglifyJsPlugin()
-        new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } })
         ])
-});
+    });
 
-var serverBundleConfig = merge(sharedConfig, {
+    const serverBundleConfig = merge(sharedConfig, {
         target: 'node',
-    resolve: { packageMains: ['main'] },
+        resolve: { mainFields: ['main'] },
         output: {
             path: path.join(__dirname, 'ClientApp', 'dist'),
             libraryTarget: 'commonjs2',
         },
         module: {
-        loaders: [ { test: /\.css(\?|$)/, loader: 'css-loader' } ]
+            rules: [ { test: /\.css(\?|$)/, use: 'css-loader' } ]
         },
         entry: { vendor: ['aspnet-prerendering', 'react-dom/server'] },
         plugins: [
@@ -80,6 +81,7 @@ var serverBundleConfig = merge(sharedConfig, {
                 name: '[name]_[hash]'
             })
         ]
-});
+    });
 
-module.exports = [clientBundleConfig, serverBundleConfig];
+    return [clientBundleConfig, serverBundleConfig];
+};