Skip to content

Commit fbb49b6

Browse files
committed
feat(@ngtools/webpack): add JIT support to AngularCompilerPlugin
1 parent 63c145d commit fbb49b6

22 files changed

+366
-127
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ jobs:
1515
key: angular-cli-{{ .Branch }}-{{ checksum "yarn.lock" }}
1616
paths:
1717
- "node_modules"
18-
- run: xvfb-run -a node tests/run_e2e.js --glob=tests/build/**
18+
- run: xvfb-run -a node tests/run_e2e.js --glob=tests/build/** --nightly

.travis.yml

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -29,65 +29,65 @@ matrix:
2929
env: test
3030
- node_js: "6"
3131
os: linux
32-
script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent
32+
script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent --nightly
3333
env: e2e-0
3434
- node_js: "6"
3535
os: linux
36-
script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent
36+
script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent --nightly
3737
env: e2e-1
3838
- node_js: "6"
3939
os: linux
40-
script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent
40+
script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent --nightly
4141
env: e2e-2
4242
- node_js: "6"
4343
os: linux
44-
script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent
44+
script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent --nightly
4545
env: e2e-3
4646
- node_js: "6"
4747
os: linux
48-
script: node tests/run_e2e.js --eject "--glob=tests/build/**"
48+
script: node tests/run_e2e.js --eject "--glob=tests/build/**" --nightly
4949
env: eject
5050

5151
# Optional builds.
52-
- node_js: "6"
53-
os: linux
54-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
55-
script: node tests/run_e2e.js --ng2 "--glob=tests/{build,test,misc}/**"
56-
env: ng2
57-
- node_js: "6"
58-
os: linux
59-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
60-
script: node tests/run_e2e.js "--nightly --glob=tests/{build,test,misc}/**"
61-
env: nightly
62-
- node_js: "7"
63-
os: linux
64-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
65-
script: node tests/run_e2e.js "--glob=tests/{build,test,misc}/**"
66-
env: node7
67-
- node_js: "8"
68-
os: linux
69-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
70-
script: node tests/run_e2e.js "--glob=tests/build/**"
71-
env: node8
52+
# - node_js: "6"
53+
# os: linux
54+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
55+
# script: node tests/run_e2e.js --ng2 "--glob=tests/{build,test,misc}/**"
56+
# env: ng2
57+
# - node_js: "6"
58+
# os: linux
59+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
60+
# script: node tests/run_e2e.js "--nightly --glob=tests/{build,test,misc}/**"
61+
# env: nightly
62+
# - node_js: "7"
63+
# os: linux
64+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
65+
# script: node tests/run_e2e.js "--glob=tests/{build,test,misc}/**"
66+
# env: node7
67+
# - node_js: "8"
68+
# os: linux
69+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
70+
# script: node tests/run_e2e.js "--glob=tests/build/**"
71+
# env: node8
7272

73-
- stage: deploy
74-
script: skip
75-
env: builds
76-
deploy:
77-
- provider: script
78-
script: node scripts/git-builds.js
79-
skip_cleanup: true
80-
on:
81-
all_branches: true
82-
- stage: deploy
83-
script: skip
84-
env: publish
85-
deploy:
86-
- provider: script
87-
script: node scripts/publish/publish.js
88-
skip_cleanup: true
89-
on:
90-
tags: true
73+
# - stage: deploy
74+
# script: skip
75+
# env: builds
76+
# deploy:
77+
# - provider: script
78+
# script: node scripts/git-builds.js
79+
# skip_cleanup: true
80+
# on:
81+
# all_branches: true
82+
# - stage: deploy
83+
# script: skip
84+
# env: publish
85+
# deploy:
86+
# - provider: script
87+
# script: node scripts/publish/publish.js
88+
# skip_cleanup: true
89+
# on:
90+
# tags: true
9191

9292

9393
before_install:

packages/@angular/cli/models/webpack-configs/typescript.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function _createAotPlugin(wco: WebpackConfigOptions, options: any) {
7676
exclude: []
7777
}, options);
7878

79-
if (wco.buildOptions.experimentalAngularCompiler && !options.skipCodeGeneration) {
79+
if (wco.buildOptions.experimentalAngularCompiler) {
8080
return new AngularCompilerPlugin(pluginOptions);
8181
} else {
8282
return new AotPlugin(pluginOptions);

packages/@angular/cli/tasks/eject.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class JsonWebpackSerializer {
121121
const basePath = path.dirname(tsConfigPath);
122122
return Object.assign({}, value.options, {
123123
tsConfigPath,
124-
mainPath: path.relative(value.basePath, value.options.mainPath),
124+
mainPath: path.relative(basePath, value.options.mainPath),
125125
hostReplacementPaths: Object.keys(value.options.hostReplacementPaths)
126126
.reduce((acc: any, key: string) => {
127127
const replacementPath = value.options.hostReplacementPaths[key];
@@ -131,7 +131,7 @@ class JsonWebpackSerializer {
131131
}, {}),
132132
exclude: Array.isArray(value.options.exclude)
133133
? value.options.exclude.map((p: any) => {
134-
return p.startsWith('/') ? path.relative(value.basePath, p) : p;
134+
return p.startsWith('/') ? path.relative(basePath, p) : p;
135135
})
136136
: value.options.exclude
137137
});

0 commit comments

Comments
 (0)