Merge pull request #27 from angular/master

Update upstream

Author: GulajavaMinistudio

CHANGELOG.md

@@ -1,3 +1,66 @@
+<a name="1.1.0-rc.0"></a>
+# [1.1.0-rc.0](https://github.com/angular/angular-cli/compare/v1.1.0-beta.1...v1.1.0-rc.0) (2017-05-15)
+
+
+### Bug Fixes
+
+* **@angular/cli:** adds language to index.html for accessibility ([cfe60b5](https://github.com/angular/angular-cli/commit/cfe60b5))
+* **@angular/cli:** allow e2e multi capabilities ([4f48be0](https://github.com/angular/angular-cli/commit/4f48be0)), closes [#975](https://github.com/angular/angular-cli/issues/975)
+* **@angular/cli:** enable full node module resolution for project deps ([#6276](https://github.com/angular/angular-cli/issues/6276)) ([54b1e35](https://github.com/angular/angular-cli/commit/54b1e35))
+* **@angular/cli:** language-service as devDeps only ([#6257](https://github.com/angular/angular-cli/issues/6257)) ([02aaec4](https://github.com/angular/angular-cli/commit/02aaec4))
+* **@angular/cli:** prefix `historyApiFallback.index` with `deployUrl` ([#6279](https://github.com/angular/angular-cli/issues/6279)) ([a5cfdde](https://github.com/angular/angular-cli/commit/a5cfdde))
+
+
+
+<a name="1.1.0-beta.1"></a>
+# [1.1.0-beta.1](https://github.com/angular/angular-cli/compare/v1.0.1...v1.1.0-beta.1) (2017-05-09)
+
+
+### Bug Fixes
+
+* **@angular/cli:** add error message when missing config env variable ([#5980](https://github.com/angular/angular-cli/issues/5980)) ([11d0afc](https://github.com/angular/angular-cli/commit/11d0afc))
+* **@angular/cli:** fix text descriptions ([17ae140](https://github.com/angular/angular-cli/commit/17ae140)), closes [#5501](https://github.com/angular/angular-cli/issues/5501)
+* **@angular/cli:** fixing component blueprint indent ([0ef9eb7](https://github.com/angular/angular-cli/commit/0ef9eb7))
+* **@angular/cli:** format files according to tslint ([377a062](https://github.com/angular/angular-cli/commit/377a062)), closes [#5751](https://github.com/angular/angular-cli/issues/5751)
+* **@angular/cli:** import at least one locale-data with intl ([#6190](https://github.com/angular/angular-cli/issues/6190)) ([1cc979f](https://github.com/angular/angular-cli/commit/1cc979f))
+* **@angular/cli:** install webpack at ejection ([#5745](https://github.com/angular/angular-cli/issues/5745)) ([8e2f8cf](https://github.com/angular/angular-cli/commit/8e2f8cf))
+* **@angular/cli:** ng get: return whole config root when no path provided. ([a5d8bc1](https://github.com/angular/angular-cli/commit/a5d8bc1)), closes [#5887](https://github.com/angular/angular-cli/issues/5887)
+* **@angular/cli:** open option in serve command should open localhost when host is 0.0.0.0 ([23c039d](https://github.com/angular/angular-cli/commit/23c039d)), closes [#5743](https://github.com/angular/angular-cli/issues/5743)
+* **@angular/cli:** properly support CSS url()'s with whitespace ([d9af12c](https://github.com/angular/angular-cli/commit/d9af12c))
+* **@angular/cli:** remove default for test runners ([e7966a2](https://github.com/angular/angular-cli/commit/e7966a2))
+* **@angular/cli:** removes redundant rules from tslint.json ([#5783](https://github.com/angular/angular-cli/issues/5783)) ([d90292e](https://github.com/angular/angular-cli/commit/d90292e)), closes [#5755](https://github.com/angular/angular-cli/issues/5755)
+* correctly generate changelog ([3ec74e2](https://github.com/angular/angular-cli/commit/3ec74e2))
+* **@angular/cli:** simplify import path if possible ([#6184](https://github.com/angular/angular-cli/issues/6184)) ([2d42a58](https://github.com/angular/angular-cli/commit/2d42a58)), closes [#6183](https://github.com/angular/angular-cli/issues/6183)
+* **@angular/cli:** small typo on generated app.component.html ([6eeb9de](https://github.com/angular/angular-cli/commit/6eeb9de))
+* **@angular/cli:** Throw error when no key provided for ng get ([382ba8d](https://github.com/angular/angular-cli/commit/382ba8d)), closes [#5887](https://github.com/angular/angular-cli/issues/5887)
+* **@angular/cli:** Update README.md project generation text. ([#5958](https://github.com/angular/angular-cli/issues/5958)) ([a67eb07](https://github.com/angular/angular-cli/commit/a67eb07))
+* **@ngtools/logger:** add typings and other information to logger package.json ([698aa3e](https://github.com/angular/angular-cli/commit/698aa3e))
+
+
+### Features
+
+* **@angular/cli:** add flag to not delete output path ([8bf040b](https://github.com/angular/angular-cli/commit/8bf040b)), closes [#5925](https://github.com/angular/angular-cli/issues/5925) [#6193](https://github.com/angular/angular-cli/issues/6193)
+* **@angular/cli:** add host check flags to ng serve ([a54a991](https://github.com/angular/angular-cli/commit/a54a991)), closes [#6070](https://github.com/angular/angular-cli/issues/6070)
+* **@angular/cli:** add import flag to modules ([8b220a4](https://github.com/angular/angular-cli/commit/8b220a4)), closes [#5377](https://github.com/angular/angular-cli/issues/5377)
+* **@angular/cli:** add language service in devDependencies section ([bb99fac](https://github.com/angular/angular-cli/commit/bb99fac))
+* **@angular/cli:** add option to use lint to adjust generated files ([a3bf529](https://github.com/angular/angular-cli/commit/a3bf529))
+* **@angular/cli:** add publicPath support via command and angular-cli.json for webpack-dev-server ([8c78fb9](https://github.com/angular/angular-cli/commit/8c78fb9)), closes [#2727](https://github.com/angular/angular-cli/issues/2727)
+* **@angular/cli:** add some rules from tslint 4.5 ([d482986](https://github.com/angular/angular-cli/commit/d482986))
+* **@angular/cli:** adding option to search docs as well ([5e39361](https://github.com/angular/angular-cli/commit/5e39361))
+* **@angular/cli:** allow lint project setting to be optional ([8035f54](https://github.com/angular/angular-cli/commit/8035f54))
+* **@angular/cli:** always use named webpack modules in dev builds ([b07f631](https://github.com/angular/angular-cli/commit/b07f631))
+* **@angular/cli:** bump to tslint 5 & codelyzer 3 ([af758b8](https://github.com/angular/angular-cli/commit/af758b8))
+* **@angular/cli:** improve ng test performance ([1cd0a08](https://github.com/angular/angular-cli/commit/1cd0a08)), closes [#5423](https://github.com/angular/angular-cli/issues/5423)
+* **@angular/cli:** new project landing page ([#6144](https://github.com/angular/angular-cli/issues/6144)) ([0ac878a](https://github.com/angular/angular-cli/commit/0ac878a)), closes [#5928](https://github.com/angular/angular-cli/issues/5928) [#6125](https://github.com/angular/angular-cli/issues/6125)
+* **@angular/cli:** support inline source maps with defined charset ([ea4c864](https://github.com/angular/angular-cli/commit/ea4c864))
+* **@angular/cli:** support TypeScript 2.3 ([69d3d2b](https://github.com/angular/angular-cli/commit/69d3d2b))
+* **@angular/cli:** update tslint on updating prefix ([#5908](https://github.com/angular/angular-cli/issues/5908)) ([2bf5c96](https://github.com/angular/angular-cli/commit/2bf5c96)), closes [#5794](https://github.com/angular/angular-cli/issues/5794)
+* **@angular/cli:** upgrade the blueprint karma-coverage-istanbul-reporter version ([#5519](https://github.com/angular/angular-cli/issues/5519)) ([d7b46d0](https://github.com/angular/angular-cli/commit/d7b46d0))
+* **@angular/cli:** use and support webpack 2.3 ([aa958a6](https://github.com/angular/angular-cli/commit/aa958a6))
+* **@angular/cli:** use and support webpack 2.4 ([818936e](https://github.com/angular/angular-cli/commit/818936e))
+
+
+
 <a name="1.0.3"></a>
 ## [1.0.3](https://github.com/angular/angular-cli/compare/v1.0.2...v1.0.3) (2017-05-09)
 

docs/documentation/build.md

@@ -82,6 +82,27 @@ Flag                | `--dev` | `--prod`
 - Replaces `process.env.NODE_ENV` in modules with the `production` value (this is needed for some libraries, like react).
 - Runs UglifyJS on the code.
 
+### CSS resources
+
+Resources in CSS, such as images and fonts, will be copied over automatically as part of a build.
+If a resource is less than 10kb it will also be inlined.
+
+You'll see these resources be outputted and fingerprinted at the root of `dist/`.
+
+### Service Worker
+
+There is experimental service worker support for production builds available in the CLI.
+To enable it, run the following commands:
+```
+npm install @angular/service-worker --save
+ng set apps.0.serviceWorker=true
+```
+
+On `--prod` builds a service worker manifest will be created and loaded automatically.
+Remember to disable the service worker while developing to avoid stale code.
+
+Note: service worker support is experimental and subject to change.
+
 ## Options
 <details>
   <summary>aot</summary>

docs/documentation/new.md

@@ -11,7 +11,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>directory</summary>
   <p>
-    `--directory` (alias: `-dir`) _default value: dir_
+    <code>--directory</code> (alias: <code>-dir</code>) <em>default value: dir</em>
   </p>
   <p>
     The directory name to create the app in.
@@ -21,7 +21,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>dry-run</summary>
   <p>
-    `--dry-run` (alias: `-d`) _default value: false_
+    <code>--dry-run</code> (alias: <code>-d</code>) <em>default value: false</em>
   </p>
   <p>
     Run through without making any changes.
@@ -31,7 +31,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>inline-style</summary>
   <p>
-    `--inline-style` (alias: `-is`) _default value: false_
+    <code>--inline-style</code> (alias: <code>-is</code>) <em>default value: false</em>
   </p>
   <p>
     Should have an inline style.
@@ -41,7 +41,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>inline-template</summary>
   <p>
-    `--inline-template` (alias: `-it`) _default value: false_
+    <code>--inline-template</code> (alias: <code>-it</code>) <em>default value: false</em>
   </p>
   <p>
     Should have an inline template.
@@ -51,7 +51,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>prefix</summary>
   <p>
-    `--prefix` (alias: `-p`) _default value: app_
+    <code>--prefix</code> (alias: <code>-p</code>) <em>default value: app</em>
   </p>
   <p>
     The prefix to use for all component selectors.
@@ -61,7 +61,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>routing</summary>
   <p>
-    `--routing` _default value: false_
+    <code>--routing</code> <em>default value: false</em>
   </p>
   <p>
     Generate a routing module.
@@ -71,7 +71,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>skip-commit</summary>
   <p>
-    `--skip-commit` (alias: `-sc`) _default value: false_
+    <code>--skip-commit</code> (alias: <code>-sc</code>) <em>default value: false</em>
   </p>
   <p>
     Skip committing the first commit to git.
@@ -81,7 +81,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>skip-git</summary>
   <p>
-    `--skip-git` (alias: `-sg`) _default value: false_
+    <code>--skip-git</code> (alias: <code>-sg</code>) <em>default value: false</em>
   </p>
   <p>
     Skip initializing a git repository.
@@ -91,7 +91,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>skip-install</summary>
   <p>
-    `--skip-install` (alias: `-si`) _default value: false_
+    <code>--skip-install</code> (alias: <code>-si</code>) <em>default value: false</em>
   </p>
   <p>
     Skip installing packages.
@@ -101,7 +101,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>skip-tests</summary>
   <p>
-    <code>--skip-tests</code> (aliases: <code>-st</code>) <em>default value: false</em>
+    <code>--skip-tests (aliases: </code>-st) <em>default value: false</em>
   </p>
   <p>
     Skip creating spec files.
@@ -114,7 +114,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>source-dir</summary>
   <p>
-    `--source-dir` (alias: `-sd`) _default value: src_
+    <code>--source-dir</code> (alias: <code>-sd</code>) <em>default value: src</em>
   </p>
   <p>
     The name of the source directory.
@@ -124,7 +124,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>style</summary>
   <p>
-    `--style` _default value: css_
+    <code>--style</code> <em>default value: css</em>
   </p>
   <p>
     The style file default extension.
@@ -134,7 +134,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>verbose</summary>
   <p>
-    `--verbose` (alias: `-v`) _default value: false_
+    <code>--verbose</code> (alias: <code>-v</code>) <em>default value: false</em>
   </p>
   <p>
     Adds more details to output logging.

docs/documentation/stories.md

@@ -25,3 +25,4 @@
  - [Code Coverage](stories/code-coverage)
  - [Application Environments](stories/application-environments)
  - [Autoprefixer Configuration](stories/autoprefixer)
+ - [Deploy to GitHub Pages](stories/githug-pages)

docs/documentation/stories/github-pages.md

@@ -0,0 +1,21 @@
+# Deploy to GitHub Pages
+
+A simple way to deploy your Angular app is to use
+[GitHub Pages](https://help.github.com/articles/what-is-github-pages/).
+
+The first step is to [create a GitHub account](https://github.com/join), and then
+[create a repository](https://help.github.com/articles/create-a-repo/) for your project.
+Make a note of the user name and project name in GitHub.
+
+Then all you need to do is run `ng build --prod --output-path docs --base-href PROJECT_NAME`, where
+`PROJECT_NAME` is the name of your project in GitHub.
+Make a copy of `dist/index.html` and name it `dist/404.html`.
+
+Commit your changes and push. On the GitHub project page, configure it to
+[publish from the docs folder](https://help.github.com/articles/configuring-a-publishing-source-for-github-pages/#publishing-your-github-pages-site-from-a-docs-folder-on-your-master-branch).
+
+And that's all you need to do! Now you can see your page at
+`https://USER_NAME.github.io/PROJECT_NAME/`.
+
+You can also use [angular-cli-ghpages](https://github.com/angular-buch/angular-cli-ghpages), a full
+featured package that does this all this for you and has extra functionality.

docs/documentation/stories/global-scripts.md

@@ -21,3 +21,23 @@ You can also rename the output and lazy load it by using the object format:
   { "input": "pre-rename-script.js", "output": "renamed-script" },
 ],
 ```
+
+## Using global libraries inside your app
+
+Once you import a library via the scripts array, you should **not** import it via a import statement
+in your TypeScript code (e.g. `import * as $ from 'jquery';`).
+If you do that, you'll end up with two different copies of the library: one imported as a
+global library, and one imported as a module.
+
+This is especially bad for libraries with plugins, like JQuery, because each copy will have
+different plugins.
+
+Instead, download typings for your library (`npm install @types/jquery`) which will give you
+access to the global variables exposed by that library.
+
+If the global library you need to use does not have global typings, you can also declare them
+manually in `src/typings.d.ts` as `any`:
+
+```
+declare var libraryName: any;
+```

docs/documentation/stories/using-corporate-proxy.md

@@ -2,7 +2,7 @@
 
 # Using corporate proxy
 
-If you work behind a corporate proxy, the regular [backend proxy](http://github.com/angular/angular-cli#proxy-to-backend) configuration will not work if you try to proxy calls to any URL outside your local network.
+If you work behind a corporate proxy, the regular [backend proxy](https://github.com/angular/angular-cli/wiki/stories-proxy) configuration will not work if you try to proxy calls to any URL outside your local network.
 
 In this case, you can configure the backend proxy to redirect calls through your corporate proxy using an agent:
 

packages/@angular/cli/blueprints/ng/files/package.json

@@ -18,7 +18,6 @@
     "@angular/core": "^4.0.0",
     "@angular/forms": "^4.0.0",
     "@angular/http": "^4.0.0",
-    "@angular/language-service": "^4.0.0",
     "@angular/platform-browser": "^4.0.0",
     "@angular/platform-browser-dynamic": "^4.0.0",
     "@angular/router": "^4.0.0",

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

@@ -67,7 +67,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     devtool: buildOptions.sourcemaps ? 'source-map' : false,
     resolve: {
       extensions: ['.ts', '.js'],
-      modules: [nodeModules],
+      modules: ['node_modules', nodeModules],
     },
     resolveLoader: {
       modules: [nodeModules]

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

@@ -177,6 +177,8 @@ export default Task.extend({
     // set publicPath property to be sent on webpack server config
     if (serveTaskOptions.deployUrl) {
       webpackDevServerConfiguration.publicPath = serveTaskOptions.deployUrl;
+      (webpackDevServerConfiguration.historyApiFallback as any).index =
+        serveTaskOptions.deployUrl + `/${appConfig.index}`;
     }
 
     if (serveTaskOptions.target === 'production') {

scripts/test-commit-messages.js

@@ -36,8 +36,12 @@ execSync('git fetch origin');
 // Travis doesn't have master when running jobs on other branches (minor/patch/etc).
 execSync('git fetch origin master:master');
 
+// Get PR target branch, default to master for running locally.
+const currentBranch = process.env.TRAVIS_BRANCH
+  || process.env.APPVEYOR_REPO_BRANCH
+  || 'master';
 
-const output = execSync('git log master.. --reverse --format="%H %s" --no-merges', {
+const output = execSync('git log ' + currentBranch + '..HEAD --reverse --format="%H %s" --no-merges', {
   encoding: 'utf-8'
 });
 

tests/e2e/tests/misc/deploy-url.ts

@@ -1,14 +1,18 @@
 import { killAllProcesses } from '../../utils/process';
 import { request } from '../../utils/http';
-import { expectToFail } from '../../utils/utils';
 import { ngServe } from '../../utils/project';
 
 export default function () {
   return Promise.resolve()
     // check when setup through command line arguments
-    .then(() => ngServe('--deploy-url', '/deployurl', '--base-href', '/deployurl'))
-    .then(() => expectToFail(() => request('http://localhost:4200')))
-    .then(() => request('http://localhost:4200/deployurl'))
+    .then(() => ngServe('--deploy-url', '/deployurl/', '--base-href', '/deployurl/'))
+    .then(() => request('http://localhost:4200'))
+    .then(body => {
+      if (!body.match(/<app-root><\/app-root>/)) {
+        throw new Error('Response does not match expected value.');
+      }
+    })
+    .then(() => request('http://localhost:4200/deployurl/'))
     .then(body => {
       if (!body.match(/<app-root><\/app-root>/)) {
         throw new Error('Response does not match expected value.');

tests/e2e/tests/misc/module-resolution.ts

@@ -0,0 +1,13 @@
+import { appendToFile, prependToFile } from '../../utils/fs';
+import { ng, silentNpm } from '../../utils/process';
+
+
+export default async function () {
+  await silentNpm('install', '[email protected]');
+
+  await prependToFile('src/app/app.module.ts', 'import * as firebase from \'firebase\';');
+  await appendToFile('src/app/app.module.ts', 'firebase.initializeApp({});');
+
+  await ng('build');
+  await ng('build', '--aot');
+}