@comet/upgrade 1.55.0 → 1.56.0

package/lib/index.js

@@ -57,15 +57,20 @@ async function main() {
         listTargetVersions();
         process.exit(-1);
     }
-    const currentVersion = getCurrentVersion();
-    console.info(`Upgrading from v${currentVersion} to v${targetVersion}`);
+    const currentMajorVersion = getCurrentVersion();
+    console.info(`Upgrading from v${currentMajorVersion} to v${targetVersion}`);
     const upgradeScripts = await findUpgradeScripts(targetVersionFolder);
+    console.info("\n⚙️ Executing before install scripts\n");
     const beforeInstallScripts = upgradeScripts.filter((script) => script.stage === "before-install");
     await runUpgradeScripts(beforeInstallScripts);
-    console.info("Updating dependencies");
+    console.info("\n☑️ Before install scripts finished\n");
+    console.info("\n🔄 Updating dependencies\n");
     await updateDependencies(targetVersion);
+    console.info("\n☑️ Dependency update finished\n");
+    console.info("\n🚀 Executing after install scripts\n");
     const afterInstallScripts = upgradeScripts.filter((script) => script.stage === "after-install");
     await runUpgradeScripts(afterInstallScripts);
+    console.info("\n☑️ After install scripts finished\n");
     await runEslintFix();
 }
 function getCurrentVersion() {
@@ -151,6 +156,7 @@ async function runUpgradeScripts(scripts) {
 }
 async function runUpgradeScript(script) {
     try {
+        console.info(`📜 Running script '${script.name}'`);
         await script.script();
         if (isLocalDevelopment) {
             // run upgrade scripts twice locally to ensure that the scripts are idempotent

package/lib/util/execute-command.util.js

@@ -5,6 +5,7 @@ const child_process_1 = require("child_process");
 // Inspired by https://github.com/facebook/create-react-app/blob/main/packages/create-react-app/createReactApp.js#L383
 function executeCommand(command, args = []) {
     return new Promise((resolve, reject) => {
+        console.debug("Executing command: ", command, args.join(" "));
         const child = (0, child_process_1.spawn)(command, args, { stdio: "inherit" });
         child.on("close", (code) => {
             if (code !== 0) {

package/lib/util/package-json.util.js

@@ -34,6 +34,12 @@ class PackageJson {
         delete this.json.dependencies?.[name];
         delete this.json.devDependencies?.[name];
     }
+    getDependencyVersion(name) {
+        return this.json.dependencies?.[name] || this.json.devDependencies?.[name];
+    }
+    hasDependency(name) {
+        return !!(this.json.dependencies?.[name] || this.json.devDependencies?.[name]);
+    }
     save() {
         (0, fs_1.writeFileSync)(this.path, JSON.stringify(this.json, null, 4));
     }

package/lib/v8/merge-admin-theme-into-admin.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = require("fs");
+const glob_1 = require("glob");
+const ts_morph_1 = require("ts-morph");
+async function mergeAdminThemeIntoAdmin() {
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./admin/tsconfig.json" });
+    const files = glob_1.glob.sync(["admin/src/**/*.{ts,tsx}"]);
+    for (const filePath of files) {
+        const sourceFile = project.getSourceFile(filePath);
+        if (!sourceFile) {
+            throw new Error(`Can't get source file for ${filePath}`);
+        }
+        const themeImport = sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue() === "@comet/admin-theme");
+        if (!themeImport)
+            continue;
+        const namedImports = themeImport.getNamedImports();
+        const importStructures = namedImports.map((namedImport) => ({
+            name: namedImport.getName(),
+            alias: namedImport.getAliasNode()?.getText(),
+        }));
+        themeImport.remove();
+        const adminImport = sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue() === "@comet/admin");
+        if (adminImport) {
+            adminImport.addNamedImports(importStructures.map((importStructure) => ({
+                name: importStructure.name,
+                alias: importStructure.alias,
+            })));
+        }
+        else {
+            sourceFile.addImportDeclaration({
+                namedImports: importStructures.map((importStructure) => ({
+                    name: importStructure.name,
+                    alias: importStructure.alias,
+                })),
+                moduleSpecifier: "@comet/admin",
+            });
+        }
+        await sourceFile.save();
+    }
+    const vendorsPath = "admin/src/vendors.d.ts";
+    if ((0, fs_1.existsSync)(vendorsPath)) {
+        const content = (0, fs_1.readFileSync)(vendorsPath, "utf-8");
+        const updatedContent = content.replace('/// <reference types="@comet/admin-theme" />\n', "");
+        if (updatedContent.trim() === "") {
+            (0, fs_1.unlinkSync)(vendorsPath);
+        }
+        else {
+            (0, fs_1.writeFileSync)(vendorsPath, updatedContent);
+        }
+    }
+}
+exports.default = mergeAdminThemeIntoAdmin;

package/lib/v8/remove-admin-theme-package.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stage = void 0;
+const fs_1 = require("fs");
+const package_json_util_1 = require("../util/package-json.util");
+exports.stage = "before-install";
+async function removeAdminThemePackage() {
+    if ((0, fs_1.existsSync)("admin/package.json")) {
+        const packageJson = new package_json_util_1.PackageJson("admin/package.json");
+        const themeVersion = packageJson.getDependencyVersion("@comet/admin-theme"); // for beta versions
+        packageJson.removeDependency("@comet/admin-theme");
+        if (!packageJson.hasDependency("@comet/admin")) {
+            packageJson.addDependency("@comet/admin", themeVersion ?? "^8.0.0");
+        }
+        packageJson.save();
+    }
+}
+exports.default = removeAdminThemePackage;

package/package.json

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