@comet/upgrade 1.96.0 → 1.98.0

package/lib/index.js

@@ -26,10 +26,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const util = __importStar(require("node:util"));
 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"));
 const execute_command_util_1 = require("./util/execute-command.util");
@@ -240,7 +240,7 @@ async function runEslintFix() {
                 silent: true,
             });
         }
-        catch (err) {
+        catch {
             console.error(`Failed to fix ESLint errors in ${microservice}. You must fix the linting errors yourself.`);
         }
     }

package/lib/v4/remove-clear-types-script.js

@@ -23,6 +23,6 @@ async function removeClearTypesScript() {
         sitePackageJson.scripts["gql:watch"] = sitePackageJson.scripts["gql:watch"].replace("npm run clear:types && ", "");
     }
     const prettierConfig = await prettier_1.default.resolveConfig(process.cwd());
-    fs_1.default.writeFileSync("site/package.json", prettier_1.default.format(JSON.stringify(sitePackageJson), { ...prettierConfig, parser: "json" }));
+    fs_1.default.writeFileSync("site/package.json", await prettier_1.default.format(JSON.stringify(sitePackageJson), { ...prettierConfig, parser: "json" }));
 }
 exports.default = removeClearTypesScript;

package/lib/v7/add-site-preview-secret.js

@@ -26,8 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
 const crypto = __importStar(require("node:crypto"));
+const fs_1 = __importDefault(require("fs"));
 const ts_morph_1 = require("ts-morph");
 const execute_command_util_1 = require("../util/execute-command.util");
 async function addSitePreviewSecret() {

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

@@ -18,7 +18,7 @@ async function moveMaxSrcResolutionInCometConfig() {
             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" }));
+        (0, fs_1.writeFileSync)(cometConfigPath, await prettier_1.default.format(JSON.stringify(config), { ...prettierConfig, parser: "json" }));
     }
 }
 exports.default = moveMaxSrcResolutionInCometConfig;

package/lib/v8/api/after-install/update-dam-configuration.js

@@ -37,10 +37,13 @@ async function updateDamConfiguration() {
         moduleSpecifier: "@comet/cms-api",
     });
     // Add ImgproxyModule configuration
-    const importsArray = sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.ArrayLiteralExpression).find((array) => {
-        const parent = array.getParent();
-        return parent && parent.getKind() === ts_morph_1.SyntaxKind.PropertyAssignment && parent.getName() === "imports";
-    });
+    const importsArray = sourceFile
+        .getClass("AppModule")
+        ?.getStaticMethod("forRoot")
+        ?.getFirstDescendantByKind(ts_morph_1.SyntaxKind.ReturnStatement)
+        ?.getFirstDescendantByKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression)
+        ?.getProperty("imports")
+        ?.getFirstDescendantByKind(ts_morph_1.SyntaxKind.ArrayLiteralExpression);
     if (importsArray) {
         const imgproxyModuleCall = sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression).find((call) => {
             const expression = call.getExpression();

package/lib/v8/api/after-install/update-s3-config.js

@@ -17,7 +17,7 @@ async function updateS3Config() {
         const storageProp = blobProp.getPropertyOrThrow("storage").getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ObjectLiteralExpression);
         s3Prop = storageProp.getPropertyOrThrow("s3").getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ObjectLiteralExpression);
     }
-    catch (error) {
+    catch {
         console.log("☑️  No S3 configuration found in the specified file. Skipping update.");
         return;
     }

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

@@ -1,8 +1,8 @@
 "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 promises_1 = require("fs/promises");
 const package_json_util_1 = require("../util/package-json.util");
 exports.stage = "before-install";
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@comet/upgrade",
-    "version": "1.96.0",
+    "version": "1.98.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {
@@ -15,31 +15,29 @@
     "main": "lib/index.js",
     "bin": "bin/index.js",
     "files": [
-        "bin/index.js",
         "lib/**/*.js"
     ],
     "scripts": {
         "build": "npm run clean && tsc",
         "clean": "rimraf lib/",
         "lint": "run-p lint:eslint lint:tsc",
-        "lint:eslint": "eslint --max-warnings 0 src/",
+        "lint:eslint": "eslint src/ **/*.json --max-warnings 0 --no-warn-ignored",
         "lint:tsc": "tsc --noEmit",
         "prepare": "husky install",
         "start": "npm run clean && tsc --watch"
     },
     "dependencies": {
         "chalk": "^4.1.2",
-        "eslint": "^8.57.1",
+        "eslint": "^9.37.0",
         "glob": "^10.4.5",
-        "prettier": "^2.8.8",
+        "prettier": "^3.6.2",
         "semver": "^7.7.2",
         "ts-morph": "^22.0.0"
     },
     "devDependencies": {
-        "@comet/eslint-config": "^3.2.7",
+        "@comet/eslint-config": "^8.3.0",
         "@tsconfig/node22": "^22.0.1",
         "@types/node": "^22.0.0",
-        "@types/prettier": "^2.7.3",
         "@types/semver": "^7.7.1",
         "husky": "^8.0.3",
         "lint-staged": "^13.3.0",