@angular/cli 15.0.0 → 15.1.0-next.0

package/lib/config/schema.json

@@ -1097,9 +1097,14 @@
             "$source": "projectName"
           }
         },
+        "functional": {
+          "type": "boolean",
+          "description": "Specifies whether to generate a guard as a function.",
+          "default": false
+        },
         "implements": {
           "type": "array",
-          "description": "Specifies which interfaces to implement.",
+          "description": "Specifies which type of guard to create.",
           "uniqueItems": true,
           "minItems": 1,
           "items": {
@@ -1485,6 +1490,11 @@
           "description": "When true (the default), creates the new files at the top level of the current project.",
           "default": true
         },
+        "functional": {
+          "type": "boolean",
+          "description": "Creates the resolver as a `ResolveFn`.",
+          "default": false
+        },
         "path": {
           "type": "string",
           "format": "path",
@@ -3236,6 +3246,14 @@
       "title": "Universal Target",
       "type": "object",
       "properties": {
+        "assets": {
+          "type": "array",
+          "description": "List of static application assets.",
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/AngularDevkitBuildAngularBuildersServerSchema/definitions/assetPattern"
+          }
+        },
         "main": {
           "type": "string",
           "description": "The name of the main entry-point file."
@@ -3460,6 +3478,43 @@
       },
       "additionalProperties": false,
       "definitions": {
+        "assetPattern": {
+          "oneOf": [
+            {
+              "type": "object",
+              "properties": {
+                "followSymlinks": {
+                  "type": "boolean",
+                  "default": false,
+                  "description": "Allow glob patterns to follow symlink directories. This allows subdirectories of the symlink to be searched."
+                },
+                "glob": {
+                  "type": "string",
+                  "description": "The pattern to match."
+                },
+                "input": {
+                  "type": "string",
+                  "description": "The input directory path in which to apply 'glob'. Defaults to the project root."
+                },
+                "ignore": {
+                  "description": "An array of globs to ignore.",
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "output": {
+                  "type": "string",
+                  "description": "Absolute path within the output."
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "fileReplacement": {
           "oneOf": [
             {

package/lib/config/workspace-schema.d.ts

@@ -398,7 +398,11 @@ export interface AngularGuardOptionsSchema {
      */
     flat?: boolean;
     /**
-     * Specifies which interfaces to implement.
+     * Specifies whether to generate a guard as a function.
+     */
+    functional?: boolean;
+    /**
+     * Specifies which type of guard to create.
      */
     implements?: Implement[];
     /**
@@ -655,6 +659,10 @@ export interface AngularResolverOptionsSchema {
      * When true (the default), creates the new files at the top level of the current project.
      */
     flat?: boolean;
+    /**
+     * Creates the resolver as a `ResolveFn`.
+     */
+    functional?: boolean;
     /**
      * The name of the new resolver.
      */

package/lib/init.js

@@ -56,15 +56,19 @@ let forceExit = false;
      * See: https://github.com/browserslist/browserslist/blob/819c4337456996d19db6ba953014579329e9c6e1/node.js#L324
      */
     process.env.BROWSERSLIST_IGNORE_OLD_DATA = '1';
+    const rawCommandName = process.argv[2];
     /**
      * Disable CLI version mismatch checks and forces usage of the invoked CLI
      * instead of invoking the local installed version.
+     *
+     * When running `ng new` always favor the global version. As in some
+     * cases orphan `node_modules` would cause the non global CLI to be used.
+     * @see: https://github.com/angular/angular-cli/issues/14603
      */
-    if (environment_options_1.disableVersionCheck) {
+    if (environment_options_1.disableVersionCheck || rawCommandName === 'new') {
         return (await Promise.resolve().then(() => __importStar(require('./cli')))).default;
     }
     let cli;
-    const rawCommandName = process.argv[2];
     try {
         // No error implies a projectLocalCli, which will load whatever
         // version of ng-cli you have installed in a local package.json

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "15.0.0",
+  "version": "15.1.0-next.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,16 +25,16 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1500.0",
-    "@angular-devkit/core": "15.0.0",
-    "@angular-devkit/schematics": "15.0.0",
-    "@schematics/angular": "15.0.0",
+    "@angular-devkit/architect": "0.1501.0-next.0",
+    "@angular-devkit/core": "15.1.0-next.0",
+    "@angular-devkit/schematics": "15.1.0-next.0",
+    "@schematics/angular": "15.1.0-next.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.3",
     "ini": "3.0.1",
     "inquirer": "8.2.4",
     "jsonc-parser": "3.2.0",
-    "npm-package-arg": "9.1.2",
+    "npm-package-arg": "10.0.0",
     "npm-pick-manifest": "8.0.1",
     "open": "8.4.0",
     "ora": "5.4.1",
@@ -47,12 +47,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "15.0.0",
-      "@angular-devkit/architect": "0.1500.0",
-      "@angular-devkit/build-angular": "15.0.0",
-      "@angular-devkit/build-webpack": "0.1500.0",
-      "@angular-devkit/core": "15.0.0",
-      "@angular-devkit/schematics": "15.0.0"
+      "@angular/cli": "15.1.0-next.0",
+      "@angular-devkit/architect": "0.1501.0-next.0",
+      "@angular-devkit/build-angular": "15.1.0-next.0",
+      "@angular-devkit/build-webpack": "0.1501.0-next.0",
+      "@angular-devkit/core": "15.1.0-next.0",
+      "@angular-devkit/schematics": "15.1.0-next.0"
     }
   },
   "engines": {

package/src/commands/add/cli.js

@@ -113,7 +113,9 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
         spinner.start('Determining package manager...');
         const usingYarn = packageManager.name === workspace_schema_1.PackageManager.Yarn;
         spinner.info(`Using package manager: ${color_1.colors.grey(packageManager.name)}`);
-        if (packageIdentifier.name && packageIdentifier.type === 'tag' && !packageIdentifier.rawSpec) {
+        if (packageIdentifier.name &&
+            packageIdentifier.type === 'range' &&
+            packageIdentifier.rawSpec === '*') {
             // only package name provided; search for viable version
             // plus special cases for packages that did not have peer deps setup
             spinner.start('Searching for compatible package version...');
@@ -241,22 +243,24 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
         if (!packageIdentifier.name) {
             return false;
         }
-        let validVersion = false;
         const installedVersion = await this.findProjectVersion(packageIdentifier.name);
-        if (installedVersion) {
-            if (packageIdentifier.type === 'range' && packageIdentifier.fetchSpec) {
-                validVersion = (0, semver_1.satisfies)(installedVersion, packageIdentifier.fetchSpec);
-            }
-            else if (packageIdentifier.type === 'version') {
-                const v1 = (0, semver_1.valid)(packageIdentifier.fetchSpec);
-                const v2 = (0, semver_1.valid)(installedVersion);
-                validVersion = v1 !== null && v1 === v2;
-            }
-            else if (!packageIdentifier.rawSpec) {
-                validVersion = true;
-            }
+        if (!installedVersion) {
+            return false;
         }
-        return validVersion;
+        if (packageIdentifier.rawSpec === '*') {
+            return true;
+        }
+        if (packageIdentifier.type === 'range' &&
+            packageIdentifier.fetchSpec &&
+            packageIdentifier.fetchSpec !== '*') {
+            return (0, semver_1.satisfies)(installedVersion, packageIdentifier.fetchSpec);
+        }
+        if (packageIdentifier.type === 'version') {
+            const v1 = (0, semver_1.valid)(packageIdentifier.fetchSpec);
+            const v2 = (0, semver_1.valid)(installedVersion);
+            return v1 !== null && v1 === v2;
+        }
+        return false;
     }
     async getCollectionName() {
         const [, collectionName] = this.context.args.positional;

package/src/commands/update/cli.js

@@ -171,11 +171,11 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                     logger.error(`Duplicate package '${packageIdentifier.name}' specified.`);
                     return 1;
                 }
-                if (options.migrateOnly && packageIdentifier.rawSpec) {
+                if (options.migrateOnly && packageIdentifier.rawSpec !== '*') {
                     logger.warn('Package specifier has no effect when using "migrate-only" option.');
                 }
                 // If next option is used and no specifier supplied, use next tag
-                if (options.next && !packageIdentifier.rawSpec) {
+                if (options.next && packageIdentifier.rawSpec === '*') {
                     packageIdentifier.fetchSpec = 'next';
                 }
                 packages.push(packageIdentifier);