fix(prisma): remove commonJs support

tsedio · Sep 17, 2024 · ebe57c5 · ebe57c5
1 parent 7fea7fa
commit ebe57c5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 28 deletions.
diff --git a/packages/orm/prisma/scripts/backup-index.cjs.js b/packages/orm/prisma/scripts/backup-index.cjs.js
diff --git a/packages/orm/prisma/scripts/backup-index.d.cts b/packages/orm/prisma/scripts/backup-index.d.cts
diff --git 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
@@ -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
@@ -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
@@ -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`;
   }