@comet/upgrade 1.12.0 → 1.14.0

package/lib/index.js

@@ -39,29 +39,26 @@ 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) {
     return fs_1.default.existsSync(`${microservice}/package.json`);
 }
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
-        let targetVersionArg = process.argv[2];
+        const targetVersionArg = process.argv[2];
         if (targetVersionArg === undefined) {
             console.error("Missing target version! Usage: npx @comet/upgrade <version>");
             process.exit(-1);
         }
-        if (!VERSION_NUMBER.test(targetVersionArg)) {
+        const targetVersion = semver_1.default.coerce(targetVersionArg, { includePrerelease: true });
+        if (!targetVersion) {
             console.error("Can't parse version number. Example usage: npx @comet/upgrade v4");
             process.exit(-1);
         }
-        if (targetVersionArg.startsWith("v")) {
-            targetVersionArg = targetVersionArg.substring(1);
-        }
-        const targetVersion = Number(targetVersionArg);
-        const scriptsFolder = path_1.default.join(__dirname, `v${targetVersion}`);
+        const targetVersionFolder = `v${targetVersion.major}`;
+        const scriptsFolder = path_1.default.join(__dirname, targetVersionFolder);
         if (!fs_1.default.existsSync(scriptsFolder)) {
-            console.error(`Can't find target version 'v${targetVersionArg}'`);
+            console.error(`Can't find upgrade scripts for target version '${targetVersionFolder}'`);
             listTargetVersions();
             process.exit(-1);
         }
@@ -69,7 +66,7 @@ function main() {
         console.info(`Upgrading from v${currentVersion} to v${targetVersion}`);
         console.info("Updating dependencies");
         yield updateDependencies(targetVersion);
-        yield runUpgradeScripts(targetVersion);
+        yield runUpgradeScripts(targetVersionFolder);
         yield runEslintFix();
     });
 }
@@ -130,23 +127,24 @@ function updateDependencies(targetVersion) {
                 "--no-audit",
                 "--loglevel",
                 "error",
-                ...dependencies.map((dependency) => `${dependency}@${targetVersion}`),
-                ...devDependencies.map((dependency) => `${dependency}@${targetVersion}`),
+                targetVersion.prerelease.length > 0 ? "--save-exact" : "",
+                ...dependencies.map((dependency) => `${dependency}@${targetVersion.version}`),
+                ...devDependencies.map((dependency) => `${dependency}@${targetVersion.version}`),
             ]);
         }
     });
 }
-function runUpgradeScripts(targetVersion) {
+function runUpgradeScripts(targetVersionFolder) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const scriptsFolder = path_1.default.join(__dirname, `v${targetVersion}`);
+        const scriptsFolder = path_1.default.join(__dirname, targetVersionFolder);
         for (const fileName of fs_1.default.readdirSync(scriptsFolder)) {
             const upgradeScript = yield (_a = path_1.default.join(scriptsFolder, fileName), Promise.resolve().then(() => __importStar(require(_a))));
             try {
                 yield upgradeScript.default();
             }
             catch (error) {
-                console.error(`Script 'v${targetVersion}/${fileName}' failed to execute. See original error below`);
+                console.error(`Script '${targetVersionFolder}/${fileName}' failed to execute. See original error below`);
                 console.error(error);
             }
         }

package/lib/v7/use-graphql-scalars.js

@@ -0,0 +1,41 @@
+"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 glob_1 = require("glob");
+const execute_command_util_1 = require("../util/execute-command.util");
+const format_code_util_1 = require("../util/format-code.util");
+function useGraphqlScalars() {
+    return __awaiter(this, void 0, void 0, function* () {
+        // replace graphql-type-json with graphql-scalars in api/package.json
+        const packageJson = yield (0, promises_1.readFile)(`api/package.json`);
+        if (!packageJson.includes("graphql-type-json")) {
+            // if not found, it was not used in the project, so we can skip this migration
+            console.log("graphql-type-json not found in api/package.json. Skipping migration.");
+            return;
+        }
+        yield (0, execute_command_util_1.executeCommand)("npm", ["uninstall", "--prefix", "api", "--no-audit", "--loglevel", "error", "graphql-type-json"]);
+        yield (0, execute_command_util_1.executeCommand)("npm", ["install", "--prefix", "api", "--no-audit", "--loglevel", "error", "graphql-scalars"]);
+        // replace graphql-type-json with graphql-scalars in all api files
+        // before: import { GraphQLJSONObject } from "graphql-type-json";
+        // after: import { GraphQLJSONObject } from "graphql-scalars";
+        const files = glob_1.glob.sync(["api/src/**/*.ts"]);
+        for (const filePath of files) {
+            let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
+            if (!fileContent.includes("graphql-type-json")) {
+                continue;
+            }
+            fileContent = fileContent.replace(/graphql-type-json/g, "graphql-scalars");
+            yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
+        }
+    });
+}
+exports.default = useGraphqlScalars;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@comet/upgrade",
-    "version": "1.12.0",
+    "version": "1.14.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {
@@ -31,14 +31,14 @@
         "eslint": "^8.56.0",
         "glob": "^10.3.10",
         "prettier": "^2.8.1",
-        "semver": "^7.3.8",
+        "semver": "^7.6.2",
         "ts-morph": "^22.0.0"
     },
     "devDependencies": {
         "@comet/eslint-config": "^3.2.1",
         "@types/node": "^20.0.0",
         "@types/prettier": "^2.7.1",
-        "@types/semver": "^7.3.13",
+        "@types/semver": "^7.5.8",
         "husky": "^8.0.2",
         "lint-staged": "^13.1.0",
         "npm-run-all": "^4.1.5",