@comet/upgrade 1.78.0 → 1.80.0

package/lib/index.js

@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = __importDefault(require("fs"));
+const glob_1 = require("glob");
 const util = __importStar(require("node:util"));
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
@@ -38,8 +39,9 @@ function microserviceExists(microservice) {
     return fs_1.default.existsSync(`${microservice}/package.json`);
 }
 const isLocalDevelopment = process.argv[0].endsWith("node");
+const skipLint = process.argv.includes("--skip-lint");
 async function main() {
-    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);
@@ -48,17 +50,17 @@ async function main() {
         console.warn("Executed via node -> assuming local development. Scripts will run twice to ensure idempotency.");
     }
     const isUpgradeScript = targetVersionArg.endsWith(".ts");
+    const isSubfolder = targetVersionArg.includes("/");
     if (isUpgradeScript) {
         if (fs_1.default.existsSync(path_1.default.join(__dirname, 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();
+            if (!skipLint)
+                await runEslintFix();
         }
         else {
             console.error(`Can't find upgrade script '${targetVersionArg}'`);
@@ -66,6 +68,22 @@ async function main() {
         }
         return;
     }
+    else if (isSubfolder) {
+        await executeSubfolder(targetVersionArg);
+    }
+    else {
+        await executeAll(targetVersionArg);
+    }
+}
+async function executeSubfolder(targetVersionArg) {
+    const upgradeScripts = await findUpgradeScripts(targetVersionArg);
+    console.info("\n⚙️ Executing scripts\n");
+    await runUpgradeScripts(upgradeScripts);
+    console.info("\n✅️ Scripts finished\n");
+    if (!skipLint)
+        await runEslintFix();
+}
+async function executeAll(targetVersionArg) {
     if (!targetVersionArg.includes(".")) {
         targetVersionArg = await (0, get_latest_package_version_1.getLatestPackageVersion)("@comet/admin", semver_1.default.coerce(targetVersionArg)?.major);
     }
@@ -95,7 +113,8 @@ async function main() {
     const afterInstallScripts = upgradeScripts.filter((script) => script.stage === "after-install");
     await runUpgradeScripts(afterInstallScripts);
     console.info("\n☑️ After install scripts finished\n");
-    await runEslintFix();
+    if (!skipLint)
+        await runEslintFix();
 }
 function getCurrentVersion() {
     if (!microserviceExists("admin")) {
@@ -176,11 +195,14 @@ async function updateDependencies(targetVersion, isMajorUpdate = false) {
 async function findUpgradeScripts(targetVersionFolder) {
     const scripts = [];
     const scriptsFolder = path_1.default.join(__dirname, targetVersionFolder);
-    for (const fileName of fs_1.default.readdirSync(scriptsFolder)) {
-        const module = await import(path_1.default.join(__dirname, targetVersionFolder, fileName));
+    const files = (0, glob_1.globSync)("**/*.js", { cwd: scriptsFolder, nodir: true });
+    for (const relativePath of files) {
+        const module = await import(path_1.default.join(scriptsFolder, relativePath));
+        const folders = relativePath.split("/");
+        const stage = folders.length >= 3 ? folders[1] : module.stage;
         scripts.push({
-            name: fileName,
-            stage: module.stage ?? "after-install",
+            name: relativePath,
+            stage: 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,
@@ -208,17 +230,18 @@ async function runUpgradeScript(script) {
     }
 }
 async function runEslintFix() {
-    console.info("Fixing ESLint errors");
+    console.info("Trying to fix ESLint errors");
     for (const microservice of microservices) {
         if (!microserviceExists(microservice)) {
             continue;
         }
         try {
-            await (0, execute_command_util_1.executeCommand)("npm", ["run", "--prefix", microservice, "--no-audit", "--loglevel", "error", "lint:eslint", "--", "--fix"]);
+            await (0, execute_command_util_1.executeCommand)("npm", ["run", "--prefix", microservice, "--no-audit", "--loglevel", "error", "lint:eslint", "--", "--fix"], {
+                silent: true,
+            });
         }
         catch (err) {
-            console.error(`Failed to fix ESLint errors in ${microservice}. See original error below`);
-            console.error(err);
+            console.error(`Failed to fix ESLint errors in ${microservice}. You must fix the linting errors yourself.`);
         }
     }
 }

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

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCommand = void 0;
 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 = []) {
+function executeCommand(command, args = [], options) {
     return new Promise((resolve, reject) => {
         console.debug("Executing command: ", command, args.join(" "));
-        const child = (0, child_process_1.spawn)(command, args, { stdio: "inherit" });
+        const stdio = options?.silent ? "ignore" : "inherit";
+        const child = (0, child_process_1.spawn)(command, args, { stdio });
         child.on("close", (code) => {
             if (code !== 0) {
                 reject({

package/lib/v8/{mui-codemods.js → admin/after-install/mui-codemods.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const execute_command_util_1 = require("../util/execute-command.util");
+const execute_command_util_1 = require("../../../util/execute-command.util");
 async function executeMuiCodemods() {
     await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/list-item-button-prop", "admin/src"]);
     await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/styled", "admin/src"]);

package/lib/v8/{mui-x-codemods.js → admin/after-install/mui-x-codemods.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const execute_command_util_1 = require("../util/execute-command.util");
+const execute_command_util_1 = require("../../../util/execute-command.util");
 async function executeMuiXCodemods() {
     await (0, execute_command_util_1.executeCommand)("npx", ["@mui/x-codemod@latest", "v6.0.0/data-grid/preset-safe", "admin/src"]);
     await (0, execute_command_util_1.executeCommand)("npx", ["@mui/x-codemod@latest", "v7.0.0/data-grid/preset-safe", "admin/src"]);

package/lib/v8/{remove-admin-theme-package.js → admin/before-install/remove-admin-theme-package.js}

@@ -2,7 +2,7 @@
 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");
+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")) {

package/lib/v8/{remove-blocks-packages.js → admin/before-install/remove-blocks-packages-admin.js}

@@ -2,18 +2,13 @@
 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");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
-async function removeBlocksPackages() {
-    if ((0, fs_1.existsSync)("api/package.json")) {
-        const packageJson = new package_json_util_1.PackageJson("api/package.json");
-        packageJson.removeDependency("@comet/blocks-api");
-        packageJson.save();
-    }
+async function removeBlocksPackagesAdmin() {
     if ((0, fs_1.existsSync)("admin/package.json")) {
         const packageJson = new package_json_util_1.PackageJson("admin/package.json");
         packageJson.removeDependency("@comet/blocks-admin");
         packageJson.save();
     }
 }
-exports.default = removeBlocksPackages;
+exports.default = removeBlocksPackagesAdmin;

package/lib/v8/{remove-comet-admin-react-select-dependency.js → admin/before-install/remove-comet-admin-react-select-dependency.js}

@@ -2,7 +2,7 @@
 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");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 async function removeCometAdminReactSelectDependency() {
     if (!(0, fs_1.existsSync)("admin/package.json")) {

package/lib/v8/{remove-v8-eslint-disable-comments-admin.js → admin/before-install/remove-v8-eslint-disable-comments-admin.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stage = void 0;
 const ts_morph_1 = require("ts-morph");
-exports.stage = "never";
+exports.stage = "before-install";
 async function removeV8EslintDisableCommentsAdmin() {
     const project = new ts_morph_1.Project({ tsConfigFilePath: "./admin/tsconfig.json" });
     const sourceFiles = project.getSourceFiles("admin/src/**/*.tsx");

package/lib/v8/{update-mui-dependencies.js → admin/before-install/update-mui-dependencies.js}

@@ -2,7 +2,7 @@
 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");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 const adminPackageJsonPath = "admin/package.json";
 async function updateMuiDependencies() {

package/lib/v8/{update-mui-x-dependencies.js → admin/before-install/update-mui-x-dependencies.js}

@@ -2,7 +2,7 @@
 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");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 const adminPackageJsonPath = "admin/package.json";
 async function updateMuiXDependencies() {

package/lib/v8/{update-react-dependencies.js → admin/before-install/update-react-dependencies.js}

@@ -2,7 +2,7 @@
 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");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 async function updateReactDependencies() {
     if (!(0, fs_1.existsSync)("admin/package.json")) {

package/lib/v8/{update-swc-dependencies.js → admin/before-install/update-swc-dependencies.js}

@@ -2,7 +2,7 @@
 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");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 async function updateSwcDependencies() {
     if (!(0, fs_1.existsSync)("admin/package.json")) {

package/lib/v8/{use-mui-date-picker-in-grid.js → admin/before-install/use-mui-date-picker-in-grid.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.stage = void 0;
 const node_fs_1 = require("node:fs");
 const ts_morph_1 = require("ts-morph");
-const package_json_util_1 = require("../util/package-json.util");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 /**
  * Prepares the admin to use the MUI DatePicker in a grid by:

package/lib/v8/{mikro-orm-dotenv.js → api/after-install/mikro-orm-dotenv.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
-const package_json_util_1 = require("../util/package-json.util");
+const package_json_util_1 = require("../../../util/package-json.util");
 /**
  * Adds a `mikro-orm` script to package.json that calls dotenv.
  * See https://mikro-orm.io/docs/upgrading-v5-to-v6#env-files-are-no-longer-automatically-loaded.

package/lib/v8/{move-maxSrcResolution-in-comet-config.js → api/after-install/move-maxSrcResolution-in-comet-config.js}

@@ -3,10 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stage = void 0;
 const fs_1 = require("fs");
 const prettier_1 = __importDefault(require("prettier"));
-exports.stage = "before-install";
 /**
  * Move the maxSrcResolution property from imgproxy to dam in comet-config.json
  */

package/lib/v8/{nest-peer-dependencies.js → api/before-install/nest-peer-dependencies.js}

@@ -2,7 +2,7 @@
 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");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 /**
  * Add peer dependencies defined by NestJS to the project.

package/lib/v8/api/before-install/remove-blocks-packages-api.js

@@ -0,0 +1,14 @@
+"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 removeBlocksPackagesApi() {
+    if ((0, fs_1.existsSync)("api/package.json")) {
+        const packageJson = new package_json_util_1.PackageJson("api/package.json");
+        packageJson.removeDependency("@comet/blocks-api");
+        packageJson.save();
+    }
+}
+exports.default = removeBlocksPackagesApi;

package/lib/v8/{remove-passport.js → api/before-install/remove-passport.js}

@@ -2,7 +2,7 @@
 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");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 async function removePassport() {
     if (!(0, fs_1.existsSync)("api/package.json")) {

package/lib/v8/{replace-nestjs-console-with-nest-commander.js → api/before-install/replace-nestjs-console-with-nest-commander.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stage = void 0;
 const node_fs_1 = require("node:fs");
-const package_json_util_1 = require("../util/package-json.util");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 /**
  * Replace the nestjs-console package with nest-commander

package/lib/v8/{update-kubernetes-client-node.js → api/before-install/update-kubernetes-client-node.js}

@@ -2,7 +2,7 @@
 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");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 async function updateKubernetesClientNode() {
     if (!(0, fs_1.existsSync)("api/package.json")) {

package/lib/v8/{update-mikro-orm-dependencies.js → api/before-install/update-mikro-orm-dependencies.js}

@@ -2,7 +2,7 @@
 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");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 async function updateNestDependencies() {
     if (!(0, fs_1.existsSync)("api/package.json")) {

package/lib/v8/{update-nest-dependencies.js → api/before-install/update-nest-dependencies.js}

@@ -2,7 +2,7 @@
 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");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 async function updateNestDependencies() {
     if (!(0, fs_1.existsSync)("api/package.json")) {

package/lib/v8/{update-sentry.js → api/before-install/update-sentry.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.stage = void 0;
 const fs_1 = require("fs");
 const ts_morph_1 = require("ts-morph");
-const package_json_util_1 = require("../util/package-json.util");
+const package_json_util_1 = require("../../../util/package-json.util");
 exports.stage = "before-install";
 async function updateSentry() {
     if (!(0, fs_1.existsSync)("api/package.json")) {

package/package.json

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

package/lib/v8/remove-current-user-from-auth-module.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const ts_morph_1 = require("ts-morph");
-/**
- * from
- *
- *     createAuthResolver({
- *         currentUser: CurrentUser,
- *     }),
- *
- *
- * to
- *
- *     createAuthResolver({}),
- */
-async function removeCurrentUserFromAuthModule() {
-    console.log("Remove Current User From Auth Module");
-    const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
-    const sourceFiles = project.getSourceFiles("api/src/**/*.ts");
-    sourceFiles.forEach((sourceFile) => {
-        const createAuthResolverCall = sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression).find((callExpression) => {
-            const expression = callExpression.getExpression();
-            return expression.getText() === "createAuthResolver";
-        });
-        if (createAuthResolverCall) {
-            const argument = createAuthResolverCall.getArguments()[0];
-            if (argument && argument.getKind() === ts_morph_1.SyntaxKind.ObjectLiteralExpression) {
-                const objectLiteral = argument.asKindOrThrow(ts_morph_1.SyntaxKind.ObjectLiteralExpression);
-                const currentUserProp = objectLiteral.getProperty("currentUser");
-                if (currentUserProp) {
-                    console.log("Found createAuthResolver and removed currentUser in ", sourceFile.getFilePath());
-                    currentUserProp.remove();
-                }
-            }
-            sourceFile.save();
-        }
-    });
-}
-exports.default = removeCurrentUserFromAuthModule;