@angular/cli 13.0.0-rc.2 → 13.0.2

package/models/schematic-engine-host.js

@@ -109,9 +109,21 @@ function wrap(schematicFile, schematicDirectory, moduleCache, exportName) {
             return legacyModules[id];
         }
         else if (id.startsWith('@angular-devkit/') || id.startsWith('@schematics/')) {
+            // Files should not redirect `@angular/core` and instead use the direct
+            // dependency if available. This allows old major version migrations to continue to function
+            // even though the latest major version may have breaking changes in `@angular/core`.
+            if (id.startsWith('@angular-devkit/core')) {
+                try {
+                    return schematicRequire(id);
+                }
+                catch (e) {
+                    if (e.code !== 'MODULE_NOT_FOUND') {
+                        throw e;
+                    }
+                }
+            }
             // Resolve from inside the `@angular/cli` project
-            const packagePath = require.resolve(id);
-            return hostRequire(packagePath);
+            return hostRequire(id);
         }
         else if (id.startsWith('.') || id.startsWith('@angular/cdk')) {
             // Wrap relative files inside the schematic collection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "13.0.0-rc.2",
+  "version": "13.0.2",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1300.0-rc.2",
-    "@angular-devkit/core": "13.0.0-rc.2",
-    "@angular-devkit/schematics": "13.0.0-rc.2",
-    "@schematics/angular": "13.0.0-rc.2",
+    "@angular-devkit/architect": "0.1300.2",
+    "@angular-devkit/core": "13.0.2",
+    "@angular-devkit/schematics": "13.0.2",
+    "@schematics/angular": "13.0.2",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.2",
@@ -51,12 +51,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "13.0.0-rc.2",
-      "@angular-devkit/architect": "0.1300.0-rc.2",
-      "@angular-devkit/build-angular": "13.0.0-rc.2",
-      "@angular-devkit/build-webpack": "0.1300.0-rc.2",
-      "@angular-devkit/core": "13.0.0-rc.2",
-      "@angular-devkit/schematics": "13.0.0-rc.2"
+      "@angular/cli": "13.0.2",
+      "@angular-devkit/architect": "0.1300.2",
+      "@angular-devkit/build-angular": "13.0.2",
+      "@angular-devkit/build-webpack": "0.1300.2",
+      "@angular-devkit/core": "13.0.2",
+      "@angular-devkit/schematics": "13.0.2"
     }
   },
   "engines": {

package/src/commands/update/schematic/index.js

@@ -320,13 +320,34 @@ function _usageMessage(options, infoMap, logger) {
     const packageGroups = new Map();
     const packagesToUpdate = [...infoMap.entries()]
         .map(([name, info]) => {
-        const tag = options.next
+        var _a, _b;
+        let tag = options.next
             ? info.npmPackageJson['dist-tags']['next']
                 ? 'next'
                 : 'latest'
             : 'latest';
-        const version = info.npmPackageJson['dist-tags'][tag];
-        const target = info.npmPackageJson.versions[version];
+        let version = info.npmPackageJson['dist-tags'][tag];
+        let target = info.npmPackageJson.versions[version];
+        const versionDiff = semver.diff(info.installed.version, version);
+        if (versionDiff !== 'patch' &&
+            versionDiff !== 'minor' &&
+            /^@(?:angular|nguniversal)\//.test(name)) {
+            const installedMajorVersion = (_a = semver.parse(info.installed.version)) === null || _a === void 0 ? void 0 : _a.major;
+            const toInstallMajorVersion = (_b = semver.parse(version)) === null || _b === void 0 ? void 0 : _b.major;
+            if (installedMajorVersion !== undefined &&
+                toInstallMajorVersion !== undefined &&
+                installedMajorVersion < toInstallMajorVersion - 1) {
+                const nextMajorVersion = `${installedMajorVersion + 1}.`;
+                const nextMajorVersions = Object.keys(info.npmPackageJson.versions)
+                    .filter((v) => v.startsWith(nextMajorVersion))
+                    .sort((a, b) => (a > b ? -1 : 1));
+                if (nextMajorVersions.length) {
+                    version = nextMajorVersions[0];
+                    target = info.npmPackageJson.versions[version];
+                    tag = '';
+                }
+            }
+        }
         return {
             name,
             info,
@@ -335,17 +356,13 @@ function _usageMessage(options, infoMap, logger) {
             target,
         };
     })
-        .filter(({ info, version, target }) => {
-        return target && semver.compare(info.installed.version, version) < 0;
-    })
-        .filter(({ target }) => {
-        return target['ng-update'];
-    })
+        .filter(({ info, version, target }) => (target === null || target === void 0 ? void 0 : target['ng-update']) && semver.compare(info.installed.version, version) < 0)
         .map(({ name, info, version, tag, target }) => {
+        var _a;
         // Look for packageGroup.
-        if (target['ng-update'] && target['ng-update']['packageGroup']) {
-            const packageGroup = target['ng-update']['packageGroup'];
-            const packageGroupName = target['ng-update']['packageGroupName'] || target['ng-update']['packageGroup'][0];
+        const packageGroup = target['ng-update']['packageGroup'];
+        if (packageGroup) {
+            const packageGroupName = target['ng-update']['packageGroupName'] || packageGroup[0];
             if (packageGroupName) {
                 if (packageGroups.has(name)) {
                     return null;
@@ -356,7 +373,10 @@ function _usageMessage(options, infoMap, logger) {
             }
         }
         let command = `ng update ${name}`;
-        if (tag == 'next') {
+        if (!tag) {
+            command += `@${((_a = semver.parse(version)) === null || _a === void 0 ? void 0 : _a.major) || version}`;
+        }
+        else if (tag == 'next') {
             command += ' --next';
         }
         return [name, `${info.installed.version} -> ${version} `, command];