Skip to content

Commit

Permalink
Merge pull request #1080 from huochunpeng/ie-promise
Browse files Browse the repository at this point in the history
fix(skeleton): fix Promise polyfill on IE
  • Loading branch information
EisenbergEffect authored Apr 18, 2019
2 parents 9c139e1 + bc377dc commit 5d39d85
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion lib/dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"clean-webpack-plugin": "^1.0.1",
"connect-history-api-fallback": "^1.6.0",
"copy-webpack-plugin": "^5.0.0",
"core-js": "^3.0.0",
"cross-env": "^5.2.0",
"cssnano": "^4.1.10",
"css-loader": "^1.0.0",
Expand Down Expand Up @@ -83,6 +82,7 @@
"opn": "^5.4.0",
"postcss-loader": "^3.0.0",
"postcss-url": "^8.0.0",
"promise-polyfill": "^8.1.0",
"protractor": "^5.4.2",
"regenerator-runtime": "0.13.2",
"requirejs": "^2.3.6",
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions skeleton/cli-bundler/aurelia_project/aurelia.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
{
"name": "vendor-bundle.js",
"prepend": [
"node_modules/promise-polyfill/dist/polyfill.min.js",
// @if feat.requirejs
"node_modules/requirejs/require.js"
// @endif
Expand Down
2 changes: 1 addition & 1 deletion skeleton/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
"aurelia-cli": "",
"aurelia-testing": "",
"aurelia-tools": "",
"core-js": "",
"gulp": "",
"minimatch": "",
"through2": "",
"vinyl-fs": "",
"promise-polyfill": "",

// @if feat.babel
"regenerator-runtime": "",
Expand Down
3 changes: 2 additions & 1 deletion skeleton/plugin/dev-app/main.ext
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'core-js/stable';
// @if feat.babel
// regenerator-runtime is to support async/await syntax in ESNext.
// If you don't use async/await, you can remove regenerator-runtime.
import 'regenerator-runtime/runtime';
// @endif
// @if feat.typescript
Expand Down
3 changes: 2 additions & 1 deletion skeleton/scaffold-minimum/src/main.ext
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'core-js/stable';
// @if feat.babel
// regenerator-runtime is to support async/await syntax in ESNext.
// If you don't use async/await, you can remove regenerator-runtime.
import 'regenerator-runtime/runtime';
// @endif
// @if feat.typescript
Expand Down
3 changes: 2 additions & 1 deletion skeleton/scaffold-navigation/src/main.ext
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'core-js/stable';
// @if feat.babel
// regenerator-runtime is to support async/await syntax in ESNext.
// If you don't use async/await, you can remove regenerator-runtime.
import 'regenerator-runtime/runtime';
// @endif
import 'bootstrap';
Expand Down
1 change: 1 addition & 0 deletions skeleton/webpack/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ module.exports = ({ production, server, extractCss, coverage, analyze, karma } =
$: 'jquery',
jQuery: 'jquery',
// @endif
'Promise': ['promise-polyfill', 'default']
}),
new ModuleDependenciesPlugin({
'aurelia-testing': ['./compile-spy', './view-spy']
Expand Down

0 comments on commit 5d39d85

Please sign in to comment.