From f26068b62b94351a579c0247f0dfea612b863fd5 Mon Sep 17 00:00:00 2001 From: SteveSandersonMS Date: Tue, 11 Oct 2016 19:04:17 +0100 Subject: [PATCH] Temporarily disable use of SourceMapDevToolPlugin wrapper as it might be possible to remove it shortly --- templates/Angular2Spa/webpack.config.js | 3 +-- templates/KnockoutSpa/webpack.config.js | 3 +-- templates/ReactReduxSpa/webpack.config.js | 3 +-- templates/ReactSpa/webpack.config.js | 3 +-- templates/WebApplicationBasic/webpack.config.dev.js | 4 ++-- templates/package-builder/src/yeoman/package.json | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/templates/Angular2Spa/webpack.config.js b/templates/Angular2Spa/webpack.config.js index 36a8652..6199f68 100644 --- a/templates/Angular2Spa/webpack.config.js +++ b/templates/Angular2Spa/webpack.config.js @@ -1,7 +1,6 @@ var isDevBuild = process.argv.indexOf('--env.prod') < 0; var path = require('path'); var webpack = require('webpack'); -var SourceMapDevToolPlugin = require('aspnet-webpack').SourceMapDevToolPlugin; var nodeExternals = require('webpack-node-externals'); var merge = require('webpack-merge'); var allFilenamesExceptJavaScript = /\.(?!js(\?|$))([^.]+(\?|$))/; @@ -34,7 +33,7 @@ var clientBundleConfig = merge(sharedConfig, { }) ].concat(isDevBuild ? [ // Plugins that apply in development builds only - new SourceMapDevToolPlugin({ moduleFilenameTemplate: '../../[resourcePath]' }) // Compiled output is at './wwwroot/dist/', but sources are relative to './' + new webpack.SourceMapDevToolPlugin({ moduleFilenameTemplate: '../../[resourcePath]' }) // Compiled output is at './wwwroot/dist/', but sources are relative to './' ] : [ // Plugins that apply in production builds only new webpack.optimize.OccurenceOrderPlugin(), diff --git a/templates/KnockoutSpa/webpack.config.js b/templates/KnockoutSpa/webpack.config.js index 0ed53ff..eaa1d24 100644 --- a/templates/KnockoutSpa/webpack.config.js +++ b/templates/KnockoutSpa/webpack.config.js @@ -2,7 +2,6 @@ var isDevBuild = process.argv.indexOf('--env.prod') < 0; var path = require('path'); var webpack = require('webpack'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); -var SourceMapDevToolPlugin = require('aspnet-webpack').SourceMapDevToolPlugin; module.exports = { entry: { 'main': './ClientApp/boot.ts' }, @@ -27,7 +26,7 @@ module.exports = { }) ].concat(isDevBuild ? [ // Plugins that apply in development builds only - new SourceMapDevToolPlugin({ moduleFilenameTemplate: '../../[resourcePath]' }) // Compiled output is at './wwwroot/dist/', but sources are relative to './' + new webpack.SourceMapDevToolPlugin({ moduleFilenameTemplate: '../../[resourcePath]' }) // Compiled output is at './wwwroot/dist/', but sources are relative to './' ] : [ // Plugins that apply in production builds only new webpack.optimize.OccurenceOrderPlugin(), diff --git a/templates/ReactReduxSpa/webpack.config.js b/templates/ReactReduxSpa/webpack.config.js index dbe8484..72d40bb 100644 --- a/templates/ReactReduxSpa/webpack.config.js +++ b/templates/ReactReduxSpa/webpack.config.js @@ -2,7 +2,6 @@ var isDevBuild = process.argv.indexOf('--env.prod') < 0; var path = require('path'); var webpack = require('webpack'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); -var SourceMapDevToolPlugin = require('aspnet-webpack').SourceMapDevToolPlugin; var nodeExternals = require('webpack-node-externals'); var merge = require('webpack-merge'); var allFilenamesExceptJavaScript = /\.(?!js(\?|$))([^.]+(\?|$))/; @@ -40,7 +39,7 @@ var clientBundleConfig = merge(sharedConfig(), { }) ].concat(isDevBuild ? [ // Plugins that apply in development builds only - new SourceMapDevToolPlugin({ moduleFilenameTemplate: '../../[resourcePath]' }) // Compiled output is at './wwwroot/dist/', but sources are relative to './' + new webpack.SourceMapDevToolPlugin({ moduleFilenameTemplate: '../../[resourcePath]' }) // Compiled output is at './wwwroot/dist/', but sources are relative to './' ] : [ // Plugins that apply in production builds only new webpack.optimize.OccurenceOrderPlugin(), diff --git a/templates/ReactSpa/webpack.config.js b/templates/ReactSpa/webpack.config.js index 0555dc1..3f63ccf 100644 --- a/templates/ReactSpa/webpack.config.js +++ b/templates/ReactSpa/webpack.config.js @@ -2,7 +2,6 @@ var isDevBuild = process.argv.indexOf('--env.prod') < 0; var path = require('path'); var webpack = require('webpack'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); -var SourceMapDevToolPlugin = require('aspnet-webpack').SourceMapDevToolPlugin; module.exports = { devtool: isDevBuild ? 'inline-source-map' : null, @@ -28,7 +27,7 @@ module.exports = { }) ].concat(isDevBuild ? [ // Plugins that apply in development builds only - new SourceMapDevToolPlugin({ moduleFilenameTemplate: '../../[resourcePath]' }) // Compiled output is at './wwwroot/dist/', but sources are relative to './' + new webpack.SourceMapDevToolPlugin({ moduleFilenameTemplate: '../../[resourcePath]' }) // Compiled output is at './wwwroot/dist/', but sources are relative to './' ] : [ // Plugins that apply in production builds only new webpack.optimize.OccurenceOrderPlugin(), diff --git a/templates/WebApplicationBasic/webpack.config.dev.js b/templates/WebApplicationBasic/webpack.config.dev.js index 3dd20b3..3a50a8a 100644 --- a/templates/WebApplicationBasic/webpack.config.dev.js +++ b/templates/WebApplicationBasic/webpack.config.dev.js @@ -1,7 +1,7 @@ -var SourceMapDevToolPlugin = require('aspnet-webpack').SourceMapDevToolPlugin; +var webpack = require('webpack'); module.exports = { plugins: [ - new SourceMapDevToolPlugin({ moduleFilenameTemplate: '../../[resourcePath]' }) // Compiled output is at './wwwroot/dist/', but sources are relative to './' + new webpack.SourceMapDevToolPlugin({ moduleFilenameTemplate: '../../[resourcePath]' }) // Compiled output is at './wwwroot/dist/', but sources are relative to './' ] }; diff --git a/templates/package-builder/src/yeoman/package.json b/templates/package-builder/src/yeoman/package.json index 8f63589..5edc3f4 100644 --- a/templates/package-builder/src/yeoman/package.json +++ b/templates/package-builder/src/yeoman/package.json @@ -1,6 +1,6 @@ { "name": "generator-aspnetcore-spa", - "version": "0.3.5", + "version": "0.3.6", "description": "Single-Page App templates for ASP.NET Core", "author": "Microsoft", "license": "Apache-2.0",