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

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/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/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/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.6",
+  "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.6",
-    "@angular-devkit/schematics": "14.0.0-next.6",
+    "@angular-devkit/core": "14.0.0-next.7",
+    "@angular-devkit/schematics": "14.0.0-next.7",
     "jsonc-parser": "3.0.0"
   },
   "repository": {

package/utility/latest-versions/package.json

@@ -3,7 +3,7 @@
   "comment": "This file is needed so that depedencies are synced by Renovate.",
   "private": true,
   "dependencies": {
-    "@types/jasmine": "~3.10.0",
+    "@types/jasmine": "~4.0.0",
     "@types/node": "^14.15.0",
     "jasmine-core": "~4.0.0",
     "karma-chrome-launcher": "~3.1.0",

package/utility/workspace-models.d.ts

@@ -110,12 +110,15 @@ export declare type TestBuilderTarget = BuilderTarget<Builders.Karma, TestBuilde
 export declare type ServeBuilderTarget = BuilderTarget<Builders.DevServer, ServeBuilderOptions>;
 export declare type ExtractI18nBuilderTarget = BuilderTarget<Builders.ExtractI18n, ExtractI18nOptions>;
 export declare type E2EBuilderTarget = BuilderTarget<Builders.Protractor, E2EOptions>;
+interface WorkspaceCLISchema {
+    warnings?: Record<string, boolean>;
+    schematicCollections?: string[];
+    defaultCollection?: string;
+}
 export interface WorkspaceSchema {
     version: 1;
     defaultProject?: string;
-    cli?: {
-        warnings?: Record<string, boolean>;
-    };
+    cli?: WorkspaceCLISchema;
     projects: {
         [key: string]: WorkspaceProject<ProjectType.Application | ProjectType.Library>;
     };
@@ -128,9 +131,7 @@ export interface WorkspaceProject<TProjectType extends ProjectType = ProjectType
     root: string;
     sourceRoot: string;
     prefix: string;
-    cli?: {
-        warnings?: Record<string, boolean>;
-    };
+    cli?: WorkspaceCLISchema;
     /**
      * Tool options.
      */
@@ -150,3 +151,4 @@ export interface WorkspaceTargets<TProjectType extends ProjectType = ProjectType
     'extract-i18n'?: ExtractI18nBuilderTarget;
     [key: string]: any;
 }
+export {};