Update templates to Webpack 2

templates/Angular2Spa/package.json

@@ -21,28 +21,27 @@
     "angular2-universal-polyfills": "~2.0.11",
     "aspnet-prerendering": "^2.0.0",
     "aspnet-webpack": "^1.0.17",
+    "awesome-typescript-loader": "3.0.0-beta.13 || ^3.0.0",
     "bootstrap": "^3.3.7",
     "css": "^2.2.1",
     "css-loader": "^0.25.0",
     "es6-shim": "^0.35.1",
     "event-source-polyfill": "^0.0.7",
     "expose-loader": "^0.7.1",
-    "extract-text-webpack-plugin": "^1.0.1",
+    "extract-text-webpack-plugin": "^2.0.0-rc",
     "file-loader": "^0.9.0",
     "html-loader": "^0.4.4",
     "isomorphic-fetch": "^2.2.1",
     "jquery": "^2.2.1",
     "json-loader": "^0.5.4",
-    "node-noop": "^1.0.0",
     "preboot": "^4.5.2",
     "raw-loader": "^0.5.1",
     "rxjs": "5.0.0-beta.12",
     "style-loader": "^0.13.1",
     "to-string-loader": "^1.1.5",
-    "ts-loader": "^0.8.2",
     "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",
     "zone.js": "^0.6.25"

templates/Angular2Spa/webpack.config.js

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

templates/Angular2Spa/webpack.config.vendor.js

@@ -1,16 +1,17 @@
-var isDevBuild = process.argv.indexOf('--env.prod') < 0;
-var path = require('path');
-var webpack = require('webpack');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var merge = require('webpack-merge');
-var extractCSS = new ExtractTextPlugin('vendor.css');
+const path = require('path');
+const webpack = require('webpack');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const merge = require('webpack-merge');
 
-var sharedConfig = {
-    resolve: { extensions: [ '', '.js' ] },
+module.exports = (env) => {
+    const extractCSS = new ExtractTextPlugin('vendor.css');
+    const isDevBuild = !(env && env.prod);
+    const sharedConfig = {
+        stats: { modules: false },
+        resolve: { extensions: [ '.js' ] },
         module: {
-        loaders: [
-            { test: /\.json$/, loader: require.resolve('json-loader') },
-            { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, loader: 'url-loader?limit=100000' }
+            rules: [
+                { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' }
             ]
         },
         entry: {
@@ -42,16 +43,15 @@ var sharedConfig = {
         plugins: [
             new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable)
             new webpack.ContextReplacementPlugin(/\@angular\b.*\b(bundles|linker)/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/11580
-        new webpack.IgnorePlugin(/^vertx$/), // Workaround for https://github.com/stefanpenner/es6-promise/issues/100
-        new webpack.NormalModuleReplacementPlugin(/\/iconv-loader$/, require.resolve('node-noop')), // Workaround for https://github.com/andris9/encoding/issues/16
+            new webpack.IgnorePlugin(/^vertx$/) // Workaround for https://github.com/stefanpenner/es6-promise/issues/100
         ]
     };
 
-var clientBundleConfig = merge(sharedConfig, {
+    const clientBundleConfig = merge(sharedConfig, {
         output: { path: path.join(__dirname, 'wwwroot', 'dist') },
         module: {
-        loaders: [
-            { test: /\.css(\?|$)/, loader: extractCSS.extract(['css-loader']) }
+            rules: [
+                { test: /\.css(\?|$)/, use: extractCSS.extract({ loader: 'css-loader' }) }
             ]
         },
         plugins: [
@@ -61,20 +61,19 @@ var clientBundleConfig = merge(sharedConfig, {
                 name: '[name]_[hash]'
             })
         ].concat(isDevBuild ? [] : [
-        new webpack.optimize.OccurenceOrderPlugin(),
-        new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } })
+            new webpack.optimize.UglifyJsPlugin()
         ])
     });
 
-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: 'to-string-loader!css-loader' } ]
+            rules: [ { test: /\.css(\?|$)/, use: ['to-string-loader', 'css-loader'] } ]
         },
         entry: { vendor: ['aspnet-prerendering'] },
         plugins: [
@@ -85,4 +84,5 @@ var serverBundleConfig = merge(sharedConfig, {
         ]
     });
 
-module.exports = [clientBundleConfig, serverBundleConfig];
+    return [clientBundleConfig, serverBundleConfig];
+}

templates/KnockoutSpa/package.json

@@ -12,13 +12,14 @@
     "@types/requirejs": "^2.1.26",
     "@types/signals": "0.0.16",
     "@types/whatwg-fetch": "0.0.30",
-    "aspnet-webpack": "^1.0.17",
+    "aspnet-webpack": "^1.0.27",
+    "awesome-typescript-loader": "3.0.0-beta.13 || ^3.0.0",
     "bootstrap": "^3.3.6",
     "bundle-loader": "^0.5.4",
     "crossroads": "^0.12.2",
     "css-loader": "^0.25.0",
     "event-source-polyfill": "^0.0.7",
-    "extract-text-webpack-plugin": "^1.0.1",
+    "extract-text-webpack-plugin": "^2.0.0-rc",
     "file-loader": "^0.9.0",
     "history": "^4.3.0",
     "isomorphic-fetch": "^2.2.1",
@@ -27,10 +28,9 @@
     "knockout": "^3.4.0",
     "raw-loader": "^0.5.1",
     "style-loader": "^0.13.1",
-    "ts-loader": "^0.8.2",
     "typescript": "^2.0.3",
     "url-loader": "^0.5.7",
-    "webpack": "^1.13.2",
+    "webpack": "^2.2.0",
     "webpack-hot-middleware": "^2.12.2"
   }
 }

templates/KnockoutSpa/webpack.config.js

@@ -1,27 +1,30 @@
-var isDevBuild = process.argv.indexOf('--env.prod') < 0;
-var path = require('path');
-var webpack = require('webpack');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
+const path = require('path');
+const webpack = require('webpack');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin;
+const bundleOutputDir = './wwwroot/dist';
 
-var bundleOutputDir = './wwwroot/dist';
-module.exports = {
+module.exports = (env) => {
+    const isDevBuild = !(env && env.prod);
+    return [{
+        stats: { modules: false },
         entry: { 'main': './ClientApp/boot.ts' },
-    resolve: { extensions: [ '', '.js', '.ts' ] },
+        resolve: { extensions: [ '.js', '.ts' ] },
         output: {
             path: path.join(__dirname, bundleOutputDir),
             filename: '[name].js',
             publicPath: '/dist/'
         },
         module: {
-        loaders: [
-            { test: /\.ts$/, include: /ClientApp/, loader: 'ts-loader', query: { silent: true } },
+            rules: [
+                { test: /\.ts$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' },
                 { test: /\.html$/, loader: 'raw-loader' },
-            { test: /\.css$/, loader: isDevBuild ? 'style-loader!css-loader' : ExtractTextPlugin.extract(['css-loader']) },
-            { test: /\.(png|jpg|jpeg|gif|svg)$/, loader: 'url-loader', query: { limit: 25000 } },
-            { test: /\.json$/, loader: 'json-loader' }
+                { test: /\.css$/, loader: isDevBuild ? 'style-loader!css-loader' : ExtractTextPlugin.extract({ loader: 'css-loader' }) },
+                { test: /\.(png|jpg|jpeg|gif|svg)$/, loader: 'url-loader?limit=25000' }
             ]
         },
         plugins: [
+            new CheckerPlugin(),
             new webpack.DllReferencePlugin({
                 context: __dirname,
                 manifest: require('./wwwroot/dist/vendor-manifest.json')
@@ -34,8 +37,8 @@ module.exports = {
             })
         ] : [
             // Plugins that apply in production builds only
-        new webpack.optimize.OccurenceOrderPlugin(),
-        new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }),
+            new webpack.optimize.UglifyJsPlugin(),
             new ExtractTextPlugin('site.css')
         ])
+    }];
 };

templates/KnockoutSpa/webpack.config.vendor.js

@@ -1,17 +1,19 @@
-var isDevBuild = process.argv.indexOf('--env.prod') < 0;
-var path = require('path');
-var webpack = require('webpack');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var extractCSS = new ExtractTextPlugin('vendor.css');
+const path = require('path');
+const webpack = require('webpack');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
-module.exports = {
+module.exports = (env) => {
+    const isDevBuild = !(env && env.prod);
+    const extractCSS = new ExtractTextPlugin('vendor.css');
+    return [{
+        stats: { modules: false },
         resolve: {
-        extensions: [ '', '.js' ]
+            extensions: [ '.js' ]
         },
         module: {
-        loaders: [
-            { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, loader: 'url-loader?limit=100000' },
-            { test: /\.css(\?|$)/, loader: extractCSS.extract(['css-loader']) }
+            rules: [
+                { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' },
+                { test: /\.css(\?|$)/, use: extractCSS.extract({ loader: 'css-loader' }) }
             ]
         },
         entry: {
@@ -26,12 +28,12 @@ module.exports = {
         plugins: [
             extractCSS,
             new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable)
-        new webpack.optimize.OccurenceOrderPlugin(),
             new webpack.DllPlugin({
                 path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'),
                 name: '[name]_[hash]'
             })
         ].concat(isDevBuild ? [] : [
-        new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } })
+            new webpack.optimize.UglifyJsPlugin()
         ])
+    }];
 };

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/uglify-js": "^2.0.27",
-    "@types/webpack": "^1.12.35",
-    "@types/webpack-env": "^1.12.1",
+    "@types/webpack": "^2.2.0",
+    "@types/webpack-env": "^1.13.0",
     "@types/whatwg-fetch": "0.0.28",
     "aspnet-prerendering": "^2.0.0",
-    "aspnet-webpack": "^1.0.17",
-    "aspnet-webpack-react": "^1.0.2",
+    "aspnet-webpack": "^1.0.27",
+    "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"
   }