Skip to content

Commit 2a25402

Browse files
clydinBrocco
authored andcommitted
refactor(@angular/cli): use project's zone.js when needed
1 parent da37cc0 commit 2a25402

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

package-lock.json

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@
100100
"webpack-dev-server": "~2.11.0",
101101
"webpack-merge": "^4.1.0",
102102
"webpack-sources": "^1.0.0",
103-
"webpack-subresource-integrity": "^1.0.1",
104-
"zone.js": "^0.8.14"
103+
"webpack-subresource-integrity": "^1.0.1"
105104
},
106105
"devDependencies": {
107106
"@angular/compiler": "^5.0.0",
@@ -143,7 +142,8 @@
143142
"temp": "0.8.3",
144143
"through": "^2.3.6",
145144
"ts-node": "^3.2.0",
146-
"tslint": "^5.1.0"
145+
"tslint": "^5.1.0",
146+
"zone.js": "^0.8.20"
147147
},
148148
"optionalDependencies": {
149149
"node-sass": "^4.7.2"

packages/@angular/cli/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@
8383
"webpack-dev-server": "~2.11.0",
8484
"webpack-merge": "^4.1.0",
8585
"webpack-sources": "^1.0.0",
86-
"webpack-subresource-integrity": "^1.0.1",
87-
"zone.js": "^0.8.14"
86+
"webpack-subresource-integrity": "^1.0.1"
8887
},
8988
"optionalDependencies": {
9089
"node-sass": "^4.7.2"

packages/@angular/cli/tasks/render-universal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export interface RenderUniversalTaskOptions {
1313

1414
export default Task.extend({
1515
run: function(options: RenderUniversalTaskOptions): Promise<any> {
16-
require('zone.js/dist/zone-node');
16+
requireProjectModule(this.project.root, 'zone.js/dist/zone-node');
1717

1818
const renderModuleFactory =
1919
requireProjectModule(this.project.root, '@angular/platform-server').renderModuleFactory;

0 commit comments

Comments
 (0)