@comet/upgrade 1.115.0 → 1.117.0

package/lib/v8/site/after-install/remove-graphql-client-from-site-preview-handlers.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = removeGraphQLClientFromSitePreviewHandlers;
-const glob_1 = require("glob");
-const ts_morph_1 = require("ts-morph");
+import { glob } from "glob";
+import { Project, SyntaxKind } from "ts-morph";
 /**
  * Removes the GraphQL client/fetch from the site preview handlers
  *
  * App Router: `sitePreviewRoute(request, createGraphQLFetch())` -> `sitePreviewRoute(request)`
  * Pages Router: `legacyPagesRouterSitePreviewApiHandler(req, res, createGraphQLClient())` -> `legacyPagesRouterSitePreviewApiHandler(req, res)`
  */
-async function removeGraphQLClientFromSitePreviewHandlers() {
-    const project = new ts_morph_1.Project({ tsConfigFilePath: "./site/tsconfig.json" });
-    const files = glob_1.glob.sync(["site/src/**/*.ts"]);
+export default async function removeGraphQLClientFromSitePreviewHandlers() {
+    const project = new Project({ tsConfigFilePath: "./site/tsconfig.json" });
+    const files = glob.sync(["site/src/**/*.ts"]);
     for (const filePath of files) {
         const sourceFile = project.getSourceFile(filePath);
         if (!sourceFile) {
@@ -24,7 +21,7 @@ async function removeGraphQLClientFromSitePreviewHandlers() {
                 .includes("sitePreviewRoute")));
         if (importsSitePreviewRoute) {
             sourceFile.forEachDescendant((node) => {
-                if (node.isKind(ts_morph_1.SyntaxKind.CallExpression)) {
+                if (node.isKind(SyntaxKind.CallExpression)) {
                     const callExpr = node;
                     const expression = callExpr.getExpression();
                     if (expression.getText() === "sitePreviewRoute") {
@@ -42,7 +39,7 @@ async function removeGraphQLClientFromSitePreviewHandlers() {
                 .includes("legacyPagesRouterSitePreviewApiHandler")));
         if (legacyPagesRouterSitePreviewApiHandler) {
             sourceFile.forEachDescendant((node) => {
-                if (node.isKind(ts_morph_1.SyntaxKind.CallExpression)) {
+                if (node.isKind(SyntaxKind.CallExpression)) {
                     const callExpr = node;
                     const expression = callExpr.getExpression();
                     if (expression.getText() === "legacyPagesRouterSitePreviewApiHandler") {

package/lib/v8/site/before-install/update-graphql-site.js

@@ -1,15 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.stage = void 0;
-exports.default = updateGraphqlSite;
-const fs_1 = require("fs");
-const package_json_util_1 = require("../../../util/package-json.util");
-exports.stage = "before-install";
-async function updateGraphqlSite() {
-    if (!(0, fs_1.existsSync)("site/package.json")) {
+import { existsSync } from "node:fs";
+import { PackageJson } from "../../../util/package-json.util.js";
+export const stage = "before-install";
+export default async function updateGraphqlSite() {
+    if (!existsSync("site/package.json")) {
         return;
     }
-    const packageJson = new package_json_util_1.PackageJson("site/package.json");
+    const packageJson = new PackageJson("site/package.json");
     packageJson.updateDependency("graphql", "^16.10.0");
     packageJson.save();
 }

package/lib/v9/admin/after-install/tooltip-replace-variant-prop.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = tooltipReplaceVariantProp;
-const ts_morph_1 = require("ts-morph");
-async function tooltipReplaceVariantProp() {
-    const project = new ts_morph_1.Project({ tsConfigFilePath: "./admin/tsconfig.json" });
+import { Project, SyntaxKind } from "ts-morph";
+export default async function tooltipReplaceVariantProp() {
+    const project = new Project({ tsConfigFilePath: "./admin/tsconfig.json" });
     const sourceFiles = project.getSourceFiles("admin/src/**/*.tsx");
     sourceFiles.forEach((sourceFile) => {
         const cometAdminImport = sourceFile.getImportDeclarations().find((importDeclaration) => {
@@ -19,27 +16,27 @@ async function tooltipReplaceVariantProp() {
                 tooltipComponentNames.add(aliasName ? aliasName.getText() : "Tooltip");
             }
         });
-        const jsxElements = sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.JsxOpeningElement);
+        const jsxElements = sourceFile.getDescendantsOfKind(SyntaxKind.JsxOpeningElement);
         jsxElements.forEach((jsxElement) => {
             const componentName = jsxElement.getTagNameNode().getText();
             if (tooltipComponentNames.has(componentName)) {
                 const variantAttribute = jsxElement
                     .getAttributes()
-                    .find((attribute) => attribute.getKind() === ts_morph_1.SyntaxKind.JsxAttribute &&
-                    attribute.asKind(ts_morph_1.SyntaxKind.JsxAttribute)?.getNameNode().getText() === "variant");
+                    .find((attribute) => attribute.getKind() === SyntaxKind.JsxAttribute &&
+                    attribute.asKind(SyntaxKind.JsxAttribute)?.getNameNode().getText() === "variant");
                 if (variantAttribute) {
-                    const jsxAttribute = variantAttribute.asKind(ts_morph_1.SyntaxKind.JsxAttribute);
+                    const jsxAttribute = variantAttribute.asKind(SyntaxKind.JsxAttribute);
                     if (jsxAttribute) {
                         const initializer = jsxAttribute.getInitializer();
                         let variantValue = null;
                         if (initializer) {
-                            if (initializer.getKind() === ts_morph_1.SyntaxKind.StringLiteral) {
-                                variantValue = initializer.asKind(ts_morph_1.SyntaxKind.StringLiteral)?.getLiteralValue() || null;
+                            if (initializer.getKind() === SyntaxKind.StringLiteral) {
+                                variantValue = initializer.asKind(SyntaxKind.StringLiteral)?.getLiteralValue() || null;
                             }
-                            else if (initializer.getKind() === ts_morph_1.SyntaxKind.JsxExpression) {
-                                const expression = initializer.asKind(ts_morph_1.SyntaxKind.JsxExpression)?.getExpression();
-                                if (expression && expression.getKind() === ts_morph_1.SyntaxKind.StringLiteral) {
-                                    variantValue = expression.asKind(ts_morph_1.SyntaxKind.StringLiteral)?.getLiteralValue() || null;
+                            else if (initializer.getKind() === SyntaxKind.JsxExpression) {
+                                const expression = initializer.asKind(SyntaxKind.JsxExpression)?.getExpression();
+                                if (expression && expression.getKind() === SyntaxKind.StringLiteral) {
+                                    variantValue = expression.asKind(SyntaxKind.StringLiteral)?.getLiteralValue() || null;
                                 }
                             }
                         }

package/lib/v9/site/before-install/update-next-dependencies.js

@@ -1,15 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.stage = void 0;
-exports.default = updateNextDependencies;
-const fs_1 = require("fs");
-const package_json_util_1 = require("../../../util/package-json.util");
-exports.stage = "before-install";
-async function updateNextDependencies() {
-    if (!(0, fs_1.existsSync)("site/package.json")) {
+import { existsSync } from "node:fs";
+import { PackageJson } from "../../../util/package-json.util.js";
+export const stage = "before-install";
+export default async function updateNextDependencies() {
+    if (!existsSync("site/package.json")) {
         return;
     }
-    const packageJson = new package_json_util_1.PackageJson("site/package.json");
+    const packageJson = new PackageJson("site/package.json");
     packageJson.updateDependency("next", "^15.5.4");
     packageJson.updateDependency("@next/bundle-analyzer", "^15.5.4");
     packageJson.updateDependency("react", "^19.2.0");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@comet/upgrade",
-    "version": "1.115.0",
+    "version": "1.117.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {
@@ -12,7 +12,8 @@
     },
     "license": "BSD-2-Clause",
     "author": "Vivid Planet Software GmbH <office@vivid-planet.com> (https://www.vivid-planet.com/)",
-    "main": "lib/index.js",
+    "type": "module",
+    "exports": "./lib/index.js",
     "bin": "bin/index.js",
     "files": [
         "lib/**/*.js"
@@ -40,7 +41,7 @@
         "@types/node": "^22.18.9",
         "@types/semver": "^7.7.1",
         "husky": "^9.1.7",
-        "lint-staged": "^16.2.3",
+        "lint-staged": "^16.2.4",
         "npm-run-all2": "^8.0.4",
         "rimraf": "^6.0.1",
         "typescript": "^5.9.3"