diff --git a/docs/documentation/add.md b/docs/documentation/add.md
index 9406f31a2c2a..8ec0068cb337 100644
--- a/docs/documentation/add.md
+++ b/docs/documentation/add.md
@@ -1,5 +1,7 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/add).**
+
# ng add
## Overview
diff --git a/docs/documentation/build.md b/docs/documentation/build.md
index ba25703f56b1..816acb63131d 100644
--- a/docs/documentation/build.md
+++ b/docs/documentation/build.md
@@ -1,4 +1,6 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/build)**.
+
# ng build
diff --git a/docs/documentation/config.md b/docs/documentation/config.md
index bc4d49f32612..62d554d1e05c 100644
--- a/docs/documentation/config.md
+++ b/docs/documentation/config.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/config)**.
# ng config
diff --git a/docs/documentation/doc.md b/docs/documentation/doc.md
index 33fcd402f69c..098d84f04f5c 100644
--- a/docs/documentation/doc.md
+++ b/docs/documentation/doc.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/doc)**.
# ng doc
diff --git a/docs/documentation/e2e.md b/docs/documentation/e2e.md
index 2f9c0d40a695..120dab85ab94 100644
--- a/docs/documentation/e2e.md
+++ b/docs/documentation/e2e.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/e2e)**.
# ng e2e
diff --git a/docs/documentation/eject.md b/docs/documentation/eject.md
index 3e2ff0055fe4..515283790dcc 100644
--- a/docs/documentation/eject.md
+++ b/docs/documentation/eject.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6.**.
# ng eject
diff --git a/docs/documentation/generate.md b/docs/documentation/generate.md
index ec448122faee..af88444ac51c 100644
--- a/docs/documentation/generate.md
+++ b/docs/documentation/generate.md
@@ -1,5 +1,7 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
# ng generate
## Overview
diff --git a/docs/documentation/generate/app-shell.md b/docs/documentation/generate/app-shell.md
index b065a442af18..af5ee13d76be 100644
--- a/docs/documentation/generate/app-shell.md
+++ b/docs/documentation/generate/app-shell.md
@@ -1,5 +1,7 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
# ng generate app-shell
## Overview
diff --git a/docs/documentation/generate/application.md b/docs/documentation/generate/application.md
index ddf2e73d2709..0f5c21c65862 100644
--- a/docs/documentation/generate/application.md
+++ b/docs/documentation/generate/application.md
@@ -1,5 +1,7 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
# ng generate application
## Overview
diff --git a/docs/documentation/generate/class.md b/docs/documentation/generate/class.md
index 2921320f5d6a..d8c562c0abb4 100644
--- a/docs/documentation/generate/class.md
+++ b/docs/documentation/generate/class.md
@@ -1,5 +1,5 @@
-
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
# ng generate class
## Overview
diff --git a/docs/documentation/generate/component.md b/docs/documentation/generate/component.md
index 2a50786f6d89..b02e9ca88466 100644
--- a/docs/documentation/generate/component.md
+++ b/docs/documentation/generate/component.md
@@ -1,5 +1,7 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
# ng generate component
## Overview
diff --git a/docs/documentation/generate/directive.md b/docs/documentation/generate/directive.md
index 96c3ce04e94b..f14d0cdde3ae 100644
--- a/docs/documentation/generate/directive.md
+++ b/docs/documentation/generate/directive.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
# ng generate directive
diff --git a/docs/documentation/generate/enum.md b/docs/documentation/generate/enum.md
index 79824e183b91..7eec3eacb13a 100644
--- a/docs/documentation/generate/enum.md
+++ b/docs/documentation/generate/enum.md
@@ -1,5 +1,5 @@
-
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
# ng generate enum
## Overview
diff --git a/docs/documentation/generate/guard.md b/docs/documentation/generate/guard.md
index 06a82df57e9b..5f37f49aae32 100644
--- a/docs/documentation/generate/guard.md
+++ b/docs/documentation/generate/guard.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
# ng generate guard
## Overview
diff --git a/docs/documentation/generate/interface.md b/docs/documentation/generate/interface.md
index 69ac2e27ab8b..0afd4b9f80bf 100644
--- a/docs/documentation/generate/interface.md
+++ b/docs/documentation/generate/interface.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
# ng generate interface
diff --git a/docs/documentation/generate/library.md b/docs/documentation/generate/library.md
index c891bf6c35bb..c79fdb6f91f1 100644
--- a/docs/documentation/generate/library.md
+++ b/docs/documentation/generate/library.md
@@ -1,4 +1,6 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
# ng generate library
diff --git a/docs/documentation/generate/module.md b/docs/documentation/generate/module.md
index aadc337a1131..c0cae09d6d0a 100644
--- a/docs/documentation/generate/module.md
+++ b/docs/documentation/generate/module.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
# ng generate module
diff --git a/docs/documentation/generate/pipe.md b/docs/documentation/generate/pipe.md
index beec9abfbd48..68bffd3644e1 100644
--- a/docs/documentation/generate/pipe.md
+++ b/docs/documentation/generate/pipe.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
# ng generate pipe
diff --git a/docs/documentation/generate/service.md b/docs/documentation/generate/service.md
index d52583b12aa3..c114bd9826c3 100644
--- a/docs/documentation/generate/service.md
+++ b/docs/documentation/generate/service.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
# ng generate service
diff --git a/docs/documentation/generate/universal.md b/docs/documentation/generate/universal.md
index 8e9bf1e0241f..870c13d7bc4b 100644
--- a/docs/documentation/generate/universal.md
+++ b/docs/documentation/generate/universal.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
# ng generate universal
diff --git a/docs/documentation/help.md b/docs/documentation/help.md
index 577f2cab8f9b..45e7bde46c8a 100644
--- a/docs/documentation/help.md
+++ b/docs/documentation/help.md
@@ -1,4 +1,6 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/help)**.
+
# ng help
diff --git a/docs/documentation/home.md b/docs/documentation/home.md
index c5674d45ce4f..f8d2bb2a87ac 100644
--- a/docs/documentation/home.md
+++ b/docs/documentation/home.md
@@ -2,7 +2,7 @@
# Angular CLI
-NOTE: this documentation is for Angular CLI 6. For Angular CLI 1.x go [here](1-x-home) instead.
+**NOTE: this documentation is for Angular CLI 6. For Angular CLI Version 7 go [here](https://angular.io/cli) and 1.x go [here](1-x-home) instead.**
### Overview
The Angular CLI is a tool to initialize, develop, scaffold and maintain [Angular](https://angular.io) applications
diff --git a/docs/documentation/lint.md b/docs/documentation/lint.md
index 46cf98642821..6c0c48ee3095 100644
--- a/docs/documentation/lint.md
+++ b/docs/documentation/lint.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/lint)**.
# ng lint
diff --git a/docs/documentation/new.md b/docs/documentation/new.md
index 4e7ebd260918..eed0ab4afbcd 100644
--- a/docs/documentation/new.md
+++ b/docs/documentation/new.md
@@ -1,5 +1,7 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/new)**.
+
# ng new
## Overview
diff --git a/docs/documentation/run.md b/docs/documentation/run.md
index c7de54d15085..06caa0658bb4 100644
--- a/docs/documentation/run.md
+++ b/docs/documentation/run.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/run)**.
# ng run
diff --git a/docs/documentation/serve.md b/docs/documentation/serve.md
index b064c71ab3f5..f583dd0dba16 100644
--- a/docs/documentation/serve.md
+++ b/docs/documentation/serve.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/serve)**.
# ng serve
diff --git a/docs/documentation/stories/1.0-update.md b/docs/documentation/stories/1.0-update.md
new file mode 100644
index 000000000000..a9fc9d8d3f25
--- /dev/null
+++ b/docs/documentation/stories/1.0-update.md
@@ -0,0 +1,503 @@
+# Angular CLI migration guide
+
+In this migration guide we'll be looking at some of the major changes to CLI projects in the
+last two months.
+
+Most of these changes were not breaking changes and your project should work fine without them.
+
+But if you've been waiting for the perfect time to update, this is it!
+Along with major rebuild speed increases, we've been busy adding a lot of features.
+
+Documentation has also completely moved to [the wiki](https://github.com/angular/angular-cli/wiki).
+The new [Stories](https://github.com/angular/angular-cli/wiki/stories) section covers common usage
+scenarios, so be sure to have a look!
+
+Below are the changes between a project generated two months ago, with `1.0.0-beta.24` and
+a `1.0.0` project.
+If you kept your project up to date you might have a lot of these already.
+
+You can find more details about changes between versions in [the releases tab on GitHub](https://github.com/angular/angular-cli/releases).
+
+If you prefer, you can also generate a new project in a separate folder using
+ `ng new upgrade-project --skip-install` and compare the differences.
+
+## @angular/cli
+
+Angular CLI can now be found on NPM under `@angular/cli` instead of `angular-cli`, and upgrading is a simple 3 step process:
+
+1. Uninstall old version
+2. Update node/npm if necessary
+3. Install new version
+
+### 1. Uninstall old version
+
+If you're using Angular CLI `beta.28` or less, you need to uninstall the `angular-cli` packages:
+```bash
+npm uninstall -g angular-cli # Remove global package
+npm uninstall --save-dev angular-cli # Remove from package.json
+```
+
+Otherwise, uninstall the `@angular/cli` packages:
+```bash
+npm uninstall -g @angular/cli # Remove global package
+npm uninstall --save-dev @angular/cli # Remove from package.json
+```
+
+Also purge the cache and local packages:
+```
+rm -rf node_modules dist # Use rmdir on Windows
+npm cache clean
+```
+
+At this point, you should not have Angular CLI on your system anymore. If invoking Angular CLI at the commandline reveals that it still exists on your system, you will have to manually remove it. See _Manually removing residual Angular CLI_.
+
+### 2. Update node/npm if necessary
+
+Angular CLI now has a minimum requirement of Node 6.9.0 or higher, together with NPM 3 or higher.
+
+If your Node or NPM versions do not meet these requirements, please refer to [the documentation](https://docs.npmjs.com/getting-started/installing-node) on how to upgrade.
+
+### 3. Install the new version
+
+To update Angular CLI to a new version, you must update both the global package and your project's local package:
+
+```bash
+npm install -g @angular/cli@latest # Global package
+npm install --save-dev @angular/cli@latest # Local package
+npm install # Restore removed dependencies
+```
+
+### Manually removing residual Angular CLI
+
+If you accidentally updated NPM before removing the old Angular CLI, you may find that uninstalling the package using `npm uninstall` is proving fruitless. This _could_ be because the global install (and uninstall) path changed between versions of npm from `/usr/local/lib` to `/usr/lib`, and hence, no longer searches through the old directory. In this case you'll have to remove it manually:
+
+`rm -rf /usr/local/lib/node_modules/@angular/cli`
+
+If the old Angular CLI package _still_ persists, you'll need to research how to remove it before proceeding with the upgrade.
+
+## .angular-cli.json
+
+`angular-cli.json` is now `.angular-cli.json`, but we still accept the old config file name.
+
+A few new properties have changed in it:
+
+### Schema
+
+Add the `$schema` property above project for handy IDE support on your config file:
+
+```
+"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+```
+
+### Polyfills
+
+There is now a dedicated entry for polyfills ([#3812](https://github.com/angular/angular-cli/pull/3812))
+inside `apps[0].polyfills`, between `main` and `test`:
+
+```
+"main": "main.ts",
+"polyfills": "polyfills.ts",
+"test": "test.ts",
+```
+
+Add it and remove `import './polyfills.ts';` from `src/main.ts` and `src/test.ts`.
+
+We also added a lot of descriptive comments to the existing `src/polyfills.ts` file, explaining
+which polyfills are needed for what browsers.
+Be sure to check it out in a new project!
+
+### Environments
+
+A new `environmentSource` entry ([#4705](https://github.com/angular/angular-cli/pull/4705))
+replaces the previous source entry inside environments.
+
+To migrate angular-cli.json follow the example below:
+
+Before:
+```
+"environments": {
+ "source": "environments/environment.ts",
+ "dev": "environments/environment.ts",
+ "prod": "environments/environment.prod.ts"
+}
+```
+
+After:
+
+```
+"environmentSource": "environments/environment.ts",
+"environments": {
+ "dev": "environments/environment.ts",
+ "prod": "environments/environment.prod.ts"
+}
+```
+
+### Linting
+
+The CLI now uses the TSLint API ([#4248](https://github.com/angular/angular-cli/pull/4248))
+to lint several TS projects at once.
+
+There is a new `lint` entry in `.angular-cli.json` between `e2e` and `test` where all linting
+targets are listed:
+
+```
+"e2e": {
+ "protractor": {
+ "config": "./protractor.conf.js"
+ }
+},
+"lint": [
+ {
+ "project": "src/tsconfig.app.json"
+ },
+ {
+ "project": "src/tsconfig.spec.json"
+ },
+ {
+ "project": "e2e/tsconfig.e2e.json"
+ }
+],
+"test": {
+ "karma": {
+ "config": "./karma.conf.js"
+ }
+},
+```
+
+### Generator defaults
+
+Now you can list generator defaults per generator ([#4389](https://github.com/angular/angular-cli/pull/4389))
+in `defaults`.
+
+Instead of:
+```
+"defaults": {
+ "styleExt": "css",
+ "prefixInterfaces": false,
+ "inline": {
+ "style": false,
+ "template": false
+ },
+ "spec": {
+ "class": false,
+ "component": true,
+ "directive": true,
+ "module": false,
+ "pipe": true,
+ "service": true
+ }
+}
+```
+
+You can instead list the flags as they appear on [the generator command](https://github.com/angular/angular-cli/wiki/generate-component):
+```
+"defaults": {
+ "styleExt": "css",
+ "component": {
+ "inlineTemplate": false,
+ "spec": true
+ }
+}
+```
+
+## One tsconfig per app
+
+CLI projects now use one tsconfig per app ([#4924](https://github.com/angular/angular-cli/pull/4924)).
+
+- `src/tsconfig.app.json`: configuration for the Angular app.
+```
+{
+ "compilerOptions": {
+ "sourceMap": true,
+ "declaration": false,
+ "moduleResolution": "node",
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "target": "es5",
+ "lib": [
+ "es2017",
+ "dom"
+ ],
+ "outDir": "../out-tsc/app",
+ "module": "es2015",
+ "baseUrl": "",
+ "types": []
+ },
+ "exclude": [
+ "test.ts",
+ "**/*.spec.ts"
+ ]
+}
+```
+- `src/tsconfig.spec.json`: configuration for the unit tests.
+```
+{
+ "compilerOptions": {
+ "sourceMap": true,
+ "declaration": false,
+ "moduleResolution": "node",
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "lib": [
+ "es2017",
+ "dom"
+ ],
+ "outDir": "../out-tsc/spec",
+ "module": "commonjs",
+ "target": "es5",
+ "baseUrl": "",
+ "types": [
+ "jasmine",
+ "node"
+ ]
+ },
+ "files": [
+ "test.ts"
+ ],
+ "include": [
+ "**/*.spec.ts",
+ "**/*.d.ts"
+ ]
+}
+
+```
+- `e2e/tsconfig.e2e.json`: configuration for the e2e tests.
+```
+{
+ "compilerOptions": {
+ "sourceMap": true,
+ "declaration": false,
+ "moduleResolution": "node",
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "lib": [
+ "es2017"
+ ],
+ "outDir": "../out-tsc/e2e",
+ "module": "commonjs",
+ "target": "es5",
+ "types":[
+ "jasmine",
+ "node"
+ ]
+ }
+}
+
+```
+
+There is an additional root-level `tsconfig.json` that is used for IDE integration.
+```
+{
+ "compileOnSave": false,
+ "compilerOptions": {
+ "outDir": "./dist/out-tsc",
+ "baseUrl": "src",
+ "sourceMap": true,
+ "declaration": false,
+ "moduleResolution": "node",
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "target": "es5",
+ "typeRoots": [
+ "node_modules/@types"
+ ],
+ "lib": [
+ "es2017",
+ "dom"
+ ]
+ }
+}
+```
+
+You can delete `e2e/tsconfig.json` and `src/tsconfig.json` after adding these.
+
+Also update `.angular-cli.json` to use them inside `apps[0]`:
+
+```
+"tsconfig": "tsconfig.app.json",
+"testTsconfig": "tsconfig.spec.json",
+```
+
+Then update `protractor.conf.js` to use the e2e config as well:
+```
+beforeLaunch: function() {
+ require('ts-node').register({
+ project: 'e2e/tsconfig.e2e.json'
+ });
+},
+```
+
+These configs have an `types` array where you should add any package you install via `@types/*`.
+This array helps keep typings isolated to the apps that really need them and avoid problems with
+duplicate typings.
+
+For instance, the unit test `tsconfig` has `jasmine` and `node`, which correspond to
+`@types/jasmine` and `@types/node`.
+Add any typings you've installed to the appropriate `tsconfig` as well.
+
+## typings.d.ts
+
+There's a new `src/typings.d.ts` file that serves two purposes:
+- provides a centralized place for users to add their own custom typings
+- makes it easy to use components that use `module.id`, present in the documentation and in snippets
+
+```
+/* SystemJS module definition */
+declare var module: NodeModule;
+interface NodeModule {
+ id: string;
+}
+```
+
+## package.json
+
+We've updated a lot of packages over the last months in order to keep projects up to date.
+
+Additions or removals are found in bold below.
+
+Packages in `dependencies`:
+- `@angular/*` packages now have a `^4.0.0` minimum
+- `core-js` remains unchanged at `^2.4.1`
+- `rxjs` was updated to `^5.1.0`
+- `ts-helpers` was **removed**
+- `zone.js` was updated to `^0.8.4`
+
+Packages in `devDependencies`:
+- `@angular/cli` at `1.0.0` replaces `angular-cli`
+- `@angular/compiler-cli` is also at `^4.0.0`
+- `@types/jasmine` remains unchanged and pinned at `2.5.38`
+- `@types/node` was updated to `~6.0.60`
+- `codelyzer` was updated to `~2.0.0`
+- `jasmine-core` was updated to `~2.5.2`
+- `jasmine-spec-reporter` was updated to `~3.2.0`
+- `karma` was updated to `~1.4.1`
+- `karma-chrome-launcher` was updated to `~2.0.0`
+- `karma-cli` was updated to `~1.0.1`
+- `karma-jasmine` was updated to `~1.1.0`
+- `karma-jasmine-html-reporter` was **added** at `^0.2.2`
+- `karma-coverage-istanbul-reporter` was **added** at `^0.2.0`, replacing `karma-remap-istanbul`
+- `karma-remap-istanbul` was **removed**
+- `protractor` was updated to `~5.1.0`
+- `ts-node` was updated to `~2.0.0`
+- `tslint` was updated to `~4.5.0`
+- `typescript` was updated to `~2.1.0`
+
+See the [karma](#karma.conf.js) and [protractor](#protractor.conf.js) sections below for more
+information on changed packages.
+
+The [Linting rules](#Linting rules) section contains a list of rules that changed due to updates.
+
+We also updated the scripts section to make it more simple:
+
+```
+"scripts": {
+ "ng": "ng",
+ "start": "ng serve",
+ "build": "ng build",
+ "test": "ng test",
+ "lint": "ng lint",
+ "e2e": "ng e2e"
+},
+```
+
+## karma.conf.js
+
+Karma configuration suffered some changes to improve the code-coverage functionality,
+use the new `@angular/cli` package, and the new HTML reporter.
+
+In the `frameworks` array update the CLI package to `@angular/cli`.
+
+In the `plugins` array:
+- add `require('karma-jasmine-html-reporter')` and `require('karma-coverage-istanbul-reporter')`
+- remove `require('karma-remap-istanbul')`
+- update the CLI plugin to `require('@angular/cli/plugins/karma')`
+
+Add a new `client` option just above `patterns`:
+```
+client:{
+ clearContext: false // leave Jasmine Spec Runner output visible in browser
+},
+files: [
+```
+
+Change the preprocessor to use the new CLI package:
+```
+preprocessors: {
+ './src/test.ts': ['@angular/cli']
+},
+```
+
+Replace `remapIstanbulReporter` with `coverageIstanbulReporter`:
+```
+coverageIstanbulReporter: {
+ reports: [ 'html', 'lcovonly' ],
+ fixWebpackSourcePaths: true
+},
+```
+
+Remove the config entry from `angularCli`:
+```
+angularCli: {
+ environment: 'dev'
+},
+```
+
+Update the reporters to use `coverage-istanbul` instead of `karma-remap-istanbul`, and
+add `kjhtml` (short for karma-jasmine-html-reporter):
+```
+reporters: config.angularCli && config.angularCli.codeCoverage
+ ? ['progress', 'coverage-istanbul']
+ : ['progress', 'kjhtml'],
+```
+
+## protractor.conf.js
+
+Protractor was updated to the new 5.x major version, but you shouldn't need to change much
+to take advantage of all its new features.
+
+Replace the spec reporter import from:
+```
+var SpecReporter = require('jasmine-spec-reporter');
+```
+to
+```
+const { SpecReporter } = require('jasmine-spec-reporter');
+```
+
+Remove `useAllAngular2AppRoots: true`.
+
+Update `beforeLaunch` as described in [One tsconfig per app](#one-tsconfig-per-app):
+```
+beforeLaunch: function() {
+ require('ts-node').register({
+ project: 'e2e/tsconfig.e2e.json'
+ });
+},
+```
+
+Update `onPrepare`:
+```
+onPrepare: function() {
+ jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+}
+```
+
+## Linting rules
+
+The updated versions of `tslint` and `codelyzer` contain a few rule changes that you should
+apply to your `tslint.json`:
+
+Add these new rules:
+```
+"callable-types": true,
+"import-blacklist": [true, "rxjs"],
+"import-spacing": true,
+"interface-over-type-literal": true,
+"no-empty-interface": true,
+"no-string-throw": true,
+"prefer-const": true,
+"typeof-compare": true,
+"unified-signatures": true,
+```
+
+Update `no-inferrable-types` to `"no-inferrable-types": [true, "ignore-params"]`.
diff --git a/docs/documentation/stories/application-environments.md b/docs/documentation/stories/application-environments.md
index 635bc2d39fe6..ac65f31c0c46 100644
--- a/docs/documentation/stories/application-environments.md
+++ b/docs/documentation/stories/application-environments.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/build#configuring-application-environments)**.
+
# Application Environments
In Angular CLI you can configure the build system to replace existing files for your intended
diff --git a/docs/documentation/stories/budgets.md b/docs/documentation/stories/budgets.md
index f6eea0f0311a..2f7f049e6f25 100644
--- a/docs/documentation/stories/budgets.md
+++ b/docs/documentation/stories/budgets.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/build#configure-size-budgets)**.
+
# Budgets
As applications grow in functionality, they also grow in size. Budgets is a feature in the
diff --git a/docs/documentation/stories/code-coverage.md b/docs/documentation/stories/code-coverage.md
index 15f67bb317da..934adc3853d6 100644
--- a/docs/documentation/stories/code-coverage.md
+++ b/docs/documentation/stories/code-coverage.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/testing#enable-code-coverage-reports)**.
+
# Code Coverage
With the Angular CLI we can run unit tests as well as create code coverage reports. Code coverage reports allow us to see any parts of our code base that may not be properly tested by our unit tests.
diff --git a/docs/documentation/stories/continuous-integration.md b/docs/documentation/stories/continuous-integration.md
index 269bab08997c..11820cf9b3ca 100644
--- a/docs/documentation/stories/continuous-integration.md
+++ b/docs/documentation/stories/continuous-integration.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/testing#set-up-continuous-integration)**.
+
# Continuous Integration
One of the best ways to keep your project bug free is through a test suite, but it's easy to forget
diff --git a/docs/documentation/stories/github-pages.md b/docs/documentation/stories/github-pages.md
index 658c8340a863..89f2795131bc 100644
--- a/docs/documentation/stories/github-pages.md
+++ b/docs/documentation/stories/github-pages.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/deployment#deploy-to-github-pages)**.
+
# Deploy to GitHub Pages
A simple way to deploy your Angular app is to use
diff --git a/docs/documentation/stories/internationalization.md b/docs/documentation/stories/internationalization.md
index 2acd551752ba..20210930a696 100644
--- a/docs/documentation/stories/internationalization.md
+++ b/docs/documentation/stories/internationalization.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/i18n)**.
+
# Internationalization (i18n)
If you are working on internationalization, the CLI can help you with the following steps:
diff --git a/docs/documentation/stories/proxy.md b/docs/documentation/stories/proxy.md
index 17b301f17c30..ceedd3c0ac69 100644
--- a/docs/documentation/stories/proxy.md
+++ b/docs/documentation/stories/proxy.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/build#using-corporate-proxy)**.
+
# Proxy To Backend
Using the [proxying support](https://webpack.js.org/configuration/dev-server/#devserver-proxy) in webpack's dev server we can highjack certain URLs and send them to a backend server.
diff --git a/docs/documentation/stories/routing.md b/docs/documentation/stories/routing.md
index 504a62e6f07e..4e73e7059c83 100644
--- a/docs/documentation/stories/routing.md
+++ b/docs/documentation/stories/routing.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/router#integrate-routing-with-your-app)**.
+
# Generating a route
The CLI supports routing in several ways:
diff --git a/docs/documentation/stories/universal-rendering.md b/docs/documentation/stories/universal-rendering.md
index cb007b6eb712..7c56041a547f 100644
--- a/docs/documentation/stories/universal-rendering.md
+++ b/docs/documentation/stories/universal-rendering.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/universal)**.
+
# Angular Universal Integration
The Angular CLI supports generation of a Universal build for your application. This is a CommonJS-formatted bundle which can be `require()`'d into a Node application (for example, an Express server) and used with `@angular/platform-server`'s APIs to prerender your application.
diff --git a/docs/documentation/test.md b/docs/documentation/test.md
index ea5c128225ea..dacb212dbbdc 100644
--- a/docs/documentation/test.md
+++ b/docs/documentation/test.md
@@ -1,4 +1,6 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/test)**.
+
# ng test
diff --git a/docs/documentation/update.md b/docs/documentation/update.md
index 7d2cebe984fb..2d9373dcfca9 100644
--- a/docs/documentation/update.md
+++ b/docs/documentation/update.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/update)**.
# ng update
diff --git a/docs/documentation/version.md b/docs/documentation/version.md
index c6418d66cff5..55240da18e7b 100644
--- a/docs/documentation/version.md
+++ b/docs/documentation/version.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/version)**.
# ng version
diff --git a/docs/documentation/xi18n.md b/docs/documentation/xi18n.md
index 835873787bef..8f7716a95a45 100644
--- a/docs/documentation/xi18n.md
+++ b/docs/documentation/xi18n.md
@@ -1,4 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/xi18n)**.
# ng xi18n
diff --git a/packages/schematics/angular/application/other-files/app.component.html b/packages/schematics/angular/application/other-files/app.component.html
index 45d45d08894b..d64e4d22d343 100644
--- a/packages/schematics/angular/application/other-files/app.component.html
+++ b/packages/schematics/angular/application/other-files/app.component.html
@@ -11,7 +11,7 @@ Here are some links to help you start:
-
+
diff --git a/packages/schematics/angular/application/other-files/app.component.ts b/packages/schematics/angular/application/other-files/app.component.ts
index c9be35dfcfbb..fb3e8bf8a20e 100644
--- a/packages/schematics/angular/application/other-files/app.component.ts
+++ b/packages/schematics/angular/application/other-files/app.component.ts
@@ -16,7 +16,7 @@ import { Component } from '@angular/core';
-
+