Merge pull request #186 from angular/master

regression in 3.1+: mapped type cannot be used to index type

Author: GulajavaMinistudio

.monorepo.json

@@ -45,6 +45,10 @@
       "version": "0.9.0-beta.4",
       "hash": "a9b1f213a4069f789d20021bda616775"
     },
+    "@_/builders": {
+      "version": "0.9.0-beta.4",
+      "hash": ""
+    },
     "devkit": {
       "version": "0.9.0-beta.4",
       "hash": "30ac66398ef7b4f7a5dbd3192d24c665"

etc/cli.angular.io/cli-logo.svg

@@ -11,6 +11,7 @@
     <!-- Material Design icons -->
     <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
     <link href='https://fonts.googleapis.com/css?family=Roboto:400,300,500,700' rel='stylesheet' type='text/css'>
+    <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:300" rel="stylesheet">
     <link rel="stylesheet" href="material.min.css">
     <link rel="stylesheet" href="main.css">
     <link rel="stylesheet" href="theme.css">
@@ -31,11 +32,11 @@
     <div class="top-nav-wrapper">
         <label for="site-nav-checkbox">SITE MENU</label>
         <nav class="mdl-navigation">
-            
+
             <a class="mdl-navigation__link" href="https://github.com/angular/angular-cli/wiki">Documentation</a>
-            
+
             <a class="mdl-navigation__link" href="https://github.com/angular/angular-cli">GitHub</a>
-            
+
         </nav>
         <div class="mdl-layout-spacer"></div>
         <nav class="mdl-navigation">
@@ -54,7 +55,19 @@
           <header class="hero-background">
     <section class="hero-container section--center mdl-grid mdl-grid--no-spacing">
         <div class="logo-container mdl-cell mdl-cell--6-col-desktop mdl-cell--12-col-tablet mdl-cell--12-col-phone">
-            <img class="hero-image" src="cli-logo.svg" alt="Mobile Toolkit">
+            <div class="console mdl-shadow--4dp">
+              <div class="console__head">
+                <div class="console__dot console__dot--red"></div>
+                <div class="console__dot console__dot--yellow"></div>
+                <div class="console__dot console__dot--green"></div>
+              </div>
+              <div class="console__body">
+                <kbd class="console__prompt">npm install -g @angular/cli</kbd>
+                <kbd class="console__prompt">ng new my-dream-app</kbd>
+                <kbd class="console__prompt">cd my-dream-app</kbd>
+                <kbd class="console__prompt">ng serve</kbd>
+              </div>
+            </div>
         </div>
         <div class="mdl-cell mdl-cell--6-col-desktop mdl-cell--12-col-tablet mdl-cell--12-col-phone">
             <h4 class="">Angular CLI</h4>
@@ -71,27 +84,27 @@ <h5 class="tagline">A command line interface for Angular</h5>
 
       <!-- Add as many features as needed -->
       <section class="features-container section--center mdl-grid mdl-grid--no-spacing">
-    
+
     <div class="features-list">
         <h4>ng new</h4>
         <p>The Angular CLI makes it easy to create an application that already works, right out of the box. It already follows our best practices!</p>
     </div>
-    
+
     <div class="features-list">
         <h4>ng generate</h4>
         <p>Generate components, routes, services and pipes with a simple command. The CLI will also create simple test shells for all of these.</p>
     </div>
-    
+
     <div class="features-list">
         <h4>ng serve</h4>
         <p>Easily test your app locally while developing.</p>
     </div>
-    
+
     <div class="features-list">
         <h4>Test, Lint, Format</h4>
         <p>Make your code really shine. Run your unittests or your end-to-end tests with the breeze of a command. Execute the official Angular linter and run clang format.</p>
     </div>
-    
+
 
     <div class="button-container mdl-cell mdl-cell--12-col-desktop center">
         <a href="https://github.com/angular/angular-cli/wiki" class="cta-button mdl-typography--font-regular mdl-button mdl-button--raised mdl-button--accent">

etc/cli.angular.io/index.html

@@ -51,12 +51,17 @@
     "url": "https://github.com/angular/angular-cli/issues"
   },
   "homepage": "https://github.com/angular/angular-cli",
