@comet/upgrade 1.60.0 → 1.62.0

package/lib/index.js

@@ -119,6 +119,7 @@ function getCurrentVersion() {
     return semver_1.default.major(version);
 }
 async function updateDependencies(targetVersion, isMajorUpdate = false) {
+    await (0, execute_command_util_1.executeCommand)("npm", ["install", "--no-audit", "--loglevel", "error", "--save-exact", `@comet/cli@${targetVersion.version}`]);
     const packages = {
         api: ["@comet/blocks-api", "@comet/cms-api"],
         admin: [

package/lib/v8/mikro-orm-create-request-context.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const glob_1 = require("glob");
+const ts_morph_1 = require("ts-morph");
+/**
+ * Replace UseRequestContext with CreateRequestContext
+ */
+async function mikroOrmCreateRequestContext() {
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
+    const files = glob_1.glob.sync("api/src/**/*.ts");
+    for (const filePath of files) {
+        const sourceFile = project.getSourceFile(filePath);
+        if (!sourceFile) {
+            continue;
+        }
+        const mikroOrmCoreImport = sourceFile.getImportDeclaration((importDeclaration) => importDeclaration.getModuleSpecifierValue() === "@mikro-orm/core");
+        if (!mikroOrmCoreImport) {
+            continue;
+        }
+        const useRequestContextImport = mikroOrmCoreImport.getNamedImports().find((namedImport) => namedImport.getText() === "UseRequestContext");
+        useRequestContextImport?.remove();
+        if (!mikroOrmCoreImport.getNamedImports().find((namedImport) => namedImport.getText() === "CreateRequestContext")) {
+            mikroOrmCoreImport.addNamedImport("CreateRequestContext");
+        }
+        sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.Decorator).forEach((decorator) => {
+            const identifier = decorator.getFirstDescendantByKind(ts_morph_1.SyntaxKind.Identifier);
+            if (identifier && identifier.getText() === "UseRequestContext") {
+                identifier.replaceWithText("CreateRequestContext");
+            }
+        });
+        await sourceFile.save();
+    }
+}
+exports.default = mikroOrmCreateRequestContext;

package/lib/v8/mikro-orm-ormconfig.js

@@ -10,6 +10,9 @@ async function replaceCustomType() {
     if (!sourceFile) {
         return;
     }
+    if (sourceFile.getText().includes("defineConfig")) {
+        return;
+    }
     sourceFile.addImportDeclaration({
         namedImports: ["defineConfig"],
         moduleSpecifier: "@mikro-orm/postgresql",
@@ -19,6 +22,11 @@ async function replaceCustomType() {
         .getDeclarations()[0]
         .getInitializerIfKindOrThrow(ts_morph_1.SyntaxKind.CallExpression)
         .getArguments()[0];
+    for (const propertyAssignment of config.getDescendantsOfKind(ts_morph_1.SyntaxKind.PropertyAssignment)) {
+        if (propertyAssignment.getName() === "type") {
+            propertyAssignment.remove();
+        }
+    }
     config.replaceWithText(`defineConfig(${config.getText()})`);
     await sourceFile.save();
 }

package/package.json

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