fix(migrate): seed with ts-node - remove declare const require (#7117)

Original PR #6034
prisma · May 17, 2021 · 3fe52e4 · 3fe52e4
1 parent eea9f78
commit 3fe52e4
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 21 deletions.
diff --git a/src/packages/migrate/package.json b/src/packages/migrate/package.json
@@ -71,6 +71,7 @@
     "strip-indent": "^3.0.0"
   },
   "scripts": {
+    "postinstall": "cd src/__tests__/fixtures/seed-sqlite && npm i && cd ../seed-sqlite-js-ts-default-export && npm i && cd ../seed-sqlite-js-ts-named-export && npm i",
     "run": "node dist/bin.js",
     "precommit": "lint-staged",
     "format": "prettier --write .",

diff --git a/src/packages/migrate/src/__tests__/DbSeed.test.ts b/src/packages/migrate/src/__tests__/DbSeed.test.ts
@@ -244,7 +244,7 @@ describe('seed', () => {
   })
 
   it('Custom --schema from package.json', async () => {
-    ctx.fixture('seed-sqilte-schema-from-package-json')
+    ctx.fixture('seed-sqlite-schema-from-package-json')
 
     const result = DbSeed.new().parse(['--preview-feature'])
     await expect(result).resolves.toMatchInlineSnapshot(`

diff --git a/src/packages/migrate/src/__tests__/fixtures/seed-sqlite-custom-ts-node/package.json b/src/packages/migrate/src/__tests__/fixtures/seed-sqlite-custom-ts-node/package.json
@@ -6,9 +6,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^14.14.21",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.1.3"
+    "@types/node": "^14.14.21"
   },
   "engines": {
     "node": ">=10.4"

diff --git a/src/packages/migrate/src/__tests__/fixtures/seed-sqlite-js-ts-default-export/package.json b/src/packages/migrate/src/__tests__/fixtures/seed-sqlite-js-ts-default-export/package.json
@@ -1,11 +1,9 @@
 {
-  "name": "seed-sqlite",
+  "name": "seed-sqlite-js-ts-default-export",
   "version": "1.0.0",
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^14.14.21",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.1.3"
+    "@types/node": "^14.14.21"
   },
   "engines": {
     "node": ">=10.4"

diff --git a/src/packages/migrate/src/__tests__/fixtures/seed-sqlite-js-ts-named-export/package.json b/src/packages/migrate/src/__tests__/fixtures/seed-sqlite-js-ts-named-export/package.json
@@ -1,11 +1,9 @@
 {
-  "name": "seed-sqlite",
+  "name": "seed-sqlite-js-ts-named-export",
   "version": "1.0.0",
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^14.14.21",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.1.3"
+    "@types/node": "^14.14.21"
   },
   "engines": {
     "node": ">=10.4"

diff --git a/...-package-json/custom-folder/schema.prisma → ...-package-json/custom-folder/schema.prisma b/...-package-json/custom-folder/schema.prisma → ...-package-json/custom-folder/schema.prisma
diff --git a/...a-from-package-json/custom-folder/seed.js → ...a-from-package-json/custom-folder/seed.js b/...a-from-package-json/custom-folder/seed.js → ...a-from-package-json/custom-folder/seed.js
diff --git a/...lte-schema-from-package-json/package.json → ...ite-schema-from-package-json/package.json b/...lte-schema-from-package-json/package.json → ...ite-schema-from-package-json/package.json
diff --git a/src/packages/migrate/src/__tests__/fixtures/seed-sqlite/package.json b/src/packages/migrate/src/__tests__/fixtures/seed-sqlite/package.json
@@ -3,9 +3,7 @@
   "version": "1.0.0",
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^14.14.21",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.1.3"
+    "@types/node": "^14.14.21"
   },
   "engines": {
     "node": ">=10.4"

diff --git a/src/packages/migrate/src/utils/seed.ts b/src/packages/migrate/src/utils/seed.ts
@@ -68,7 +68,7 @@ export function detectSeedFiles(schemaPath) {
 }
 
 function getSeedScript(type: 'TS' | 'JS', seedFilepath: string) {
-  let script = `
+  const script = `
   const __seed = require('./${seedFilepath}')
   const __keys = Object.keys(__seed)
 
@@ -83,10 +83,6 @@ function getSeedScript(type: 'TS' | 'JS', seedFilepath: string) {
     ''
   }`
 
-  if (type === 'TS') {
-    script = 'declare const require: any' + script
-  }
-
   return script
 }
 
@@ -146,7 +142,7 @@ To install them run: ${chalk.green(
       // Check package.json for a "ts-node" script (so users can customize flags)
       const scripts = await getScriptsFromPackageJson()
       let tsNodeCommand = `ts-node`
-      let tsNodeArgs = `-p -e "${getSeedScript('TS', detected.ts)}"`
+      let tsNodeArgs = `--print --eval "${getSeedScript('TS', detected.ts)}"`
 
       // User can customize the `ts-node` command from the package script
       if (scripts?.['ts-node']) {