@comet/upgrade 1.6.0 → 1.8.0

package/lib/index.js

@@ -35,10 +35,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
+const execute_command_util_1 = require("./util/execute-command.util");
 const VERSION_NUMBER = /^v?\d+$/;
 const microservices = ["api", "admin", "site"];
 function microserviceExists(microservice) {
@@ -123,7 +123,7 @@ function updateDependencies(targetVersion) {
                 console.warn(`Microservice '${microservice}' has no Comet DXP dependencies. Skipping install`);
                 continue;
             }
-            yield executeCommand("npm", [
+            yield (0, execute_command_util_1.executeCommand)("npm", [
                 "install",
                 "--prefix",
                 microservice,
@@ -136,21 +136,6 @@ function updateDependencies(targetVersion) {
         }
     });
 }
-// Inspired by https://github.com/facebook/create-react-app/blob/main/packages/create-react-app/createReactApp.js#L383
-function executeCommand(command, args = []) {
-    return new Promise((resolve, reject) => {
-        const child = (0, child_process_1.spawn)(command, args, { stdio: "inherit" });
-        child.on("close", (code) => {
-            if (code !== 0) {
-                reject({
-                    command: `${command} ${args.join(" ")}`,
-                });
-                return;
-            }
-            resolve();
-        });
-    });
-}
 function runUpgradeScripts(targetVersion) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -175,7 +160,7 @@ function runEslintFix() {
                 continue;
             }
             try {
-                yield executeCommand("npm", ["run", "--prefix", microservice, "--no-audit", "--loglevel", "error", "lint:eslint", "--", "--fix"]);
+                yield (0, execute_command_util_1.executeCommand)("npm", ["run", "--prefix", microservice, "--no-audit", "--loglevel", "error", "lint:eslint", "--", "--fix"]);
             }
             catch (err) {
                 console.error(`Failed to fix ESLint errors in ${microservice}. See original error below`);

package/lib/util/execute-command.util.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeCommand = void 0;
+const child_process_1 = require("child_process");
+// Inspired by https://github.com/facebook/create-react-app/blob/main/packages/create-react-app/createReactApp.js#L383
+function executeCommand(command, args = []) {
+    return new Promise((resolve, reject) => {
+        const child = (0, child_process_1.spawn)(command, args, { stdio: "inherit" });
+        child.on("close", (code) => {
+            if (code !== 0) {
+                reject({
+                    command: `${command} ${args.join(" ")}`,
+                });
+                return;
+            }
+            resolve();
+        });
+    });
+}
+exports.executeCommand = executeCommand;

package/lib/v7/hide-graphql-field-suggestions.js

@@ -0,0 +1,74 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ts_morph_1 = require("ts-morph");
+/**
+ * Adds the `formatError` property to `GraphQLModule` options to hide `GraphQL` field suggestions for non dev environments.
+ */
+function hideGraphqlFieldSuggestions() {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
+        const sourceFile = project.getSourceFile("api/src/app.module.ts");
+        if (!sourceFile)
+            throw new Error("app.module.ts not found");
+        // Add the required import statements
+        sourceFile.addImportDeclaration({
+            namedImports: ["ValidationError"],
+            moduleSpecifier: "apollo-server-express",
+        });
+        sourceFile.addImportDeclaration({
+            namedImports: ["ApolloDriverConfig"],
+            moduleSpecifier: "@nestjs/apollo",
+        });
+        // Get the forRoot method within AppModule
+        const forRootMethod = sourceFile.getClassOrThrow("AppModule").getMethodOrThrow("forRoot");
+        // Get the GraphQLModule.forRootAsync call within the forRoot method
+        const graphqlForRootCall = (_a = forRootMethod
+            .getBody()) === null || _a === void 0 ? void 0 : _a.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression).find((call) => call.getText().includes("GraphQLModule.forRootAsync"));
+        if (!graphqlForRootCall)
+            throw new Error("GraphQLModule.forRootAsync call not found within forRoot method.");
+        // Add the generic type ApolloDriverConfig to the GraphQLModule.forRootAsync call
+        if (!forRootMethod.getFullText().includes("GraphQLModule.forRootAsync<ApolloDriverConfig>")) {
+            const expression = graphqlForRootCall.getExpression();
+            if (!expression)
+                throw new Error("Expression not found within GraphQLModule.forRootAsync call.");
+            const expressionText = expression.getText();
+            expression.replaceWithText(expressionText.replace(`${expressionText}`, `${expressionText}<ApolloDriverConfig>`));
+        }
+        const formatErrorImplText = `
+        (error) => {
+            if (process.env.NODE_ENV !== "development") {
+                if (error instanceof ValidationError) {
+                    return new ValidationError("Invalid request.");
+                }
+            }
+            return error;
+        }`;
+        // return if property formatError already exists
+        if (graphqlForRootCall.getArguments().find((arg) => arg.getText().includes("formatError"))) {
+            throw new Error(`formatError property already exists in GraphQLModule.forRootAsync options. To be sure GraphQl field suggestions are disabled for non dev environments, please check if the implementation already contains: ${formatErrorImplText}`);
+        }
+        // Find the useFactory function within the GraphQLModule.forRootAsync call
+        const useFactoryFunction = graphqlForRootCall.getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ArrowFunction, "useFactory function not found within GraphQLModule.forRootAsync call.");
+        if (!useFactoryFunction.getParent().getText().includes("useFactory"))
+            throw new Error("useFactory function not found within GraphQLModule.forRootAsync call.");
+        // Find the object literal being returned by the useFactory function
+        const returnObjectLiteral = useFactoryFunction.getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ObjectLiteralExpression, "Object literal not found within useFactory function.");
+        // Add your formatError to GraphQLModule.forRootAsync options
+        returnObjectLiteral.addPropertyAssignment({
+            name: "formatError",
+            initializer: ({ write }) => write(formatErrorImplText),
+        });
+        sourceFile.saveSync();
+    });
+}
+exports.default = hideGraphqlFieldSuggestions;

