Move externals plugin into configs (#234)

Move the ExternalLoaderPlugin into the configs since it must be registered after the HtmlWebpackPlugin in order to function correctly.
dojo · Jan 23, 2019 · c6c5d15 · c6c5d15
1 parent 95418c0
commit c6c5d15
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/src/base.config.ts b/src/base.config.ts
@@ -1,5 +1,4 @@
 import CssModulePlugin from '@dojo/webpack-contrib/css-module-plugin/CssModulePlugin';
-import ExternalLoaderPlugin from '@dojo/webpack-contrib/external-loader-plugin/ExternalLoaderPlugin';
 import BootstrapPlugin from '@dojo/webpack-contrib/bootstrap-plugin/BootstrapPlugin';
 import I18nPlugin from '@dojo/webpack-contrib/i18n-plugin/I18nPlugin';
 import registryTransformer from '@dojo/webpack-contrib/registry-transformer';
@@ -364,13 +363,6 @@ export default function webpackConfigFactory(args: any): webpack.Configuration {
 					cldrPaths: args.cldrPaths,
 					target: mainEntryPath
 				}),
-			args.externals &&
-				args.externals.dependencies &&
-				new ExternalLoaderPlugin({
-					dependencies: args.externals.dependencies,
-					hash: true,
-					outputPath: args.externals.outputPath
-				}),
 			!singleBundle &&
 				new webpack.DefinePlugin({
 					__MAIN_ENTRY: JSON.stringify(mainEntryPath)

diff --git a/src/base.test.config.ts b/src/base.test.config.ts
@@ -1,5 +1,6 @@
 import * as webpack from 'webpack';
 import baseConfigFactory, { libraryName } from './base.config';
+import ExternalLoaderPlugin from '@dojo/webpack-contrib/external-loader-plugin/ExternalLoaderPlugin';
 
 const WrapperPlugin = require('wrapper-webpack-plugin');
 
@@ -12,6 +13,13 @@ function webpackConfig(args: any): webpack.Configuration {
 
 	config.plugins = [
 		...plugins!,
+		args.externals &&
+			args.externals.dependencies &&
+			new ExternalLoaderPlugin({
+				dependencies: args.externals.dependencies,
+				hash: true,
+				outputPath: args.externals.outputPath
+			}),
 		new WrapperPlugin({
 			test: /(all.*(\.js$))/,
 			footer: `typeof define === 'function' && define.amd && define(['${libraryName}'], function() {});`

diff --git a/src/dev.config.ts b/src/dev.config.ts
@@ -5,6 +5,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import webpack = require('webpack');
 import BuildTimeRender from '@dojo/webpack-contrib/build-time-render/BuildTimeRender';
+import ExternalLoaderPlugin from '@dojo/webpack-contrib/external-loader-plugin/ExternalLoaderPlugin';
 import ServiceWorkerPlugin, {
 	ServiceWorkerOptions
 } from '@dojo/webpack-contrib/service-worker-plugin/ServiceWorkerPlugin';
@@ -36,6 +37,13 @@ function webpackConfig(args: any): webpack.Configuration {
 			template: 'src/index.html',
 			cache: false
 		}),
+		args.externals &&
+			args.externals.dependencies &&
+			new ExternalLoaderPlugin({
+				dependencies: args.externals.dependencies,
+				hash: true,
+				outputPath: args.externals.outputPath
+			}),
 		manifest &&
 			new WebpackPwaManifest({
 				...manifest,

diff --git a/src/dist.config.ts b/src/dist.config.ts
@@ -1,4 +1,5 @@
 import BuildTimeRender from '@dojo/webpack-contrib/build-time-render/BuildTimeRender';
+import ExternalLoaderPlugin from '@dojo/webpack-contrib/external-loader-plugin/ExternalLoaderPlugin';
 import BundleAnalyzerPlugin from '@dojo/webpack-contrib/webpack-bundle-analyzer/BundleAnalyzerPlugin';
 import ServiceWorkerPlugin, {
 	ServiceWorkerOptions
@@ -63,6 +64,13 @@ function webpackConfig(args: any): webpack.Configuration {
 			template: 'src/index.html',
 			cache: false
 		}),
+		args.externals &&
+			args.externals.dependencies &&
+			new ExternalLoaderPlugin({
+				dependencies: args.externals.dependencies,
+				hash: true,
+				outputPath: args.externals.outputPath
+			}),
 		manifest &&
 			new WebpackPwaManifest({
 				...manifest,