Merge branch 'master' into update-grid-live-data

Author: mbechev

examples-standalone/grid-performance/angular.json

@@ -11,13 +11,14 @@
  "prefix": "app",
  "architect": {
  "build": {
- "builder": "@angular-devkit/build-angular:application",
+ "builder": "@angular/build:application",
  "options": {
  "outputPath": "dist/grid-performance",
  "index": "src/index.html",
  "browser": "src/main.ts",
  "polyfills": [
- "zone.js"
+ "zone.js",
+ "@angular/localize/init"
  ],
  "tsConfig": "tsconfig.app.json",
  "assets": [
@@ -57,7 +58,7 @@
  "defaultConfiguration": "production"
  },
  "serve": {
- "builder": "@angular-devkit/build-angular:dev-server",
+ "builder": "@angular/build:dev-server",
  "configurations": {
  "production": {
  "buildTarget": "grid-performance:build:production"
@@ -69,13 +70,13 @@
  "defaultConfiguration": "development"
  },
  "extract-i18n": {
- "builder": "@angular-devkit/build-angular:extract-i18n",
+ "builder": "@angular/build:extract-i18n",
  "options": {
  "buildTarget": "grid-performance:build"
  }
  },
  "test": {
- "builder": "@angular-devkit/build-angular:karma",
+ "builder": "@angular/build:karma",
  "options": {
  "polyfills": [
  "zone.js",
@@ -97,5 +98,31 @@
  }
  }
  }
+ },
+ "schematics": {
+ "@schematics/angular:component": {
+ "type": "component"
+ },
+ "@schematics/angular:directive": {
+ "type": "directive"
+ },
+ "@schematics/angular:service": {
+ "type": "service"
+ },
+ "@schematics/angular:guard": {
+ "typeSeparator": "."
+ },
+ "@schematics/angular:interceptor": {
+ "typeSeparator": "."
+ },
+ "@schematics/angular:module": {
+ "typeSeparator": "."
+ },
+ "@schematics/angular:pipe": {
+ "typeSeparator": "."
+ },
+ "@schematics/angular:resolver": {
+ "typeSeparator": "."
+ }
  }
 }