@comet/upgrade 1.68.0 → 1.70.0

package/lib/v8/comet-config-provider.js

@@ -210,7 +210,6 @@ async function cometConfigProvider() {
             damConfig.insertSpreadAssignment(0, { expression: "config.dam" });
             cometConfigProviderOpeningElement.addAttribute({ name: "dam", initializer: `{${damConfig.getText()}}` });
         }
-        cometConfigProviderOpeningElement.addAttribute({ name: "imgproxy", initializer: "{config.imgproxy}" });
         damConfigProviderElement.replaceWithText(damConfigProviderElement
             .getJsxChildren()
             .map((child) => child.getText())

package/lib/v8/eslint-dev-dependencies.js

@@ -2,6 +2,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 adminEslintConfig = `import eslintConfigReact from "@comet/eslint-config/react.js";
 
@@ -99,9 +100,39 @@ const createNewFlatConfigurationFile = ({ workingDirectory, fileContent }) => {
  //
  ${commentedEslintConfig}
  `;
-    (0, fs_1.writeFileSync)(`${workingDirectory}eslint.config.mjs`, oldEslintConfigTodo + fileContent);
+    const project = new ts_morph_1.Project({ tsConfigFilePath: `./${workingDirectory}tsconfig.json` });
+    const filePath = `${workingDirectory}eslint.config.mjs`;
+    const sourceFile = project.createSourceFile(filePath, oldEslintConfigTodo + fileContent, { overwrite: true });
+    transferEslintIgnore({ workingDirectory, sourceFile });
+    sourceFile.saveSync();
 };
 const deleteOldEslintRc = ({ workingDirectory }) => {
     console.log(`🚀 Delete old .eslintrc.json configuration file ${workingDirectory}`);
     (0, fs_1.rmSync)(`${workingDirectory}.eslintrc.json`);
 };
+const transferEslintIgnore = ({ workingDirectory, sourceFile }) => {
+    console.log(`🚀 Transfer ignores from .eslintignore to eslint.config.mjs ${workingDirectory}`);
+    if (!(0, fs_1.existsSync)(`${workingDirectory}.eslintignore`)) {
+        return;
+    }
+    const eslintIgnore = (0, fs_1.readFileSync)(`${workingDirectory}.eslintignore`, "utf-8")
+        .split("\n")
+        .filter((ignore) => ignore.length > 0);
+    const arrayLiteral = sourceFile.getVariableStatementOrThrow("config").getDescendantsOfKind(ts_morph_1.SyntaxKind.ArrayLiteralExpression)[0];
+    const firstObject = arrayLiteral.getElements()[0];
+    if (firstObject.isKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression)) {
+        const ignoresProp = firstObject.getProperty("ignores");
+        if (ignoresProp?.isKind(ts_morph_1.SyntaxKind.PropertyAssignment)) {
+            const ignoresArray = ignoresProp.getInitializerIfKind(ts_morph_1.SyntaxKind.ArrayLiteralExpression);
+            if (ignoresArray) {
+                eslintIgnore.forEach((ignore) => {
+                    if (!ignoresArray?.getElements().some((element) => element.getText() === `"${ignore}"`)) {
+                        ignoresArray?.addElement(`"${ignore}"`);
+                    }
+                });
+            }
+        }
+    }
+    console.log(`🚀 Delete old .eslintignore file ${workingDirectory}`);
+    (0, fs_1.rmSync)(`${workingDirectory}.eslintignore`);
+};

package/lib/v8/move-maxSrcResolution-in-comet-config.js

@@ -0,0 +1,26 @@
+"use strict";
+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
+ */
+async function moveMaxSrcResolutionInCometConfig() {
+    const cometConfigPath = "api/src/comet-config.json";
+    if ((0, fs_1.existsSync)(cometConfigPath)) {
+        const content = (0, fs_1.readFileSync)(cometConfigPath, "utf-8");
+        const config = JSON.parse(content);
+        if (config.imgproxy && config.imgproxy.maxSrcResolution !== undefined) {
+            config.dam.maxSrcResolution = config.imgproxy.maxSrcResolution;
+            delete config.imgproxy.maxSrcResolution;
+        }
+        const prettierConfig = await prettier_1.default.resolveConfig(process.cwd());
+        (0, fs_1.writeFileSync)(cometConfigPath, prettier_1.default.format(JSON.stringify(config), { ...prettierConfig, parser: "json" }));
+    }
+}
+exports.default = moveMaxSrcResolutionInCometConfig;

package/lib/v8/mui-codemods.js

