@comet/upgrade 1.74.0 → 1.76.0

package/lib/v8/ignore-restricted-imports-admin.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stage = void 0;
+const ts_morph_1 = require("ts-morph");
+exports.stage = "never";
+async function ignoreRestrictedImportsAdmin() {
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./admin/tsconfig.json" });
+    const sourceFiles = project.getSourceFiles("admin/src/**/*.tsx");
+    for (const sourceFile of sourceFiles) {
+        const imports = sourceFile.getImportDeclarations();
+        for (const imp of imports) {
+            const module = imp.getModuleSpecifierValue();
+            if (module === "@mui/material") {
+                const namedImports = imp.getNamedImports().map((ni) => ni.getName());
+                if (namedImports.includes("Button") || namedImports.includes("Dialog")) {
+                    // Check for existing comments above
+                    const statements = imp.getLeadingCommentRanges().map((r) => r.getText());
+                    const hasEslintComment = statements.some((s) => s.includes("eslint-disable-next-line no-restricted-imports"));
+                    if (!hasEslintComment) {
+                        imp.replaceWithText(`// TODO v8: remove eslint-disable-next-line\n// eslint-disable-next-line no-restricted-imports\n${imp.getText()}`);
+                    }
+                }
+            }
+        }
+    }
+    await project.save();
+}
+exports.default = ignoreRestrictedImportsAdmin;

package/lib/v8/remove-v8-eslint-disable-comments-admin.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stage = void 0;
+const ts_morph_1 = require("ts-morph");
+exports.stage = "never";
+async function removeV8EslintDisableCommentsAdmin() {
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./admin/tsconfig.json" });
+    const sourceFiles = project.getSourceFiles("admin/src/**/*.tsx");
+    for (const sourceFile of sourceFiles) {
+        const imports = sourceFile.getImportDeclarations();
+        // Store comments to remove as [start, end] tuples
+        const commentRangesToRemove = [];
+        for (const imp of imports) {
+            const leadingComments = imp.getLeadingCommentRanges();
+            for (let i = 0; i < leadingComments.length - 1; i++) {
+                const first = leadingComments[i];
+                const second = leadingComments[i + 1];
+                const firstText = first.getText();
+                const secondText = second.getText();
+                if (firstText.includes("TODO v8: remove eslint-disable-next-line") &&
+                    secondText.includes("eslint-disable-next-line no-restricted-imports")) {
+                    // Mark both comments for removal
+                    commentRangesToRemove.push([second.getPos(), second.getEnd()]);
+                    commentRangesToRemove.push([first.getPos(), first.getEnd()]);
+                }
+            }
+        }
+        // Remove all comments from the file, in reverse order
+        commentRangesToRemove
+            .sort((a, b) => b[0] - a[0]) // Sort descending by start index
+            .forEach(([start, end]) => {
+            sourceFile.removeText(start, end);
+        });
+    }
+    await project.save();
+}
+exports.default = removeV8EslintDisableCommentsAdmin;

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.74.0",
+    "version": "1.76.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {