8000 Merge branch 'master' into master · Madd/angular-cli@2fafdfc · GitHub
[go: up one dir, main page]
Skip to content

Commit 2fafdfc

Browse files
MaddMadd
authored
Merge branch 'master' into master
2 parents 3110e11 + 024825d commit 2fafdfc

File tree

12 files changed

+505
-35
lines changed

12 files changed

+505
-35
lines changed

‎CHANGELOG.md

Lines changed: 132 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,145 @@
1-
## Always follow the [upgrade guide](https://github.com/angular/angular-cli#updating-angular-cli) when upgrading to a new version. The changelog does not list breaking changes that are fixed via the update procedure.
1+
**Always follow the [upgrade guide](https://github.com/angular/angular-cli#updating-angular-cli) when upgrading to a new version. The changelog does not list breaking changes that are fixed via the update procedure.**
22

3-
<a name="1.0.0-beta.6"></a>
4-
# 1.0.0-beta.6 (2016-06-13)
3+
---
4+
5+
<a name="1.0.0-beta.7"></a>
6+
# 1.0.0-beta.7 (2016-06-23)
7+
8+
9+
### Bug Fixes
10+
11+
* **deps:** update router (#1121) ([b90a110](https://github.com/angular/angular-cli/commit/b90a110))
12+
* **e2e:** prevent chrome race condition (#1141) ([9df0ffe](https://github.com/angular/angular-cli/commit/9df0ffe))
13+
* **init:** don't replace live reload script on diffs (#1128) ([e97fd9f](https://github.com/angular/angular-cli/commit/e97fd9f)), closes [#1122](https://github.com/angular/angular-cli/issues/1122)
14+
* **lint:** add missing rulesDirectory (#1108) ([1690a82](https://github.com/angular/angular-cli/commit/1690a82)), closes [#1094](https://github.com/angular/angular-cli/issues/1094)
15+
* **mobile:** partially fix dep problem (#1151) ([4b638c8](https://github.com/angular/angular-cli/commit/4b638c8)), closes [(#1151](https://github.com/(/issues/1151)
516

617
### Features
7-
- Admin elevation no longer required on Windows (https://github.com/angular/angular-cli/pull/905).
8-
- Automatically add SASS/Stylus if project is initialized with `--style={sass|scss|styl}` (https://github.com/angular/angular-cli/pull/998).
9-
- Allow any number of env files (https://github.com/angular/angular-cli/pull/913).
18+
19+
* add file system utilities for 'upgrade' process ([327f649](https://github.com/angular/angular-cli/commit/327f649))
20+
21+
22+
23+
<a name="1.0.0-beta.6"></a>
24+
# 1.0.0-beta.6 (2016-06-15)
25+
1026

1127
### Bug Fixes
12-
- Fix adding 3rd party libs without package format (https://github.com/angular/angular-cli/pull/1028/commits/065e98f40384f8b28dcaf84028c411043697ff11).
13-
- Fix github deploy deep links (https://github.com/angular/angular-cli/pull/1020).
14-
- Fix `ng e2e` exit code (https://github.com/angular/angular-cli/pull/1025).
15-
- Fix missing vendor file (https://github.com/angular/angular-cli/pull/972).
16-
- Fix github user pages base href (https://github.com/angular/angular-cli/pull/965).
28+
29+
* **admin:** added support for non Administrator CLI user ([0bc3d94](https://github.com/angular/angular-cli/commit/0bc3d94)), closes [#905](https://github.com/angular/angular-cli/issues/905) [#886](https://github.com/angular/angular-cli/issues/886) [#370](https://github.com/angular/angular-cli/issues/370)
30+
* **barrel:** alphabetized barrel exports ([67b577d](https://github.com/angular/angular-cli/commit/67b577d)), closes [#582](https://github.com/angular/angular-cli/issues/582)
31+
* **deploy:** Fix base href for user pages (#965) ([424cff2](https://github.com/angular/angular-cli/commit/424cff2)), closes [(#965](https://github.com/(/issues/965)
32+
* **e2e:** return exit codes on failure of e2e tests ([d0c07ac](https://github.com/angular/angular-cli/commit/d0c07ac)), closes [#1017](https://github.com/angular/angular-cli/issues/1017) [#1025](https://github.com/angular/angular-cli/issues/1025) [#1044](https://github.com/angular/angular-cli/issues/1044)
33+
* **generator:** --dry-run no longer modifies files ([6efc8ee](https://github.com/angular/angular-cli/commit/6efc8ee))
34+
* Persist style extension config at project creation. ([85c9aec](https://github.com/angular/angular-cli/commit/85c9aec)), closes [#780](https://github.com/angular/angular-cli/issues/780)
35+
* skips git-init if working folder is inside a git repo ([52c0cfb](https://github.com/angular/angular-cli/commit/52c0cfb)), closes [#802](https://github.com/angular/angular-cli/issues/802)
36+
* **gh-deploy:** fix deep links (#1020) ([f8f8179](https://github.com/angular/angular-cli/commit/f8f8179)), closes [(#1020](https://github.com/(/issues/1020) [#995](https://github.com/angular/angular-cli/issues/995)
37+
* **mobile:** add missing vendor file to build (#972) ([9a7bfe0](https://github.com/angular/angular-cli/commit/9a7bfe0)), closes [#847](https://github.com/angular/angular-cli/issues/847)
38+
* **mobile:** lock dependency (#961) ([740805b](https://github.com/angular/angular-cli/commit/740805b)), closes [#958](https://github.com/angular/angular-cli/issues/958)
39+
* **sourcemaps:** try to improve the source maps by fixing the path (#1028) ([5f909aa](https://github.com/angular/angular-cli/commit/5f909aa))
40+
* **template:** Update pipe template to include Pipe in name ([c92f330](https://github.com/angular/angular-cli/commit/c92f330)), closes [#869](https://github.com/angular/angular-cli/issues/869)
41+
42+
### Features
43+
44+
* allow lazy route prefix to be configurable ([c3fd9c7](https://github.com/angular/angular-cli/commit/c3fd9c7)), closes [#842](https://github.com/angular/angular-cli/issues/842)
45+
* **router:** upgrade the router version ([eb9b80e](https://github.com/angular/angular-cli/commit/eb9b80e))
46+
* **style:** automatically add dependencies if style is set on new projects ([01e31ab](https://github.com/angular/angular-cli/commit/01e31ab)), closes [#986](https://github.com/angular/angular-cli/issues/986)
47+
* **test:** run e2e of generated project (#490) ([d0dbd70](https://github.com/angular/angular-cli/commit/d0dbd70))
48+
1749

1850
### BREAKING CHANGES
19-
- `<PROJECT-NAME>AppComponent` is now simply `AppComponent`, and it's selector is now `app-root` (https://github.com/angular/angular-cli/pull/1042).
2051

21-
- Route generation is temporarily disabled while we move to the [recently announce router](http://angularjs.blogspot.ie/2016/06/improvements-coming-for-routing-in.html)(https://github.com/angular/angular-cli/pull/992). It is recommended that users manually move to this router in all new projects.
52+
* The router has been updated to the newest version, usage of the deprecated router and the original release candidate routers are no longer supported
53+
54+
* `<PROJECT-NAME>AppComponent` is now simply `AppComponent`, and it's selector is now `app-root` (https://github.com/angular/angular-cli/pull/1042).
55+
56+
* Route generation is temporarily disabled while we move to the [recently announce router](http://angularjs.blogspot.ie/2016/06/improvements-coming-for 870 -routing-in.html)(https://github.com/angular/angular-cli/pull/992). It is recommended that users manually move to this router in all new projects.
57+
58+
2259

2360
<a name="1.0.0-beta.5"></a>
2461
# 1.0.0-beta.5 (2016-05-19)
2562

26-
### Known Issues
2763

28-
- `ng new -mobile` fails npm install (https://github.com/angular/angular-cli/issues/958).
29-
- Adding 3rd party libs without SystemJS package format breaks prod mode (https://github.com/angular/angular-cli/issues/951).
30-
- Deep links do not work on Github pages deploys (https://github.com/angular/angular-cli/issues/995).
31-
- `ng e2e` doesn't return error exit code on test failures (https://github.com/angular/angular-cli/issues/1017).
32-
- `ng build -prod` fails on mobile projects due to missing vendor file (https://github.com/angular/angular-cli/issues/847).
33-
- Github deploy to user pages doesn't use correct base href (https://github.com/angular/angular-cli/pull/965).
34-
- `ng test` on windows hits the file discriptor limit (https://github.com/angular/angular-cli/issues/977).
35-
- `ng serve/build/test` need admin elevation on Windows (https://github.com/angular/angular-cli/issues/641).
64+
### Bug Fixes
65+
66+
* **build:** fix broken sourcemaps (#839) ([234de2b](https://github.com/angular/angular-cli/commit/234de2b)), closes [(#839](https://github.com/(/issues/839)
67+
68+
### Features
69+
70+
* **blueprint:** add blueprint for generating interfaces (#757) ([482aa74](https://github.com/angular/angular-cli/commit/482aa74)), closes [#729](https://github.com/angular/angular-cli/issues/729)
71+
* **test:** use link-cli option on e2e (#841) ([85d1400](https://github.com/angular/angular-cli/commit/85d1400))
72+
73+
### Performance Improvements
74+
75+
* **ng new:** command to link to `angular-cli` (#778) ([9b8334f](https://github.com/angular/angular-cli/commit/9b8334f))
76+
77+
78+
79+
<a name="1.0.0-beta.4"></a>
80+
# 1.0.0-beta.4 (2016-05-18)
81+
82+
83+
### Bug Fixes
84+
85+
* **build:** fix infinite loop on ng serve (#775) ([285db13](https://github.com/angular/angular-cli/commit/285db13)), closes [(#775](https://github.com/(/issues/775)
86+
* **deploy:** fix file copy, index tag rewrite (#772) ([a34aca8](https://github.com/angular/angular-cli/commit/a34aca8)), closes [(#772](https://github.com/(/issues/772)
87+
* **index:** fix live reload file path (#774) ([be718cb](https://github.com/angular/angular-cli/commit/be718cb)), closes [(#774](https://github.com/(/issues/774)
88+
* **mobile:** don't import system-config in system-import.js (#794) ([7ab7d72](https://github.com/angular/angular-cli/commit/7ab7d72))
89+
* **mobile:** make app-shell compilation synchronous ([9ed28ba](https://github.com/angular/angular-cli/commit/9ed28ba))
90+
* **mobile:** prevent already-bundled JS from getting cached by Service Worker ([9d18f74](https://github.com/angular/angular-cli/commit/9d18f74))
91+
92+
### Features
93+
94+
* **mobile:** add app shell to mobile blueprint (#809) ([e7d7ed8](https://github.com/angular/angular-cli/commit/e7d7ed8))
95+
* **SASSPlugin:** Allow regexes to be passed to include/exclude certain file patterns ([6b45099](https://github.com/angular/angular-cli/commit/6b45099)), closes [#558](https://github.com/angular/angular-cli/issues/558)
96+
97+
98+
99+
<a name="1.0.0-beta.2-mobile.3"></a>
100+
# 1.0.0-beta.2-mobile.3 (2016-05-13)
101+
102+
103+
### Bug Fixes
104+
105+
* **broccoli-typescript:** properly parse compilerOptions (#764) ([bbf1bc8](https://github.com/angular/angular-cli/commit/bbf1bc8))
106+
* **mobile:** include vendor scripts in bundle ([679d0e6](https://github.com/angular/angular-cli/commit/679d0e6)), closes [#733](https://github.com/angular/angular-cli/issues/733)
107+
* **mobile:** remove mobile-specific dependencies from root package ([263e23b](https://github.com/angular/angular-cli/commit/263e23b))
108+
* **mobile:** update path to reflect updated service worker package (#746) ([818fb19](https://github.com/angular/angular-cli/commit/818fb19))
109+
* **package:** temporarily remove angular2-service-worker ([7f86ab3](https://github.com/angular/angular-cli/commit/7f86ab3))
110+
111+
### Features
112+
113+
* **blueprints:** add enum blueprint. ([eddb354](https://github.com/angular/angular-cli/commit/eddb354)), closes [#707](https://github.com/angular/angular-cli/issues/707)
114+
115+
116+
117+
<a name="1.0.0-beta.2-mobile"></a>
118+
# 1.0.0-beta.2-mobile (2016-05-12)
119+
120+
121+
### Bug Fixes
122+
123+
* package.json use sourceDir for new command ([8dcd996](https://github.com/angular/angular-cli/commit/8dcd996))
124+
* use options sourceDir, and fix null property access. Also use 1.9 ([7ba388d](https://github.com/angular/angular-cli/commit/7ba388d)), closes [#619](https://github.com/angular/angular-cli/issues/619)
125+
* **710:** Missing http module dependency ([c0aadae](https://github.com/angular/angular-cli/commit/c0aadae))
126+
* **commands:** fix outdated string utils import. ([7db40df](https://github.com/angular/angular-cli/commit/7db40df))
127+
128+
### Features
129+
130+
* **mobile:** add blueprint for app manifest and icons ([f717bde](https://github.com/angular/angular-cli/commit/f717bde))
131+
* **mobile:** add prod build step to concatenate scripts ([51569ce](https://github.com/angular/angular-cli/commit/51569ce))
132+
* **mobile:** add ServiceWorker generation to build process and index ([04593eb](https://github.com/angular/angular-cli/commit/04593eb))
133+
* **mobile:** add support for generating App Shell in index.html ([cb1270f](https://github.com/angular/angular-cli/commit/cb1270f))
134+
* **ng2 blueprint:** add test script entry to package.json ([eabc160](https://github.com/angular/angular-cli/commit/eabc160))
135+
136+
137+
138+
<a name="1.0.0-beta.1"></a>
139+
# 1.0.0-beta.1 (2016-05-07)
140+
141+
142+
### Bug Fixes
143+
144+
* **generated-project:** cli was not using the correct version of CLI in generated project. (#672) ([02073ae](https://github.com/angular/angular-cli/commit/02073ae))
145+

‎README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ If you wish to collaborate while the project is still young, check out [our issu
1818

1919
## Prerequisites
2020

21-
The generated project has dependencies that require **Node 4 or greater**.
21+
The generated project has dependencies that require
22+
* **Node 4 or greater**.
23+
* **Typings v1 or greater**.
2224

2325
## Table of Contents
2426

@@ -212,7 +214,7 @@ You can modify the these scripts in `package.json` to run whatever tool you pref
212214

213215
### Support for offline applications
214216

215-
The index.html file includes a commented-out code snippet for installing the angular2-service-worker. This support is experimental, please see the angular/mobile-toolkit project for documentation on how to make use of this functionality.
217+
The index.html file includes a commented-out code snippet for installing the angular2-service-worker. This support is experimental, please see the angular/mobile-toolkit project and https://mobile.angular.io/ for documentation on how to make use of this functionality.
216218

217219
### Commands autocompletion
218220

‎addon/ng2/blueprints/ng2/files/__path__/system-config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const barrels: string[] = [
2222
'@angular/core',
2323
'@angular/common',
2424
'@angular/compiler',
25+
'@angular/forms',
2526
'@angular/http',
2627
'@angular/router',
2728
'@angular/platform-browser',

‎addon/ng2/blueprints/ng2/files/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/common": "2.0.0-rc.2",
17-
"@angular/compiler": "2.0.0-rc.2",
18-
"@angular/core": "2.0.0-rc.2",
19-
"@angular/http": "2.0.0-rc.2",
20-
"@angular/platform-browser": "2.0.0-rc.2",
21-
"@angular/platform-browser-dynamic": "2.0.0-rc.2",
22-
"@angular/router": "3.0.0-alpha.7",
16+
"@angular/common": "2.0.0-rc.3",
17+
"@angular/compiler": "2.0.0-rc.3",
18+
"@angular/core": "2.0.0-rc.3",
19+
"@angular/forms": "0.2.0",
20+
"@angular/http": "2.0.0-rc.3",
21+
"@angular/platform-browser": "2.0.0-rc.3",
22+
"@angular/platform-browser-dynamic": "2.0.0-rc.3",
23+
"@angular/router": "3.0.0-alpha.8",
2324
"es6-shim": "0.35.1",
2425
"reflect-metadata": "0.1.3",
2526
"rxjs": "5.0.0-beta.6",
2627
"systemjs": "0.19.26",
2728
"zone.js": "0.6.12"
2829
},
2930
"devDependencies": {<% if(isMobile) { %>
30-
"@angular/platform-server": "2.0.0-rc.2",
31-
"@angular/router-deprecated": "2.0.0-rc.2",
31+
"@angular/platform-server": "2.0.0-rc.3",
3232
"@angular/service-worker": "0.2.0",
3333
"@angular/app-shell": "0.0.0",
3434
"angular2-broccoli-prerender": "0.11.0",

‎addon/ng2/commands/init.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ var validProjectName = require('ember-cli/lib/utilities/valid-project-name');
77
var normalizeBlueprint = require('ember-cli/lib/utilities/normalize-blueprint-option');
88
var GitInit = require('../tasks/git-init');
99
var LinkCli = require('../tasks/link-cli');
10+
var NpmInstall = require('../tasks/npm-install');
1011

1112
module.exports = Command.extend({
1213
name: 'init',
@@ -68,7 +69,7 @@ module.exports = Command.extend({
6869
}
6970

7071
if (!commandOptions.skipNpm) {
71-
var npmInstall = new this.tasks.NpmInstall({
72+
var npmInstall = new NpmInstall({
7273
ui: this.ui,
7374
analytics: this.analytics,
7475
project: this.project

‎addon/ng2/tasks/npm-install.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
'use strict';
2+
3+
// Runs `npm install` in cwd
4+
5+
var NpmTask = require('./npm-task');
6+
7+
module.exports = NpmTask.extend({
8+
command: 'install',
9+
startProgressMessage: 'Installing packages for tooling via npm',
10+
completionMessage: 'Installed packages for tooling via npm.'
11+
});

‎addon/ng2/tasks/npm-task.js

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*eslint-disable no-console */
2+
'use strict';
3+
4+
// Runs `npm install` in cwd
5+
6+
var chalk = require('chalk');
7+
var Task = require('ember-cli/lib/models/task');
8+
var npm = require('../utilities/npm');
9+
10+
module.exports = Task.extend({
11+
// The command to run: can be 'install' or 'uninstall'
12+
command: '',
13+
// Message to send to ui.startProgress
14+
startProgressMessage: '',
15+
// Message to send to ui.writeLine on completion
16+
completionMessage: '',
17+
18+
init: function() {
19+
this.npm = this.npm || require('npm');
20+
},
21+
// Options: Boolean verbose
22+
run: function(options) {
23+
this.ui.startProgress(chalk.green(this.startProgressMessage), chalk.green('.'));
24+
25+
var npmOptions = {
26+
loglevel: options.verbose ? 'verbose' : 'error',
27+
progress: false,
28+
logstream: this.ui.outputStream,
29+
color: 'always',
30+
// by default, do install peoples optional deps
31+
'optional': 'optional' in options ? options.optional : true,
32+
'save-dev': !!options['save-dev'],
33+
'save-exact': !!options['save-exact']
34+
};
35+
36+
var packages = options.packages || [];
37+
38+
// npm otherwise is otherwise noisy, already submitted PR for npm to fix
39+
// misplaced console.log
40+
this.disableLogger();
41+
42+
return npm(this.command, packages, npmOptions, this.npm).
43+
finally(this.finally.bind(this)).
44+
then(this.announceCompletion.bind(this));
45+
},
46+
47+
announceCompletion: function() {
48+
this.ui.writeLine(chalk.green(this.completionMessage));
49+
},
50+
51+
finally: function() {
52+
this.ui.stopProgress();
53+
this.restoreLogger();
54+
},
55+
56+
disableLogger: function() {
57+
this.oldLog = console.log;
58+
console.log = function() {};
59+
},
60+
61+
restoreLogger: function() {
62+
console.log = this.oldLog; // Hack, see above
63+
}
64+
});

0 commit comments

Comments
 (0)
0