From 4d206d0ccaa27db2894693a6715c39800fe255f0 Mon Sep 17 00:00:00 2001 From: Stephen Pellicer Date: Wed, 7 Sep 2016 08:49:00 -0400 Subject: [PATCH 1/2] fixes for working with angular-2.0.0-rc.6 lock package versions add mainFields to webpack config --- addon/ng2/models/webpack-build-common.ts | 1 + package.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addon/ng2/models/webpack-build-common.ts b/addon/ng2/models/webpack-build-common.ts index d4291f118851..80916804de23 100644 --- a/addon/ng2/models/webpack-build-common.ts +++ b/addon/ng2/models/webpack-build-common.ts @@ -36,6 +36,7 @@ export function getWebpackCommonConfig( return { devtool: 'source-map', resolve: { + mainFields: ['browser', 'main'], extensions: ['', '.ts', '.js'], root: appRoot }, diff --git a/package.json b/package.json index 720438199e80..f2372cbfa250 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@angular/core": "^2.0.0-rc.6", "@angular/tsc-wrapped": "^0.2.2", "angular2-template-loader": "^0.5.0", - "awesome-typescript-loader": "^2.2.3", + "awesome-typescript-loader": "2.2.1", "chalk": "^1.1.3", "common-tags": "^1.3.1", "compression-webpack-plugin": "^0.3.1", @@ -103,7 +103,7 @@ "typedoc": "^0.4.2", "typescript": "2.0.2", "url-loader": "^0.5.7", - "webpack": "2.1.0-beta.19", + "webpack": "2.1.0-beta.21", "webpack-dev-server": "^2.1.0-beta.3", "webpack-md5-hash": "0.0.5", "webpack-merge": "^0.14.0" From cc9c68d1c7df82c1396b5c0b50c8c8595e7ca78c Mon Sep 17 00:00:00 2001 From: Stephen Pellicer Date: Wed, 7 Sep 2016 09:35:01 -0400 Subject: [PATCH 2/2] downgrade typescript to 2.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2372cbfa250..a06153e6d9c0 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "ts-loader": "^0.8.2", "tslint-loader": "^2.1.4", "typedoc": "^0.4.2", - "typescript": "2.0.2", + "typescript": "2.0.0", "url-loader": "^0.5.7", "webpack": "2.1.0-beta.21", "webpack-dev-server": "^2.1.0-beta.3",