-  "workspaces": [
-    "packages/angular/*",
-    "packages/angular_devkit/*",
-    "packages/ngtools/*",
-    "packages/schematics/*"
-  ],
+  "workspaces": {
+    "packages": [
+      "packages/angular/*",
+      "packages/angular_devkit/*",
+      "packages/ngtools/*",
+      "packages/schematics/*"
+    ],
+    "nohoist": [
+      "@angular/compiler-cli"
+    ]
+  },
   "dependencies": {
     "glob": "^7.0.3",
     "node-fetch": "^2.2.0",
@@ -66,6 +71,8 @@
     "typescript": "~3.0.1"
   },
   "devDependencies": {
+    "@angular/compiler": "^7.0.0-beta.4",
+    "@angular/compiler-cli": "^7.0.0-beta.4",
     "@bazel/typescript": "0.16.1",
     "@ngtools/json-schema": "^1.1.0",
     "@types/copy-webpack-plugin": "^4.4.1",
@@ -80,9 +87,9 @@
     "@types/request": "^2.47.1",
     "@types/semver": "^5.5.0",
     "@types/source-map": "0.5.2",
-    "@types/webpack": "^4.4.0",
-    "@types/webpack-dev-server": "^2.9.4",
-    "@types/webpack-sources": "^0.1.4",
+    "@types/webpack": "^4.4.11",
+    "@types/webpack-dev-server": "^3.1.0",
+    "@types/webpack-sources": "^0.1.5",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
@@ -95,7 +102,7 @@
     "license-checker": "^20.1.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
-    "rxjs": "~6.2.0",
+    "rxjs": "~6.3.0",
     "semver": "^5.3.0",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
@@ -105,10 +112,5 @@
     "ts-node": "^5.0.0",
     "tslint-no-circular-imports": "^0.5.0",
     "tslint-sonarts": "^1.7.0"
-  },
-  "resolutions": {
-    "@types/webpack": "4.4.0",
-    "@types/webpack-dev-server": "2.9.4",
-    "rxjs": "~6.2.0"
   }
 }

etc/cli.angular.io/main.css

@@ -0,0 +1,10 @@
+{
+  "$schema": "../architect/src/builders-schema.json",
+  "builders": {
+    "true": {
+      "class": "./src/true",
+      "schema": "./src/noop-schema.json",
+      "description": "Always succeed."
+    }
+  }
+}

etc/cli.angular.io/theme.css

@@ -0,0 +1,12 @@
+{
+  "name": "@_/builders",
+  "version": "0.0.0",
+  "description": "CLI tool for Angular",
+  "main": "src/index.js",
+  "typings": "src/index.d.ts",
+  "builders": "builders.json",
+  "private": true,
+  "dependencies": {
+    "rxjs": "6.3.3"
+  }
+}

package.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "type": "object"
+}

packages/_/builders/builders.json

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Observable, of } from 'rxjs';
+
+export class TrueBuilder {
+  constructor() {}
+
+  run(): Observable<{ success: boolean }> {
+    return of({
+      success: true,
+    });
+  }
+}
+
+export default TrueBuilder;

packages/_/builders/package.json

@@ -42,10 +42,26 @@ with NPM 5.5.1 or higher.
 ## Installation
 
 **BEFORE YOU INSTALL:** please read the [prerequisites](#prerequisites)
+
+### Install Globablly
 ```bash
 npm install -g @angular/cli
 ```
 
+### Install Locally
+```bash
+npm install @angular/cli
+```
+
+To run a locally installed version of the angular-cli, you can call `ng` commands directly by adding the `.bin` folder within your local `node_modules` folder to your PATH. The `node_modules` and `.bin` folders are created in the directory where `npm install @angular/cli` was run upon completion of the install command.
+
+Alternatively, you can install [npx](https://www.npmjs.com/package/npx) and run `npx ng <command>` within the local directory where `npm install @angular/cli` was run, which will use the locally installed angular-cli.
+
+### Install Specific Version (Example: 6.1.1)
+```bash
+npm install -g @angular/[email protected]
+```
+
 ## Usage
 
 ```bash

packages/_/builders/src/noop-schema.json

@@ -54,6 +54,11 @@
           "type": "boolean",
           "default": "true",
           "description": "Disables interactive inputs (i.e., prompts)."
+        },
+        "defaults": {
+          "type": "boolean",
+          "default": "false",
+          "description": "Disables interactive inputs (i.e., prompts) for options with a default."
         }
       }
     }

packages/_/builders/src/true.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
+import { TargetSpecifier } from '@angular-devkit/architect';
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Schema as LintCommandSchema } from './lint';
@@ -14,6 +14,12 @@ export class LintCommand extends ArchitectCommand<LintCommandSchema> {
   public readonly target = 'lint';
   public readonly multiTarget = true;
 
+  protected async runSingleTarget(targetSpec: TargetSpecifier, options: string[]) {
+    this.logger.info(`Linting ${JSON.stringify(targetSpec.project)}...`);
+
+    return super.runSingleTarget(targetSpec, options);
+  }
+
   public async run(options: ArchitectCommandOptions & Arguments) {
     return this.runArchitectTarget(options);
   }

packages/angular/cli/README.md

@@ -141,7 +141,7 @@
             },
             "viewEncapsulation": {
               "description": "Specifies the view encapsulation strategy.",
-              "enum": ["Emulated", "Native", "None"],
+              "enum": ["Emulated", "Native", "None", "ShadowDom"],
               "type": "string",
               "alias": "v"
             }
@@ -1101,6 +1101,11 @@
               "type": "string",
               "description": "Specifies the source language of the application."
             },
+            "progress": {
+              "type": "boolean",
+              "description": "Log progress to the console.",
+              "default": true
+            },
             "outputPath": {
               "type": "string",
               "description": "Path where output will be placed."