@schematics/angular 14.0.1 → 14.1.0-next.0

package/e2e/index.js

@@ -7,14 +7,22 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const utility_1 = require("../utility");
-const dependencies_1 = require("../utility/dependencies");
+const utility_1 = require("@schematics/angular/utility");
+const path_1 = require("path");
 const json_file_1 = require("../utility/json-file");
 const latest_versions_1 = require("../utility/latest-versions");
-const paths_1 = require("../utility/paths");
-const workspace_models_1 = require("../utility/workspace-models");
+/**
+ * The list of development dependencies used by the E2E protractor-based builder.
+ * The versions are sourced from the latest versions `../utility/latest-versions/package.json`
+ * file which is automatically updated via renovate.
+ */
+const E2E_DEV_DEPENDENCIES = Object.freeze([
+    'protractor',
+    'jasmine-spec-reporter',
+    'ts-node',
+    '@types/node',
+]);
 function addScriptsToPackageJson() {
     return (host) => {
         const pkgJson = new json_file_1.JSONFile(host, 'package.json');
@@ -25,64 +33,41 @@ function addScriptsToPackageJson() {
     };
 }
 function default_1(options) {
-    return async (host) => {
-        const appProject = options.relatedAppName;
-        const workspace = await (0, utility_1.readWorkspace)(host);
-        const project = workspace.projects.get(appProject);
+    const { relatedAppName } = options;
+    return (0, utility_1.updateWorkspace)((workspace) => {
+        const project = workspace.projects.get(relatedAppName);
         if (!project) {
-            throw new schematics_1.SchematicsException(`Project name "${appProject}" doesn't not exist.`);
+            throw new schematics_1.SchematicsException(`Project name "${relatedAppName}" doesn't not exist.`);
         }
-        const root = (0, core_1.join)((0, core_1.normalize)(project.root), 'e2e');
+        const e2eRootPath = path_1.posix.join(project.root, 'e2e');
         project.targets.add({
             name: 'e2e',
-            builder: workspace_models_1.Builders.Protractor,
+            builder: utility_1.AngularBuilder.Protractor,
             defaultConfiguration: 'development',
             options: {
-                protractorConfig: `${root}/protractor.conf.js`,
+                protractorConfig: path_1.posix.join(e2eRootPath, 'protractor.conf.js'),
             },
             configurations: {
                 production: {
-                    devServerTarget: `${options.relatedAppName}:serve:production`,
+                    devServerTarget: `${relatedAppName}:serve:production`,
                 },
                 development: {
-                    devServerTarget: `${options.relatedAppName}:serve:development`,
+                    devServerTarget: `${relatedAppName}:serve:development`,
                 },
             },
         });
-        await (0, utility_1.writeWorkspace)(host, workspace);
         return (0, schematics_1.chain)([
             (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
                 (0, schematics_1.applyTemplates)({
                     utils: schematics_1.strings,
                     ...options,
-                    relativePathToWorkspaceRoot: (0, paths_1.relativePathToWorkspaceRoot)(root),
+                    relativePathToWorkspaceRoot: path_1.posix.relative(path_1.posix.join('/', e2eRootPath), '/'),
                 }),
-                (0, schematics_1.move)(root),
+                (0, schematics_1.move)(e2eRootPath),
             ])),
-            (host) => [
-                {
-                    type: dependencies_1.NodeDependencyType.Dev,
-                    name: 'protractor',
-                    version: '~7.0.0',
-                },
-                {
-                    type: dependencies_1.NodeDependencyType.Dev,
-                    name: 'jasmine-spec-reporter',
-                    version: '~7.0.0',
-                },
-                {
-                    type: dependencies_1.NodeDependencyType.Dev,
-                    name: 'ts-node',
-                    version: latest_versions_1.latestVersions['ts-node'],
-                },
-                {
-                    type: dependencies_1.NodeDependencyType.Dev,
-                    name: '@types/node',
-                    version: latest_versions_1.latestVersions['@types/node'],
-                },
-            ].forEach((dep) => (0, dependencies_1.addPackageJsonDependency)(host, dep)),
+            ...E2E_DEV_DEPENDENCIES.map((name) => (0, utility_1.addDependency)(name, latest_versions_1.latestVersions[name], { type: utility_1.DependencyType.Dev })),
             addScriptsToPackageJson(),
         ]);
-    };
+    });
 }
 exports.default = default_1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "14.0.1",
+  "version": "14.1.0-next.0",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -23,8 +23,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "14.0.1",
-    "@angular-devkit/schematics": "14.0.1",
+    "@angular-devkit/core": "14.1.0-next.0",
+    "@angular-devkit/schematics": "14.1.0-next.0",
     "jsonc-parser": "3.0.0"
   },
   "repository": {

package/utility/dependency.d.ts

@@ -15,6 +15,29 @@ export declare enum DependencyType {
     Dev = "devDependencies",
     Peer = "peerDependencies"
 }
+/**
+ * An enum used to specify the dependency installation behavior for the {@link addDependency}
+ * schematics rule. The installation behavior affects if and when {@link NodePackageInstallTask}
+ * will be scheduled when using the rule.
+ */
+export declare enum InstallBehavior {
+    /**
+     * No installation will occur as a result of the rule when specified.
+     *
+     * NOTE: This does not prevent other rules from scheduling a {@link NodePackageInstallTask}
+     * which may install the dependency.
+     */
+    None = 0,
+    /**
+     * Automatically determine the need to schedule a {@link NodePackageInstallTask} based on
+     * previous usage of the {@link addDependency} within the schematic.
+     */
+    Auto = 1,
+    /**
+     * Always schedule a {@link NodePackageInstallTask} when the rule is executed.
+     */
+    Always = 2
+}
 /**
  * Adds a package as a dependency to a `package.json`. By default the `package.json` located
  * at the schematic's root will be used. The `manifestPath` option can be used to explicitly specify
@@ -42,4 +65,10 @@ export declare function addDependency(name: string, specifier: string, options?:
      * Defaults to `/package.json`.
      */
     packageJsonPath?: string;
+    /**
+     * The dependency installation behavior to use to determine whether a
+     * {@link NodePackageInstallTask} should be scheduled after adding the dependency.
+     * Defaults to {@link InstallBehavior.Auto}.
+     */
+    install?: InstallBehavior;
 }): Rule;

package/utility/dependency.js

@@ -30,7 +30,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addDependency = exports.DependencyType = void 0;
+exports.addDependency = exports.InstallBehavior = exports.DependencyType = void 0;
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const path = __importStar(require("path"));
 const installTasks = new WeakMap();
@@ -44,6 +44,30 @@ var DependencyType;
     DependencyType["Dev"] = "devDependencies";
     DependencyType["Peer"] = "peerDependencies";
 })(DependencyType = exports.DependencyType || (exports.DependencyType = {}));
