Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit a5d2f20

Browse files
committed
chore: update deps
1 parent 38713c4 commit a5d2f20

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,18 @@
1616
"license": "MIT",
1717
"devDependencies": {
1818
"awesome-typescript-loader": "0.15.10",
19-
"ie-shim": "^0.1.0",
20-
"source-map-loader": "^0.1.5",
2119
"typescript": "~1.8.7",
2220
"typings": "^0.7.4",
2321
"webpack": "^1.12.9",
2422
"webpack-dev-server": "^1.14.0",
25-
"webpack-merge": "^0.8.3"
23+
"webpack-merge": "^0.8.3",
24+
"es6-promise": "3.0.2",
25+
"es6-shim": "0.33.3",
26+
"reflect-metadata": "0.1.2"
2627
},
2728
"dependencies": {
2829
"angular2": "2.0.0-beta.9",
29-
"es6-promise": "3.0.2",
30-
"es6-shim": "0.33.3",
31-
"reflect-metadata": "0.1.2",
30+
"core-js": "^2.2.0",
3231
"rxjs": "5.0.0-beta.2",
3332
"zone.js": "0.5.15"
3433
},

src/polyfills.ts

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
// Polyfills
2-
import 'es6-shim';
3-
import 'reflect-metadata';
4-
// import 'ie-shim';
2+
// These modules are what's in angular 2 bundle polyfills so don't include them
3+
// import 'es6-shim';
4+
// import 'es6-promise';
5+
// import 'reflect-metadata';
6+
7+
// CoreJS has all the polyfills you need
8+
9+
import 'core-js';
510
import 'zone.js/dist/zone-microtask';
6-
import 'zone.js/dist/long-stack-trace-zone';
11+
import 'zone.js/dist/long-stack-trace-zone'; // Development only

webpack.config.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
var webpack = require('webpack');
2-
var webpackMerge = require('webpack-merge');
32
var path = require('path');
43

54

@@ -20,14 +19,11 @@ var webpackConfig = {
2019
],
2120

2221
module: {
23-
preLoaders: [
24-
{ test: /\.js$/, loader: 'source-map-loader', exclude: /node_modules(\/|\\)rxjs/ }
25-
],
2622
loaders: [
2723
// .ts files for TypeScript
2824
{ test: /\.ts$/, loader: 'awesome-typescript-loader' },
2925

30-
],
26+
]
3127
}
3228

3329
};
@@ -45,6 +41,9 @@ var webpackConfig = {
4541

4642

4743

44+
45+
46+
4847
// Our Webpack Defaults
4948
var defaultConfig = {
5049
devtool: 'cheap-module-eval-source-map',
@@ -75,7 +74,6 @@ var defaultConfig = {
7574

7675
node: {
7776
global: 1,
78-
process: 1,
7977
crypto: 'empty',
8078
module: 0,
8179
Buffer: 0,
@@ -84,5 +82,5 @@ var defaultConfig = {
8482
},
8583
}
8684

87-
85+
var webpackMerge = require('webpack-merge');
8886
module.exports = webpackMerge(defaultConfig, webpackConfig);

0 commit comments

Comments
 (0)