@tramvai/cli 6.68.2 → 6.68.4
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/commands/new/steps/installDependencies.d.ts.map +1 -1
- package/lib/commands/new/steps/installDependencies.js +2 -1
- package/lib/commands/new/steps/installDependencies.js.map +1 -1
- package/lib/commands/update/checkVersionValidator.d.ts +1 -1
- package/lib/commands/update/checkVersionValidator.d.ts.map +1 -1
- package/lib/commands/update/checkVersionValidator.js +3 -2
- package/lib/commands/update/checkVersionValidator.js.map +1 -1
- package/lib/commands/update/dependantLibs.d.ts +1 -1
- package/lib/commands/update/dependantLibs.d.ts.map +1 -1
- package/lib/commands/update/dependantLibs.js +3 -2
- package/lib/commands/update/dependantLibs.js.map +1 -1
- package/lib/commands/update/update.d.ts.map +1 -1
- package/lib/commands/update/update.js +6 -3
- package/lib/commands/update/update.js.map +1 -1
- package/lib/commands/update/updatePackageJson.d.ts +1 -1
- package/lib/commands/update/updatePackageJson.d.ts.map +1 -1
- package/lib/commands/update/updatePackageJson.js +7 -7
- package/lib/commands/update/updatePackageJson.js.map +1 -1
- package/lib/utils/commands/dependencies/getLatestPackageVersion.d.ts +1 -1
- package/lib/utils/commands/dependencies/getLatestPackageVersion.d.ts.map +1 -1
- package/lib/utils/commands/dependencies/getLatestPackageVersion.js +4 -2
- package/lib/utils/commands/dependencies/getLatestPackageVersion.js.map +1 -1
- package/lib/utils/commands/dependencies/packageHasVersion.d.ts +1 -1
- package/lib/utils/commands/dependencies/packageHasVersion.d.ts.map +1 -1
- package/lib/utils/commands/dependencies/packageHasVersion.js +3 -2
- package/lib/utils/commands/dependencies/packageHasVersion.js.map +1 -1
- package/package.json +10 -9
- package/src/commands/new/steps/installDependencies.ts +2 -1
- package/src/commands/update/checkVersionValidator.ts +4 -2
- package/src/commands/update/dependantLibs.ts +3 -1
- package/src/commands/update/update.ts +6 -3
- package/src/commands/update/updatePackageJson.spec.ts +19 -3
- package/src/commands/update/updatePackageJson.ts +7 -2
- package/src/utils/commands/dependencies/getLatestPackageVersion.ts +4 -1
- package/src/utils/commands/dependencies/packageHasVersion.ts +7 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installDependencies.d.ts","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"installDependencies.d.ts","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAoG9C,wBAAsB,mBAAmB,CAAC,EACxC,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,gBAAgB,EAChB,SAAS,GACV,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,IAAI,CAAC;IACX,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,iBAyDA"}
|
|
@@ -65,7 +65,8 @@ const devDependencies = [
|
|
|
65
65
|
];
|
|
66
66
|
const rootDependencies = {
|
|
67
67
|
devDependencies: ['@tramvai/cli'],
|
|
68
|
-
|
|
68
|
+
// with monorepo template and workspaces, old `tslib` version can be hoisted in the root
|
|
69
|
+
dependencies: ['tslib@^2.0.3'],
|
|
69
70
|
};
|
|
70
71
|
function getBaseDeps(type, isDev) {
|
|
71
72
|
const depsMap = DEPS[type];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installDependencies.js","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAK1B,MAAM,wBAAwB,GAAG;IAC/B,kBAAkB;IAClB,wBAAwB;IACxB,oBAAoB;IACpB,qBAAqB;IACrB,yBAAyB;IACzB,qBAAqB;IACrB,cAAc;IACd,qBAAqB;IACrB,gCAAgC;IAChC,SAAS;CACV,CAAC;AAEF,MAAM,IAAI,GAA4E;IACpF,GAAG,EAAE;QACH,YAAY,EAAE;YACZ,eAAe;YACf,gBAAgB;YAChB,gBAAgB;YAChB,wBAAwB;YACxB,mCAAmC;YACnC,wBAAwB;YACxB,wBAAwB;YACxB,qBAAqB;YACrB,wBAAwB;YACxB,wBAAwB;YACxB,wBAAwB;YACxB,wBAAwB;YACxB,OAAO;YACP,WAAW;YACX,cAAc;SACf;QACD,mBAAmB,EAAE,wBAAwB;KAC9C;IACD,WAAW,EAAE;QACX,YAAY,EAAE;YACZ,eAAe;YACf,gBAAgB;YAChB,gBAAgB;YAChB,yBAAyB;YACzB,OAAO;YACP,WAAW;YACX,cAAc;SACf;QACD,mBAAmB,EAAE,CAAC,GAAG,wBAAwB,EAAE,yBAAyB,CAAC;KAC9E;CACF,CAAC;AAEF,MAAM,eAAe,GAAG;IACtB,wBAAwB;IACxB,8BAA8B;IAC9B,gCAAgC;IAChC,cAAc;IACd,sBAAsB;IACtB,2BAA2B;IAC3B,gCAAgC;IAChC,gBAAgB;IAChB,UAAU;IACV,aAAa;IACb,0BAA0B;IAC1B,YAAY;CACb,CAAC;AAEF,MAAM,gBAAgB,GAAG;IACvB,eAAe,EAAE,CAAC,cAAc,CAAC;IACjC,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"installDependencies.js","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAK1B,MAAM,wBAAwB,GAAG;IAC/B,kBAAkB;IAClB,wBAAwB;IACxB,oBAAoB;IACpB,qBAAqB;IACrB,yBAAyB;IACzB,qBAAqB;IACrB,cAAc;IACd,qBAAqB;IACrB,gCAAgC;IAChC,SAAS;CACV,CAAC;AAEF,MAAM,IAAI,GAA4E;IACpF,GAAG,EAAE;QACH,YAAY,EAAE;YACZ,eAAe;YACf,gBAAgB;YAChB,gBAAgB;YAChB,wBAAwB;YACxB,mCAAmC;YACnC,wBAAwB;YACxB,wBAAwB;YACxB,qBAAqB;YACrB,wBAAwB;YACxB,wBAAwB;YACxB,wBAAwB;YACxB,wBAAwB;YACxB,OAAO;YACP,WAAW;YACX,cAAc;SACf;QACD,mBAAmB,EAAE,wBAAwB;KAC9C;IACD,WAAW,EAAE;QACX,YAAY,EAAE;YACZ,eAAe;YACf,gBAAgB;YAChB,gBAAgB;YAChB,yBAAyB;YACzB,OAAO;YACP,WAAW;YACX,cAAc;SACf;QACD,mBAAmB,EAAE,CAAC,GAAG,wBAAwB,EAAE,yBAAyB,CAAC;KAC9E;CACF,CAAC;AAEF,MAAM,eAAe,GAAG;IACtB,wBAAwB;IACxB,8BAA8B;IAC9B,gCAAgC;IAChC,cAAc;IACd,sBAAsB;IACtB,2BAA2B;IAC3B,gCAAgC;IAChC,gBAAgB;IAChB,UAAU;IACV,aAAa;IACb,0BAA0B;IAC1B,YAAY;CACb,CAAC;AAEF,MAAM,gBAAgB,GAAG;IACvB,eAAe,EAAE,CAAC,cAAc,CAAC;IACjC,wFAAwF;IACxF,YAAY,EAAE,CAAC,cAAc,CAAC;CAC/B,CAAC;AAEF,SAAS,WAAW,CAAC,IAAU,EAAE,KAAc;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAC7C,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;IAChE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;IAE9E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AAC1C,CAAC;AAED,SAAS,OAAO,CAAC,IAAU,EAAE,OAA+C;IAC1E,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAEjE,OAAO,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAA+C;IACnF,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAEjE,IAAI,OAAO,EAAE,MAAM,EAAE;QACnB,OAAO,QAAQ,CAAC;KACjB;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,WAAW,CAAC,IAAU;IAC7B,OAAO,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC;AAC1C,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAC,EACxC,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,gBAAgB,EAChB,SAAS,GAOV;IACC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC;IAEpD,MAAM,OAAO,GAAmB;QAC9B,GAAG,EAAE,QAAQ;QACb,GAAG,EAAE;YACH,uBAAuB,EAAE,MAAM;SAChC;QACD,KAAK,EAAE,SAAS;QAChB,SAAS;KACV,CAAC;IAEF,qHAAqH;IACrH,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,mCAAmC,CAAC,CAAC;QAEhF,MAAM,cAAc,CAAC,OAAO,CAAC;YAC3B,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;YACvD,aAAa,EAAE,IAAI;YACnB,GAAG,OAAO;YACV,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,+BAA+B,CAAC,CAAC;QAE5E,MAAM,cAAc,CAAC,OAAO,CAAC;YAC3B,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;YACxD,aAAa,EAAE,KAAK;YACpB,GAAG,OAAO;YACV,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;KACJ;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,CAAC;IAE3E,MAAM,cAAc,CAAC,OAAO,CAAC;QAC3B,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC;QACxB,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,CAAC;IAE3E,MAAM,cAAc,CAAC,OAAO,CAAC;QAC3B,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QACzC,aAAa,EAAE,IAAI;QACnB,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,IAAI,gBAAgB,KAAK,MAAM,EAAE;QAC/B,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,+BAA+B,CAAC,CAAC;QAE5E,MAAM,cAAc,CAAC,OAAO,CAAC;YAC3B,YAAY,EAAE,WAAW,CAAC,IAAI,CAAC;YAC/B,aAAa,EAAE,IAAI;YACnB,GAAG,OAAO;SACX,CAAC,CAAC;KACJ;AACH,CAAC;AArED,kDAqEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkVersionValidator.d.ts","sourceRoot":"","sources":["../../../src/commands/update/checkVersionValidator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"checkVersionValidator.d.ts","sourceRoot":"","sources":["../../../src/commands/update/checkVersionValidator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,eAAO,MAAM,YAAY,kCAA+C,MAAM;;;EAkB7E,CAAC"}
|
|
@@ -2,14 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.checkVersion = void 0;
|
|
4
4
|
const packageHasVersion_1 = require("../../utils/commands/dependencies/packageHasVersion");
|
|
5
|
-
const checkVersion = async (
|
|
5
|
+
const checkVersion = async (context, { to: version = 'latest' }) => {
|
|
6
6
|
if (version === 'latest') {
|
|
7
7
|
return {
|
|
8
8
|
name: 'checkVersion',
|
|
9
9
|
status: 'ok',
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
|
-
|
|
12
|
+
const registryUrl = await context.packageManager.getRegistryUrl();
|
|
13
|
+
if (await (0, packageHasVersion_1.packageHasVersion)('@tramvai/core', version, registryUrl)) {
|
|
13
14
|
return {
|
|
14
15
|
name: 'checkVersion',
|
|
15
16
|
status: 'ok',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkVersionValidator.js","sourceRoot":"","sources":["../../../src/commands/update/checkVersionValidator.ts"],"names":[],"mappings":";;;AAAA,2FAAwF;AAGjF,MAAM,YAAY,GAAG,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"checkVersionValidator.js","sourceRoot":"","sources":["../../../src/commands/update/checkVersionValidator.ts"],"names":[],"mappings":";;;AAAA,2FAAwF;AAGjF,MAAM,YAAY,GAAG,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAU,EAAE,EAAE;IAChF,IAAI,OAAO,KAAK,QAAQ,EAAE;QACxB,OAAO;YACL,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,IAAI;SACb,CAAC;KACH;IAED,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAElE,IAAI,MAAM,IAAA,qCAAiB,EAAC,eAAe,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAClE,OAAO;YACL,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,IAAI;SACb,CAAC;KACH;IAED,MAAM,IAAI,KAAK,CAAC,mBAAmB,OAAO,iBAAiB,CAAC,CAAC;AAC/D,CAAC,CAAC;AAlBW,QAAA,YAAY,gBAkBvB"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { Ora } from 'ora';
|
|
2
|
-
export declare const getLibPackageVersion: (name: string, version: string, resolvedVersion: string, spinner: Ora) => Promise<string | undefined>;
|
|
2
|
+
export declare const getLibPackageVersion: (name: string, version: string, resolvedVersion: string, registryUrl: string, spinner: Ora) => Promise<string | undefined>;
|
|
3
3
|
//# sourceMappingURL=dependantLibs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependantLibs.d.ts","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG/B,eAAO,MAAM,oBAAoB,SACzB,MAAM,WACH,MAAM,mBACE,MAAM,
|
|
1
|
+
{"version":3,"file":"dependantLibs.d.ts","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG/B,eAAO,MAAM,oBAAoB,SACzB,MAAM,WACH,MAAM,mBACE,MAAM,eACV,MAAM,WACV,GAAG,KACX,QAAQ,MAAM,GAAG,SAAS,CAiC5B,CAAC"}
|
|
@@ -5,11 +5,12 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const latest_version_1 = tslib_1.__importDefault(require("latest-version"));
|
|
6
6
|
const package_json_1 = tslib_1.__importDefault(require("package-json"));
|
|
7
7
|
const tramvaiVersions_1 = require("../../utils/tramvaiVersions");
|
|
8
|
-
const getLibPackageVersion = async (name, version, resolvedVersion, spinner) => {
|
|
8
|
+
const getLibPackageVersion = async (name, version, resolvedVersion, registryUrl, spinner) => {
|
|
9
9
|
const unifiedModule = tramvaiVersions_1.DEPENDANT_LIBS_MAP.get(name);
|
|
10
10
|
if (!unifiedModule) {
|
|
11
11
|
try {
|
|
12
|
-
|
|
12
|
+
// @ts-expect-error uncomplete type definition, `registryUrl` is supported
|
|
13
|
+
return await (0, latest_version_1.default)(name, { version, registryUrl });
|
|
13
14
|
}
|
|
14
15
|
catch (e) {
|
|
15
16
|
// clear the spinner to be able to log info that should be preserved in the output
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependantLibs.js","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":";;;;AAAA,4EAAqD;AACrD,wEAA0C;AAE1C,iEAAiE;AAE1D,MAAM,oBAAoB,GAAG,KAAK,EACvC,IAAY,EACZ,OAAe,EACf,eAAuB,EACvB,OAAY,EACiB,EAAE;IAC/B,MAAM,aAAa,GAAG,oCAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,aAAa,EAAE;QAClB,IAAI;YACF,OAAO,MAAM,IAAA,wBAAuB,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"dependantLibs.js","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":";;;;AAAA,4EAAqD;AACrD,wEAA0C;AAE1C,iEAAiE;AAE1D,MAAM,oBAAoB,GAAG,KAAK,EACvC,IAAY,EACZ,OAAe,EACf,eAAuB,EACvB,WAAmB,EACnB,OAAY,EACiB,EAAE;IAC/B,MAAM,aAAa,GAAG,oCAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,aAAa,EAAE;QAClB,IAAI;YACF,0EAA0E;YAC1E,OAAO,MAAM,IAAA,wBAAuB,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;SACtE;QAAC,OAAO,CAAC,EAAE;YACV,kFAAkF;YAClF,gFAAgF;YAChF,OAAO,CAAC,KAAK,EAAE,CAAC;YAEhB,OAAO,CAAC,IAAI,CAAC,6CAA6C,IAAI;6CACvB,CAAC,CAAC;YAEzC,OAAO;SACR;KACF;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,sBAAc,EAAC,aAAa,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;IAE3F,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACvB,kFAAkF;QAClF,gFAAgF;QAChF,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,OAAO,CAAC,IAAI,CAAC,6CAA6C,IAAI;6CACrB,CAAC,CAAC;QAE3C,OAAO;KACR;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAC;AAvCW,QAAA,oBAAoB,wBAuC/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAQ1D,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;kCAGS,OAAO,wBACiB,MAAM,KACtC,QAAQ,aAAa,CAAC;AAHzB,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAQ1D,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;kCAGS,OAAO,wBACiB,MAAM,KACtC,QAAQ,aAAa,CAAC;AAHzB,wBA0EE"}
|
|
@@ -6,7 +6,10 @@ const updatePackageJson_1 = require("./updatePackageJson");
|
|
|
6
6
|
const checkVersions_1 = require("../../utils/commands/dependencies/checkVersions");
|
|
7
7
|
const findTramvaiVersion_1 = require("../../utils/commands/dependencies/findTramvaiVersion");
|
|
8
8
|
exports.default = async (context, { to: version = 'latest', tag }) => {
|
|
9
|
-
const
|
|
9
|
+
const registry = await context.packageManager.getRegistryUrl();
|
|
10
|
+
const resolvedVersion = tag
|
|
11
|
+
? version
|
|
12
|
+
: await (0, getLatestPackageVersion_1.getLatestPackageVersion)('@tramvai/cli', registry, version);
|
|
10
13
|
const currentVersion = await (0, findTramvaiVersion_1.findTramvaiVersion)();
|
|
11
14
|
if (!currentVersion) {
|
|
12
15
|
throw new Error('Could not resolve tramvai version from package.json. Do you have @tramvai/core installed?');
|
|
@@ -20,9 +23,9 @@ exports.default = async (context, { to: version = 'latest', tag }) => {
|
|
|
20
23
|
message: `Next tramvai version resolved to ${tag ? 'tag' : 'version'} "${resolvedVersion}", current version is "${currentVersion}"`,
|
|
21
24
|
});
|
|
22
25
|
if (context.packageManager.workspaces) {
|
|
23
|
-
await Promise.all(context.packageManager.workspaces.map((directory) => (0, updatePackageJson_1.updatePackageJson)(version, resolvedVersion, currentVersion, tag, directory)));
|
|
26
|
+
await Promise.all(context.packageManager.workspaces.map((directory) => (0, updatePackageJson_1.updatePackageJson)(version, resolvedVersion, currentVersion, registry, tag, directory)));
|
|
24
27
|
}
|
|
25
|
-
await (0, updatePackageJson_1.updatePackageJson)(version, resolvedVersion, currentVersion, tag);
|
|
28
|
+
await (0, updatePackageJson_1.updatePackageJson)(version, resolvedVersion, currentVersion, registry, tag);
|
|
26
29
|
context.logger.event({
|
|
27
30
|
type: 'info',
|
|
28
31
|
event: 'install',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":";;AAEA,uGAAoG;AACpG,uEAAoE;AACpE,2DAAwD;AACxD,mFAAgF;AAEhF,6FAA0F;AAO1F,kBAAe,KAAK,EAClB,OAAgB,EAChB,EAAE,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAE,GAAG,EAAU,EACf,EAAE;IAC1B,MAAM,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":";;AAEA,uGAAoG;AACpG,uEAAoE;AACpE,2DAAwD;AACxD,mFAAgF;AAEhF,6FAA0F;AAO1F,kBAAe,KAAK,EAClB,OAAgB,EAChB,EAAE,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAE,GAAG,EAAU,EACf,EAAE;IAC1B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAC/D,MAAM,eAAe,GAAG,GAAG;QACzB,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,IAAA,iDAAuB,EAAC,cAAc,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACrE,MAAM,cAAc,GAAG,MAAM,IAAA,uCAAkB,GAAE,CAAC;IAElD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;KACH;IAED,IAAI,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,eAAe,EAAE;QACpE,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;KACH;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,oCAAoC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,KAAK,eAAe,0BAA0B,cAAc,GAAG;KACpI,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE;QACrC,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAClD,IAAA,qCAAiB,EAAC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,CAAC,CACtF,CACF,CAAC;KACH;IAED,MAAM,IAAA,qCAAiB,EAAC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IAEjF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,yBAAyB;KACnC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAE3D,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE;QACzC,6CAA6C;QAC7C,8BAA8B;QAC9B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,OAAO,EAAE,0BAA0B;SACpC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;KAC3D;IAED,MAAM,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;IAEvB,MAAM,IAAA,6BAAa,EAAC,OAAO,CAAC,CAAC;IAE7B,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE;QACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,QAAQ;YACf,OAAO,EACL,8FAA8F;SACjG,CAAC,CAAC;KACJ;IAED,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const updatePackageJson: (version: string, resolvedVersion: string, currentVersion: string, tag?: boolean, path?: string) => Promise<void>;
|
|
1
|
+
export declare const updatePackageJson: (version: string, resolvedVersion: string, currentVersion: string, registryUrl: string, tag?: boolean, path?: string) => Promise<void>;
|
|
2
2
|
//# sourceMappingURL=updatePackageJson.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updatePackageJson.d.ts","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"updatePackageJson.d.ts","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"AA6DA,eAAO,MAAM,iBAAiB,YACnB,MAAM,mBACE,MAAM,kBACP,MAAM,eACT,MAAM,QACb,OAAO,iCA0Cd,CAAC"}
|
|
@@ -9,7 +9,7 @@ const path_1 = require("path");
|
|
|
9
9
|
const packageHasVersion_1 = require("../../utils/commands/dependencies/packageHasVersion");
|
|
10
10
|
const dependantLibs_1 = require("./dependantLibs");
|
|
11
11
|
const tramvaiVersions_1 = require("../../utils/tramvaiVersions");
|
|
12
|
-
const updateDependencies = (dependencies = {}, version, resolvedVersion, currentVersion, tag, spinner) => {
|
|
12
|
+
const updateDependencies = (dependencies = {}, version, resolvedVersion, currentVersion, tag, registryUrl, spinner) => {
|
|
13
13
|
return (0, p_map_1.default)(Object.keys(dependencies), async (dep) => {
|
|
14
14
|
let nextVersion;
|
|
15
15
|
if ((0, tramvaiVersions_1.isUnifiedVersion)(dep) && dependencies[dep] === currentVersion) {
|
|
@@ -18,11 +18,11 @@ const updateDependencies = (dependencies = {}, version, resolvedVersion, current
|
|
|
18
18
|
else if ((0, tramvaiVersions_1.isDependantLib)(dep)) {
|
|
19
19
|
const libVersion = tag
|
|
20
20
|
? resolvedVersion
|
|
21
|
-
: await (0, dependantLibs_1.getLibPackageVersion)(dep, version, resolvedVersion, spinner);
|
|
21
|
+
: await (0, dependantLibs_1.getLibPackageVersion)(dep, version, resolvedVersion, registryUrl, spinner);
|
|
22
22
|
nextVersion = libVersion;
|
|
23
23
|
}
|
|
24
24
|
if (nextVersion) {
|
|
25
|
-
const depHasVersion = await (0, packageHasVersion_1.packageHasVersion)(dep, nextVersion);
|
|
25
|
+
const depHasVersion = await (0, packageHasVersion_1.packageHasVersion)(dep, nextVersion, registryUrl);
|
|
26
26
|
// clear the spinner to be able to log info that should be preserved in the output
|
|
27
27
|
// the idea borrowed from [here](https://github.com/sindresorhus/ora/issues/120)
|
|
28
28
|
spinner.clear();
|
|
@@ -43,15 +43,15 @@ const updateDependencies = (dependencies = {}, version, resolvedVersion, current
|
|
|
43
43
|
concurrency: 10,
|
|
44
44
|
});
|
|
45
45
|
};
|
|
46
|
-
const updatePackageJson = async (version, resolvedVersion, currentVersion, tag, path = '.') => {
|
|
46
|
+
const updatePackageJson = async (version, resolvedVersion, currentVersion, registryUrl, tag, path = '.') => {
|
|
47
47
|
const packageJsonPath = (0, path_1.resolve)(path, 'package.json');
|
|
48
48
|
const file = fs_1.default.readFileSync(packageJsonPath);
|
|
49
49
|
const content = JSON.parse(file.toString());
|
|
50
50
|
const spinner = (0, ora_1.default)(`Updating package.json versions`).start();
|
|
51
51
|
try {
|
|
52
|
-
await updateDependencies(content.dependencies, version, resolvedVersion, currentVersion, tag, spinner);
|
|
53
|
-
await updateDependencies(content.devDependencies, version, resolvedVersion, currentVersion, tag, spinner);
|
|
54
|
-
await updateDependencies(content.peerDependencies, version, resolvedVersion, currentVersion, tag, spinner);
|
|
52
|
+
await updateDependencies(content.dependencies, version, resolvedVersion, currentVersion, tag, registryUrl, spinner);
|
|
53
|
+
await updateDependencies(content.devDependencies, version, resolvedVersion, currentVersion, tag, registryUrl, spinner);
|
|
54
|
+
await updateDependencies(content.peerDependencies, version, resolvedVersion, currentVersion, tag, registryUrl, spinner);
|
|
55
55
|
fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(content, null, 2));
|
|
56
56
|
}
|
|
57
57
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updatePackageJson.js","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":";;;;AAAA,oDAAoB;AACpB,0DAAyB;AAEzB,sDAAsB;AACtB,+BAA+B;AAC/B,2FAAwF;AACxF,mDAAuD;AACvD,iEAA+E;AAE/E,MAAM,kBAAkB,GAAG,CACzB,eAAuC,EAAE,EACzC,OAAe,EACf,eAAuB,EACvB,cAAsB,EACtB,GAAY,EACZ,OAAY,EACZ,EAAE;IACF,OAAO,IAAA,eAAI,EACT,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EACzB,KAAK,EAAE,GAAG,EAAE,EAAE;QACZ,IAAI,WAA+B,CAAC;QAEpC,IAAI,IAAA,kCAAgB,EAAC,GAAG,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,KAAK,cAAc,EAAE;YACjE,WAAW,GAAG,eAAe,CAAC;SAC/B;aAAM,IAAI,IAAA,gCAAc,EAAC,GAAG,CAAC,EAAE;YAC9B,MAAM,UAAU,GAAG,GAAG;gBACpB,CAAC,CAAC,eAAe;gBACjB,CAAC,CAAC,MAAM,IAAA,oCAAoB,EAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"updatePackageJson.js","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const getLatestPackageVersion: (packageName: string, version?: string, silent?: boolean) => Promise<string>;
|
|
1
|
+
export declare const getLatestPackageVersion: (packageName: string, registryUrl: string, version?: string, silent?: boolean) => Promise<string>;
|
|
2
2
|
//# sourceMappingURL=getLatestPackageVersion.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLatestPackageVersion.d.ts","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/getLatestPackageVersion.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,uBAAuB,gBACrB,MAAM,
|
|
1
|
+
{"version":3,"file":"getLatestPackageVersion.d.ts","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/getLatestPackageVersion.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,uBAAuB,gBACrB,MAAM,eACN,MAAM,wDAmBpB,CAAC"}
|
|
@@ -4,12 +4,14 @@ exports.getLatestPackageVersion = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const ora_1 = tslib_1.__importDefault(require("ora"));
|
|
6
6
|
const latest_version_1 = tslib_1.__importDefault(require("latest-version"));
|
|
7
|
-
const getLatestPackageVersion = async (packageName, version = 'latest', silent = false) => {
|
|
7
|
+
const getLatestPackageVersion = async (packageName, registryUrl, version = 'latest', silent = false) => {
|
|
8
8
|
const spinner = silent
|
|
9
9
|
? null
|
|
10
10
|
: (0, ora_1.default)(`Resolving the highest version satifying to ${version}`).start();
|
|
11
11
|
try {
|
|
12
|
-
|
|
12
|
+
// underlying `registry-url` package uses only `.npmrc` file to resolve registry URL
|
|
13
|
+
// @ts-expect-error uncomplete type definition, `registryUrl` is supported
|
|
14
|
+
const result = await (0, latest_version_1.default)(packageName, { version, registryUrl });
|
|
13
15
|
return result;
|
|
14
16
|
}
|
|
15
17
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLatestPackageVersion.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/getLatestPackageVersion.ts"],"names":[],"mappings":";;;;AAAA,sDAAsB;AACtB,4EAA2C;AAEpC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,WAAmB,EACnB,OAAO,GAAG,QAAQ,EAClB,MAAM,GAAG,KAAK,EACd,EAAE;IACF,MAAM,OAAO,GAAG,MAAM;QACpB,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,IAAA,aAAG,EAAC,8CAA8C,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;IAEzE,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAa,EAAC,WAAW,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"getLatestPackageVersion.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/getLatestPackageVersion.ts"],"names":[],"mappings":";;;;AAAA,sDAAsB;AACtB,4EAA2C;AAEpC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,WAAmB,EACnB,WAAmB,EACnB,OAAO,GAAG,QAAQ,EAClB,MAAM,GAAG,KAAK,EACd,EAAE;IACF,MAAM,OAAO,GAAG,MAAM;QACpB,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,IAAA,aAAG,EAAC,8CAA8C,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;IAEzE,IAAI;QACF,oFAAoF;QACpF,0EAA0E;QAC1E,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAa,EAAC,WAAW,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;QAE1E,OAAO,MAAM,CAAC;KACf;YAAS;QACR,IAAI,OAAO,EAAE;YACX,OAAO,CAAC,IAAI,EAAE,CAAC;SAChB;KACF;AACH,CAAC,CAAC;AArBW,QAAA,uBAAuB,2BAqBlC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const packageHasVersion: (packageName: string, version: string) => Promise<boolean>;
|
|
1
|
+
export declare const packageHasVersion: (packageName: string, version: string, registryUrl: string) => Promise<boolean>;
|
|
2
2
|
//# sourceMappingURL=packageHasVersion.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageHasVersion.d.ts","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/packageHasVersion.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"packageHasVersion.d.ts","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/packageHasVersion.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iBAAiB,gBACf,MAAM,WACV,MAAM,eACF,MAAM,KAClB,QAAQ,OAAO,CAQjB,CAAC"}
|
|
@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.packageHasVersion = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const latest_version_1 = tslib_1.__importDefault(require("latest-version"));
|
|
6
|
-
const packageHasVersion = async (packageName, version) => {
|
|
6
|
+
const packageHasVersion = async (packageName, version, registryUrl) => {
|
|
7
7
|
try {
|
|
8
|
-
|
|
8
|
+
// @ts-expect-error uncomplete type definition, `registryUrl` is supported
|
|
9
|
+
await (0, latest_version_1.default)(packageName, { version, registryUrl });
|
|
9
10
|
return true;
|
|
10
11
|
}
|
|
11
12
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageHasVersion.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/packageHasVersion.ts"],"names":[],"mappings":";;;;AAAA,4EAA2C;AAEpC,MAAM,iBAAiB,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"packageHasVersion.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/packageHasVersion.ts"],"names":[],"mappings":";;;;AAAA,4EAA2C;AAEpC,MAAM,iBAAiB,GAAG,KAAK,EACpC,WAAmB,EACnB,OAAe,EACf,WAAmB,EACD,EAAE;IACpB,IAAI;QACF,0EAA0E;QAC1E,MAAM,IAAA,wBAAa,EAAC,WAAW,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC;AAZW,QAAA,iBAAiB,qBAY5B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/cli",
|
|
3
|
-
"version": "6.68.
|
|
3
|
+
"version": "6.68.4",
|
|
4
4
|
"description": "Cli инструмент для сборки и запуска приложений",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=20.18.1"
|
|
@@ -68,21 +68,21 @@
|
|
|
68
68
|
"@tinkoff/is-modern-lib": "6.1.0",
|
|
69
69
|
"@tinkoff/logger": "^0.10.507",
|
|
70
70
|
"@tinkoff/minicss-class-generator": "0.6.1",
|
|
71
|
-
"@tinkoff/package-manager-wrapper": "0.5.
|
|
71
|
+
"@tinkoff/package-manager-wrapper": "0.5.3",
|
|
72
72
|
"@tinkoff/request-core": "^0.10.0",
|
|
73
73
|
"@tinkoff/request-plugin-protocol-http": "0.15.0",
|
|
74
74
|
"@tinkoff/request-plugin-retry": "^0.3.0",
|
|
75
75
|
"@tinkoff/utils": "^2.1.3",
|
|
76
76
|
"@tinkoff/webpack-dedupe-plugin": "5.0.0",
|
|
77
|
-
"@tramvai/api": "6.68.
|
|
77
|
+
"@tramvai/api": "6.68.4",
|
|
78
78
|
"@tramvai/build": "7.2.0",
|
|
79
|
-
"@tramvai/plugin-babel-transpiler": "6.68.
|
|
80
|
-
"@tramvai/plugin-swc-transpiler": "6.68.
|
|
81
|
-
"@tramvai/plugin-webpack-builder": "6.68.
|
|
82
|
-
"@tramvai/plugin-webpack-pwa": "6.68.
|
|
83
|
-
"@tramvai/react": "6.68.
|
|
79
|
+
"@tramvai/plugin-babel-transpiler": "6.68.4",
|
|
80
|
+
"@tramvai/plugin-swc-transpiler": "6.68.4",
|
|
81
|
+
"@tramvai/plugin-webpack-builder": "6.68.4",
|
|
82
|
+
"@tramvai/plugin-webpack-pwa": "6.68.4",
|
|
83
|
+
"@tramvai/react": "6.68.4",
|
|
84
84
|
"@tramvai/tools-check-versions": "0.8.0",
|
|
85
|
-
"@tramvai/tools-migrate": "0.10.
|
|
85
|
+
"@tramvai/tools-migrate": "0.10.4",
|
|
86
86
|
"ajv": "^8.12.0",
|
|
87
87
|
"ansi-escapes": "^4.3.2",
|
|
88
88
|
"autoprefixer": "^10.4.8",
|
|
@@ -160,6 +160,7 @@
|
|
|
160
160
|
"text-table": "^0.2.0",
|
|
161
161
|
"thread-loader": "^3.0.4",
|
|
162
162
|
"tsconfig-paths-webpack-plugin": "^4.0.1",
|
|
163
|
+
"tslib": "^2.4.0",
|
|
163
164
|
"undici": "^7.16.0",
|
|
164
165
|
"utility-types": "^3.10.0",
|
|
165
166
|
"v8-compile-cache": "^2.3.0",
|
|
@@ -68,7 +68,8 @@ const devDependencies = [
|
|
|
68
68
|
|
|
69
69
|
const rootDependencies = {
|
|
70
70
|
devDependencies: ['@tramvai/cli'],
|
|
71
|
-
|
|
71
|
+
// with monorepo template and workspaces, old `tslib` version can be hoisted in the root
|
|
72
|
+
dependencies: ['tslib@^2.0.3'],
|
|
72
73
|
};
|
|
73
74
|
|
|
74
75
|
function getBaseDeps(type: Type, isDev: boolean) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { packageHasVersion } from '../../utils/commands/dependencies/packageHasVersion';
|
|
2
2
|
import type { Params } from './update';
|
|
3
3
|
|
|
4
|
-
export const checkVersion = async (
|
|
4
|
+
export const checkVersion = async (context, { to: version = 'latest' }: Params) => {
|
|
5
5
|
if (version === 'latest') {
|
|
6
6
|
return {
|
|
7
7
|
name: 'checkVersion',
|
|
@@ -9,7 +9,9 @@ export const checkVersion = async (_, { to: version = 'latest' }: Params) => {
|
|
|
9
9
|
};
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
-
|
|
12
|
+
const registryUrl = await context.packageManager.getRegistryUrl();
|
|
13
|
+
|
|
14
|
+
if (await packageHasVersion('@tramvai/core', version, registryUrl)) {
|
|
13
15
|
return {
|
|
14
16
|
name: 'checkVersion',
|
|
15
17
|
status: 'ok',
|
|
@@ -7,13 +7,15 @@ export const getLibPackageVersion = async (
|
|
|
7
7
|
name: string,
|
|
8
8
|
version: string,
|
|
9
9
|
resolvedVersion: string,
|
|
10
|
+
registryUrl: string,
|
|
10
11
|
spinner: Ora
|
|
11
12
|
): Promise<string | undefined> => {
|
|
12
13
|
const unifiedModule = DEPENDANT_LIBS_MAP.get(name);
|
|
13
14
|
|
|
14
15
|
if (!unifiedModule) {
|
|
15
16
|
try {
|
|
16
|
-
|
|
17
|
+
// @ts-expect-error uncomplete type definition, `registryUrl` is supported
|
|
18
|
+
return await getLatestPackageVersion(name, { version, registryUrl });
|
|
17
19
|
} catch (e) {
|
|
18
20
|
// clear the spinner to be able to log info that should be preserved in the output
|
|
19
21
|
// the idea borrowed from [here](https://github.com/sindresorhus/ora/issues/120)
|
|
@@ -16,7 +16,10 @@ export default async (
|
|
|
16
16
|
context: Context,
|
|
17
17
|
{ to: version = 'latest', tag }: Params
|
|
18
18
|
): Promise<CommandResult> => {
|
|
19
|
-
const
|
|
19
|
+
const registry = await context.packageManager.getRegistryUrl();
|
|
20
|
+
const resolvedVersion = tag
|
|
21
|
+
? version
|
|
22
|
+
: await getLatestPackageVersion('@tramvai/cli', registry, version);
|
|
20
23
|
const currentVersion = await findTramvaiVersion();
|
|
21
24
|
|
|
22
25
|
if (!currentVersion) {
|
|
@@ -40,12 +43,12 @@ export default async (
|
|
|
40
43
|
if (context.packageManager.workspaces) {
|
|
41
44
|
await Promise.all(
|
|
42
45
|
context.packageManager.workspaces.map((directory) =>
|
|
43
|
-
updatePackageJson(version, resolvedVersion, currentVersion, tag, directory)
|
|
46
|
+
updatePackageJson(version, resolvedVersion, currentVersion, registry, tag, directory)
|
|
44
47
|
)
|
|
45
48
|
);
|
|
46
49
|
}
|
|
47
50
|
|
|
48
|
-
await updatePackageJson(version, resolvedVersion, currentVersion, tag);
|
|
51
|
+
await updatePackageJson(version, resolvedVersion, currentVersion, registry, tag);
|
|
49
52
|
|
|
50
53
|
context.logger.event({
|
|
51
54
|
type: 'info',
|
|
@@ -76,7 +76,12 @@ it('should update tramvai deps to latest versions', async () => {
|
|
|
76
76
|
return {};
|
|
77
77
|
});
|
|
78
78
|
|
|
79
|
-
await updatePackageJson(
|
|
79
|
+
await updatePackageJson(
|
|
80
|
+
LATEST_TRAMVAI_VERSION,
|
|
81
|
+
LATEST_TRAMVAI_VERSION,
|
|
82
|
+
CURRENT_TRAMVAI_VERSION,
|
|
83
|
+
'fake-registry'
|
|
84
|
+
);
|
|
80
85
|
|
|
81
86
|
// eslint-disable-next-line jest/no-interpolation-in-snapshots
|
|
82
87
|
expect(mockFsWrite.mock.calls[0]).toMatchInlineSnapshot(`
|
|
@@ -138,7 +143,12 @@ it('prerelease should be resolved and used for dependant libs', async () => {
|
|
|
138
143
|
return {};
|
|
139
144
|
});
|
|
140
145
|
|
|
141
|
-
await updatePackageJson(
|
|
146
|
+
await updatePackageJson(
|
|
147
|
+
'prerelease',
|
|
148
|
+
LATEST_TRAMVAI_VERSION,
|
|
149
|
+
CURRENT_TRAMVAI_VERSION,
|
|
150
|
+
'fake-registry'
|
|
151
|
+
);
|
|
142
152
|
|
|
143
153
|
// eslint-disable-next-line jest/no-interpolation-in-snapshots
|
|
144
154
|
expect(mockFsWrite.mock.calls[0]).toMatchInlineSnapshot(`
|
|
@@ -201,7 +211,13 @@ it('dist tag should be used for dependant libs', async () => {
|
|
|
201
211
|
return {};
|
|
202
212
|
});
|
|
203
213
|
|
|
204
|
-
await updatePackageJson(
|
|
214
|
+
await updatePackageJson(
|
|
215
|
+
'prerelease',
|
|
216
|
+
'prerelease',
|
|
217
|
+
CURRENT_TRAMVAI_VERSION,
|
|
218
|
+
'fake-registry',
|
|
219
|
+
true
|
|
220
|
+
);
|
|
205
221
|
|
|
206
222
|
// eslint-disable-next-line jest/no-interpolation-in-snapshots
|
|
207
223
|
expect(mockFsWrite.mock.calls[0]).toMatchInlineSnapshot(`
|
|
@@ -13,6 +13,7 @@ const updateDependencies = (
|
|
|
13
13
|
resolvedVersion: string,
|
|
14
14
|
currentVersion: string,
|
|
15
15
|
tag: boolean,
|
|
16
|
+
registryUrl: string,
|
|
16
17
|
spinner: Ora
|
|
17
18
|
) => {
|
|
18
19
|
return pMap<string, void>(
|
|
@@ -25,12 +26,12 @@ const updateDependencies = (
|
|
|
25
26
|
} else if (isDependantLib(dep)) {
|
|
26
27
|
const libVersion = tag
|
|
27
28
|
? resolvedVersion
|
|
28
|
-
: await getLibPackageVersion(dep, version, resolvedVersion, spinner);
|
|
29
|
+
: await getLibPackageVersion(dep, version, resolvedVersion, registryUrl, spinner);
|
|
29
30
|
nextVersion = libVersion;
|
|
30
31
|
}
|
|
31
32
|
|
|
32
33
|
if (nextVersion) {
|
|
33
|
-
const depHasVersion = await packageHasVersion(dep, nextVersion);
|
|
34
|
+
const depHasVersion = await packageHasVersion(dep, nextVersion, registryUrl);
|
|
34
35
|
|
|
35
36
|
// clear the spinner to be able to log info that should be preserved in the output
|
|
36
37
|
// the idea borrowed from [here](https://github.com/sindresorhus/ora/issues/120)
|
|
@@ -62,6 +63,7 @@ export const updatePackageJson = async (
|
|
|
62
63
|
version: string,
|
|
63
64
|
resolvedVersion: string,
|
|
64
65
|
currentVersion: string,
|
|
66
|
+
registryUrl: string,
|
|
65
67
|
tag?: boolean,
|
|
66
68
|
path = '.'
|
|
67
69
|
) => {
|
|
@@ -78,6 +80,7 @@ export const updatePackageJson = async (
|
|
|
78
80
|
resolvedVersion,
|
|
79
81
|
currentVersion,
|
|
80
82
|
tag,
|
|
83
|
+
registryUrl,
|
|
81
84
|
spinner
|
|
82
85
|
);
|
|
83
86
|
await updateDependencies(
|
|
@@ -86,6 +89,7 @@ export const updatePackageJson = async (
|
|
|
86
89
|
resolvedVersion,
|
|
87
90
|
currentVersion,
|
|
88
91
|
tag,
|
|
92
|
+
registryUrl,
|
|
89
93
|
spinner
|
|
90
94
|
);
|
|
91
95
|
await updateDependencies(
|
|
@@ -94,6 +98,7 @@ export const updatePackageJson = async (
|
|
|
94
98
|
resolvedVersion,
|
|
95
99
|
currentVersion,
|
|
96
100
|
tag,
|
|
101
|
+
registryUrl,
|
|
97
102
|
spinner
|
|
98
103
|
);
|
|
99
104
|
|
|
@@ -3,6 +3,7 @@ import latestVersion from 'latest-version';
|
|
|
3
3
|
|
|
4
4
|
export const getLatestPackageVersion = async (
|
|
5
5
|
packageName: string,
|
|
6
|
+
registryUrl: string,
|
|
6
7
|
version = 'latest',
|
|
7
8
|
silent = false
|
|
8
9
|
) => {
|
|
@@ -11,7 +12,9 @@ export const getLatestPackageVersion = async (
|
|
|
11
12
|
: ora(`Resolving the highest version satifying to ${version}`).start();
|
|
12
13
|
|
|
13
14
|
try {
|
|
14
|
-
|
|
15
|
+
// underlying `registry-url` package uses only `.npmrc` file to resolve registry URL
|
|
16
|
+
// @ts-expect-error uncomplete type definition, `registryUrl` is supported
|
|
17
|
+
const result = await latestVersion(packageName, { version, registryUrl });
|
|
15
18
|
|
|
16
19
|
return result;
|
|
17
20
|
} finally {
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import latestVersion from 'latest-version';
|
|
2
2
|
|
|
3
|
-
export const packageHasVersion = async (
|
|
3
|
+
export const packageHasVersion = async (
|
|
4
|
+
packageName: string,
|
|
5
|
+
version: string,
|
|
6
|
+
registryUrl: string
|
|
7
|
+
): Promise<boolean> => {
|
|
4
8
|
try {
|
|
5
|
-
|
|
9
|
+
// @ts-expect-error uncomplete type definition, `registryUrl` is supported
|
|
10
|
+
await latestVersion(packageName, { version, registryUrl });
|
|
6
11
|
return true;
|
|
7
12
|
} catch (e) {
|
|
8
13
|
return false;
|