@angular/cli 15.0.0-next.1 → 15.0.0-next.3

package/lib/config/schema.json

@@ -1662,8 +1662,22 @@
           "description": "The full path for the main entry point to the app, relative to the current workspace."
         },
         "polyfills": {
-          "type": "string",
-          "description": "The full path for the polyfills file, relative to the current workspace."
+          "description": "Polyfills to be included in the build.",
+          "oneOf": [
+            {
+              "type": "array",
+              "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
+              "items": {
+                "type": "string",
+                "uniqueItems": true
+              },
+              "default": []
+            },
+            {
+              "type": "string",
+              "description": "The full path for the polyfills file, relative to the current workspace or a module specifier. Example: 'zone.js'."
+            }
+          ]
         },
         "tsConfig": {
           "type": "string",
@@ -1716,7 +1730,7 @@
                   "input": {
                     "type": "string",
                     "description": "The file to include.",
-                    "pattern": "\\.(?:css|scss|sass|less|styl)$"
+                    "pattern": "\\.(?:css|scss|sass|less)$"
                   },
                   "bundleName": {
                     "type": "string",
@@ -1734,7 +1748,7 @@
               {
                 "type": "string",
                 "description": "The file to include.",
-                "pattern": "\\.(?:css|scss|sass|less|styl)$"
+                "pattern": "\\.(?:css|scss|sass|less)$"
               }
             ]
           }
@@ -2215,8 +2229,22 @@
           "description": "The full path for the main entry point to the app, relative to the current workspace."
         },
         "polyfills": {
-          "type": "string",
-          "description": "The full path for the polyfills file, relative to the current workspace."
+          "description": "Polyfills to be included in the build.",
+          "oneOf": [
+            {
+              "type": "array",
+              "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
+              "items": {
+                "type": "string",
+                "uniqueItems": true
+              },
+              "default": []
+            },
+            {
+              "type": "string",
+              "description": "The full path for the polyfills file, relative to the current workspace or a module specifier. Example: 'zone.js'."
+            }
+          ]
         },
         "tsConfig": {
           "type": "string",
@@ -2269,7 +2297,7 @@
                   "input": {
                     "type": "string",
                     "description": "The file to include.",
-                    "pattern": "\\.(?:css|scss|sass|less|styl)$"
+                    "pattern": "\\.(?:css|scss|sass|less)$"
                   },
                   "bundleName": {
                     "type": "string",
@@ -2287,7 +2315,7 @@
               {
                 "type": "string",
                 "description": "The file to include.",
-                "pattern": "\\.(?:css|scss|sass|less|styl)$"
+                "pattern": "\\.(?:css|scss|sass|less)$"
               }
             ]
           }
@@ -2674,36 +2702,18 @@
           ]
         },
         "fileReplacement": {
-          "oneOf": [
-            {
-              "type": "object",
-              "properties": {
-                "src": {
-                  "type": "string",
-                  "pattern": "\\.(([cm]?j|t)sx?|json)$"
-                },
-                "replaceWith": {
-                  "type": "string",
-                  "pattern": "\\.(([cm]?j|t)sx?|json)$"
-                }
-              },
-              "additionalProperties": false
+          "type": "object",
+          "properties": {
+            "replace": {
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             },
-            {
-              "type": "object",
-              "properties": {
-                "replace": {
-                  "type": "string",
-                  "pattern": "\\.(([cm]?j|t)sx?|json)$"
-                },
-                "with": {
-                  "type": "string",
-                  "pattern": "\\.(([cm]?j|t)sx?|json)$"
-                }
-              },
-              "additionalProperties": false
+            "with": {
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             }
-          ]
+          },
+          "additionalProperties": false
         },
         "budget": {
           "type": "object",
@@ -2918,8 +2928,22 @@
           "description": "The name of the Karma configuration file."
         },
         "polyfills": {
-          "type": "string",
-          "description": "The name of the polyfills file."
+          "description": "Polyfills to be included in the build.",
+          "oneOf": [
+            {
+              "type": "array",
+              "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
+              "items": {
+                "type": "string",
+                "uniqueItems": true
+              },
+              "default": []
+            },
+            {
+              "type": "string",
+              "description": "The full path for the polyfills file, relative to the current workspace or a module specifier. Example: 'zone.js'."
+            }
+          ]
         },
         "assets": {
           "type": "array",
@@ -2976,7 +3000,7 @@
                   "input": {
                     "type": "string",
                     "description": "The file to include.",
-                    "pattern": "\\.(?:css|scss|sass|less|styl)$"
+                    "pattern": "\\.(?:css|scss|sass|less)$"
                   },
                   "bundleName": {
                     "type": "string",
@@ -2994,7 +3018,7 @@
               {
                 "type": "string",
                 "description": "The file to include.",
-                "pattern": "\\.(?:css|scss|sass|less|styl)$"
+                "pattern": "\\.(?:css|scss|sass|less)$"
               }
             ]
           }
@@ -3030,6 +3054,9 @@
           "items": {
             "type": "string"
           },
+          "default": [
+            "**/*.spec.ts"
+          ],
           "description": "Globs of files to include, relative to workspace or project root. \nThere are 2 special cases:\n - when a path to directory is provided, all spec files ending \".spec.@(ts|tsx)\" will be included\n - when a path to a file is provided, and a matching spec file exists it will be included instead."
         },
         "sourceMap": {
@@ -3431,11 +3458,6 @@
           "description": "Use file name for lazy loaded chunks.",
           "default": false
         },
-        "bundleDependencies": {
-          "description": "Which external dependencies to bundle into the bundle. By default, all of node_modules will be bundled.",
-          "default": true,
-          "type": "boolean"
-        },
         "externalDependencies": {
           "description": "Exclude the listed external dependencies from being bundled into the bundle. Instead, the created bundle relies on these dependencies to be available during runtime.",
           "type": "array",

package/lib/init.js

@@ -33,6 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("symbol-observable");
 // symbol polyfill must go first
 const fs_1 = require("fs");
+const module_1 = require("module");
 const path = __importStar(require("path"));
 const semver_1 = require("semver");
 const color_1 = require("../src/utilities/color");
@@ -67,7 +68,8 @@ let forceExit = false;
     try {
         // No error implies a projectLocalCli, which will load whatever
         // version of ng-cli you have installed in a local package.json
-        const projectLocalCli = require.resolve('@angular/cli', { paths: [process.cwd()] });
+        const cwdRequire = (0, module_1.createRequire)(process.cwd() + '/');
+        const projectLocalCli = cwdRequire.resolve('@angular/cli');
         cli = await Promise.resolve().then(() => __importStar(require(projectLocalCli)));
         const globalVersion = new semver_1.SemVer(version_1.VERSION.full);
         // Older versions might not have the VERSION export

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "15.0.0-next.1",
+  "version": "15.0.0-next.3",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,10 +25,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1500.0-next.1",
-    "@angular-devkit/core": "15.0.0-next.1",
-    "@angular-devkit/schematics": "15.0.0-next.1",
-    "@schematics/angular": "15.0.0-next.1",
+    "@angular-devkit/architect": "0.1500.0-next.3",
+    "@angular-devkit/core": "15.0.0-next.3",
+    "@angular-devkit/schematics": "15.0.0-next.3",
+    "@schematics/angular": "15.0.0-next.3",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.3",
     "debug": "4.3.4",
@@ -49,12 +49,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "15.0.0-next.1",
-      "@angular-devkit/architect": "0.1500.0-next.1",
-      "@angular-devkit/build-angular": "15.0.0-next.1",
-      "@angular-devkit/build-webpack": "0.1500.0-next.1",
-      "@angular-devkit/core": "15.0.0-next.1",
-      "@angular-devkit/schematics": "15.0.0-next.1"
+      "@angular/cli": "15.0.0-next.3",
+      "@angular-devkit/architect": "0.1500.0-next.3",
+      "@angular-devkit/build-angular": "15.0.0-next.3",
+      "@angular-devkit/build-webpack": "0.1500.0-next.3",
+      "@angular-devkit/core": "15.0.0-next.3",
+      "@angular-devkit/schematics": "15.0.0-next.3"
     }
   },
   "engines": {

package/src/command-builder/architect-base-command-module.js

@@ -39,7 +39,7 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
         await this.reportAnalytics({
             ...(await architectHost.getOptionsForTarget(target)),
             ...options,
-        });
+        }, undefined /** paths */, undefined /** dimensions */, builderName);
         const { logger } = this.context;
         const run = await this.getArchitect().scheduleTarget(target, options, {
             logger,

package/src/command-builder/command-module.d.ts

@@ -74,7 +74,7 @@ export declare abstract class CommandModule<T extends {} = {}> implements Comman
     abstract builder(argv: Argv): Promise<Argv<T>> | Argv<T>;
     abstract run(options: Options<T> & OtherOptions): Promise<number | void> | number | void;
     handler(args: ArgumentsCamelCase<T> & OtherOptions): Promise<void>;
-    reportAnalytics(options: (Options<T> & OtherOptions) | OtherOptions, paths?: string[], dimensions?: (boolean | number | string)[]): Promise<void>;
+    reportAnalytics(options: (Options<T> & OtherOptions) | OtherOptions, paths?: string[], dimensions?: (boolean | number | string)[], title?: string): Promise<void>;
     protected getAnalytics(): Promise<analytics.Analytics>;
     /**
      * Adds schema options to a command also this keeps track of options that are required for analytics.
@@ -82,6 +82,13 @@ export declare abstract class CommandModule<T extends {} = {}> implements Comman
      */
     protected addSchemaOptionsToCommand<T>(localYargs: Argv<T>, options: Option[]): Argv<T>;
     protected getWorkspaceOrThrow(): AngularWorkspace;
+    /**
+     * Flush on an interval (if the event loop is waiting).
+     *
+     * @returns a method that when called will terminate the periodic
+     * flush and call flush one last time.
+     */
+    private periodicAnalyticsFlush;
 }
 /**
  * Creates an known command module error.

package/src/command-builder/command-module.js

@@ -99,8 +99,10 @@ class CommandModule {
         }
         // Gather and report analytics.
         const analytics = await this.getAnalytics();
+        let stopPeriodicFlushes;
         if (this.shouldReportAnalytics) {
             await this.reportAnalytics(camelCasedOptions);
+            stopPeriodicFlushes = this.periodicAnalyticsFlush(analytics);
         }
         let exitCode;
         try {
@@ -109,7 +111,6 @@ class CommandModule {
             exitCode = await this.run(camelCasedOptions);
             const endTime = Date.now();
             analytics.timing(this.commandName, 'duration', endTime - startTime);
-            await analytics.flush();
         }
         catch (e) {
             if (e instanceof core_1.schema.SchemaValidationException) {
@@ -121,12 +122,13 @@ class CommandModule {
             }
         }
         finally {
+            await (stopPeriodicFlushes === null || stopPeriodicFlushes === void 0 ? void 0 : stopPeriodicFlushes());
             if (typeof exitCode === 'number' && exitCode > 0) {
                 process.exitCode = exitCode;
             }
         }
     }
-    async reportAnalytics(options, paths = [], dimensions = []) {
+    async reportAnalytics(options, paths = [], dimensions = [], title) {
         for (const [name, ua] of this.optionsWithAnalytics) {
             const value = options[name];
             if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
@@ -137,6 +139,7 @@ class CommandModule {
         analytics.pageview('/command/' + [this.commandName, ...paths].join('/'), {
             dimensions,
             metrics: [],
+            title,
         });
     }
     getAnalytics() {
@@ -204,6 +207,23 @@ class CommandModule {
         }
         return workspace;
     }
+    /**
+     * Flush on an interval (if the event loop is waiting).
+     *
+     * @returns a method that when called will terminate the periodic
+     * flush and call flush one last time.
+     */
+    periodicAnalyticsFlush(analytics) {
+        let analyticsFlushPromise = Promise.resolve();
+        const analyticsFlushInterval = setInterval(() => {
+            analyticsFlushPromise = analyticsFlushPromise.then(() => analytics.flush());
+        }, 2000);
+        return () => {
+            clearInterval(analyticsFlushInterval);
+            // Flush one last time.
+            return analyticsFlushPromise.then(() => analytics.flush());
+        };
+    }
 }
 __decorate([
     memoize_1.memoize

package/src/command-builder/schematics-command-module.js

@@ -128,16 +128,9 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
         workflow.registry.addSmartDefaultProvider('workingDirectory', () => workingDir === '' ? undefined : workingDir);
         let shouldReportAnalytics = true;
         workflow.engineHost.registerOptionsTransform(async (schematic, options) => {
-            var _a;
             if (shouldReportAnalytics) {
                 shouldReportAnalytics = false;
-                // ng generate lib -> ng generate
-                const commandName = (_a = this.command) === null || _a === void 0 ? void 0 : _a.split(' ', 1)[0];
-                await this.reportAnalytics(options, [
-                    commandName,
-                    schematic.collection.name.replace(/\//g, '_'),
-                    schematic.name.replace(/\//g, '_'),
-                ]);
+                await this.reportAnalytics(options, undefined /** paths */, undefined /** dimensions */, schematic.collection.name + ':' + schematic.name);
             }
             // TODO: The below should be removed in version 15 when we change 1P schematics to use the `workingDirectory smart default`.
             // Handle `"format": "path"` options.

package/src/command-builder/utilities/schematic-engine-host.js

@@ -6,9 +6,6 @@
  * 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
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchematicEngineHost = void 0;
@@ -16,7 +13,7 @@ const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
 const fs_1 = require("fs");
 const jsonc_parser_1 = require("jsonc-parser");
-const module_1 = __importDefault(require("module"));
+const module_1 = require("module");
 const path_1 = require("path");
 const vm_1 = require("vm");
 const error_1 = require("../../utilities/error");
@@ -56,7 +53,8 @@ class SchematicEngineHost extends tools_1.NodeModulesEngineHost {
         const [path, name] = refString.split('#', 2);
         // Mimic behavior of ExportStringRef class used in default behavior
         const fullPath = path[0] === '.' ? (0, path_1.resolve)(parentPath !== null && parentPath !== void 0 ? parentPath : process.cwd(), path) : path;
-        const schematicFile = require.resolve(fullPath, { paths: [parentPath] });
+        const referenceRequire = (0, module_1.createRequire)(__filename);
+        const schematicFile = referenceRequire.resolve(fullPath, { paths: [parentPath] });
         if (shouldWrapSchematic(schematicFile, !!(collectionDescription === null || collectionDescription === void 0 ? void 0 : collectionDescription.encapsulation))) {
             const schematicPath = (0, path_1.dirname)(schematicFile);
             const moduleCache = new Map();
@@ -103,8 +101,8 @@ const legacyModules = {
  * @param exportName An optional name of a specific export to return. Otherwise, return all exports.
  */
 function wrap(schematicFile, schematicDirectory, moduleCache, exportName) {
-    const hostRequire = module_1.default.createRequire(__filename);
-    const schematicRequire = module_1.default.createRequire(schematicFile);
+    const hostRequire = (0, module_1.createRequire)(__filename);
+    const schematicRequire = (0, module_1.createRequire)(schematicFile);
     const customRequire = function (id) {
         if (legacyModules[id]) {
             // Provide compatibility modules for older versions of @angular/cdk

package/src/commands/add/cli.d.ts

@@ -20,6 +20,7 @@ export declare class AddCommandModule extends SchematicsCommandModule implements
     longDescriptionPath: string;
     protected allowPrivateSchematics: boolean;
     private readonly schematicName;
+    private rootRequire;
     builder(argv: Argv): Promise<Argv<AddCommandArgs>>;
     run(options: Options<AddCommandArgs> & OtherOptions): Promise<number | void>;
     private isProjectVersionValid;

package/src/commands/add/cli.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddCommandModule = void 0;
 const core_1 = require("@angular-devkit/core");
 const tools_1 = require("@angular-devkit/schematics/tools");
+const module_1 = require("module");
 const npm_package_arg_1 = __importDefault(require("npm-package-arg"));
 const path_1 = require("path");
 const semver_1 = require("semver");
@@ -42,6 +43,7 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
         this.allowPrivateSchematics = true;
         this.schematicName = 'ng-add';
+        this.rootRequire = (0, module_1.createRequire)(this.context.root + '/');
     }
     async builder(argv) {
         const localYargs = (await super.builder(argv))
@@ -214,9 +216,8 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
             // Temporary packages are located in a different directory
             // Hence we need to resolve them using the temp path
             const { success, tempNodeModules } = await packageManager.installTemp(packageIdentifier.raw, registry ? [`--registry="${registry}"`] : undefined);
-            const resolvedCollectionPath = require.resolve((0, path_1.join)(collectionName, 'package.json'), {
-                paths: [tempNodeModules],
-            });
+            const tempRequire = (0, module_1.createRequire)(tempNodeModules + '/');
+            const resolvedCollectionPath = tempRequire.resolve((0, path_1.join)(collectionName, 'package.json'));
             if (!success) {
                 return 1;
             }
@@ -266,7 +267,7 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
     }
     isPackageInstalled(name) {
         try {
-            require.resolve((0, path_1.join)(name, 'package.json'), { paths: [this.context.root] });
+            this.rootRequire.resolve((0, path_1.join)(name, 'package.json'));
             return true;
         }
         catch (e) {
@@ -309,9 +310,7 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
         const { logger, root } = this.context;
         let installedPackage;
         try {
-            installedPackage = require.resolve((0, path_1.join)(name, 'package.json'), {
-                paths: [root],
-            });
+            installedPackage = this.rootRequire.resolve((0, path_1.join)(name, 'package.json'));
         }
         catch { }
         if (installedPackage) {

package/src/commands/update/cli.js

@@ -38,6 +38,7 @@ const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
+const module_1 = require("module");
 const npm_package_arg_1 = __importDefault(require("npm-package-arg"));
 const npm_pick_manifest_1 = __importDefault(require("npm-pick-manifest"));
 const path = __importStar(require("path"));
@@ -366,7 +367,8 @@ class UpdateCommandModule extends command_module_1.CommandModule {
             // Try to resolve from package location.
             // This avoids issues with package hoisting.
             try {
-                migrations = require.resolve(migrations, { paths: [packagePath] });
+                const packageRequire = (0, module_1.createRequire)(packagePath + '/');
+                migrations = packageRequire.resolve(migrations);
             }
             catch (e) {
                 (0, error_1.assertIsError)(e);
@@ -531,6 +533,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const migrations = global.externalMigrations;
         if (success && migrations) {
+            const rootRequire = (0, module_1.createRequire)(this.context.root + '/');
             for (const migration of migrations) {
                 // Resolve the package from the workspace root, as otherwise it will be resolved from the temp
                 // installed CLI version.
@@ -540,15 +543,13 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                     try {
                         packagePath = path.dirname(
                         // This may fail if the `package.json` is not exported as an entry point
-                        require.resolve(path.join(migration.package, 'package.json'), {
-                            paths: [this.context.root],
-                        }));
+                        rootRequire.resolve(path.join(migration.package, 'package.json')));
                     }
                     catch (e) {
                         (0, error_1.assertIsError)(e);
                         if (e.code === 'MODULE_NOT_FOUND') {
                             // Fallback to trying to resolve the package's main entry point
-                            packagePath = require.resolve(migration.package, { paths: [this.context.root] });
+                            packagePath = rootRequire.resolve(migration.package);
                         }
                         else {
                             throw e;
@@ -577,7 +578,8 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                     // Try to resolve from package location.
                     // This avoids issues with package hoisting.
                     try {
-                        migrations = require.resolve(migration.collection, { paths: [packagePath] });
+                        const packageRequire = (0, module_1.createRequire)(packagePath + '/');
+                        migrations = packageRequire.resolve(migration.collection);
                     }
                     catch (e) {
                         (0, error_1.assertIsError)(e);