+/**
+ * An enum used to specify the dependency installation behavior for the {@link addDependency}
+ * schematics rule. The installation behavior affects if and when {@link NodePackageInstallTask}
+ * will be scheduled when using the rule.
+ */
+var InstallBehavior;
+(function (InstallBehavior) {
+    /**
+     * No installation will occur as a result of the rule when specified.
+     *
+     * NOTE: This does not prevent other rules from scheduling a {@link NodePackageInstallTask}
+     * which may install the dependency.
+     */
+    InstallBehavior[InstallBehavior["None"] = 0] = "None";
+    /**
+     * Automatically determine the need to schedule a {@link NodePackageInstallTask} based on
+     * previous usage of the {@link addDependency} within the schematic.
+     */
+    InstallBehavior[InstallBehavior["Auto"] = 1] = "Auto";
+    /**
+     * Always schedule a {@link NodePackageInstallTask} when the rule is executed.
+     */
+    InstallBehavior[InstallBehavior["Always"] = 2] = "Always";
+})(InstallBehavior = exports.InstallBehavior || (exports.InstallBehavior = {}));
 /**
  * Adds a package as a dependency to a `package.json`. By default the `package.json` located
  * at the schematic's root will be used. The `manifestPath` option can be used to explicitly specify
@@ -61,7 +85,7 @@ var DependencyType;
  * @returns A Schematics {@link Rule}
  */
 function addDependency(name, specifier, options = {}) {
-    const { type = DependencyType.Default, packageJsonPath = '/package.json' } = options;
+    const { type = DependencyType.Default, packageJsonPath = '/package.json', install = InstallBehavior.Auto, } = options;
     return (tree, context) => {
         var _a;
         const manifest = tree.readJson(packageJsonPath);
@@ -87,7 +111,8 @@ function addDependency(name, specifier, options = {}) {
         }
         tree.overwrite(packageJsonPath, JSON.stringify(manifest, null, 2));
         const installPaths = (_a = installTasks.get(context)) !== null && _a !== void 0 ? _a : new Set();
-        if (!installPaths.has(packageJsonPath)) {
+        if (install === InstallBehavior.Always ||
+            (install === InstallBehavior.Auto && !installPaths.has(packageJsonPath))) {
             context.addTask(new tasks_1.NodePackageInstallTask({ workingDirectory: path.dirname(packageJsonPath) }));
             installPaths.add(packageJsonPath);
             installTasks.set(context, installPaths);

package/utility/index.d.ts

@@ -7,4 +7,4 @@
  */
 export { ProjectDefinition, TargetDefinition, WorkspaceDefinition, getWorkspace as readWorkspace, updateWorkspace, writeWorkspace, } from './workspace';
 export { Builders as AngularBuilder } from './workspace-models';
-export { DependencyType, addDependency } from './dependency';
+export { DependencyType, InstallBehavior, addDependency } from './dependency';

package/utility/index.js

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addDependency = exports.DependencyType = exports.AngularBuilder = exports.writeWorkspace = exports.updateWorkspace = exports.readWorkspace = void 0;
+exports.addDependency = exports.InstallBehavior = exports.DependencyType = exports.AngularBuilder = exports.writeWorkspace = exports.updateWorkspace = exports.readWorkspace = void 0;
 // Workspace related rules and types
 var workspace_1 = require("./workspace");
 Object.defineProperty(exports, "readWorkspace", { enumerable: true, get: function () { return workspace_1.getWorkspace; } });
@@ -18,4 +18,5 @@ Object.defineProperty(exports, "AngularBuilder", { enumerable: true, get: functi
 // Package dependency related rules and types
 var dependency_1 = require("./dependency");
 Object.defineProperty(exports, "DependencyType", { enumerable: true, get: function () { return dependency_1.DependencyType; } });
+Object.defineProperty(exports, "InstallBehavior", { enumerable: true, get: function () { return dependency_1.InstallBehavior; } });
 Object.defineProperty(exports, "addDependency", { enumerable: true, get: function () { return dependency_1.addDependency; } });

package/utility/latest-versions/package.json

@@ -6,15 +6,17 @@
     "@types/jasmine": "~4.0.0",
     "@types/node": "^14.15.0",
     "jasmine-core": "~4.1.0",
+    "jasmine-spec-reporter": "~7.0.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "~2.2.0",
-    "karma-jasmine-html-reporter": "~1.7.0",
+    "karma-jasmine-html-reporter": "~2.0.0",
     "karma-jasmine": "~5.0.0",
     "karma": "~6.3.0",
-    "ng-packagr": "^14.0.0",
+    "ng-packagr": "^14.0.0-next.8",
+    "protractor": "~7.0.0",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",
-    "ts-node": "~10.7.0",
+    "ts-node": "~10.8.0",
     "typescript": "~4.7.2",
     "zone.js": "~0.11.4"
   }

package/utility/latest-versions.js

@@ -13,7 +13,7 @@ exports.latestVersions = {
     // but ts_library doesn't support JSON inputs.
     ...require('./latest-versions/package.json')['dependencies'],
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
-    Angular: '^14.0.0',
+    Angular: '^14.0.0-next.0',
     // Since @angular-devkit/build-angular and @schematics/angular are always
     // published together from the same monorepo, and they are both
     // non-experimental, they will always have the same version.