From ebe57c5a0f360fbd4b8a2655b59a28d8dc2bdb47 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 11 Sep 2024 09:36:15 +0200 Subject: [PATCH] fix(prisma): remove commonJs support --- packages/orm/prisma/scripts/backup-index.cjs.js | 9 --------- packages/orm/prisma/scripts/backup-index.d.cts | 1 - packages/orm/prisma/src/cli/prismaGenerator.ts | 15 ++++----------- packages/orm/prisma/src/generator/generateCode.ts | 5 ++--- .../transform/transformFieldToDecorators.ts | 1 - .../src/generator/utils/resolveExtension.ts | 4 +--- 6 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 packages/orm/prisma/scripts/backup-index.cjs.js delete mode 100644 packages/orm/prisma/scripts/backup-index.d.cts diff --git a/packages/orm/prisma/scripts/backup-index.cjs.js b/packages/orm/prisma/scripts/backup-index.cjs.js deleted file mode 100644 index 5b25a20da5c..00000000000 --- a/packages/orm/prisma/scripts/backup-index.cjs.js +++ /dev/null @@ -1,9 +0,0 @@ -const tsed = require("../.schema"); -const path = require("path"); - -module.exports = tsed; - -/** - * Annotation for ncc/zeit - */ -path.join(__dirname, "../.schema"); diff --git a/packages/orm/prisma/scripts/backup-index.d.cts b/packages/orm/prisma/scripts/backup-index.d.cts deleted file mode 100644 index b9a510b0d9e..00000000000 --- a/packages/orm/prisma/scripts/backup-index.d.cts +++ /dev/null @@ -1 +0,0 @@ -export * from "../.schema.js"; diff --git a/packages/orm/prisma/src/cli/prismaGenerator.ts b/packages/orm/prisma/src/cli/prismaGenerator.ts index 6db53643f77..a7d3f8381be 100644 --- a/packages/orm/prisma/src/cli/prismaGenerator.ts +++ b/packages/orm/prisma/src/cli/prismaGenerator.ts @@ -4,7 +4,6 @@ import fs from "fs-extra"; import path, {join} from "path"; import {generateCode} from "../generator/generateCode.js"; import removeDir from "../generator/utils/removeDir.js"; -import {isCommonjs} from "../generator/utils/sourceType"; function parseStringBoolean(stringBoolean: string | undefined) { return Boolean(stringBoolean ? stringBoolean === "true" : undefined); @@ -38,17 +37,11 @@ export function generate({defaultOutput, packageDir}: GenerateOptions) { }); if (outputDir === defaultOutput) { - await fs.copy(join(packageDir, "scripts", "backup-index.cjs.js"), join(packageDir, "lib", "cjs", "index.js")); await fs.copy(join(packageDir, "scripts", "backup-index.esm.js"), join(packageDir, "lib", "esm", "index.js")); - - if (isCommonjs()) { - await fs.copy(join(packageDir, "scripts", "backup-index.d.cts"), join(packageDir, "lib", "types", "index.d.ts")); - } else { - await fs.copy(join(packageDir, "scripts", "backup-index.d.mts"), join(packageDir, "lib", "types", "index.d.ts")); - await fs.writeJson(`${outputDir}/package.json`, { - type: "module" - }); - } + await fs.copy(join(packageDir, "scripts", "backup-index.d.mts"), join(packageDir, "lib", "types", "index.d.ts")); + await fs.writeJson(`${outputDir}/package.json`, { + type: "module" + }); } return ""; diff --git a/packages/orm/prisma/src/generator/generateCode.ts b/packages/orm/prisma/src/generator/generateCode.ts index 32720f4df41..c5e51122795 100644 --- a/packages/orm/prisma/src/generator/generateCode.ts +++ b/packages/orm/prisma/src/generator/generateCode.ts @@ -8,11 +8,10 @@ import {generateModels} from "./utils/generateModels.js"; import {generatePrismaService} from "./utils/generatePrismaService.js"; import {generateRepositories} from "./utils/generateRepositories.js"; import {saveProject} from "./utils/saveProject.js"; -import {isCommonjs} from "./utils/sourceType.js"; const baseCompilerOptions: CompilerOptions = { - target: isCommonjs() ? ScriptTarget.ES2020 : ScriptTarget.ESNext, - module: isCommonjs() ? ModuleKind.CommonJS : ModuleKind.ESNext, + target: ScriptTarget.ESNext, + module: ModuleKind.ESNext, emitDecoratorMetadata: true, experimentalDecorators: true, esModuleInterop: true diff --git a/packages/orm/prisma/src/generator/transform/transformFieldToDecorators.ts b/packages/orm/prisma/src/generator/transform/transformFieldToDecorators.ts index f4ddf16c146..34c0315b415 100644 --- a/packages/orm/prisma/src/generator/transform/transformFieldToDecorators.ts +++ b/packages/orm/prisma/src/generator/transform/transformFieldToDecorators.ts @@ -4,7 +4,6 @@ import {DmmfModel} from "../domain/DmmfModel.js"; import {ScalarDecorators, ScalarJsClasses} from "../domain/ScalarTsTypes.js"; import {TransformContext} from "../domain/TransformContext.js"; import {isCircularRef} from "../utils/isCircularRef.js"; -import {isEsm} from "../utils/sourceType.js"; function createDecorator(name: string, args: string[]): DecoratorStructure { return { diff --git a/packages/orm/prisma/src/generator/utils/resolveExtension.ts b/packages/orm/prisma/src/generator/utils/resolveExtension.ts index d59ef3afe34..f061f55bcaf 100644 --- a/packages/orm/prisma/src/generator/utils/resolveExtension.ts +++ b/packages/orm/prisma/src/generator/utils/resolveExtension.ts @@ -1,7 +1,5 @@ -import {isEsm} from "./sourceType.js"; - export function resolveExtension(moduleSpecifier: string) { - if (isEsm() && moduleSpecifier.match(/\.\/.*/) && !moduleSpecifier.endsWith(".js")) { + if (moduleSpecifier.match(/\.\/.*/) && !moduleSpecifier.endsWith(".js")) { return `${moduleSpecifier}.js`; }