@comet/upgrade 1.33.0 → 1.35.0

package/lib/util/package-json.util.js

@@ -37,5 +37,9 @@ class PackageJson {
     save() {
         (0, fs_1.writeFileSync)(this.path, JSON.stringify(this.json, null, 4));
     }
+    addScript(name, script) {
+        this.json.scripts ??= {};
+        this.json.scripts[name] = script;
+    }
 }
 exports.PackageJson = PackageJson;

package/lib/v8/mikro-orm-base-entity-generic.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = require("fs/promises");
+const glob_1 = require("glob");
+/**
+ * BaseEntity no longer has generic type arguments.
+ * See https://mikro-orm.io/docs/upgrading-v5-to-v6#baseentity-no-longer-has-generic-type-arguments.
+ */
+async function removeGenericFromBaseEntity() {
+    const files = glob_1.glob.sync(["api/src/**/*.entity.ts"]);
+    for (const filePath of files) {
+        let fileContent = await (0, promises_1.readFile)(filePath, "utf-8");
+        fileContent = fileContent.replaceAll(/BaseEntity<.*>/g, "BaseEntity");
+        await (0, promises_1.writeFile)(filePath, fileContent);
+    }
+}
+exports.default = removeGenericFromBaseEntity;

package/lib/v8/mikro-orm-custom-type.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = require("fs/promises");
+const glob_1 = require("glob");
+/**
+ * Custom type has been removed in favor of just type.
+ * See https://mikro-orm.io/docs/upgrading-v5-to-v6#removed-propertyoptionscustomtype-in-favour-of-just-type.
+ */
+async function replaceCustomType() {
+    const files = glob_1.glob.sync(["api/src/**/*.entity.ts"]);
+    for (const filePath of files) {
+        let fileContent = await (0, promises_1.readFile)(filePath, "utf-8");
+        fileContent = fileContent.replaceAll("customType:", "type:");
+        await (0, promises_1.writeFile)(filePath, fileContent);
+    }
+}
+exports.default = replaceCustomType;

package/lib/v8/mikro-orm-delete-rule.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = require("fs/promises");
+const glob_1 = require("glob");
+/**
+ * onDelete has been renamed to deleteRule.
+ * See https://mikro-orm.io/docs/upgrading-v5-to-v6#renames.
+ */
+async function renameOnDelete() {
+    const files = glob_1.glob.sync(["api/src/**/*.entity.ts"]);
+    for (const filePath of files) {
+        let fileContent = await (0, promises_1.readFile)(filePath, "utf-8");
+        fileContent = fileContent.replaceAll("onDelete:", "deleteRule:");
+        await (0, promises_1.writeFile)(filePath, fileContent);
+    }
+}
+exports.default = renameOnDelete;

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = require("fs");
+const package_json_util_1 = require("../util/package-json.util");
+/**
+ * Adds a `mikro-orm` script to package.json that calls dotenv.
+ * See https://mikro-orm.io/docs/upgrading-v5-to-v6#env-files-are-no-longer-automatically-loaded.
+ */
+async function addDotenvCallToConfig() {
+    if (!(0, fs_1.existsSync)("api/package.json")) {
+        return;
+    }
+    const packageJson = new package_json_util_1.PackageJson("api/package.json");
+    packageJson.addScript("mikro-orm", "dotenv -e .env.secrets -e .env.local -e .env -e .env.site-configs -- mikro-orm");
+    packageJson.save();
+}
+exports.default = addDotenvCallToConfig;

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = require("fs/promises");
+const glob_1 = require("glob");
+/**
+ * Always import form `@mikro-orm/postgresql`.
+ * See https://mikro-orm.io/docs/upgrading-v5-to-v6#all-drivers-now-re-export-the-mikro-ormcore-package.
+ */
+async function replaceImports() {
+    const files = glob_1.glob.sync(["api/src/**/*.entity.ts"]);
+    for (const filePath of files) {
+        let fileContent = await (0, promises_1.readFile)(filePath, "utf-8");
+        fileContent = fileContent.replaceAll("@mikro-orm/core", "@mikro-orm/postgresql");
+        await (0, promises_1.writeFile)(filePath, fileContent);
+    }
+}
+exports.default = replaceImports;

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

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ts_morph_1 = require("ts-morph");
+/**
+ * Wrap the config in createOrmConfig with defineConfig
+ */
+async function replaceCustomType() {
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
+    const sourceFile = project.getSourceFile("api/src/db/ormconfig.ts");
+    if (!sourceFile) {
+        return;
+    }
+    sourceFile.addImportDeclaration({
+        namedImports: ["defineConfig"],
+        moduleSpecifier: "@mikro-orm/postgresql",
+    });
+    const config = sourceFile
+        .getVariableStatementOrThrow("ormConfig")
+        .getDeclarations()[0]
+        .getInitializerIfKindOrThrow(ts_morph_1.SyntaxKind.CallExpression)
+        .getArguments()[0];
+    config.replaceWithText(`defineConfig(${config.getText()})`);
+    await sourceFile.save();
+}
+exports.default = replaceCustomType;

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

@@ -16,8 +16,6 @@ async function updateNestDependencies() {
     packageJson.updateDependency("@nestjs/common", "^10.0.0");
     packageJson.updateDependency("@nestjs/core", "^10.0.0");
     packageJson.updateDependency("@nestjs/graphql", "^12.0.0");
-    // TODO remove when https://github.com/vivid-planet/comet/pull/2809 has been merged
-    packageJson.updateDependency("@nestjs/passport", "^10.0.0");
     packageJson.updateDependency("@nestjs/platform-express", "^10.0.0");
     packageJson.updateDependency("graphql", "^16.6.0");
     packageJson.updateDependency("nestjs-console", "^9.0.0");

package/package.json

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