Skip to content

Commit 24c7308

Browse files
authored
Merge branch 'master' into path-case-2833
2 parents 55200cf + 23a6cc6 commit 24c7308

File tree

7 files changed

+24
-7
lines changed

7 files changed

+24
-7
lines changed

CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
<a name="1.0.0-beta.19"></a>
2+
# [1.0.0-beta.19](https://github.com/angular/angular-cli/compare/v1.0.0-beta.18...v1.0.0-beta.19) (2016-10-28)
3+
4+
5+
### Bug Fixes
6+
7+
* **appveyor:** add workaround for webdriver bug ([#2862](https://github.com/angular/angular-cli/issues/2862)) ([2b17b46](https://github.com/angular/angular-cli/commit/2b17b46))
8+
* **compiler:** update codegen API ([#2919](https://github.com/angular/angular-cli/issues/2919)) ([b50c121](https://github.com/angular/angular-cli/commit/b50c121)), closes [#2917](https://github.com/angular/angular-cli/issues/2917)
9+
* **e2e:** fix travis e2e ([#2914](https://github.com/angular/angular-cli/issues/2914)) ([b62b996](https://github.com/angular/angular-cli/commit/b62b996))
10+
11+
12+
### Features
13+
14+
* **test:** make code coverage and lint optional ([#2840](https://github.com/angular/angular-cli/issues/2840)) ([8944d04](https://github.com/angular/angular-cli/commit/8944d04)), closes [#1799](https://github.com/angular/angular-cli/issues/1799)
15+
16+
17+
118
<a name="1.0.0-beta.18"></a>
219
# [1.0.0-beta.18](https://github.com/angular/angular-cli/compare/v1.0.0-beta.17...v1.0.0-beta.18) (2016-10-20)
320

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-cli",
3-
"version": "1.0.0-beta.18",
3+
"version": "1.0.0-beta.19",
44
"description": "CLI tool for Angular",
55
"main": "packages/angular-cli/lib/cli/index.js",
66
"trackingCode": "UA-8594346-19",

packages/angular-cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-cli",
3-
"version": "1.0.0-beta.18",
3+
"version": "1.0.0-beta.19",
44
"description": "CLI tool for Angular",
55
"main": "lib/cli/index.js",
66
"trackingCode": "UA-8594346-19",

packages/ast-tools/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular-cli/ast-tools",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"description": "CLI tool for Angular",
55
"main": "./src/index.js",
66
"keywords": [

packages/base-href-webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular-cli/base-href-webpack",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"description": "Base HREF Webpack plugin",
55
"main": "./src/index.js",
66
"keywords": [

packages/webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngtools/webpack",
3-
"version": "1.1.2",
3+
"version": "1.1.3",
44
"description": "",
55
"main": "./src/index.js",
66
"repository": {

packages/webpack/src/plugin.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ export class AotPlugin {
207207
// We need to temporarily patch the CodeGenerator until either it's patched or allows us
208208
// to pass in our own ReflectorHost.
209209
patchReflectorHost(codeGenerator);
210-
this._donePromise = codeGenerator.codegen()
210+
this._donePromise = codeGenerator.codegen({transitiveModules: true})
211211
.then(() => {
212212
// Create a new Program, based on the old one. This will trigger a resolution of all
213213
// transitive modules, which include files that might just have been generated.
@@ -239,7 +239,7 @@ export class AotPlugin {
239239
return lazyRoutes;
240240
}, {});
241241
})
242-
.then(() => cb(), (err) => cb(err));
242+
.then(() => cb(), (err: any) => cb(err));
243243
}
244244

245245
private _resolveModule(module: ModuleRoute, containingFile: string) {

0 commit comments

Comments
 (0)