@angular/cli 22.0.0 → 22.1.0-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/config/schema.json +4 -6
- package/lib/config/workspace-schema.d.ts +4 -6
- package/lib/config/workspace-schema.js +4 -6
- package/lib/config/workspace-schema.js.map +1 -1
- package/package.json +20 -20
- package/src/commands/add/cli.d.ts +1 -0
- package/src/commands/add/cli.js +56 -1
- package/src/commands/add/cli.js.map +1 -1
- package/src/commands/mcp/resources/best-practices.md +6 -1
- package/src/commands/update/cli.js +96 -104
- package/src/commands/update/cli.js.map +1 -1
- package/src/commands/update/update-resolver.d.ts +62 -0
- package/src/commands/update/update-resolver.js +801 -0
- package/src/commands/update/update-resolver.js.map +1 -0
- package/src/commands/update/utilities/migration.js +5 -2
- package/src/commands/update/utilities/migration.js.map +1 -1
- package/src/package-managers/package-manager.js +64 -0
- package/src/package-managers/package-manager.js.map +1 -1
- package/src/package-managers/parsers.d.ts +0 -5
- package/src/package-managers/parsers.js +43 -1
- package/src/package-managers/parsers.js.map +1 -1
- package/src/utilities/package-metadata.js +0 -13
- package/src/utilities/package-metadata.js.map +1 -1
- package/src/utilities/version.js +1 -1
- package/src/commands/update/schematic/collection.json +0 -9
- package/src/commands/update/schematic/index.d.ts +0 -11
- package/src/commands/update/schematic/index.js +0 -717
- package/src/commands/update/schematic/index.js.map +0 -1
- package/src/commands/update/schematic/schema.d.ts +0 -51
- package/src/commands/update/schematic/schema.js +0 -16
- package/src/commands/update/schematic/schema.js.map +0 -1
- package/src/commands/update/schematic/schema.json +0 -64
|
@@ -0,0 +1,801 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
8
|
+
*/
|
|
9
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
12
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
13
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
14
|
+
}
|
|
15
|
+
Object.defineProperty(o, k2, desc);
|
|
16
|
+
}) : (function(o, m, k, k2) {
|
|
17
|
+
if (k2 === undefined) k2 = k;
|
|
18
|
+
o[k2] = m[k];
|
|
19
|
+
}));
|
|
20
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
+
}) : function(o, v) {
|
|
23
|
+
o["default"] = v;
|
|
24
|
+
});
|
|
25
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
26
|
+
var ownKeys = function(o) {
|
|
27
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
28
|
+
var ar = [];
|
|
29
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
30
|
+
return ar;
|
|
31
|
+
};
|
|
32
|
+
return ownKeys(o);
|
|
33
|
+
};
|
|
34
|
+
return function (mod) {
|
|
35
|
+
if (mod && mod.__esModule) return mod;
|
|
36
|
+
var result = {};
|
|
37
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
38
|
+
__setModuleDefault(result, mod);
|
|
39
|
+
return result;
|
|
40
|
+
};
|
|
41
|
+
})();
|
|
42
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
43
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
44
|
+
};
|
|
45
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
|
+
exports.angularMajorCompatGuarantee = angularMajorCompatGuarantee;
|
|
47
|
+
exports.isPnpActive = isPnpActive;
|
|
48
|
+
exports.findPackageJson = findPackageJson;
|
|
49
|
+
exports.resolveUserUpdatePlan = resolveUserUpdatePlan;
|
|
50
|
+
exports.printUpdateUsageMessage = printUpdateUsageMessage;
|
|
51
|
+
exports.applyUpdatePlan = applyUpdatePlan;
|
|
52
|
+
const core_1 = require("@angular-devkit/core");
|
|
53
|
+
const node_fs_1 = require("node:fs");
|
|
54
|
+
const node_module_1 = require("node:module");
|
|
55
|
+
const path = __importStar(require("node:path"));
|
|
56
|
+
const npm_package_arg_1 = __importDefault(require("npm-package-arg"));
|
|
57
|
+
const semver = __importStar(require("semver"));
|
|
58
|
+
const package_metadata_1 = require("../../utilities/package-metadata");
|
|
59
|
+
function angularMajorCompatGuarantee(range) {
|
|
60
|
+
let newRange = semver.validRange(range);
|
|
61
|
+
if (!newRange) {
|
|
62
|
+
return range;
|
|
63
|
+
}
|
|
64
|
+
let major = 1;
|
|
65
|
+
while (!semver.gtr(major + '.0.0', newRange)) {
|
|
66
|
+
major++;
|
|
67
|
+
if (major >= 99) {
|
|
68
|
+
return newRange;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
newRange = range;
|
|
72
|
+
for (let minor = 0; minor < 20; minor++) {
|
|
73
|
+
newRange += ` || ^${major}.${minor}.0-alpha.0 `;
|
|
74
|
+
}
|
|
75
|
+
return semver.validRange(newRange) || range;
|
|
76
|
+
}
|
|
77
|
+
const knownPeerCompatibleList = {
|
|
78
|
+
'@angular/core': angularMajorCompatGuarantee,
|
|
79
|
+
};
|
|
80
|
+
function _updatePeerVersion(infoMap, name, range) {
|
|
81
|
+
const maybePackageInfo = infoMap.get(name);
|
|
82
|
+
if (!maybePackageInfo) {
|
|
83
|
+
return range;
|
|
84
|
+
}
|
|
85
|
+
if (maybePackageInfo.target) {
|
|
86
|
+
name = maybePackageInfo.target.updateMetadata.packageGroupName || name;
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
name = maybePackageInfo.installed.updateMetadata.packageGroupName || name;
|
|
90
|
+
}
|
|
91
|
+
const maybeTransform = knownPeerCompatibleList[name];
|
|
92
|
+
if (maybeTransform) {
|
|
93
|
+
if (typeof maybeTransform == 'function') {
|
|
94
|
+
return maybeTransform(range);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
return maybeTransform;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
return range;
|
|
101
|
+
}
|
|
102
|
+
function _validateForwardPeerDependencies(name, infoMap, logger) {
|
|
103
|
+
let error = false;
|
|
104
|
+
const info = infoMap.get(name);
|
|
105
|
+
if (!info || !info.target) {
|
|
106
|
+
return error;
|
|
107
|
+
}
|
|
108
|
+
const peerDependencies = info.target.packageJson.peerDependencies || {};
|
|
109
|
+
const peerDependenciesMeta = info.target.packageJson.peerDependenciesMeta || {};
|
|
110
|
+
for (const [peer, range] of Object.entries(peerDependencies)) {
|
|
111
|
+
const peerInfo = infoMap.get(peer);
|
|
112
|
+
if (!peerInfo) {
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
115
|
+
const isOptional = !!peerDependenciesMeta[peer]?.optional;
|
|
116
|
+
const resolvedRange = _updatePeerVersion(infoMap, peer, range);
|
|
117
|
+
const resolvedVersion = peerInfo.target ? peerInfo.target.version : peerInfo.installed.version;
|
|
118
|
+
if (!semver.satisfies(resolvedVersion, resolvedRange, { includePrerelease: true })) {
|
|
119
|
+
logger.error(`Package ${JSON.stringify(name)} has an incompatible peer dependency to ` +
|
|
120
|
+
`${JSON.stringify(peer)} (requires ${JSON.stringify(range)}, ` +
|
|
121
|
+
`would install ${JSON.stringify(resolvedVersion)}).`);
|
|
122
|
+
error = error || !isOptional;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
return error;
|
|
126
|
+
}
|
|
127
|
+
function _validateReversePeerDependencies(name, version, infoMap, logger, next) {
|
|
128
|
+
let error = false;
|
|
129
|
+
for (const [installed, installedInfo] of infoMap.entries()) {
|
|
130
|
+
const installedLogger = logger.createChild(installed);
|
|
131
|
+
installedLogger.debug(`${installed}...`);
|
|
132
|
+
const peers = (installedInfo.target || installedInfo.installed).packageJson.peerDependencies;
|
|
133
|
+
const peersMeta = (installedInfo.target || installedInfo.installed).packageJson
|
|
134
|
+
.peerDependenciesMeta;
|
|
135
|
+
for (const [peer, range] of Object.entries(peers || {})) {
|
|
136
|
+
if (peer !== name) {
|
|
137
|
+
continue;
|
|
138
|
+
}
|
|
139
|
+
const isOptional = !!peersMeta?.[peer]?.optional;
|
|
140
|
+
const resolvedRange = _updatePeerVersion(infoMap, name, range);
|
|
141
|
+
if (!semver.satisfies(version, resolvedRange, { includePrerelease: next || undefined })) {
|
|
142
|
+
logger.error(`Package ${JSON.stringify(installed)} has an incompatible peer dependency to ` +
|
|
143
|
+
`${JSON.stringify(name)} (requires ${JSON.stringify(range)}, ` +
|
|
144
|
+
`would install ${JSON.stringify(version)}).`);
|
|
145
|
+
error = error || !isOptional;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
return error;
|
|
150
|
+
}
|
|
151
|
+
function _validateUpdatePackages(infoMap, force, next, logger) {
|
|
152
|
+
logger.debug('Validating peer dependencies...');
|
|
153
|
+
let error = false;
|
|
154
|
+
for (const name of infoMap.keys()) {
|
|
155
|
+
const info = infoMap.get(name);
|
|
156
|
+
if (!info || !info.target) {
|
|
157
|
+
continue;
|
|
158
|
+
}
|
|
159
|
+
logger.debug(`Checking ${name}...`);
|
|
160
|
+
error = _validateForwardPeerDependencies(name, infoMap, logger) || error;
|
|
161
|
+
error =
|
|
162
|
+
_validateReversePeerDependencies(name, info.target.version, infoMap, logger, next) || error;
|
|
163
|
+
}
|
|
164
|
+
if (error && !force) {
|
|
165
|
+
throw new Error('Incompatible peer dependencies found. See above for details. ' +
|
|
166
|
+
'You can bypass this check using the --force option.');
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
function _getUpdateMetadata(packageJson, logger) {
|
|
170
|
+
const metadata = packageJson['ng-update'];
|
|
171
|
+
const result = {
|
|
172
|
+
packageGroup: {},
|
|
173
|
+
requirements: {},
|
|
174
|
+
};
|
|
175
|
+
if (!metadata || typeof metadata != 'object' || Array.isArray(metadata)) {
|
|
176
|
+
return result;
|
|
177
|
+
}
|
|
178
|
+
if (metadata['packageGroup']) {
|
|
179
|
+
const packageGroup = metadata['packageGroup'];
|
|
180
|
+
if (Array.isArray(packageGroup) && packageGroup.every((x) => typeof x == 'string')) {
|
|
181
|
+
result.packageGroup = packageGroup.reduce((group, name) => {
|
|
182
|
+
group[name] = packageJson.version;
|
|
183
|
+
return group;
|
|
184
|
+
}, {});
|
|
185
|
+
}
|
|
186
|
+
else if (typeof packageGroup == 'object' && packageGroup !== null) {
|
|
187
|
+
result.packageGroup = Object.entries(packageGroup).reduce((group, [name, version]) => {
|
|
188
|
+
if (typeof version == 'string') {
|
|
189
|
+
group[name] = version;
|
|
190
|
+
}
|
|
191
|
+
return group;
|
|
192
|
+
}, {});
|
|
193
|
+
}
|
|
194
|
+
else {
|
|
195
|
+
logger.warn(`PackageGroup metadata for ${packageJson.name} is malformed. Ignoring.`);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
if (typeof metadata['packageGroupName'] == 'string') {
|
|
199
|
+
result.packageGroupName = metadata['packageGroupName'];
|
|
200
|
+
}
|
|
201
|
+
if (typeof metadata['migrations'] == 'string') {
|
|
202
|
+
result.migrations = metadata['migrations'];
|
|
203
|
+
}
|
|
204
|
+
return result;
|
|
205
|
+
}
|
|
206
|
+
function isPnpActive(workspaceRoot) {
|
|
207
|
+
return (process.versions.pnp !== undefined ||
|
|
208
|
+
(0, node_fs_1.existsSync)(path.join(workspaceRoot, '.pnp.cjs')) ||
|
|
209
|
+
(0, node_fs_1.existsSync)(path.join(workspaceRoot, '.pnp.js')));
|
|
210
|
+
}
|
|
211
|
+
function findPackageJson(workspaceDir, packageName) {
|
|
212
|
+
if (isPnpActive(workspaceDir)) {
|
|
213
|
+
try {
|
|
214
|
+
const workspaceRequire = (0, node_module_1.createRequire)(path.join(workspaceDir, 'package.json'));
|
|
215
|
+
return workspaceRequire.resolve(`${packageName}/package.json`);
|
|
216
|
+
}
|
|
217
|
+
catch {
|
|
218
|
+
return undefined;
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
let currentDir = workspaceDir;
|
|
222
|
+
while (true) {
|
|
223
|
+
const candidatePath = path.join(currentDir, 'node_modules', packageName, 'package.json');
|
|
224
|
+
if ((0, node_fs_1.existsSync)(candidatePath)) {
|
|
225
|
+
return (0, node_fs_1.realpathSync)(candidatePath);
|
|
226
|
+
}
|
|
227
|
+
const parentDir = path.dirname(currentDir);
|
|
228
|
+
if (parentDir === currentDir) {
|
|
229
|
+
break;
|
|
230
|
+
}
|
|
231
|
+
currentDir = parentDir;
|
|
232
|
+
}
|
|
233
|
+
return undefined;
|
|
234
|
+
}
|
|
235
|
+
function getInstalledPackageJson(packageName, workspaceRoot) {
|
|
236
|
+
try {
|
|
237
|
+
const manifestPath = findPackageJson(workspaceRoot, packageName);
|
|
238
|
+
if (manifestPath) {
|
|
239
|
+
const content = (0, node_fs_1.readFileSync)(manifestPath, 'utf8');
|
|
240
|
+
return JSON.parse(content);
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
catch { }
|
|
244
|
+
return null;
|
|
245
|
+
}
|
|
246
|
+
function getInstalledVersion(packageName, workspaceRoot) {
|
|
247
|
+
const pkgJson = getInstalledPackageJson(packageName, workspaceRoot);
|
|
248
|
+
return pkgJson?.version ?? null;
|
|
249
|
+
}
|
|
250
|
+
function _buildLocalPackageInfo(name, allDependencies, workspaceRoot) {
|
|
251
|
+
const packageJsonRange = allDependencies.get(name);
|
|
252
|
+
if (!packageJsonRange) {
|
|
253
|
+
throw new Error(`Package ${JSON.stringify(name)} was not found in package.json.`);
|
|
254
|
+
}
|
|
255
|
+
const localPkgJson = getInstalledPackageJson(name, workspaceRoot);
|
|
256
|
+
if (!localPkgJson) {
|
|
257
|
+
throw new Error(`Package ${name} is not installed.`);
|
|
258
|
+
}
|
|
259
|
+
const installedVersion = localPkgJson.version;
|
|
260
|
+
const npmPackageJson = {
|
|
261
|
+
name,
|
|
262
|
+
versions: {
|
|
263
|
+
[installedVersion]: localPkgJson,
|
|
264
|
+
},
|
|
265
|
+
'dist-tags': {},
|
|
266
|
+
};
|
|
267
|
+
const logger = new core_1.logging.NullLogger();
|
|
268
|
+
return {
|
|
269
|
+
name,
|
|
270
|
+
npmPackageJson,
|
|
271
|
+
installed: {
|
|
272
|
+
version: installedVersion,
|
|
273
|
+
packageJson: localPkgJson,
|
|
274
|
+
updateMetadata: _getUpdateMetadata(localPkgJson, logger),
|
|
275
|
+
},
|
|
276
|
+
packageJsonRange,
|
|
277
|
+
};
|
|
278
|
+
}
|
|
279
|
+
function _buildPackageInfo(packages, allDependencies, npmPackageJson, workspaceRoot, logger) {
|
|
280
|
+
const name = npmPackageJson.name;
|
|
281
|
+
const packageJsonRange = allDependencies.get(name);
|
|
282
|
+
if (!packageJsonRange) {
|
|
283
|
+
throw new Error(`Package ${JSON.stringify(name)} was not found in package.json.`);
|
|
284
|
+
}
|
|
285
|
+
const localPkgJson = getInstalledPackageJson(name, workspaceRoot);
|
|
286
|
+
let installedVersion = localPkgJson?.version;
|
|
287
|
+
const packageVersionsNonDeprecated = [];
|
|
288
|
+
const packageVersionsDeprecated = [];
|
|
289
|
+
for (const [version, { deprecated }] of Object.entries(npmPackageJson.versions ?? {})) {
|
|
290
|
+
if (deprecated) {
|
|
291
|
+
packageVersionsDeprecated.push(version);
|
|
292
|
+
}
|
|
293
|
+
else {
|
|
294
|
+
packageVersionsNonDeprecated.push(version);
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
const findSatisfyingVersion = (targetVersion) => (semver.maxSatisfying(packageVersionsNonDeprecated, targetVersion) ??
|
|
298
|
+
semver.maxSatisfying(packageVersionsDeprecated, targetVersion)) ??
|
|
299
|
+
undefined;
|
|
300
|
+
if (!installedVersion) {
|
|
301
|
+
installedVersion = findSatisfyingVersion(packageJsonRange);
|
|
302
|
+
}
|
|
303
|
+
if (!installedVersion) {
|
|
304
|
+
throw new Error(`An unexpected error happened; could not determine version for package ${name}.`);
|
|
305
|
+
}
|
|
306
|
+
const versions = npmPackageJson.versions ?? {};
|
|
307
|
+
const installedPackageJson = versions[installedVersion] || localPkgJson;
|
|
308
|
+
if (!installedPackageJson) {
|
|
309
|
+
throw new Error(`An unexpected error happened; package ${name} has no version ${installedVersion}.`);
|
|
310
|
+
}
|
|
311
|
+
let targetVersion = packages.get(name);
|
|
312
|
+
if (targetVersion) {
|
|
313
|
+
const distTags = npmPackageJson['dist-tags'] ?? {};
|
|
314
|
+
if (distTags[targetVersion]) {
|
|
315
|
+
targetVersion = distTags[targetVersion];
|
|
316
|
+
}
|
|
317
|
+
else if (targetVersion == 'next') {
|
|
318
|
+
targetVersion = distTags['latest'];
|
|
319
|
+
}
|
|
320
|
+
else {
|
|
321
|
+
targetVersion = findSatisfyingVersion(targetVersion);
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
if (targetVersion && semver.lte(targetVersion, installedVersion)) {
|
|
325
|
+
logger.debug(`Package ${name} already satisfied by package.json (${packageJsonRange}).`);
|
|
326
|
+
targetVersion = undefined;
|
|
327
|
+
}
|
|
328
|
+
const target = targetVersion
|
|
329
|
+
? {
|
|
330
|
+
version: targetVersion,
|
|
331
|
+
packageJson: versions[targetVersion],
|
|
332
|
+
updateMetadata: _getUpdateMetadata(versions[targetVersion], logger),
|
|
333
|
+
}
|
|
334
|
+
: undefined;
|
|
335
|
+
return {
|
|
336
|
+
name,
|
|
337
|
+
npmPackageJson,
|
|
338
|
+
installed: {
|
|
339
|
+
version: installedVersion,
|
|
340
|
+
packageJson: installedPackageJson,
|
|
341
|
+
updateMetadata: _getUpdateMetadata(installedPackageJson, logger),
|
|
342
|
+
},
|
|
343
|
+
target,
|
|
344
|
+
packageJsonRange,
|
|
345
|
+
};
|
|
346
|
+
}
|
|
347
|
+
function _buildPackageList(options, allDependencies, logger) {
|
|
348
|
+
const packages = new Map();
|
|
349
|
+
const inputPackages = options.packages ?? [];
|
|
350
|
+
if (inputPackages.length === 0) {
|
|
351
|
+
return packages;
|
|
352
|
+
}
|
|
353
|
+
for (const pkg of inputPackages) {
|
|
354
|
+
let pkgName = pkg;
|
|
355
|
+
let pkgVersion;
|
|
356
|
+
if (pkg.startsWith('@')) {
|
|
357
|
+
const parts = pkg.split('@');
|
|
358
|
+
pkgName = '@' + parts[1];
|
|
359
|
+
pkgVersion = parts[2];
|
|
360
|
+
}
|
|
361
|
+
else if (pkg.includes('@')) {
|
|
362
|
+
const parts = pkg.split('@');
|
|
363
|
+
pkgName = parts[0];
|
|
364
|
+
pkgVersion = parts[1];
|
|
365
|
+
}
|
|
366
|
+
if (!allDependencies.has(pkgName)) {
|
|
367
|
+
throw new Error(`Package ${JSON.stringify(pkgName)} is not in package.json.`);
|
|
368
|
+
}
|
|
369
|
+
if (options.migrateOnly && !pkgVersion && options.from) {
|
|
370
|
+
pkgVersion = options.from;
|
|
371
|
+
}
|
|
372
|
+
packages.set(pkgName, (pkgVersion || (options.next ? 'next' : 'latest')));
|
|
373
|
+
}
|
|
374
|
+
return packages;
|
|
375
|
+
}
|
|
376
|
+
function resolvePackageVersion(metadata, range, next = false) {
|
|
377
|
+
const distTags = metadata['dist-tags'] ?? {};
|
|
378
|
+
if (distTags[range]) {
|
|
379
|
+
return distTags[range];
|
|
380
|
+
}
|
|
381
|
+
if (range === 'next') {
|
|
382
|
+
return distTags['latest'] ?? null;
|
|
383
|
+
}
|
|
384
|
+
const packageVersionsNonDeprecated = [];
|
|
385
|
+
const packageVersionsDeprecated = [];
|
|
386
|
+
for (const [v, { deprecated }] of Object.entries(metadata.versions ?? {})) {
|
|
387
|
+
if (deprecated) {
|
|
388
|
+
packageVersionsDeprecated.push(v);
|
|
389
|
+
}
|
|
390
|
+
else {
|
|
391
|
+
packageVersionsNonDeprecated.push(v);
|
|
392
|
+
}
|
|
393
|
+
}
|
|
394
|
+
return (semver.maxSatisfying(packageVersionsNonDeprecated, range, {
|
|
395
|
+
includePrerelease: next || undefined,
|
|
396
|
+
}) ??
|
|
397
|
+
semver.maxSatisfying(packageVersionsDeprecated, range, {
|
|
398
|
+
includePrerelease: next || undefined,
|
|
399
|
+
}));
|
|
400
|
+
}
|
|
401
|
+
function _addPackageGroup(packages, allDependencies, metadata, logger) {
|
|
402
|
+
const maybePackage = packages.get(metadata.name);
|
|
403
|
+
if (!maybePackage) {
|
|
404
|
+
return;
|
|
405
|
+
}
|
|
406
|
+
const distTags = metadata['dist-tags'] ?? {};
|
|
407
|
+
let version = maybePackage;
|
|
408
|
+
if (distTags[version]) {
|
|
409
|
+
version = distTags[version];
|
|
410
|
+
}
|
|
411
|
+
else if (version === 'next') {
|
|
412
|
+
version = distTags['latest'];
|
|
413
|
+
}
|
|
414
|
+
else {
|
|
415
|
+
const packageVersionsNonDeprecated = [];
|
|
416
|
+
const packageVersionsDeprecated = [];
|
|
417
|
+
const versions = metadata.versions ?? {};
|
|
418
|
+
for (const [v, { deprecated }] of Object.entries(versions)) {
|
|
419
|
+
if (deprecated) {
|
|
420
|
+
packageVersionsDeprecated.push(v);
|
|
421
|
+
}
|
|
422
|
+
else {
|
|
423
|
+
packageVersionsNonDeprecated.push(v);
|
|
424
|
+
}
|
|
425
|
+
}
|
|
426
|
+
version =
|
|
427
|
+
(semver.maxSatisfying(packageVersionsNonDeprecated, version) ??
|
|
428
|
+
semver.maxSatisfying(packageVersionsDeprecated, version)) ??
|
|
429
|
+
version;
|
|
430
|
+
}
|
|
431
|
+
const versions = metadata.versions ?? {};
|
|
432
|
+
if (!versions[version]) {
|
|
433
|
+
return;
|
|
434
|
+
}
|
|
435
|
+
const ngUpdateMetadata = versions[version]['ng-update'];
|
|
436
|
+
if (!ngUpdateMetadata) {
|
|
437
|
+
return;
|
|
438
|
+
}
|
|
439
|
+
const packageGroup = ngUpdateMetadata['packageGroup'];
|
|
440
|
+
if (!packageGroup) {
|
|
441
|
+
return;
|
|
442
|
+
}
|
|
443
|
+
let packageGroupNormalized;
|
|
444
|
+
if (Array.isArray(packageGroup) && !packageGroup.some((x) => typeof x != 'string')) {
|
|
445
|
+
packageGroupNormalized = packageGroup.reduce((acc, curr) => {
|
|
446
|
+
acc[curr] = version;
|
|
447
|
+
return acc;
|
|
448
|
+
}, {});
|
|
449
|
+
}
|
|
450
|
+
else if (typeof packageGroup === 'object' && packageGroup !== null) {
|
|
451
|
+
packageGroupNormalized = Object.entries(packageGroup).reduce((acc, [name, v]) => {
|
|
452
|
+
if (typeof v === 'string') {
|
|
453
|
+
acc[name] = v;
|
|
454
|
+
}
|
|
455
|
+
return acc;
|
|
456
|
+
}, {});
|
|
457
|
+
}
|
|
458
|
+
else {
|
|
459
|
+
logger.warn(`PackageGroup metadata for ${metadata.name} is malformed. Ignoring.`);
|
|
460
|
+
return;
|
|
461
|
+
}
|
|
462
|
+
for (const [member, memberVersion] of Object.entries(packageGroupNormalized)) {
|
|
463
|
+
if (packages.has(member)) {
|
|
464
|
+
continue;
|
|
465
|
+
}
|
|
466
|
+
if (allDependencies.has(member)) {
|
|
467
|
+
packages.set(member, memberVersion);
|
|
468
|
+
}
|
|
469
|
+
}
|
|
470
|
+
}
|
|
471
|
+
async function _addPeerDependencies(packages, allDependencies, npmPackageJson, workspaceRoot, fetchMetadata, logger) {
|
|
472
|
+
const maybePackage = packages.get(npmPackageJson.name);
|
|
473
|
+
if (!maybePackage) {
|
|
474
|
+
return;
|
|
475
|
+
}
|
|
476
|
+
const distTags = npmPackageJson['dist-tags'] ?? {};
|
|
477
|
+
const version = distTags[maybePackage] || maybePackage;
|
|
478
|
+
const versions = npmPackageJson.versions ?? {};
|
|
479
|
+
const packageJson = versions[version];
|
|
480
|
+
if (!packageJson) {
|
|
481
|
+
return;
|
|
482
|
+
}
|
|
483
|
+
for (const [peer, range] of Object.entries(packageJson.peerDependencies || {})) {
|
|
484
|
+
if (packages.has(peer)) {
|
|
485
|
+
continue;
|
|
486
|
+
}
|
|
487
|
+
const installedVersion = getInstalledVersion(peer, workspaceRoot);
|
|
488
|
+
if (installedVersion) {
|
|
489
|
+
if (semver.satisfies(installedVersion, range)) {
|
|
490
|
+
continue;
|
|
491
|
+
}
|
|
492
|
+
}
|
|
493
|
+
else {
|
|
494
|
+
const packageJsonRange = allDependencies.get(peer);
|
|
495
|
+
if (packageJsonRange) {
|
|
496
|
+
const peerMetadata = await fetchMetadata(peer);
|
|
497
|
+
if (peerMetadata) {
|
|
498
|
+
const packageVersionsNonDeprecated = [];
|
|
499
|
+
const packageVersionsDeprecated = [];
|
|
500
|
+
for (const [v, { deprecated }] of Object.entries(peerMetadata.versions ?? {})) {
|
|
501
|
+
if (deprecated) {
|
|
502
|
+
packageVersionsDeprecated.push(v);
|
|
503
|
+
}
|
|
504
|
+
else {
|
|
505
|
+
packageVersionsNonDeprecated.push(v);
|
|
506
|
+
}
|
|
507
|
+
}
|
|
508
|
+
const resolvedInstalledVersion = semver.maxSatisfying(packageVersionsNonDeprecated, packageJsonRange) ??
|
|
509
|
+
semver.maxSatisfying(packageVersionsDeprecated, packageJsonRange);
|
|
510
|
+
if (resolvedInstalledVersion && semver.satisfies(resolvedInstalledVersion, range)) {
|
|
511
|
+
continue;
|
|
512
|
+
}
|
|
513
|
+
}
|
|
514
|
+
}
|
|
515
|
+
}
|
|
516
|
+
packages.set(peer, range);
|
|
517
|
+
}
|
|
518
|
+
}
|
|
519
|
+
function _formatVersion(v) {
|
|
520
|
+
if (v === undefined) {
|
|
521
|
+
return v;
|
|
522
|
+
}
|
|
523
|
+
if (semver.valid(v)) {
|
|
524
|
+
return v;
|
|
525
|
+
}
|
|
526
|
+
const coerced = semver.coerce(v);
|
|
527
|
+
return coerced ? coerced.toString() : undefined;
|
|
528
|
+
}
|
|
529
|
+
function isPkgFromRegistry(name, specifier) {
|
|
530
|
+
const result = npm_package_arg_1.default.resolve(name, specifier);
|
|
531
|
+
return !!result.registry;
|
|
532
|
+
}
|
|
533
|
+
async function resolveUserUpdatePlan(options, logger) {
|
|
534
|
+
const workspaceRoot = options.workspaceRoot ?? process.cwd();
|
|
535
|
+
const packageJsonPath = path.join(workspaceRoot, 'package.json');
|
|
536
|
+
if (!(0, node_fs_1.existsSync)(packageJsonPath)) {
|
|
537
|
+
throw new Error('Could not find a package.json. Are you in a Node project?');
|
|
538
|
+
}
|
|
539
|
+
const rawJson = (0, node_fs_1.readFileSync)(packageJsonPath, 'utf8');
|
|
540
|
+
const packageJsonContent = JSON.parse(rawJson);
|
|
541
|
+
const getDependencies = (deps) => Object.entries(deps ?? {}).map(([name, range]) => [name, range]);
|
|
542
|
+
const allRawDeps = [
|
|
543
|
+
...getDependencies(packageJsonContent.dependencies),
|
|
544
|
+
...getDependencies(packageJsonContent.devDependencies),
|
|
545
|
+
...getDependencies(packageJsonContent.peerDependencies),
|
|
546
|
+
];
|
|
547
|
+
const npmDeps = new Map(allRawDeps.filter(([name, specifier]) => {
|
|
548
|
+
try {
|
|
549
|
+
return isPkgFromRegistry(name, specifier);
|
|
550
|
+
}
|
|
551
|
+
catch {
|
|
552
|
+
logger.warn(`Package ${name} was not found on the registry. Skipping.`);
|
|
553
|
+
return false;
|
|
554
|
+
}
|
|
555
|
+
}));
|
|
556
|
+
const packagesOption = options.packages ?? [];
|
|
557
|
+
const normalizedPackages = packagesOption.reduce((acc, curr) => {
|
|
558
|
+
return acc.concat(curr.split(','));
|
|
559
|
+
}, []);
|
|
560
|
+
options.packages = normalizedPackages;
|
|
561
|
+
if (options.migrateOnly && options.from) {
|
|
562
|
+
if (options.packages.length !== 1) {
|
|
563
|
+
throw new Error('--from requires that only a single package be passed.');
|
|
564
|
+
}
|
|
565
|
+
}
|
|
566
|
+
options.from = _formatVersion(options.from);
|
|
567
|
+
options.to = _formatVersion(options.to);
|
|
568
|
+
const usingYarn = options.packageManager === 'yarn';
|
|
569
|
+
const packages = _buildPackageList(options, npmDeps, logger);
|
|
570
|
+
const npmPackageJsonMap = new Map();
|
|
571
|
+
const getOrFetchPackageMetadata = async (packageName) => {
|
|
572
|
+
let metadata = npmPackageJsonMap.get(packageName);
|
|
573
|
+
if (!metadata) {
|
|
574
|
+
const raw = await (0, package_metadata_1.getNpmPackageJson)(packageName, logger, {
|
|
575
|
+
registry: options.registry,
|
|
576
|
+
usingYarn,
|
|
577
|
+
verbose: options.verbose,
|
|
578
|
+
});
|
|
579
|
+
if (raw.name) {
|
|
580
|
+
metadata = raw;
|
|
581
|
+
npmPackageJsonMap.set(packageName, metadata);
|
|
582
|
+
}
|
|
583
|
+
}
|
|
584
|
+
return metadata ?? null;
|
|
585
|
+
};
|
|
586
|
+
if (packages.size === 0) {
|
|
587
|
+
await Promise.all(Array.from(npmDeps.keys()).map(async (depName) => {
|
|
588
|
+
await getOrFetchPackageMetadata(depName);
|
|
589
|
+
}));
|
|
590
|
+
}
|
|
591
|
+
else {
|
|
592
|
+
let lastPackagesSize;
|
|
593
|
+
do {
|
|
594
|
+
lastPackagesSize = packages.size;
|
|
595
|
+
let lastGroupSize;
|
|
596
|
+
do {
|
|
597
|
+
lastGroupSize = packages.size;
|
|
598
|
+
for (const name of Array.from(packages.keys())) {
|
|
599
|
+
const metadata = await getOrFetchPackageMetadata(name);
|
|
600
|
+
const spec = packages.get(name);
|
|
601
|
+
if (metadata && spec) {
|
|
602
|
+
const resolvedVersion = resolvePackageVersion(metadata, spec, !!options.next);
|
|
603
|
+
if (resolvedVersion) {
|
|
604
|
+
packages.set(name, resolvedVersion);
|
|
605
|
+
}
|
|
606
|
+
_addPackageGroup(packages, npmDeps, metadata, logger);
|
|
607
|
+
}
|
|
608
|
+
}
|
|
609
|
+
} while (packages.size > lastGroupSize);
|
|
610
|
+
for (const name of Array.from(packages.keys())) {
|
|
611
|
+
const metadata = await getOrFetchPackageMetadata(name);
|
|
612
|
+
const spec = packages.get(name);
|
|
613
|
+
if (metadata && spec) {
|
|
614
|
+
const resolvedVersion = resolvePackageVersion(metadata, spec, !!options.next);
|
|
615
|
+
if (resolvedVersion) {
|
|
616
|
+
packages.set(name, resolvedVersion);
|
|
617
|
+
}
|
|
618
|
+
await _addPeerDependencies(packages, npmDeps, metadata, workspaceRoot, getOrFetchPackageMetadata, logger);
|
|
619
|
+
}
|
|
620
|
+
}
|
|
621
|
+
} while (packages.size > lastPackagesSize);
|
|
622
|
+
}
|
|
623
|
+
const packageInfoMap = new Map();
|
|
624
|
+
for (const depName of npmDeps.keys()) {
|
|
625
|
+
const isUpdating = packages.has(depName);
|
|
626
|
+
const localPkgJson = getInstalledPackageJson(depName, workspaceRoot);
|
|
627
|
+
if (isUpdating || !localPkgJson) {
|
|
628
|
+
const metadata = await getOrFetchPackageMetadata(depName);
|
|
629
|
+
if (metadata) {
|
|
630
|
+
packageInfoMap.set(depName, _buildPackageInfo(packages, npmDeps, metadata, workspaceRoot, logger));
|
|
631
|
+
}
|
|
632
|
+
else {
|
|
633
|
+
packageInfoMap.set(depName, _buildLocalPackageInfo(depName, npmDeps, workspaceRoot));
|
|
634
|
+
}
|
|
635
|
+
}
|
|
636
|
+
else {
|
|
637
|
+
packageInfoMap.set(depName, _buildLocalPackageInfo(depName, npmDeps, workspaceRoot));
|
|
638
|
+
}
|
|
639
|
+
}
|
|
640
|
+
const packagesToUpdate = new Map();
|
|
641
|
+
const migrationsToRun = [];
|
|
642
|
+
if (packages.size > 0) {
|
|
643
|
+
if (!(options.migrateOnly && options.from && options.packages)) {
|
|
644
|
+
const sublog = new core_1.logging.LevelCapLogger('validation', logger.createChild(''), 'warn');
|
|
645
|
+
_validateUpdatePackages(packageInfoMap, !!options.force, !!options.next, sublog);
|
|
646
|
+
for (const [name, info] of packageInfoMap.entries()) {
|
|
647
|
+
if (!info.target || !info.installed) {
|
|
648
|
+
continue;
|
|
649
|
+
}
|
|
650
|
+
packagesToUpdate.set(name, info.target.version);
|
|
651
|
+
if (info.target.updateMetadata.migrations) {
|
|
652
|
+
migrationsToRun.push({
|
|
653
|
+
package: name,
|
|
654
|
+
collection: info.target.updateMetadata.migrations,
|
|
655
|
+
from: info.installed.version,
|
|
656
|
+
to: info.target.version,
|
|
657
|
+
});
|
|
658
|
+
}
|
|
659
|
+
}
|
|
660
|
+
}
|
|
661
|
+
}
|
|
662
|
+
return {
|
|
663
|
+
packagesToUpdate,
|
|
664
|
+
migrationsToRun,
|
|
665
|
+
packageInfoMap,
|
|
666
|
+
};
|
|
667
|
+
}
|
|
668
|
+
function printUpdateUsageMessage(infoMap, logger, next = false) {
|
|
669
|
+
const packageGroups = new Map();
|
|
670
|
+
const packagesToUpdate = [...infoMap.entries()]
|
|
671
|
+
.map(([name, info]) => {
|
|
672
|
+
const distTags = info.npmPackageJson['dist-tags'] ?? {};
|
|
673
|
+
let tag = next ? (distTags['next'] ? 'next' : 'latest') : 'latest';
|
|
674
|
+
let version = distTags[tag] ?? info.installed.version;
|
|
675
|
+
const versions = info.npmPackageJson.versions ?? {};
|
|
676
|
+
let target = versions[version];
|
|
677
|
+
const versionDiff = semver.diff(info.installed.version, version);
|
|
678
|
+
if (versionDiff !== 'patch' &&
|
|
679
|
+
versionDiff !== 'minor' &&
|
|
680
|
+
/^@(?:angular|nguniversal)\//.test(name)) {
|
|
681
|
+
const installedMajorVersion = semver.parse(info.installed.version)?.major;
|
|
682
|
+
const toInstallMajorVersion = semver.parse(version)?.major;
|
|
683
|
+
if (installedMajorVersion !== undefined &&
|
|
684
|
+
toInstallMajorVersion !== undefined &&
|
|
685
|
+
installedMajorVersion < toInstallMajorVersion - 1) {
|
|
686
|
+
const nextMajorVersion = `${installedMajorVersion + 1}.`;
|
|
687
|
+
const nextMajorVersions = Object.keys(versions)
|
|
688
|
+
.filter((v) => v.startsWith(nextMajorVersion))
|
|
689
|
+
.sort((a, b) => (a > b ? -1 : 1));
|
|
690
|
+
if (nextMajorVersions.length) {
|
|
691
|
+
version = nextMajorVersions[0];
|
|
692
|
+
target = versions[version];
|
|
693
|
+
tag = '';
|
|
694
|
+
}
|
|
695
|
+
}
|
|
696
|
+
}
|
|
697
|
+
return {
|
|
698
|
+
name,
|
|
699
|
+
info,
|
|
700
|
+
version,
|
|
701
|
+
tag,
|
|
702
|
+
target,
|
|
703
|
+
};
|
|
704
|
+
})
|
|
705
|
+
.filter(({ info, version, target }) => target?.['ng-update'] && semver.compare(info.installed.version, version) < 0)
|
|
706
|
+
.map(({ name, info, version, tag, target }) => {
|
|
707
|
+
// Look for packageGroup.
|
|
708
|
+
const ngUpdate = target['ng-update'];
|
|
709
|
+
const packageGroup = ngUpdate?.['packageGroup'];
|
|
710
|
+
if (packageGroup) {
|
|
711
|
+
const packageGroupNames = Array.isArray(packageGroup)
|
|
712
|
+
? packageGroup
|
|
713
|
+
: Object.keys(packageGroup);
|
|
714
|
+
const packageGroupName = ngUpdate?.['packageGroupName'] || packageGroupNames.find((n) => infoMap.has(n));
|
|
715
|
+
if (packageGroupName) {
|
|
716
|
+
if (packageGroups.has(name)) {
|
|
717
|
+
return null;
|
|
718
|
+
}
|
|
719
|
+
for (const groupName of packageGroupNames) {
|
|
720
|
+
packageGroups.set(groupName, packageGroupName);
|
|
721
|
+
}
|
|
722
|
+
packageGroups.set(packageGroupName, packageGroupName);
|
|
723
|
+
name = packageGroupName;
|
|
724
|
+
}
|
|
725
|
+
}
|
|
726
|
+
let command = `ng update ${name}`;
|
|
727
|
+
if (!tag) {
|
|
728
|
+
command += `@${semver.parse(version)?.major || version}`;
|
|
729
|
+
}
|
|
730
|
+
else if (tag == 'next') {
|
|
731
|
+
command += ' --next';
|
|
732
|
+
}
|
|
733
|
+
return [name, `${info.installed.version} -> ${version} `, command];
|
|
734
|
+
})
|
|
735
|
+
.filter((x) => x !== null)
|
|
736
|
+
.sort((a, b) => a[0].localeCompare(b[0]));
|
|
737
|
+
if (packagesToUpdate.length == 0) {
|
|
738
|
+
logger.info('We analyzed your package.json and everything seems to be in order. Good work!');
|
|
739
|
+
return;
|
|
740
|
+
}
|
|
741
|
+
logger.info('We analyzed your package.json, there are some packages to update:\n');
|
|
742
|
+
// Find the largest name to know the padding needed.
|
|
743
|
+
let namePad = Math.max(...[...infoMap.keys()].map((x) => x.length)) + 2;
|
|
744
|
+
if (!Number.isFinite(namePad)) {
|
|
745
|
+
namePad = 30;
|
|
746
|
+
}
|
|
747
|
+
const pads = [namePad, 25, 0];
|
|
748
|
+
logger.info(' ' + ['Name', 'Version', 'Command to update'].map((x, i) => x.padEnd(pads[i])).join(''));
|
|
749
|
+
const totalWidth = pads.reduce((sum, width) => sum + width, 20);
|
|
750
|
+
logger.info(` ${'-'.repeat(totalWidth)}`);
|
|
751
|
+
packagesToUpdate.forEach((fields) => {
|
|
752
|
+
if (!fields) {
|
|
753
|
+
return;
|
|
754
|
+
}
|
|
755
|
+
logger.info(' ' + fields.map((x, i) => x.padEnd(pads[i])).join(''));
|
|
756
|
+
});
|
|
757
|
+
logger.info(`\nThere might be additional packages which don't provide 'ng update' capabilities that are outdated.\n` +
|
|
758
|
+
`You can update the additional packages by running the update command of your package manager.`);
|
|
759
|
+
}
|
|
760
|
+
async function applyUpdatePlan(workspaceRoot, plan, logger) {
|
|
761
|
+
const packageJsonPath = path.join(workspaceRoot, 'package.json');
|
|
762
|
+
const packageJsonContent = await node_fs_1.promises.readFile(packageJsonPath, 'utf8');
|
|
763
|
+
const packageJson = JSON.parse(packageJsonContent);
|
|
764
|
+
const updateDependency = (deps, name, newVersion) => {
|
|
765
|
+
const oldVersion = deps[name];
|
|
766
|
+
const execResult = /^[\^~]/.exec(oldVersion);
|
|
767
|
+
deps[name] = `${execResult ? execResult[0] : ''}${newVersion}`;
|
|
768
|
+
};
|
|
769
|
+
for (const [name, targetVersion] of plan.packagesToUpdate.entries()) {
|
|
770
|
+
logger.info(`Updating package.json with dependency ${name} to version ${targetVersion}...`);
|
|
771
|
+
if (packageJson.dependencies && packageJson.dependencies[name]) {
|
|
772
|
+
updateDependency(packageJson.dependencies, name, targetVersion);
|
|
773
|
+
if (packageJson.devDependencies) {
|
|
774
|
+
delete packageJson.devDependencies[name];
|
|
775
|
+
}
|
|
776
|
+
if (packageJson.peerDependencies) {
|
|
777
|
+
delete packageJson.peerDependencies[name];
|
|
778
|
+
}
|
|
779
|
+
}
|
|
780
|
+
else if (packageJson.devDependencies && packageJson.devDependencies[name]) {
|
|
781
|
+
updateDependency(packageJson.devDependencies, name, targetVersion);
|
|
782
|
+
if (packageJson.peerDependencies) {
|
|
783
|
+
delete packageJson.peerDependencies[name];
|
|
784
|
+
}
|
|
785
|
+
}
|
|
786
|
+
else if (packageJson.peerDependencies && packageJson.peerDependencies[name]) {
|
|
787
|
+
updateDependency(packageJson.peerDependencies, name, targetVersion);
|
|
788
|
+
}
|
|
789
|
+
else {
|
|
790
|
+
if (!packageJson.dependencies) {
|
|
791
|
+
packageJson.dependencies = {};
|
|
792
|
+
}
|
|
793
|
+
packageJson.dependencies[name] = `^${targetVersion}`;
|
|
794
|
+
}
|
|
795
|
+
}
|
|
796
|
+
const eofMatches = packageJsonContent.match(/\r?\n$/);
|
|
797
|
+
const eof = eofMatches?.[0] ?? '';
|
|
798
|
+
const newContent = JSON.stringify(packageJson, null, 2) + eof;
|
|
799
|
+
await node_fs_1.promises.writeFile(packageJsonPath, newContent, 'utf8');
|
|
800
|
+
}
|
|
801
|
+
//# sourceMappingURL=update-resolver.js.map
|