chore(build, types): cleanup

scripts/lint.ts

@@ -19,7 +19,7 @@ async function main() {
     }
   }
 
-  let packages = []
+  let packages = [] as string[]
   if (args['--staged']) {
     packages = await getStagedPackages()
   } else {

src/packages/cli/fixtures/test.sh

@@ -4,7 +4,7 @@
 #
 # Test version command
 #
-VERSION=$(node ./dist/bin.js --version)
+VERSION=$(node ./build/index.js --version)
 if [[ ${VERSION} != *"@prisma/client"* ]]; then
   echo "prisma --version is broken"
   exit 1
@@ -14,7 +14,7 @@ fi
 # Test custom generator path
 #
 cd ./fixtures/custom\ generator
-GENERATE_RESULT=$(node ../../dist/bin.js generate)
+GENERATE_RESULT=$(node ../../build/index.js generate)
 if [[ ${GENERATE_RESULT} != *"onGenerate"* ]]; then
   echo "custom generators are broken"
   echo $GENERATE_RESULT
@@ -26,7 +26,7 @@ cd ../..
 # Test introspection output with warnings
 #
 cd fixtures/introspection-warnings
-INTROSPECTION=$(node ../../dist/bin.js introspect --url=file:./warnings.db 2>&1)
+INTROSPECTION=$(node ../../build/index.js introspect --url=file:./warnings.db 2>&1)
 if [[ ${INTROSPECTION} != *"column_name_that_becomes_empty_string"* ]]; then
   echo "prisma introspect column_name_that_becomes_empty_string is broken"
   echo $INTROSPECTION
@@ -46,13 +46,13 @@ cd ../../
 # Test generate output command
 #
 cd fixtures/project/subdir
-GENERATE=$(node ../../../dist/bin.js generate)
+GENERATE=$(node ../../../build/index.js generate)
 if [[ ${GENERATE} != *"Generated "* ]]; then
   echo "prisma generate is broken"
   exit 1
 fi
 
-GENERATE_DENYLIST=$(node ../../../dist/bin.js generate --schema=denylist.prisma 2>&1)
+GENERATE_DENYLIST=$(node ../../../build/index.js generate --schema=denylist.prisma 2>&1)
 if [[ ${GENERATE_DENYLIST} != *"Error validating model \"public\""* ]]; then
   echo "prisma generate denylist is broken"
   exit 1
@@ -64,29 +64,29 @@ fi
 
 # Relative path
 GENERATE_RELATIVE_SCHEMA_PATH="./schema.prisma"
-GENERATE_RELATIVE_SCHEMA=$(node ../../../dist/bin.js generate --schema=$GENERATE_RELATIVE_SCHEMA_PATH)
+GENERATE_RELATIVE_SCHEMA=$(node ../../../build/index.js generate --schema=$GENERATE_RELATIVE_SCHEMA_PATH)
 if [[ ${GENERATE_RELATIVE_SCHEMA} != *"Generated "* ]]; then
   echo "prisma generate --schema=$GENERATE_RELATIVE_SCHEMA_PATH is broken"
   exit 1
 fi
 # Same case but should fail!
 GENERATE_RELATIVE_SCHEMA_INVALID_PATH="./invalid.prisma"
-GENERATE_RELATIVE_SCHEMA_INVALID=$(node ../../../dist/bin.js generate --schema=$GENERATE_RELATIVE_SCHEMA_INVALID_PATH 2>&1 > /dev/null)
+GENERATE_RELATIVE_SCHEMA_INVALID=$(node ../../../build/index.js generate --schema=$GENERATE_RELATIVE_SCHEMA_INVALID_PATH 2>&1 > /dev/null)
 if [[ ${GENERATE_RELATIVE_SCHEMA_INVALID} != *"Provided --schema at $GENERATE_RELATIVE_SCHEMA_INVALID_PATH doesn't exist."* ]]; then
   echo "prisma generate --schema=$GENERATE_RELATIVE_SCHEMA_INVALID_PATH is broken (should fail)"
   exit 1
 fi
 
 # Absolute path
 GENERATE_ABSOLUTE_SCHEMA_PATH="$(pwd)/schema.prisma"
-GENERATE_ABSOLUTE_SCHEMA=$(node ../../../dist/bin.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_PATH)
+GENERATE_ABSOLUTE_SCHEMA=$(node ../../../build/index.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_PATH)
 if [[ ${GENERATE_ABSOLUTE_SCHEMA} != *"Generated "* ]]; then
   echo "prisma generate --schema=$GENERATE_ABSOLUTE_SCHEMA_PATH is broken"
   exit 1
 fi
 # Same case but should fail!
 GENERATE_ABSOLUTE_SCHEMA_INVALID_PATH="$(pwd)/invalid.prisma"
-GENERATE_ABSOLUTE_SCHEMA_INVALID=$(node ../../../dist/bin.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_INVALID_PATH 2>&1 > /dev/null)
+GENERATE_ABSOLUTE_SCHEMA_INVALID=$(node ../../../build/index.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_INVALID_PATH 2>&1 > /dev/null)
 if [[ ${GENERATE_ABSOLUTE_SCHEMA_INVALID} != *"Provided --schema at $GENERATE_ABSOLUTE_SCHEMA_INVALID_PATH doesn't exist"* ]]; then
   echo "prisma generate --schema=$GENERATE_ABSOLUTE_SCHEMA_INVALID_PATH is broken (should fail)"
   exit 1
@@ -105,29 +105,29 @@ cd fixtures/project/ && yarn postinstall
 cd ../..
 # Relative path
 GENERATE_RELATIVE_SCHEMA_FROM_PARENT_PATH="./fixtures/project/subdir/schema.prisma"
-GENERATE_RELATIVE_SCHEMA_FROM_PARENT=$(SQLITE_URL=file:dev.db node ./dist/bin.js generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_PATH)
+GENERATE_RELATIVE_SCHEMA_FROM_PARENT=$(SQLITE_URL=file:dev.db node ./build/index.js generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_PATH)
 if [[ ${GENERATE_RELATIVE_SCHEMA_FROM_PARENT} != *"Generated "* ]]; then
   echo "prisma generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_PATH is broken"
   exit 1
 fi
 # Same case but should fail!
 GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID_PATH="./fixtures/project/subdir/invalid.prisma"
-GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID=$(node ./dist/bin.js generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID_PATH 2>&1 > /dev/null)
+GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID=$(node ./build/index.js generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID_PATH 2>&1 > /dev/null)
 if [[ ${GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID} != *"Provided --schema at $GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID_PATH doesn't exist."* ]]; then
   echo "prisma generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID_PATH is broken (should fail)"
   exit 1
 fi
 
 # Absolute path
 GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_PATH="$(pwd)/fixtures/project/subdir/schema.prisma"
-GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT=$(SQLITE_URL=file:dev.db node ./dist/bin.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_PATH)
+GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT=$(SQLITE_URL=file:dev.db node ./build/index.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_PATH)
 if [[ ${GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT} != *"Generated "* ]]; then
   echo "prisma generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_PATH is broken"
   exit 1
 fi
 # Same case but should fail!
 GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID_PATH="$(pwd)/fixtures/project/subdir/invalid.prisma"
-GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID=$(node ./dist/bin.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID_PATH 2>&1 > /dev/null)
+GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID=$(node ./build/index.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID_PATH 2>&1 > /dev/null)
 if [[ ${GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID} != *"Provided --schema at $GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID_PATH doesn't exist."* ]]; then
   echo "prisma generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID_PATH is broken (should fail)"
   exit 1

src/packages/cli/helpers/build.js

@@ -9,40 +9,37 @@ const { promisify } = require('util')
 const copyFile = promisify(fs.copyFile)
 const lineReplace = require('line-replace')
 
+const ESBUILD_DEFAULT = {
+  platform: 'node',
+  target: 'node12',
+  bundle: true,
+  tsconfig: 'tsconfig.build.json'
+}
+
 async function main() {
   const before = Date.now()
 
   await makeDir('./build')
 
-  await Promise.all([
-    run('node ./helpers/copy-prisma-client.js'),
-    run('tsc --build tsconfig.build.json', true),
-  ])
+  await run('node ./helpers/copy-prisma-client.js')
 
   await Promise.all([
     esbuild.build({
-      platform: 'node',
-      bundle: true,
-      target: 'node12',
-      outfile: 'build/index.js',
+      ...ESBUILD_DEFAULT,
       entryPoints: ['src/bin.ts'],
+      outfile: 'build/index.js',
       external: ['@prisma/engines', '_http_common'],
     }),
     esbuild.build({
-      platform: 'node',
-      bundle: true,
-      minify: true,
-      target: ['node12'],
-      outfile: 'preinstall/index.js',
+      ...ESBUILD_DEFAULT,
       entryPoints: ['scripts/preinstall.js'],
+      outfile: 'preinstall/index.js',
     }),
     esbuild.build({
-      platform: 'node',
-      bundle: true,
-      minify: true,
-      target: ['node12'],
-      outfile: 'install/index.js',
+      ...ESBUILD_DEFAULT,
       entryPoints: ['scripts/install.js'],
+      outfile: 'install/index.js',
+      minify: true,
     }),
     copy({
       from: path.join(

src/packages/cli/package.json

@@ -71,6 +71,7 @@
     "@prisma/studio-server": "0.417.0",
     "@timsuchanek/copy": "1.4.5",
     "@types/jest": "26.0.24",
+    "@types/rimraf": "3.0.1",
     "@types/ws": "7.4.7",
     "@typescript-eslint/eslint-plugin": "4.28.5",
     "@typescript-eslint/parser": "4.28.5",
@@ -110,6 +111,8 @@
     "typescript": "4.3.5"
   },
   "scripts": {
+    "dev": "DEV=true node helpers/build.js",
+    "build": "node helpers/build.js",
     "test:commands": "./fixtures/test.sh && jest --maxConcurrency=1",
     "test-update": "pnpm run test:commands -- -u",
     "test": "pnpm run test:commands",
@@ -119,7 +122,6 @@
     "lint": "eslint --cache --fix --ext .ts .",
     "lint-ci": "eslint --ext .ts .",
     "tsc": "tsc -d -p tsconfig.build.json && bash scripts/copy-runtime-dist.sh",
-    "build": "node helpers/build.js",
     "prepublishOnly": "pnpm run build",
     "preinstall": "node scripts/preinstall-entry.js",
     "precommit": "lint-staged"

src/packages/cli/src/Init.ts

@@ -79,6 +79,8 @@ export const defaultPort = (provider: ConnectorType) => {
     case 'postgresql':
       return 5432
   }
+
+  return undefined
 }
 
 export const defaultURL = (
@@ -276,12 +278,9 @@ export class Init implements Command {
     }
 
     try {
-      fs.writeFileSync(
-      path.join(outputDir, ".gitignore"),
-      defaultGitIgnore()
-      );
+      fs.writeFileSync(path.join(outputDir, '.gitignore'), defaultGitIgnore())
     } catch (error) {
-      console.error("Failed to write .gitignore file, reason: ", error);
+      console.error('Failed to write .gitignore file, reason: ', error)
     }
 
     const steps: string[] = []

src/packages/cli/tsconfig.build.json

@@ -1,15 +1,8 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../../../tsconfig.build.json",
   "compilerOptions": {
-    "outDir": "dist"
+    "outDir": "dist",
+    "emitDeclarationOnly": true
   },
-  "exclude": [
-    "dist",
-    "build",
-    "runtime",
-    "examples",
-    "src/__tests__",
-    "fixtures",
-    "**/node_modules/**"
-  ]
+  "include": ["src"],
 }

src/packages/cli/tsconfig.eslint.json

@@ -1,5 +1,3 @@
 {
-  "extends": "./tsconfig",
-  "include": ["src"],
-  "exclude": []
+  "extends": "./tsconfig.json"
 }

src/packages/cli/tsconfig.json

@@ -1,16 +1,3 @@
 {
-  "compilerOptions": {
-    "lib": ["esnext", "esnext.asynciterable", "dom"],
-    "module": "commonjs",
-    "target": "es2018",
-    "strict": true,
-    "esModuleInterop": true,
-    "sourceMap": true,
-    "noImplicitAny": false,
-    "rootDir": "src",
-    "declaration": true,
-    "skipLibCheck": true,
-    "incremental": true
-  },
-  "exclude": ["scripts", "src/__tests__", "**/tmp-*"]
+  "extends": "../../../tsconfig.json"
 }

src/packages/client/.eslintignore

@@ -1,19 +1,10 @@
 /node_modules
-/dist
 /generator-build
+/declaration
 /runtime
-/runtime-dist
-/fixtures
-/index.d.ts
-/scripts/
-sandbox
+/sandbox
 
-/src/byline.ts
-/src/__tests__/generation/node_modules
+generated-dmmf.ts
 /src/__tests__/types
-/src/__tests__/runtime-tests
 /src/__tests__/benchmarks
-/src/sandbox
-generated-dmmf.ts
 /src/__tests__/__helpers__/dmmf-types.ts
-

src/packages/client/.gitignore

@@ -1,32 +1,8 @@
-node_modules
-dist
-build
-runtime
-runtime-browser
-runtime-browser-dist
+/node_modules
+/declaration
+/generator-build
+/runtime
 
-download
-generator
-cli
-.DS_Store
-!src/runtime
-yarn-error.log
-src/utils/transformed-dmmf.json
-*-dmmf.json
-*-dmmf-raw.json
-db
-query-engine*
-test.sh
-try-getConfig.ts
-generator-build
-@prisma
-getConfig.sh
-migrations
-/schema.prisma
-/dmmf.json
-try-getDmmf.ts
-write-test
-prisma-client-*.tgz
-*.tsbuildinfo
 pnpm-lock.yaml
-*.zip
+*.tsbuildinfo
+.DS_Store

src/packages/client/.npmignore

@@ -1,2 +0,0 @@
-runtime/prisma
-runtime/schema-inferrer-bin