@comet/upgrade 1.73.0 → 1.75.0

package/lib/index.js

@@ -37,8 +37,7 @@ const microservices = ["api", "admin", "site"];
 function microserviceExists(microservice) {
     return fs_1.default.existsSync(`${microservice}/package.json`);
 }
-const isRunningViaNpx = Boolean(process.env.npm_execpath?.includes("npx"));
-const isLocalDevelopment = !isRunningViaNpx;
+const isLocalDevelopment = process.argv[0].endsWith("node");
 async function main() {
     let targetVersionArg = process.argv[2];
     if (targetVersionArg === undefined) {
@@ -46,7 +45,7 @@ async function main() {
         process.exit(-1);
     }
     if (isLocalDevelopment) {
-        console.warn("Not running via npx -> assuming local development. Scripts will run twice to ensure idempotency.");
+        console.warn("Executed via node -> assuming local development. Scripts will run twice to ensure idempotency.");
     }
     const isUpgradeScript = targetVersionArg.endsWith(".ts");
     if (isUpgradeScript) {

package/lib/v8/remove-react-barrel-imports-admin.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const glob_1 = require("glob");
+const ts_morph_1 = require("ts-morph");
+async function removeReactBarrelImportsAdmin() {
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./admin/tsconfig.json" });
+    const files = glob_1.glob.sync(["admin/src/**/*.ts", "admin/src/**/*.tsx"]);
+    for (const filePath of files) {
+        const sourceFile = project.getSourceFile(filePath);
+        if (!sourceFile)
+            continue;
+        // Find and remove all imports of React from "react"
+        const reactImports = sourceFile.getImportDeclarations().filter((imp) => imp.getModuleSpecifierValue() === "react");
+        const namedUsages = new Set();
+        for (const imp of reactImports) {
+            // Collect named imports (if any)
+            const named = imp.getNamedImports().map((ni) => ni.getName());
+            named.forEach((n) => namedUsages.add(n));
+            // Remove the import
+            imp.remove();
+        }
+        // Find usages of React.something and replace with something
+        sourceFile.forEachDescendant((node) => {
+            if (node.getKindName() === "PropertyAccessExpression") {
+                const text = node.getText();
+                if (text.startsWith("React.")) {
+                    // Only add the first property after React. as named import
+                    const member = text.split(".")[1];
+                    if (member)
+                        namedUsages.add(member);
+                    node.replaceWithText(text.replace("React.", ""));
+                }
+            }
+        });
+        // Add import { ... } from "react" for all used members
+        if (namedUsages.size > 0) {
+            sourceFile.addImportDeclaration({
+                namedImports: Array.from(namedUsages),
+                moduleSpecifier: "react",
+            });
+        }
+    }
+    await project.save();
+}
+exports.default = removeReactBarrelImportsAdmin;

package/lib/v8/remove-react-barrel-imports-site.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const glob_1 = require("glob");
+const ts_morph_1 = require("ts-morph");
+async function removeReactBarrelImportsSite() {
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./site/tsconfig.json" });
+    const files = glob_1.glob.sync(["site/src/**/*.ts", "site/src/**/*.tsx"]);
+    for (const filePath of files) {
+        const sourceFile = project.getSourceFile(filePath);
+        if (!sourceFile)
+            continue;
+        // Find and remove all imports of React from "react"
+        const reactImports = sourceFile.getImportDeclarations().filter((imp) => imp.getModuleSpecifierValue() === "react");
+        const namedUsages = new Set();
+        for (const imp of reactImports) {
+            // Collect named imports (if any)
+            const named = imp.getNamedImports().map((ni) => ni.getName());
+            named.forEach((n) => namedUsages.add(n));
+            // Remove the import
+            imp.remove();
+        }
+        // Find usages of React.something and replace with something
+        sourceFile.forEachDescendant((node) => {
+            if (node.getKindName() === "PropertyAccessExpression") {
+                const text = node.getText();
+                if (text.startsWith("React.")) {
+                    // Only add the first property after React. as named import
+                    const member = text.split(".")[1];
+                    if (member)
+                        namedUsages.add(member);
+                    node.replaceWithText(text.replace("React.", ""));
+                }
+            }
+        });
+        // Add import { ... } from "react" for all used members
+        if (namedUsages.size > 0) {
+            sourceFile.addImportDeclaration({
+                namedImports: Array.from(namedUsages),
+                moduleSpecifier: "react",
+            });
+        }
+    }
+    await project.save();
+}
+exports.default = removeReactBarrelImportsSite;

package/lib/v8/replace-playground-with-graphiql.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ts_morph_1 = require("ts-morph");
+/**
+ * From
+ *
+ * GraphQLModule.forRootAsync<ApolloDriverConfig>({
+ *     useFactory: (moduleRef: ModuleRef) => ({
+ *         playground: config.debug,
+ *     }),
+ * }),
+ *
+ * to
+ *
+ * GraphQLModule.forRootAsync<ApolloDriverConfig>({
+ *     useFactory: (moduleRef: ModuleRef) => ({
+ *         graphiql: config.debug ? { url: "/api/graphql" } : undefined,
+ *         playground: false,
+ *     }),
+ * }),
+ */
+function default_1() {
+    const project = new ts_morph_1.Project();
+    const filePath = "api/src/app.module.ts";
+    const sourceFile = project.addSourceFileAtPath(filePath);
+    for (const node of sourceFile.getDescendants()) {
+        if (node.getKind() === ts_morph_1.SyntaxKind.CallExpression && node.getText().startsWith("GraphQLModule.forRootAsync")) {
+            const callExpr = node.asKindOrThrow(ts_morph_1.SyntaxKind.CallExpression);
+            const arg = callExpr.getArguments()[0];
+            if (arg && arg.getKind() === ts_morph_1.SyntaxKind.ObjectLiteralExpression) {
+                const obj = arg.asKindOrThrow(ts_morph_1.SyntaxKind.ObjectLiteralExpression);
+                const useFactoryProp = obj.getProperty("useFactory");
+                if (useFactoryProp && useFactoryProp.getKind() === ts_morph_1.SyntaxKind.PropertyAssignment) {
+                    const useFactory = useFactoryProp.asKindOrThrow(ts_morph_1.SyntaxKind.PropertyAssignment);
+                    const arrowFunc = useFactory.getInitializerIfKind(ts_morph_1.SyntaxKind.ArrowFunction);
+                    if (arrowFunc) {
+                        const body = arrowFunc.getBody();
+                        if (body.getKind() === ts_morph_1.SyntaxKind.ParenthesizedExpression) {
+                            const retObj = body.getFirstChildByKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression);
+                            if (retObj) {
+                                if (retObj.getProperty("graphiql")) {
+                                    return; // Already has graphiql property
+                                }
+                                // Replace playground: config.debug with playground: false
+                                const playgroundProp = retObj.getProperty("playground");
+                                if (playgroundProp) {
+                                    playgroundProp.replaceWithText("playground: false");
+                                }
+                                const graphiqlProperty = retObj.insertPropertyAssignment(playgroundProp ? playgroundProp.getChildIndex() - 1 : 0, {
+                                    name: "graphiql",
+                                    initializer: 'config.debug ? { url: "/api/graphql" } : undefined',
+                                });
+                                graphiqlProperty.replaceWithText(`// eslint-disable-next-line @cspell/spellchecker\n${graphiqlProperty.getText()}`);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    sourceFile.saveSync();
+}
+exports.default = default_1;

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

@@ -12,15 +12,15 @@ async function updateNestDependencies() {
     packageJson.addDependency("@apollo/server", "^4.0.0");
     packageJson.removeDependency("apollo-server-core");
     packageJson.removeDependency("apollo-server-express");
-    packageJson.updateDependency("@nestjs/apollo", "^13.0.3");
-    packageJson.updateDependency("@nestjs/common", "^11.0.10");
-    packageJson.updateDependency("@nestjs/core", "^11.0.10");
-    packageJson.updateDependency("@nestjs/graphql", "^13.0.3");
+    packageJson.updateDependency("@nestjs/apollo", "^13.1.0");
+    packageJson.updateDependency("@nestjs/common", "^11.1.3");
+    packageJson.updateDependency("@nestjs/core", "^11.1.3");
+    packageJson.updateDependency("@nestjs/graphql", "^13.1.0");
     packageJson.updateDependency("@nestjs/mapped-types", "^2.1.0");
-    packageJson.updateDependency("@nestjs/platform-express", "^11.0.10");
-    packageJson.updateDependency("@nestjs/cli", "^11.0.3");
-    packageJson.updateDependency("@nestjs/schematics", "^11.0.1");
-    packageJson.updateDependency("@nestjs/testing", "^11.0.0");
+    packageJson.updateDependency("@nestjs/platform-express", "^11.1.3");
+    packageJson.updateDependency("@nestjs/cli", "^11.0.7");
+    packageJson.updateDependency("@nestjs/schematics", "^11.0.5");
+    packageJson.updateDependency("@nestjs/testing", "^11.1.3");
     packageJson.updateDependency("graphql", "^16.10.0");
     packageJson.updateDependency("express", "^5.0.1");
     packageJson.updateDependency("@types/express", "^5.0.0");

package/package.json

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