@@ -6,5 +6,8 @@ async function executeMuiCodemods() {
     await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/styled", "admin/src"]);
     await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/sx-prop", "admin/src"]);
     await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/theme-v6", "admin/src/theme.ts"]);
+    await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v7.0.0/grid-props", "admin/src"]);
+    await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v7.0.0/input-label-size-normal-medium", "admin/src"]);
+    await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v7.0.0/lab-removed-components", "admin/src"]);
 }
 exports.default = executeMuiCodemods;

package/lib/v8/replace-node-with-v22-in-gitlab-ci-files.js

@@ -0,0 +1,47 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stage = void 0;
+const fs_1 = require("fs");
+const glob = __importStar(require("glob"));
+exports.stage = "before-install";
+/**
+ * Replace node with version 22 in .gitlab-ci yml files
+ */
+async function replaceNodeWithV22InNvmrc() {
+    const files = glob.sync("**/.gitlab-ci/*.yml", { nodir: true });
+    for (const file of files) {
+        let content = await fs_1.promises.readFile(file, "utf8");
+        content = content
+            .replace(/node18/g, "node22")
+            .replace(/node20/g, "node22")
+            .replace(/nodejs18/g, "nodejs22-minimal")
+            .replace(/nodejs20-minimal/g, "nodejs22-minimal")
+            .replace(/nodejs20/g, "nodejs22-minimal");
+        await fs_1.promises.writeFile(file, content, "utf8");
+    }
+    console.log("Upgrade complete!");
+}
+exports.default = replaceNodeWithV22InNvmrc;

package/lib/v8/replace-node-with-v22-locally.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stage = void 0;
+const promises_1 = require("fs/promises");
+const node_fs_1 = require("node:fs");
+const package_json_util_1 = require("../util/package-json.util");
+exports.stage = "before-install";
+/**
+ * Replace node with version 22 in .nvmrc and package.json files
+ */
+async function replaceNodeWithV22Locally() {
+    if ((0, node_fs_1.existsSync)(".nvmrc")) {
+        await (0, promises_1.writeFile)(".nvmrc", "22\n");
+    }
+    else {
+        console.warn("Your project doesn't have a .nvmrc file. Skipping the replacement of node version.");
+    }
+    updateTypesNode("api");
+    updateTypesNode("admin");
+    updateTypesNode("site");
+}
+exports.default = replaceNodeWithV22Locally;
+function updateTypesNode(microservice) {
+    const path = `${microservice}/package.json`;
+    if ((0, node_fs_1.existsSync)(path)) {
+        const packageJson = new package_json_util_1.PackageJson(path);
+        packageJson.updateDependency("@types/node", "^22.0.0");
+        packageJson.save();
+    }
+}

package/lib/v8/update-kubernetes-client-node.js

@@ -0,0 +1,15 @@
+"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 updateKubernetesClientNode() {
+    if (!(0, fs_1.existsSync)("api/package.json")) {
+        return;
+    }
+    const packageJson = new package_json_util_1.PackageJson("api/package.json");
+    packageJson.updateDependency("@kubernetes/client-node", "^1.0.0");
+    packageJson.save();
+}
+exports.default = updateKubernetesClientNode;

package/lib/v8/update-mui-dependencies.js

@@ -10,11 +10,11 @@ async function updateMuiDependencies() {
         return;
     }
     const packageJson = new package_json_util_1.PackageJson(adminPackageJsonPath);
-    packageJson.addDependency("@mui/material", "^6.0.0");
-    packageJson.addDependency("@mui/system", "^6.0.0");
-    packageJson.addDependency("@mui/utils", "^6.0.0");
-    packageJson.addDependency("@mui/icons-material", "^6.0.0");
-    packageJson.addDependency("@mui/lab", "^6.0.0-beta.10");
+    packageJson.updateDependency("@mui/material", "^7.0.0");
+    packageJson.updateDependency("@mui/system", "^7.0.0");
+    packageJson.updateDependency("@mui/utils", "^7.0.0");
+    packageJson.updateDependency("@mui/icons-material", "^7.0.0");
+    packageJson.updateDependency("@mui/lab", "^7.0.0-beta.9");
     packageJson.save();
 }
 exports.default = updateMuiDependencies;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@comet/upgrade",
-    "version": "1.68.0",
+    "version": "1.70.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {
@@ -37,8 +37,8 @@
     },
     "devDependencies": {
         "@comet/eslint-config": "^3.2.1",
-        "@tsconfig/node20": "^20.1.4",
-        "@types/node": "^20.0.0",
+        "@tsconfig/node22": "^22.0.1",
+        "@types/node": "^22.0.0",
         "@types/prettier": "^2.7.1",
         "@types/semver": "^7.5.8",
         "husky": "^8.0.2",
@@ -48,7 +48,7 @@
         "typescript": "~5.1.0"
     },
     "engines": {
-        "node": "20"
+        "node": "22"
     },
     "publishConfig": {
         "access": "public",