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

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,41 +1,44 @@
-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;
+const bundleOutputDir = './wwwroot/dist';
 
-var bundleOutputDir = './wwwroot/dist';
+module.exports = (env) => {
-module.exports = {
+    const isDevBuild = !(env && env.prod);
-    entry: { 'main': './ClientApp/boot.ts' },
+    return [{
-    resolve: { extensions: [ '', '.js', '.ts' ] },
+        stats: { modules: false },
-    output: {
+        entry: { 'main': './ClientApp/boot.ts' },
-        path: path.join(__dirname, bundleOutputDir),
+        resolve: { extensions: [ '.js', '.ts' ] },
-        filename: '[name].js',
+        output: {
-        publicPath: '/dist/'
+            path: path.join(__dirname, bundleOutputDir),
-    },
+            filename: '[name].js',
-    module: {
+            publicPath: '/dist/'
-        loaders: [
+        },
-            { test: /\.ts$/, include: /ClientApp/, loader: 'ts-loader', query: { silent: true } },
+        module: {
-            { test: /\.html$/, loader: 'raw-loader' },
+            rules: [
-            { test: /\.css$/, loader: isDevBuild ? 'style-loader!css-loader' : ExtractTextPlugin.extract(['css-loader']) },
+                { test: /\.ts$/, include: /ClientApp/, use: 'awesome-typescript-loader?silent=true' },
-            { test: /\.(png|jpg|jpeg|gif|svg)$/, loader: 'url-loader', query: { limit: 25000 } },
+                { test: /\.html$/, loader: 'raw-loader' },
-            { 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 webpack.DllReferencePlugin({
+        plugins: [
-            context: __dirname,
+            new CheckerPlugin(),
-            manifest: require('./wwwroot/dist/vendor-manifest.json')
+            new webpack.DllReferencePlugin({
-        })
+                context: __dirname,
-    ].concat(isDevBuild ? [
+                manifest: require('./wwwroot/dist/vendor-manifest.json')
-        // Plugins that apply in development builds only
+            })
-        new webpack.SourceMapDevToolPlugin({
+        ].concat(isDevBuild ? [
-            filename: '[file].map', // Remove this line if you prefer inline source maps
+            // Plugins that apply in development builds only
-            moduleFilenameTemplate: path.relative(bundleOutputDir, '[resourcePath]') // Point sourcemap entries to the original file locations on disk
+            new webpack.SourceMapDevToolPlugin({
-        })
+                filename: '[file].map', // Remove this line if you prefer inline source maps
-    ] : [
+                moduleFilenameTemplate: path.relative(bundleOutputDir, '[resourcePath]') // Point sourcemap entries to the original file locations on disk
-        // Plugins that apply in production builds only
+            })
-        new webpack.optimize.OccurenceOrderPlugin(),
+        ] : [
-        new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }),
+            // Plugins that apply in production builds only
-        new ExtractTextPlugin('site.css')
+            new webpack.optimize.UglifyJsPlugin(),
-    ])
+            new ExtractTextPlugin('site.css')
+        ])
+    }];
 };

templates/KnockoutSpa/webpack.config.vendor.js

@@ -1,37 +1,39 @@
-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');
-var extractCSS = new ExtractTextPlugin('vendor.css');
 
-module.exports = {
+module.exports = (env) => {
-    resolve: {
+    const isDevBuild = !(env && env.prod);
-        extensions: [ '', '.js' ]
+    const extractCSS = new ExtractTextPlugin('vendor.css');
-    },
+    return [{
-    module: {
+        stats: { modules: false },
-        loaders: [
+        resolve: {
-            { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, loader: 'url-loader?limit=100000' },
+            extensions: [ '.js' ]
-            { test: /\.css(\?|$)/, loader: extractCSS.extract(['css-loader']) }
+        },
-        ]
+        module: {
-    },
+            rules: [
-    entry: {
+                { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' },
-        vendor: ['bootstrap', 'bootstrap/dist/css/bootstrap.css', 'knockout', 'crossroads', 'event-source-polyfill', 'history', 'isomorphic-fetch', 'style-loader', 'jquery'],
+                { test: /\.css(\?|$)/, use: extractCSS.extract({ loader: 'css-loader' }) }
-    },
+            ]
-    output: {
+        },
-        path: path.join(__dirname, 'wwwroot', 'dist'),
+        entry: {
-        publicPath: '/dist/',
+            vendor: ['bootstrap', 'bootstrap/dist/css/bootstrap.css', 'knockout', 'crossroads', 'event-source-polyfill', 'history', 'isomorphic-fetch', 'style-loader', 'jquery'],
-        filename: '[name].js',
+        },
-        library: '[name]_[hash]',
+        output: {
-    },
+            path: path.join(__dirname, 'wwwroot', 'dist'),
-    plugins: [
+            publicPath: '/dist/',
-        extractCSS,
+            filename: '[name].js',
-        new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable)
+            library: '[name]_[hash]',
-        new webpack.optimize.OccurenceOrderPlugin(),
+        },
-        new webpack.DllPlugin({
+        plugins: [
-            path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'),
+            extractCSS,
-            name: '[name]_[hash]'
+            new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable)
-        })
+            new webpack.DllPlugin({
-    ].concat(isDevBuild ? [] : [
+                path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'),
-        new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } })
+                name: '[name]_[hash]'
-    ])
+            })
+        ].concat(isDevBuild ? [] : [
+            new webpack.optimize.UglifyJsPlugin()
+        ])
+    }];
 };