From bf1c6f332a71d193857a5df3ffe5c172d64cc6b2 Mon Sep 17 00:00:00 2001
From: Chunpeng Huo <huocp@me.com>
Date: Wed, 19 Feb 2020 08:28:02 +1100
Subject: [PATCH] refactor(webpack): use entry not ProviderPlugin for promise
 polyfill

---
 skeleton/webpack/webpack.config.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/skeleton/webpack/webpack.config.js b/skeleton/webpack/webpack.config.js
index 986c0feff..f21e54f6e 100644
--- a/skeleton/webpack/webpack.config.js
+++ b/skeleton/webpack/webpack.config.js
@@ -5,7 +5,9 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const DuplicatePackageCheckerPlugin = require('duplicate-package-checker-webpack-plugin');
 const project = require('./aurelia_project/aurelia.json');
 const { AureliaPlugin, ModuleDependenciesPlugin } = require('aurelia-webpack-plugin');
+// @if feat['scaffold-navigation']
 const { ProvidePlugin } = require('webpack');
+// @endif
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const CleanWebpackPlugin = require('clean-webpack-plugin');
 
@@ -67,7 +69,11 @@ module.exports = ({ production } = {}, {extractCss, analyze, tests, hmr, port, h
     alias: { 'aurelia-binding': path.resolve(__dirname, 'node_modules/aurelia-binding') }
   },
   entry: {
-    app: ['aurelia-bootstrapper']
+    app: [
+      // Remove next line if you don't need to support IE11
+      'promise-polyfill/src/polyfill',
+      'aurelia-bootstrapper'
+    ]
   },
   mode: production ? 'production' : 'development',
   output: {
@@ -310,13 +316,14 @@ module.exports = ({ production } = {}, {extractCss, analyze, tests, hmr, port, h
   plugins: [
     ...when(!tests, new DuplicatePackageCheckerPlugin()),
     new AureliaPlugin(),
-    new ProvidePlugin({
     // @if feat['scaffold-navigation']
-      $: 'jquery',
-      jQuery: 'jquery',
-    // @endif
-      'Promise': ['promise-polyfill', 'default']
+    new ProvidePlugin({
+      'jQuery': 'jquery',
+      '$': 'jquery',
+      'window.jQuery': 'jquery',
+      'window.$': 'jquery'
     }),
+    // @endif
     new ModuleDependenciesPlugin({
       'aurelia-testing': ['./compile-spy', './view-spy']
     }),