package/lib/v7/replace-roboto-with-roboto-flex.js

@@ -0,0 +1,49 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = require("fs/promises");
+const execute_command_util_1 = require("../util/execute-command.util");
+const format_code_util_1 = require("../util/format-code.util");
+/**
+ * Replaces the old font package "Roboto" with the new "Roboto Flex"
+ */
+function replaceRobotoWithRobotoFlex() {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield replacePackageInPackageJson();
+        yield removeOldPackageImports();
+        yield addNewPackageImport();
+        yield (0, execute_command_util_1.executeCommand)("npm", ["install", "--prefix", "admin", "--no-audit", "--loglevel", "error"]);
+    });
+}
+exports.default = replaceRobotoWithRobotoFlex;
+const replacePackageInPackageJson = () => __awaiter(void 0, void 0, void 0, function* () {
+    const filePath = "admin/package.json";
+    let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
+    const searchString = "@fontsource/roboto";
+    const re = new RegExp(`^.*${searchString}.*$`, "gm");
+    fileContent = fileContent.replace(re, '    "@fontsource-variable/roboto-flex": "^5.0.0",');
+    yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
+});
+const removeOldPackageImports = () => __awaiter(void 0, void 0, void 0, function* () {
+    const filePath = "admin/src/App.tsx";
+    let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
+    const searchString = 'import "@fontsource/roboto';
+    const re = new RegExp(`^.*${searchString}.*$`, "gm");
+    fileContent = fileContent.replace(re, "");
+    yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
+});
+const addNewPackageImport = () => __awaiter(void 0, void 0, void 0, function* () {
+    const filePath = "admin/src/App.tsx";
+    let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
+    fileContent = `import "@fontsource-variable/roboto-flex/full.css";
+    ${fileContent}`;
+    yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
+});

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@comet/upgrade",
-    "version": "1.6.0",
+    "version": "1.8.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {
@@ -31,7 +31,8 @@
         "eslint": "^8.56.0",
         "glob": "^10.3.10",
         "prettier": "^2.8.1",
-        "semver": "^7.3.8"
+        "semver": "^7.3.8",
+        "ts-morph": "^22.0.0"
     },
     "devDependencies": {
         "@comet/eslint-config": "^3.2.1",