Merge branch 'master' into fix-3699-help-generate-print-blueprints

Author: catull

.appveyor.yml

@@ -7,13 +7,13 @@ matrix:
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - npm install -g npm
-  - npm install
+  - npm install -g yarn
+  - yarn install
 
 test_script:
   - node --version
-  - npm --version
-  - npm test
+  - yarn --version
+  - yarn test
   - node tests\run_e2e.js
 
 build: off

.gitignore

@@ -1,7 +1,6 @@
 dist/
 node_modules/
 npm-debug.log*
-yarn.lock
 
 # IDEs
 .idea/

.travis.yml

@@ -54,11 +54,12 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CHROME_BIN=chromium-browser; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "--no-sandbox" > ~/.config/chromium-flags.conf; fi
   - npm install -g npm
-  - npm config set spin false
-  - npm config set progress false
+  - npm install -g yarn
+  - yarn config set spin false
+  - yarn config set progress false
 
 install:
-  - npm install --no-optional
+  - yarn install --no-optional
 
 script:
   - if [[ "$SCRIPT" ]]; then npm run-script $SCRIPT; fi

README.md

@@ -125,7 +125,7 @@ The CLI supports routing in several ways:
 
   The `--routing` option also generates a default component with the same name as the module.
 
-- You can use the `--routing` option with `ng new` or `ng init` to create a `app-routing.module.ts` file when you create or initialize a project.
+- You can use the `--routing` option with `ng new` to create a `app-routing.module.ts` file when you create or initialize a project.
 
 <!-- DeleteSection1 Start here to remove upon next release -->
 ### Creating a build
@@ -440,12 +440,12 @@ Local project package:
 rm -rf node_modules dist # use rmdir on Windows
 npm install --save-dev angular-cli@latest
 npm install
-ng init
+ng update
 ```
 
-Running `ng init` will check for changes in all the auto-generated files created by `ng new` and allow you to update yours. You are offered four choices for each changed file: `y` (overwrite), `n` (don't overwrite), `d` (show diff between your file and the updated file) and `h` (help).
+Running `ng update` will check for changes in all the auto-generated files created by `ng new` and allow you to update yours. You are offered four choices for each changed file: `y` (overwrite), `n` (don't overwrite), `d` (show diff between your file and the updated file) and `h` (help).
 
-Carefully read the diffs for each code file, and either accept the changes or incorporate them manually after `ng init` finishes.
+Carefully read the diffs for each code file, and either accept the changes or incorporate them manually after `ng update` finishes.
 
 **The main cause of errors after an update is failing to incorporate these updates into your code**.
 

docs/design/docker-deploy.md

@@ -15,7 +15,7 @@ Provide tasks for common Docker workflows:
 
 1. Requires user to have Docker CLI tools installed.
    (See also: ["Implementation Approaches"](#implementation-approaches))
-1. User is free to use the Angular CLI without Docker (and vice versa). By default, do not generate Docker files upon creation of a new project (`ng new`, `ng init`).
+1. User is free to use the Angular CLI without Docker (and vice versa). By default, do not generate Docker files upon creation of a new project (`ng new`).
 1. Don't recreate the wheel. Docker CLI tools are very full featured on their own. Implement the common Docker use cases that make it convenient for Angular applications.
 1. Don't inhibit users from using the standalone Docker CLI tools for other use cases.
 1. Assumes 1:1 Dockerfile with the Angular project. Support for multiple services under the same project is outside the scope of this initial design.

docs/documentation/lint.md

@@ -1,8 +1,14 @@
+<!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+
 # ng lint
 
 ## Overview
-`ng lint` will lint your app code.
+`ng lint` will lint you app code using tslint.
+
+## Options
+
+`--fix` will attempt to fix lint errors
 
-This will use the `lint` npm script that in generated projects uses `tslint`.
+`--force` will always return error code 0 even with lint errors
 
-You can modify the these scripts in `package.json` to run whatever tool you prefer.
+`--format` (`-t`) the output formatter to use

docs/documentation/overview.md

@@ -109,7 +109,7 @@ your app.
 
 ### Additional Commands
 * [ng new](new)
-* [ng init](init)
+* [ng update](update)
 * [ng serve](serve)
 * [ng generate](generate)
 * [ng test](test)

docs/documentation/test.md

@@ -15,8 +15,6 @@ Tests will execute after a build is executed via [Karma](http://karma-runner.git
 
 You can run tests with coverage via `--code-coverage`. The coverage report will be in the `coverage/` directory.
 
-Linting during tests is also available via the `--lint` flag. See [Linting and formatting code](#linting-and-formatting-code) chapter for more informations.
-
 ## Options
 `--watch` (`-w`) flag to run builds when files change
 

docs/documentation/init.md renamed to docs/documentation/update.md

@@ -1,9 +1,9 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
 
-# ng init
+# ng update
 
 ## Overview
-`ng init [name]` initializes, or re-initializes, an angular application.
+`ng update [name]` updates, initializes, or re-initializes, an angular application.
 
 Initialization is done in-place, meaning that the generated application is initialized in the current directory.
 

package.json

@@ -48,14 +48,15 @@
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
     "css-loader": "^0.26.1",
+    "cssnano": "^3.10.0",
     "debug": "^2.1.3",
     "denodeify": "^1.2.1",
     "diff": "^2.2.2",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-string-utils": "^1.0.0",
     "enhanced-resolve": "^2.3.0",
     "exists-sync": "0.0.3",
-    "extract-text-webpack-plugin": "^2.0.0-beta.5",
+    "extract-text-webpack-plugin": "^2.0.0-rc.1",
     "file-loader": "^0.8.5",
     "findup": "0.1.5",
     "fs-extra": "^0.30.0",
@@ -64,7 +65,6 @@
     "html-webpack-plugin": "^2.19.0",
     "inflection": "^1.7.0",
     "inquirer": "^0.12.0",
-    "is-git-url": "^0.2.0",
     "isbinaryfile": "^2.0.3",
     "json-loader": "^0.5.4",
     "karma-sourcemap-loader": "^0.3.7",
@@ -74,18 +74,14 @@
     "loader-utils": "^0.2.16",
     "lodash": "^4.11.1",
     "magic-string": "^0.16.0",
-    "markdown-it": "4.3.0",
-    "markdown-it-terminal": "0.0.3",
     "minimatch": "^3.0.3",
     "node-modules-path": "^1.0.0",
     "node-sass": "^4.3.0",
     "nopt": "^3.0.1",
     "opn": "4.0.1",
     "ora": "^0.2.0",
     "portfinder": "1.0.9",
-    "postcss-discard-comments": "^2.0.4",
     "postcss-loader": "^0.9.1",
-    "quick-temp": "0.1.5",
     "raw-loader": "^0.5.1",
     "reflect-metadata": "^0.1.8",
     "remap-istanbul": "^0.6.4",
@@ -105,8 +101,6 @@
     "stylus-loader": "^2.4.0",
     "temp": "0.8.3",
     "through": "^2.3.6",
-    "tslint": "^4.0.2",
-    "tslint-loader": "^3.3.0",
     "typescript": "~2.0.3",
     "url-loader": "^0.5.7",
     "walk-sync": "^0.2.6",
@@ -137,7 +131,7 @@
     "@types/rimraf": "0.0.25-alpha",
     "@types/semver": "^5.3.30",
     "@types/source-map": "^0.5.0",
-    "@types/webpack": "^2.2.1",
+    "@types/webpack": "^2.2.4",
     "chai": "^3.5.0",
     "conventional-changelog": "^1.1.0",
     "dtsgenerator": "^0.7.1",
@@ -146,7 +140,7 @@
     "jasmine": "^2.4.1",
     "jasmine-spec-reporter": "^2.7.0",
     "minimist": "^1.2.0",
-    "mocha": "^2.4.5",
+    "mocha": "^3.2.0",
     "mock-fs": "^3.12.1",
     "npm-run": "^4.1.0",
     "npm-run-all": "^3.0.0",
@@ -156,6 +150,7 @@
     "rewire": "^2.5.1",
     "sinon": "^1.17.3",
     "tree-kill": "^1.0.0",
-    "ts-node": "^1.3.0"
+    "ts-node": "^1.3.0",
+    "tslint": "^4.0.2"
   }
 }

packages/@ngtools/json-schema/src/schema-tree.spec.ts

@@ -27,6 +27,14 @@ describe('@ngtools/json-schema', () => {
       proto.oneOfKey2 = 'hello';
       expect(proto.oneOfKey2 instanceof Array).toBe(false);
     });
+
+    it('returns undefined for values that are non-existent', () => {
+      const proto: any = Object.create(null);
+      const root = new RootSchemaTreeNode(proto, { value: valueJson, schema: schemaJson });
+
+      const value = root.children['objectKey1'].children['objectKey'].children['stringKey'].get();
+      expect(value).toBe(undefined);
+    });
   });
 
 

packages/@ngtools/json-schema/src/schema-tree.ts

@@ -409,10 +409,12 @@ export abstract class LeafSchemaTreeNode<T> extends SchemaTreeNode<T> {
     if (!this.defined && this._forward) {
       return this._forward.get();
     }
-    if (!this.defined && this._default !== undefined) {
-      return this._default;
+    if (!this.defined) {
+      return this._default !== undefined ? this._default : undefined;
     }
-    return this._value === undefined ? undefined : this.convert(this._value);
+    return this._value === undefined
+      ? undefined
+      : (this._value === null ? null : this.convert(this._value));
   }
   set(v: T, force = false) {
     if (this.readOnly && !force) {