@comet/upgrade 1.13.0 → 1.15.0

package/README.md

@@ -14,6 +14,12 @@ For example:
 npx @comet/upgrade v4
 ```
 
+You can also run a single upgrade script by providing the path to the script:
+
+```sh
+npx @comet/upgrade v7/hide-graphql-field-suggestions.ts
+```
+
 ## Create a new upgrade script
 
 1. Start the development process:

package/lib/index.js

@@ -39,29 +39,31 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
 const execute_command_util_1 = require("./util/execute-command.util");
-const VERSION_NUMBER = /^v?\d+$/;
 const microservices = ["api", "admin", "site"];
 function microserviceExists(microservice) {
     return fs_1.default.existsSync(`${microservice}/package.json`);
 }
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
-        let targetVersionArg = process.argv[2];
+        const targetVersionArg = process.argv[2];
         if (targetVersionArg === undefined) {
             console.error("Missing target version! Usage: npx @comet/upgrade <version>");
             process.exit(-1);
         }
-        if (!VERSION_NUMBER.test(targetVersionArg)) {
+        const isUpgradeScript = fs_1.default.existsSync(path_1.default.join(__dirname, targetVersionArg.replace(/\.ts$/, ".js")));
+        if (isUpgradeScript) {
+            yield runUpgradeScript(targetVersionArg.replace(/\.ts$/, ".js"));
+            return;
+        }
+        const targetVersion = semver_1.default.coerce(targetVersionArg, { includePrerelease: true });
+        if (!targetVersion) {
             console.error("Can't parse version number. Example usage: npx @comet/upgrade v4");
             process.exit(-1);
         }
-        if (targetVersionArg.startsWith("v")) {
-            targetVersionArg = targetVersionArg.substring(1);
-        }
-        const targetVersion = Number(targetVersionArg);
-        const scriptsFolder = path_1.default.join(__dirname, `v${targetVersion}`);
+        const targetVersionFolder = `v${targetVersion.major}`;
+        const scriptsFolder = path_1.default.join(__dirname, targetVersionFolder);
         if (!fs_1.default.existsSync(scriptsFolder)) {
-            console.error(`Can't find target version 'v${targetVersionArg}'`);
+            console.error(`Can't find upgrade scripts for target version '${targetVersionFolder}'`);
             listTargetVersions();
             process.exit(-1);
         }
@@ -69,7 +71,7 @@ function main() {
         console.info(`Upgrading from v${currentVersion} to v${targetVersion}`);
         console.info("Updating dependencies");
         yield updateDependencies(targetVersion);
-        yield runUpgradeScripts(targetVersion);
+        yield runUpgradeScripts(targetVersionFolder);
         yield runEslintFix();
     });
 }
@@ -130,25 +132,31 @@ function updateDependencies(targetVersion) {
                 "--no-audit",
                 "--loglevel",
                 "error",
-                ...dependencies.map((dependency) => `${dependency}@${targetVersion}`),
-                ...devDependencies.map((dependency) => `${dependency}@${targetVersion}`),
+                targetVersion.prerelease.length > 0 ? "--save-exact" : "",
+                ...dependencies.map((dependency) => `${dependency}@${targetVersion.version}`),
+                ...devDependencies.map((dependency) => `${dependency}@${targetVersion.version}`),
             ]);
         }
     });
 }
-function runUpgradeScripts(targetVersion) {
+function runUpgradeScripts(targetVersionFolder) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const scriptsFolder = path_1.default.join(__dirname, `v${targetVersion}`);
+        const scriptsFolder = path_1.default.join(__dirname, targetVersionFolder);
         for (const fileName of fs_1.default.readdirSync(scriptsFolder)) {
-            const upgradeScript = yield (_a = path_1.default.join(scriptsFolder, fileName), Promise.resolve().then(() => __importStar(require(_a))));
-            try {
-                yield upgradeScript.default();
-            }
-            catch (error) {
-                console.error(`Script 'v${targetVersion}/${fileName}' failed to execute. See original error below`);
-                console.error(error);
-            }
+            yield runUpgradeScript(path_1.default.join(targetVersionFolder, fileName));
+        }
+    });
+}
+function runUpgradeScript(script) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const upgradeScript = yield (_a = path_1.default.join(__dirname, script), Promise.resolve().then(() => __importStar(require(_a))));
+        try {
+            yield upgradeScript.default();
+        }
+        catch (error) {
+            console.error(`Script '${script}' failed to execute. See original error below`);
+            console.error(error);
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@comet/upgrade",
-    "version": "1.13.0",
+    "version": "1.15.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {
@@ -31,14 +31,14 @@
         "eslint": "^8.56.0",
         "glob": "^10.3.10",
         "prettier": "^2.8.1",
-        "semver": "^7.3.8",
+        "semver": "^7.6.2",
         "ts-morph": "^22.0.0"
     },
     "devDependencies": {
         "@comet/eslint-config": "^3.2.1",
         "@types/node": "^20.0.0",
         "@types/prettier": "^2.7.1",
-        "@types/semver": "^7.3.13",
+        "@types/semver": "^7.5.8",
         "husky": "^8.0.2",
         "lint-staged": "^13.1.0",
         "npm-run-all": "^4.1.5",