Skip to content

Commit db4e024

Browse files
hanslhansl
committed
v1.0.0-beta.24
1 parent 3459300 commit db4e024

File tree

11 files changed

+83
-53
lines changed

11 files changed

+83
-53
lines changed

‎CHANGELOG.md

+21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
1+
<a name="1.0.0-beta.24"></a>
2+
# [1.0.0-beta.24](https://github.com/angular/angular-cli/compare/v1.0.0-beta.23...v1.0.0-beta.24) (2016-12-20)
3+
4+
5+
### Bug Fixes
6+
7+
* **@ngtools/webpack:** report errors during codegen ([#3608](https://github.com/angular/angular-cli/issues/3608)) ([0f604ac](https://github.com/angular/angular-cli/commit/0f604ac))
8+
* **build:** hashes in prod builds now changes when ID change. ([#3609](https://github.com/angular/angular-cli/issues/3609)) ([8e9abf9](https://github.com/angular/angular-cli/commit/8e9abf9))
9+
* **test:** exclude non spec files from test.ts ([#3538](https://github.com/angular/angular-cli/issues/3538)) ([bcb324f](https://github.com/angular/angular-cli/commit/bcb324f))
10+
* **tests:** serve `assets` files from `ng test` ([#3628](https://github.com/angular/angular-cli/issues/3628)) ([3459300](https://github.com/angular/angular-cli/commit/3459300))
11+
* **webpack:** correctly load component stylesheets ([#3511](https://github.com/angular/angular-cli/issues/3511)) ([d4da7bd](https://github.com/angular/angular-cli/commit/d4da7bd))
12+
13+
14+
### Features
15+
16+
* **generate:** Show files updated when generating ([#3642](https://github.com/angular/angular-cli/issues/3642)) ([c011b04](https://github.com/angular/angular-cli/commit/c011b04)), closes [#3624](https://github.com/angular/angular-cli/issues/3624)
17+
* **version:** display versions of [@angular](https://github.com/angular)/* and [@ngtools](https://github.com/ngtools)/* ([#3592](https://github.com/angular/angular-cli/issues/3592)) ([123f74d](https://github.com/angular/angular-cli/commit/123f74d)), closes [#3589](https://github.com/angular/angular-cli/issues/3589)
18+
19+
20+
121
<a name="1.0.0-beta.23"></a>
222
# [1.0.0-beta.23](https://github.com/angular/angular-cli/compare/v1.0.0-beta.22-1...v1.0.0-beta.23) (2016-12-15)
323

24+
This beta was abandoned and unpublished due to a breaking bug.
425

526
### Bug Fixes
627

‎package.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-cli",
3-
"version": "1.0.0-beta.23",
3+
"version": "1.0.0-beta.24",
44
"description": "CLI tool for Angular",
55
"main": "packages/angular-cli/lib/cli/index.js",
66
"trackingCode": "UA-8594346-19",
@@ -42,10 +42,10 @@
4242
"homepage": "https://github.com/angular/angular-cli",
4343
"dependencies": {
4444
"@angular-cli/ast-tools": "^1.0.0",
45-
"@angular/compiler": "~2.3.1",
46-
"@angular/compiler-cli": "~2.3.1",
47-
"@angular/core": "~2.3.1",
48-
"@angular/tsc-wrapped": "~0.5.0",
45+
"@angular/compiler": "^2.3.1",
46+
"@angular/compiler-cli": "^2.3.1",
47+
"@angular/core": "^2.3.1",
48+
"@angular/tsc-wrapped": "^0.5.0",
4949
"async": "^2.1.4",
5050
"autoprefixer": "^6.5.3",
5151
"chalk": "^1.1.3",
@@ -101,7 +101,7 @@
101101
"resolve": "^1.1.7",
102102
"rimraf": "^2.5.3",
103103
"rsvp": "^3.0.17",
104-
"rxjs": "5.0.0-rc.4",
104+
"rxjs": "^5.0.1",
105105
"sass-loader": "^4.0.1",
106106
"script-loader": "^0.7.0",
107107
"semver": "^5.1.0",
@@ -124,7 +124,8 @@
124124
"webpack-dev-server": "2.1.0-beta.9",
125125
"webpack-merge": "^0.14.0",
126126
"webpack-sources": "^0.1.3",
127-
"yam": "0.0.18"
127+
"yam": "0.0.18",
128+
"zone.js": "^0.7.2"
128129
},
129130
"ember-addon": {
130131
"paths": [

‎packages/@angular-cli/ast-tools/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular-cli/ast-tools",
3-
"version": "1.0.10",
3+
"version": "1.0.11",
44
"description": "CLI tool for Angular",
55
"main": "./src/index.js",
66
"keywords": [
@@ -24,8 +24,8 @@
2424
"npm": ">= 3.0.0"
2525
},
2626
"dependencies": {
27-
"@angular/tsc-wrapped": "^0.3.0",
28-
"rxjs": "5.0.0-rc.4",
27+
"@angular/tsc-wrapped": "^0.5.0",
28+
"rxjs": "^5.0.1",
2929
"denodeify": "^1.2.1",
3030
"typescript": "~2.0.3"
3131
}

‎packages/@angular-cli/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.9",
3+
"version": "1.0.10",
44
"description": "Base HREF Webpack plugin",
55
"main": "./src/index.js",
66
"keywords": [

‎packages/@ngtools/webpack/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngtools/webpack",
3-
"version": "1.2.0",
3+
"version": "1.2.1",
44
"description": "Webpack plugin that AoT compiles your Angular components and modules.",
55
"main": "./src/index.js",
66
"typings": "src/index.d.ts",
@@ -31,10 +31,10 @@
3131
"source-map": "^0.5.6"
3232
},
3333
"peerDependencies": {
34-
"@angular/compiler": "~2.3.1",
35-
"@angular/compiler-cli": "~2.3.1",
36-
"@angular/core": "~2.3.1",
37-
"@angular/tsc-wrapped": "~0.5.0",
34+
"@angular/compiler": "^2.3.1",
35+
"@angular/compiler-cli": "^2.3.1",
36+
"@angular/core": "^2.3.1",
37+
"@angular/tsc-wrapped": "^0.5.0",
3838
"typescript": "^2.0.2",
3939
"reflect-metadata": "^0.1.8",
4040
"webpack": "^2.1.0-beta.25"

‎packages/@ngtools/webpack/src/plugin.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@ export class AotPlugin implements Tapable {
133133
}
134134
this._rootFilePath = fileNames;
135135

136-
// Check the genDir.
137-
let genDir = basePath;
136+
// Check the genDir. We generate a default gendir that's under basepath; it will generate
137+
// a `node_modules` directory and because of that we don't want TypeScript resolution to
138+
// resolve to that directory but the real `node_modules`.
139+
let genDir = path.join(basePath, '$$_gendir');
138140

139141
this._compilerOptions = tsConfig.options;
140142
this._angularCompilerOptions = Object.assign(

‎packages/angular-cli/blueprints/ng2/files/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/common": "~2.3.1",
17-
"@angular/compiler": "~2.3.1",
18-
"@angular/core": "~2.3.1",
19-
"@angular/forms": "~2.3.1",
20-
"@angular/http": "~2.3.1",
21-
"@angular/platform-browser": "~2.3.1",
22-
"@angular/platform-browser-dynamic": "~2.3.1",
23-
"@angular/router": "~3.3.1",
16+
"@angular/common": "^2.3.1",
17+
"@angular/compiler": "^2.3.1",
18+
"@angular/core": "^2.3.1",
19+
"@angular/forms": "^2.3.1",
20+
"@angular/http": "^2.3.1",
21+
"@angular/platform-browser": "^2.3.1",
22+
"@angular/platform-browser-dynamic": "^2.3.1",
23+
"@angular/router": "^3.3.1",
2424
"core-js": "^2.4.1",
25-
"rxjs": "5.0.0-rc.4",
25+
"rxjs": "^5.0.1",
2626
"ts-helpers": "^1.1.1",
2727
"zone.js": "^0.7.2"
2828
},
2929
"devDependencies": {
30-
"@angular/compiler-cli": "~2.3.1",
30+
"@angular/compiler-cli": "^2.3.1",
3131
"@types/jasmine": "2.5.38",
3232
"@types/node": "^6.0.42",
3333
"angular-cli": "<%= version %>",

‎packages/angular-cli/lib/cli/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
/*eslint-disable no-console */
22

3+
// Prevent the dependency validation from tripping because we don't import zone.js. We need
4+
// it as a peer dependency of @angular/core.
5+
// require('zone.js')
6+
7+
38
// This file hooks up on require calls to transpile TypeScript.
49
const cli = require('../../ember-cli/lib/cli');
510
const UI = require('../../ember-cli/lib/ui');

‎packages/angular-cli/package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-cli",
3-
"version": "1.0.0-beta.23",
3+
"version": "1.0.0-beta.24",
44
"description": "CLI tool for Angular",
55
"main": "lib/cli/index.js",
66
"trackingCode": "UA-8594346-19",
@@ -27,9 +27,9 @@
2727
"dependencies": {
2828
"@angular-cli/ast-tools": "^1.0.1",
2929
"@angular-cli/base-href-webpack": "^1.0.0",
30-
"@angular/compiler": "~2.3.1",
31-
"@angular/compiler-cli": "~2.3.1",
32-
"@angular/core": "~2.3.1",
30+
"@angular/compiler": "^2.3.1",
31+
"@angular/compiler-cli": "^2.3.1",
32+
"@angular/core": "^2.3.1",
3333
"@ngtools/webpack": "^1.0.0",
3434
"async": "^2.1.4",
3535
"autoprefixer": "^6.5.3",
@@ -103,7 +103,8 @@
103103
"webpack-dev-server": "2.1.0-beta.9",
104104
"webpack-merge": "^0.14.0",
105105
"webpack-sources": "^0.1.3",
106-
"yam": "0.0.18"
106+
"yam": "0.0.18",
107+
"zone.js": "^0.7.2"
107108
},
108109
"ember-addon": {
109110
"paths": [

‎tests/e2e/assets/webpack/test-app-weird/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
"name": "test",
33
"license": "MIT",
44
"dependencies": {
5-
"@angular/common": "~2.3.1",
6-
"@angular/compiler": "~2.3.1",
7-
"@angular/compiler-cli": "~2.3.1",
8-
"@angular/core": "~2.3.1",
9-
"@angular/http": "~2.3.1",
10-
"@angular/platform-browser": "~2.3.1",
11-
"@angular/platform-browser-dynamic": "~2.3.1",
12-
"@angular/platform-server": "~2.3.1",
13-
"@angular/router": "~3.3.1",
5+
"@angular/common": "^2.3.1",
6+
"@angular/compiler": "^2.3.1",
7+
"@angular/compiler-cli": "^2.3.1",
8+
"@angular/core": "^2.3.1",
9+
"@angular/http": "^2.3.1",
10+
"@angular/platform-browser": "^2.3.1",
11+
"@angular/platform-browser-dynamic": "^2.3.1",
12+
"@angular/platform-server": "^2.3.1",
13+
"@angular/router": "^3.3.1",
1414
"@ngtools/webpack": "0.0.0",
1515
"core-js": "^2.4.1",
16-
"rxjs": "5.0.0-rc.4",
16+
"rxjs": "^5.0.1",
1717
"zone.js": "^0.7.2"
1818
},
1919
"devDependencies": {

‎tests/e2e/assets/webpack/test-app/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
"name": "test",
33
"license": "MIT",
44
"dependencies": {
5-
"@angular/common": "~2.3.1",
6-
"@angular/compiler": "~2.3.1",
7-
"@angular/compiler-cli": "~2.3.1",
8-
"@angular/core": "~2.3.1",
9-
"@angular/http": "~2.3.1",
10-
"@angular/platform-browser": "~2.3.1",
11-
"@angular/platform-browser-dynamic": "~2.3.1",
12-
"@angular/platform-server": "~2.3.1",
13-
"@angular/router": "~3.3.1",
5+
"@angular/common": "^2.3.1",
6+
"@angular/compiler": "^2.3.1",
7+
"@angular/compiler-cli": "^2.3.1",
8+
"@angular/core": "^2.3.1",
9+
"@angular/http": "^2.3.1",
10+
"@angular/platform-browser": "^2.3.1",
11+
"@angular/platform-browser-dynamic": "^2.3.1",
12+
"@angular/platform-server": "^2.3.1",
13+
"@angular/router": "^3.3.1",
1414
"@ngtools/webpack": "0.0.0",
1515
"core-js": "^2.4.1",
16-
"rxjs": "5.0.0-rc.4",
16+
"rxjs": "^5.0.1",
1717
"zone.js": "^0.7.2"
1818
},
1919
"devDependencies": {

0 commit comments

Comments
 (0)