@comet/upgrade 1.21.0 → 1.23.0

package/lib/index.js

@@ -20,7 +20,14 @@ async function main() {
     const isUpgradeScript = targetVersionArg.endsWith(".ts");
     if (isUpgradeScript) {
         if (fs_1.default.existsSync(path_1.default.join(__dirname, targetVersionArg.replace(/\.ts$/, ".js")))) {
-            await runUpgradeScript(targetVersionArg.replace(/\.ts$/, ".js"));
+            const module = await import(path_1.default.join(__dirname, targetVersionArg.replace(/\.ts$/, ".js")));
+            await runUpgradeScript({
+                name: targetVersionArg,
+                stage: "before-install",
+                // Need default.default because of ESM interoperability with CommonJS.
+                // See https://www.typescriptlang.org/docs/handbook/modules/reference.html#node16-nodenext.
+                script: module.default.default,
+            });
             await runEslintFix();
         }
         else {
@@ -43,9 +50,13 @@ async function main() {
     }
     const currentVersion = getCurrentVersion();
     console.info(`Upgrading from v${currentVersion} to v${targetVersion}`);
+    const upgradeScripts = await findUpgradeScripts(targetVersionFolder);
+    const beforeInstallScripts = upgradeScripts.filter((script) => script.stage === "before-install");
+    await runUpgradeScripts(beforeInstallScripts);
     console.info("Updating dependencies");
     await updateDependencies(targetVersion);
-    await runUpgradeScripts(targetVersionFolder);
+    const afterInstallScripts = upgradeScripts.filter((script) => script.stage === "after-install");
+    await runUpgradeScripts(afterInstallScripts);
     await runEslintFix();
 }
 function getCurrentVersion() {
@@ -103,27 +114,38 @@ async function updateDependencies(targetVersion) {
             "--no-audit",
             "--loglevel",
             "error",
-            targetVersion.prerelease.length > 0 ? "--save-exact" : "",
+            ...(targetVersion.prerelease.length > 0 ? ["--save-exact"] : []),
             ...dependencies.map((dependency) => `${dependency}@${targetVersion.version}`),
             ...devDependencies.map((dependency) => `${dependency}@${targetVersion.version}`),
         ]);
     }
 }
-async function runUpgradeScripts(targetVersionFolder) {
+async function findUpgradeScripts(targetVersionFolder) {
+    const scripts = [];
     const scriptsFolder = path_1.default.join(__dirname, targetVersionFolder);
     for (const fileName of fs_1.default.readdirSync(scriptsFolder)) {
-        await runUpgradeScript(path_1.default.join(targetVersionFolder, fileName));
+        const module = await import(path_1.default.join(__dirname, targetVersionFolder, fileName));
+        scripts.push({
+            name: fileName,
+            stage: module.stage ?? "after-install",
+            // Need default.default because of ESM interoperability with CommonJS.
+            // See https://www.typescriptlang.org/docs/handbook/modules/reference.html#node16-nodenext.
+            script: module.default.default,
+        });
+    }
+    return scripts;
+}
+async function runUpgradeScripts(scripts) {
+    for (const script of scripts) {
+        await runUpgradeScript(script);
     }
 }
 async function runUpgradeScript(script) {
-    const upgradeScript = await import(path_1.default.join(__dirname, script));
     try {
-        // Need default.default because of ESM interoperability with CommonJS.
-        // See https://www.typescriptlang.org/docs/handbook/modules/reference.html#node16-nodenext.
-        await upgradeScript.default.default();
+        await script.script();
     }
     catch (error) {
-        console.error(`Script '${script}' failed to execute. See original error below`);
+        console.error(`Script '${script.name}' failed to execute. See original error below`);
         console.error(error);
     }
 }

package/lib/v8/remove-blocks-packages.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stage = void 0;
+const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
+exports.stage = "before-install";
+async function removeBlocksPackages() {
+    if ((0, fs_1.existsSync)("api/package.json")) {
+        let fileContent = (await (0, promises_1.readFile)("api/package.json")).toString();
+        fileContent = fileContent.replace(/\n\s*"@comet\/blocks-api".*$/m, "");
+        await (0, promises_1.writeFile)("api/package.json", fileContent);
+    }
+}
+exports.default = removeBlocksPackages;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@comet/upgrade",
-    "version": "1.21.0",
+    "version": "1.23.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {