@schematics/angular 14.0.0-next.4 → 14.0.0-next.7

package/app-shell/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -105,7 +109,7 @@ function validateProject(mainPath) {
         const tmpl = getComponentTemplateInfo(host, componentPath);
         const template = getComponentTemplate(host, componentPath, tmpl);
         if (!routerOutletCheckRegex.test(template)) {
-            const errorMsg = `Prerequisite for app shell is to define a router-outlet in your root component.`;
+            const errorMsg = `Prerequisite for application shell is to define a router-outlet in your root component.`;
             context.logger.error(errorMsg);
             throw new schematics_1.SchematicsException(errorMsg);
         }

package/app-shell/schema.d.ts

@@ -1,5 +1,5 @@
 /**
- * Generates an app shell for running a server-side version of an app.
+ * Generates an application shell for running a server-side version of an app.
  */
 export interface Schema {
     /**
@@ -7,7 +7,7 @@ export interface Schema {
      */
     appDir?: string;
     /**
-     * The app ID to use in withServerTransition().
+     * The application ID to use in withServerTransition().
      */
     appId?: string;
     /**
@@ -27,7 +27,7 @@ export interface Schema {
      */
     rootModuleFileName?: string;
     /**
-     * Route path used to produce the app shell.
+     * Route path used to produce the application shell.
      */
     route?: string;
 }

package/app-shell/schema.json

@@ -3,7 +3,7 @@
   "$id": "SchematicsAngularAppShell",
   "title": "Angular AppShell Options Schema",
   "type": "object",
-  "description": "Generates an app shell for running a server-side version of an app.",
+  "description": "Generates an application shell for running a server-side version of an app.",
   "additionalProperties": false,
   "long-description": "./app-shell-long.md",
   "properties": {
@@ -16,13 +16,13 @@
     },
     "route": {
       "type": "string",
-      "description": "Route path used to produce the app shell.",
+      "description": "Route path used to produce the application shell.",
       "default": "shell"
     },
     "appId": {
       "type": "string",
       "format": "html-selector",
-      "description": "The app ID to use in withServerTransition().",
+      "description": "The application ID to use in withServerTransition().",
       "default": "serverApp"
     },
     "main": {

package/application/index.js

@@ -198,9 +198,6 @@ function addAppToWorkspaceFile(options, appDir, folderName) {
         },
     };
     return (0, workspace_1.updateWorkspace)((workspace) => {
-        if (workspace.projects.size === 0) {
-            workspace.extensions.defaultProject = options.name;
-        }
         workspace.projects.add({
             name: options.name,
             ...project,
@@ -234,7 +231,7 @@ function default_1(options) {
         const newProjectRoot = workspace.extensions.newProjectRoot || '';
         const isRootApp = options.projectRoot !== undefined;
         // If scoped project (i.e. "@foo/bar"), convert dir to "foo/bar".
-        let folderName = options.name.startsWith('@') ? options.name.substr(1) : options.name;
+        let folderName = options.name.startsWith('@') ? options.name.slice(1) : options.name;
         if (/[A-Z]/.test(folderName)) {
             folderName = core_1.strings.dasherize(folderName);
         }

package/application/schema.d.ts

@@ -1,5 +1,5 @@
 /**
- * Generates a new basic app definition in the "projects" subfolder of the workspace.
+ * Generates a new basic application definition in the "projects" subfolder of the workspace.
  */
 export interface Schema {
     /**

package/application/schema.json

@@ -3,7 +3,7 @@
   "$id": "SchematicsAngularApp",
   "title": "Angular Application Options Schema",
   "type": "object",
-  "description": "Generates a new basic app definition in the \"projects\" subfolder of the workspace.",
+  "description": "Generates a new basic application definition in the \"projects\" subfolder of the workspace.",
   "additionalProperties": false,
   "properties": {
     "projectRoot": {

package/class/schema.json

@@ -36,8 +36,7 @@
     },
     "type": {
       "type": "string",
-      "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\".",
-      "default": ""
+      "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\"."
     }
   },
   "required": ["name"]

package/collection.json

@@ -13,7 +13,6 @@
       "hidden": true
     },
     "service-worker": {
-      "aliases": ["serviceWorker"],
       "factory": "./service-worker",
       "description": "Initializes a service worker setup.",
       "schema": "./service-worker/schema.json"
@@ -102,9 +101,8 @@
       "hidden": true
     },
     "app-shell": {
-      "aliases": ["appShell"],
       "factory": "./app-shell",
-      "description": "Create an app shell.",
+      "description": "Create an application shell.",
       "schema": "./app-shell/schema.json"
     },
     "library": {
@@ -114,7 +112,6 @@
       "description": "Generate a library project for Angular."
     },
     "web-worker": {
-      "aliases": ["webWorker"],
       "factory": "./web-worker",
       "schema": "./web-worker/schema.json",
       "description": "Create a Web Worker."

package/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.spec.ts.template

@@ -11,9 +11,7 @@ describe('<%= classify(name) %><%= classify(type) %>', () => {
       declarations: [ <%= classify(name) %><%= classify(type) %> ]
     })
     .compileComponents();
-  });
 
-  beforeEach(() => {
     fixture = TestBed.createComponent(<%= classify(name) %><%= classify(type) %>);
     component = fixture.componentInstance;
     fixture.detectChanges();

package/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template

@@ -6,15 +6,15 @@ import { Component, OnInit<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }
     <p>
       <%= dasherize(name) %> works!
     </p>
-  `,<% } else { %>
-  templateUrl: './<%= dasherize(name) %><%= type ? '.' + dasherize(type): '' %>.html',<% } if(inlineStyle) { %>
+  `<% } else { %>
+  templateUrl: './<%= dasherize(name) %><%= type ? '.' + dasherize(type): '' %>.html'<% } if(inlineStyle) { %>,
   styles: [<% if(displayBlock){ %>
     `
       :host {
         display: block;
       }
     `<% } %>
-  ]<% } else if (style !== 'none') { %>
+  ]<% } else if (style !== 'none') { %>,
   styleUrls: ['./<%= dasherize(name) %><%= type ? '.' + dasherize(type): '' %>.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>

package/component/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/directive/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/e2e/e2e-long.md

@@ -1,2 +1,2 @@
-The e2e tests are created in a separate app in the `projects` folder of the workspace,
+The e2e tests are created in a separate application in the `projects` folder of the workspace,
 next to the project being tested.

package/e2e/index.js

@@ -11,6 +11,7 @@ const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const dependencies_1 = require("../utility/dependencies");
 const json_file_1 = require("../utility/json-file");
+const latest_versions_1 = require("../utility/latest-versions");
 const paths_1 = require("../utility/paths");
 const workspace_1 = require("../utility/workspace");
 const workspace_models_1 = require("../utility/workspace-models");
@@ -74,6 +75,11 @@ function default_1(options) {
                     name: 'ts-node',
                     version: '~9.1.1',
                 },
+                {
+                    type: dependencies_1.NodeDependencyType.Dev,
+                    name: '@types/node',
+                    version: latest_versions_1.latestVersions['@types/node'],
+                },
             ].forEach((dep) => (0, dependencies_1.addPackageJsonDependency)(host, dep)),
             addScriptsToPackageJson(),
         ]);

package/e2e/schema.d.ts

@@ -3,7 +3,7 @@
  */
 export interface Schema {
     /**
-     * The name of the app being tested.
+     * The name of the application being tested.
      */
     relatedAppName: string;
     /**

package/e2e/schema.json

@@ -13,7 +13,7 @@
       "default": "app-root"
     },
     "relatedAppName": {
-      "description": "The name of the app being tested.",
+      "description": "The name of the application being tested.",
       "type": "string"
     }
   },

package/interface/schema.json

@@ -30,7 +30,6 @@
     },
     "prefix": {
       "type": "string",
-      "default": "",
       "description": "A prefix to apply to generated selectors."
     },
     "type": {

package/library/index.js

@@ -61,9 +61,6 @@ function addDependenciesToPackageJson() {
 }
 function addLibToWorkspaceFile(options, projectRoot, projectName) {
     return (0, workspace_1.updateWorkspace)((workspace) => {
-        if (workspace.projects.size === 0) {
-            workspace.extensions.defaultProject = projectName;
-        }
         workspace.projects.add({
             name: projectName,
             root: projectRoot,
@@ -109,7 +106,7 @@ function default_1(options) {
         }
         const workspace = await (0, workspace_1.getWorkspace)(host);
         const newProjectRoot = workspace.extensions.newProjectRoot || '';
-        let folderName = packageName.startsWith('@') ? packageName.substr(1) : packageName;
+        let folderName = packageName.startsWith('@') ? packageName.slice(1) : packageName;
         if (/[A-Z]/.test(folderName)) {
             folderName = core_1.strings.dasherize(folderName);
         }

package/migrations/migration-collection.json

@@ -14,6 +14,16 @@
       "version": "14.0.0",
       "factory": "./update-14/remove-show-circular-dependencies-option",
       "description": "Remove 'showCircularDependencies' option from browser and server builders."
+    },
+    "remove-default-project-option": {
+      "version": "14.0.0",
+      "factory": "./update-14/remove-default-project-option",
+      "description": "Remove 'defaultProject' option from workspace configuration. The project to use will be determined from the current working directory."
+    },
+    "replace-default-collection-option": {
+      "version": "14.0.0",
+      "factory": "./update-14/replace-default-collection-option",
+      "description": "Replace 'defaultCollection' option in workspace configuration with 'schematicCollections'."
     }
   }
 }

package/migrations/update-14/remove-default-project-option.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright Google LLC 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 { Rule } from '@angular-devkit/schematics';
+/** Migration to remove 'defaultProject' option from angular.json. */
+export default function (): Rule;

package/migrations/update-14/remove-default-project-option.js

@@ -0,0 +1,17 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const workspace_1 = require("../../utility/workspace");
+/** Migration to remove 'defaultProject' option from angular.json. */
+function default_1() {
+    return (0, workspace_1.updateWorkspace)((workspace) => {
+        delete workspace.extensions['defaultProject'];
+    });
+}
+exports.default = default_1;

package/migrations/update-14/replace-default-collection-option.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright Google LLC 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 { Rule } from '@angular-devkit/schematics';
+/** Migration to replace 'defaultCollection' option in angular.json. */
+export default function (): Rule;

package/migrations/update-14/replace-default-collection-option.js

@@ -0,0 +1,32 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@angular-devkit/core");
+const workspace_1 = require("../../utility/workspace");
+/** Migration to replace 'defaultCollection' option in angular.json. */
+function default_1() {
+    return (0, workspace_1.updateWorkspace)((workspace) => {
+        // workspace level
+        replaceDefaultCollection(workspace.extensions['cli']);
+        // Project level
+        for (const project of workspace.projects.values()) {
+            replaceDefaultCollection(project.extensions['cli']);
+        }
+    });
+}
+exports.default = default_1;
+function replaceDefaultCollection(cliExtension) {
+    if (cliExtension && (0, core_1.isJsonObject)(cliExtension) && cliExtension['defaultCollection']) {
+        // If `schematicsCollection` defined `defaultCollection` is ignored hence no need to warn.
+        if (!cliExtension['schematicCollections']) {
+            cliExtension['schematicCollections'] = [cliExtension['defaultCollection']];
+        }
+        delete cliExtension['defaultCollection'];
+    }
+}

package/module/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/ng-new/index.js

@@ -12,7 +12,7 @@ const tasks_1 = require("@angular-devkit/schematics/tasks");
 function default_1(options) {
     if (!options.directory) {
         // If scoped project (i.e. "@foo/bar"), convert directory to "foo/bar".
-        options.directory = options.name.startsWith('@') ? options.name.substr(1) : options.name;
+        options.directory = options.name.startsWith('@') ? options.name.slice(1) : options.name;
     }
     const workspaceOptions = {
         name: options.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "14.0.0-next.4",
+  "version": "14.0.0-next.7",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -15,8 +15,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "14.0.0-next.4",
-    "@angular-devkit/schematics": "14.0.0-next.4",
+    "@angular-devkit/core": "14.0.0-next.7",
+    "@angular-devkit/schematics": "14.0.0-next.7",
     "jsonc-parser": "3.0.0"
   },
   "repository": {
@@ -24,7 +24,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^12.20.0 || ^14.15.0 || >=16.10.0",
+    "node": "^14.15.0 || >=16.10.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },

package/pipe/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/service-worker/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -89,11 +93,11 @@ function updateAppModule(mainPath) {
                 host.commitUpdate(recorder);
             }
         }
-        // register SW in app module
+        // register SW in application module
         const importText = core_1.tags.stripIndent `
       ServiceWorkerModule.register('ngsw-worker.js', {
         enabled: ${importModule}.production,
-        // Register the ServiceWorker as soon as the app is stable
+        // Register the ServiceWorker as soon as the application is stable
         // or after 30 seconds (whichever comes first).
         registrationStrategy: 'registerWhenStable:30000'
       })

package/third_party/github.com/Microsoft/TypeScript/BUILD.bazel

@@ -1,7 +1,12 @@
 load("//tools:defaults.bzl", "ts_library")
 
-# files fetched on 2021-12-10 from
-# https://github.com/microsoft/TypeScript/releases/tag/v4.5.2
+# files fetched on 2022-03-10 from
+# https://github.com/microsoft/TypeScript/releases/tag/v4.6.2
+
+# Commands to download:
+# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.6.2/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
+# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.6.2/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
+
 licenses(["notice"])  # Apache 2.0
 
 exports_files([