fix(deps): update undici to 4.x

helpers/compile/depcheck.ts

@@ -1,4 +1,5 @@
 import * as esbuild from 'esbuild'
+import { builtinModules } from 'module'
 import glob from 'globby'
 import path from 'path'
 
@@ -37,11 +38,6 @@ const unusedIgnore = [
 // packages that aren't missing but are detected
 const missingIgnore = ['.prisma', '@prisma/client']
 
-// native nodejs imports so that we can filter out
-const nativeDependencies = new Set(
-  Object.keys((process as any).binding('natives')),
-)
-
 /**
  * Checks for unused and missing dependencies
  */
@@ -79,12 +75,12 @@ const unusedPlugin: esbuild.Plugin = {
     build.onEnd(() => {
       // we take all the dependencies that aren't collected and are native
       const unusedDependencies = [...dependencies].filter((dep) => {
-        return !collectedDependencies.has(dep) || nativeDependencies.has(dep)
+        return !collectedDependencies.has(dep) || builtinModules.includes(dep)
       })
 
       // we take all the collected deps that aren't deps and aren't native
       const missingDependencies = [...collectedDependencies].filter((dep) => {
-        return !dependencies.has(dep) && !nativeDependencies.has(dep)
+        return !dependencies.has(dep) && !builtinModules.includes(dep)
       })
 
       // we exclude the deps that match our unusedIgnore patterns

helpers/compile/plugins/replaceWithPlugin.ts

@@ -1,9 +1,16 @@
+import { builtinModules } from 'module'
 import type * as esbuild from 'esbuild'
 import fs from 'fs'
 
-function applyReplacements(contents: string, replacements: [RegExp, string][]) {
+type Replacement = [RegExp, string | ((regex: RegExp, contents: string) => string | Promise<string>)]
+
+async function applyReplacements(contents: string, replacements: Replacement[]) {
   for (const [regex, replacement] of replacements) {
-    contents = contents.replace(regex, replacement)
+    if (typeof replacement === 'string') {
+      contents = contents.replace(regex, replacement)
+    } else {
+      contents = await replacement(regex, contents)
+    }
   }
 
   return contents
@@ -14,14 +21,18 @@ function applyReplacements(contents: string, replacements: [RegExp, string][]) {
  * @param replacements
  * @returns
  */
-export const replaceWithPlugin = (replacements: [RegExp, string][]): esbuild.Plugin => {
+export const replaceWithPlugin = (replacements: Replacement[]): esbuild.Plugin => {
   return {
     name: 'replaceWithPlugin',
     setup(build) {
       build.onLoad({ filter: /.*/ }, async (args) => {
+        // we skip, don't attempt to edit files that aren't js
+        if (builtinModules.includes(args.path)) return {}
+        if (!/.*?(.js|.mjs)$/.exec(args.path)) return {}
+
         const contents = await fs.promises.readFile(args.path, 'utf8')
 
-        return { contents: applyReplacements(contents, replacements) }
+        return { contents: await applyReplacements(contents, replacements) }
       })
     },
   }

packages/cli/helpers/build.ts

@@ -1,7 +1,7 @@
 import type { BuildOptions } from '../../../helpers/compile/build'
 import { run } from '../../../helpers/compile/build'
 import { build } from '../../../helpers/compile/build'
-import { copySync } from 'fs-extra'
+import { copy } from 'fs-extra'
 import path from 'path'
 import type * as esbuild from 'esbuild'
 import fs from 'fs'
@@ -37,7 +37,7 @@ const resolveHelperPlugin: esbuild.Plugin = {
 const cliLifecyclePlugin: esbuild.Plugin = {
   name: 'cliLifecyclePlugin',
   setup(build) {
-    // we only do this for the first oen of the builds
+    // we only do this for the first one of the builds
     if (build.initialOptions?.format === 'esm') return
 
     build.onStart(async () => {
@@ -47,7 +47,7 @@ const cliLifecyclePlugin: esbuild.Plugin = {
 
     build.onEnd(async () => {
       // we copy the contents from @prisma/studio to build
-      copySync(path.join(require.resolve('@prisma/studio/package.json'), '../dist'), './build/public', {
+      await copy(path.join(require.resolve('@prisma/studio/package.json'), '../dist'), './build/public', {
         recursive: true,
         overwrite: true,
       })
@@ -72,7 +72,7 @@ const cliLifecyclePlugin: esbuild.Plugin = {
 const cliBuildConfig: BuildOptions = {
   entryPoints: ['src/bin.ts'],
   outfile: 'build/index',
-  external: ['@prisma/engines', '_http_common'],
+  external: ['@prisma/engines'],
   plugins: [resolveHelperPlugin, cliLifecyclePlugin],
   bundle: true,
 }

packages/cli/package.json

@@ -46,6 +46,7 @@
     "runtime/*.d.ts",
     "runtime/utils",
     "runtime/dist",
+    "runtime/llhttp",
     "prisma-client",
     "preinstall",
     "scripts/preinstall-entry.js",
@@ -124,7 +125,7 @@
     "format": "prettier --write .",
     "lint": "eslint --cache --fix --ext .ts .",
     "lint-ci": "eslint --ext .ts .",
-    "tsc": "tsc -d -p tsconfig.build.json && bash scripts/copy-runtime-dist.sh",
+    "tsc": "tsc -d -p tsconfig.build.json",
     "prepublishOnly": "pnpm run build",
     "preinstall": "node scripts/preinstall-entry.js",
     "precommit": "lint-staged"

packages/cli/src/__tests__/__helpers__/snapshotSerializer.ts

@@ -18,16 +18,11 @@ function removePlatforms(str) {
 }
 
 function normalizeGithubLinks(str) {
-  return str.replace(
-    /https:\/\/github.com\/prisma\/prisma-client-js\/issues\/\S+/,
-    'TEST_GITHUB_LINK',
-  )
+  return str.replace(/https:\/\/github.com\/prisma\/prisma-client-js\/issues\/\S+/, 'TEST_GITHUB_LINK')
 }
 
 function normalizeRustError(str) {
-  return str
-    .replace(/\/rustc\/(.+)\//g, '/rustc/hash/')
-    .replace(/(\[.*)(:\d*:\d*)(\])/g, '[/some/rust/path:0:0$3')
+  return str.replace(/\/rustc\/(.+)\//g, '/rustc/hash/').replace(/(\[.*)(:\d*:\d*)(\])/g, '[/some/rust/path:0:0$3')
 }
 
 function normalizeTmpDir(str) {
@@ -65,22 +60,13 @@ export function test(value) {
 }
 
 export function serialize(value) {
-  const message =
-    typeof value === 'string'
-      ? value
-      : value instanceof Error
-      ? value.message
-      : ''
+  const message = typeof value === 'string' ? value : value instanceof Error ? value.message : ''
   return prepareSchemaForSnapshot(
     normalizeGithubLinks(
       normalizeRustError(
         normalizeMs(
           normalizeTmpDir(
-            normalizeGithubLinks(
-              normalizeToUnixPaths(
-                removePlatforms(trimErrorPaths(stripAnsi(message))),
-              ),
-            ),
+            normalizeGithubLinks(normalizeToUnixPaths(removePlatforms(trimErrorPaths(stripAnsi(message))))),
           ),
         ),
       ),

packages/cli/src/__tests__/commands/Init.test.ts

@@ -10,10 +10,7 @@ test('is schema and env written on disk replace', async () => {
   const result = await ctx.cli('init')
   expect(stripAnsi(result.stdout)).toMatchSnapshot()
 
-  const schema = fs.readFileSync(
-    join(ctx.tmpDir, 'prisma', 'schema.prisma'),
-    'utf-8',
-  )
+  const schema = fs.readFileSync(join(ctx.tmpDir, 'prisma', 'schema.prisma'), 'utf-8')
   expect(schema).toMatch(defaultSchema())
 
   const env = fs.readFileSync(join(ctx.tmpDir, '.env'), 'utf-8')
@@ -25,10 +22,7 @@ test('works with url param', async () => {
   const result = await ctx.cli('init', '--url', 'file:dev.db')
   expect(stripAnsi(result.stdout)).toMatchSnapshot()
 
-  const schema = fs.readFileSync(
-    join(ctx.tmpDir, 'prisma', 'schema.prisma'),
-    'utf-8',
-  )
+  const schema = fs.readFileSync(join(ctx.tmpDir, 'prisma', 'schema.prisma'), 'utf-8')
   expect(schema).toMatch(defaultSchema('sqlite'))
 
   const env = fs.readFileSync(join(ctx.tmpDir, '.env'), 'utf-8')
@@ -48,10 +42,7 @@ test('works with provider param - postgresql', async () => {
   const result = await ctx.cli('init', '--datasource-provider', 'postgresql')
   expect(stripAnsi(result.stdout)).toMatchSnapshot()
 
-  const schema = fs.readFileSync(
-    join(ctx.tmpDir, 'prisma', 'schema.prisma'),
-    'utf-8',
-  )
+  const schema = fs.readFileSync(join(ctx.tmpDir, 'prisma', 'schema.prisma'), 'utf-8')
   expect(schema).toMatch(defaultSchema('postgresql'))
 
   const env = fs.readFileSync(join(ctx.tmpDir, '.env'), 'utf-8')
@@ -71,10 +62,7 @@ test('works with provider param - mysql', async () => {
   const result = await ctx.cli('init', '--datasource-provider', 'mysql')
   expect(stripAnsi(result.stdout)).toMatchSnapshot()
 
-  const schema = fs.readFileSync(
-    join(ctx.tmpDir, 'prisma', 'schema.prisma'),
-    'utf-8',
-  )
+  const schema = fs.readFileSync(join(ctx.tmpDir, 'prisma', 'schema.prisma'), 'utf-8')
   expect(schema).toMatch(defaultSchema('mysql'))
 
   const env = fs.readFileSync(join(ctx.tmpDir, '.env'), 'utf-8')
@@ -94,10 +82,7 @@ test('works with provider param - SQLITE', async () => {
   const result = await ctx.cli('init', '--datasource-provider', 'SQLITE')
   expect(stripAnsi(result.stdout)).toMatchSnapshot()
 
-  const schema = fs.readFileSync(
-    join(ctx.tmpDir, 'prisma', 'schema.prisma'),
-    'utf-8',
-  )
+  const schema = fs.readFileSync(join(ctx.tmpDir, 'prisma', 'schema.prisma'), 'utf-8')
   expect(schema).toMatch(defaultSchema('sqlite'))
 
   const env = fs.readFileSync(join(ctx.tmpDir, '.env'), 'utf-8')
@@ -117,10 +102,7 @@ test('works with provider param - SqlServer', async () => {
   const result = await ctx.cli('init', '--datasource-provider', 'SqlServer')
   expect(stripAnsi(result.stdout)).toMatchSnapshot()
 
-  const schema = fs.readFileSync(
-    join(ctx.tmpDir, 'prisma', 'schema.prisma'),
-    'utf-8',
-  )
+  const schema = fs.readFileSync(join(ctx.tmpDir, 'prisma', 'schema.prisma'), 'utf-8')
   expect(schema).toMatch(defaultSchema('sqlserver'))
 
   const env = fs.readFileSync(join(ctx.tmpDir, '.env'), 'utf-8')
@@ -140,10 +122,7 @@ test('works with provider param - MongoDB', async () => {
   const result = await ctx.cli('init', '--datasource-provider', 'MongoDB')
   expect(stripAnsi(result.stdout)).toMatchSnapshot()
 
-  const schema = fs.readFileSync(
-    join(ctx.tmpDir, 'prisma', 'schema.prisma'),
-    'utf-8',
-  )
+  const schema = fs.readFileSync(join(ctx.tmpDir, 'prisma', 'schema.prisma'), 'utf-8')
   expect(schema).toMatch(defaultSchema('mongodb'))
 
   const env = fs.readFileSync(join(ctx.tmpDir, '.env'), 'utf-8')
@@ -165,17 +144,11 @@ test('errors with invalid provider param', async () => {
 })
 
 test('warns when DATABASE_URL present in .env ', async () => {
-  fs.writeFileSync(
-    join(ctx.tmpDir, '.env'),
-    `DATABASE_URL="postgres://dont:overwrite@me:5432/tests"`,
-  )
+  fs.writeFileSync(join(ctx.tmpDir, '.env'), `DATABASE_URL="postgres://dont:overwrite@me:5432/tests"`)
   const result = await ctx.cli('init')
   expect(stripAnsi(result.all!)).toMatchSnapshot()
 
-  const schema = fs.readFileSync(
-    join(ctx.tmpDir, 'prisma', 'schema.prisma'),
-    'utf-8',
-  )
+  const schema = fs.readFileSync(join(ctx.tmpDir, 'prisma', 'schema.prisma'), 'utf-8')
   expect(schema).toMatch(defaultSchema())
 
   const env = fs.readFileSync(join(ctx.tmpDir, '.env'), 'utf-8')
@@ -187,10 +160,7 @@ test('appends when .env present', async () => {
   const result = await ctx.cli('init')
   expect(stripAnsi(result.stdout)).toMatchSnapshot()
 
-  const schema = fs.readFileSync(
-    join(ctx.tmpDir, 'prisma', 'schema.prisma'),
-    'utf-8',
-  )
+  const schema = fs.readFileSync(join(ctx.tmpDir, 'prisma', 'schema.prisma'), 'utf-8')
   expect(schema).toMatch(defaultSchema())
 
   const env = fs.readFileSync(join(ctx.tmpDir, '.env'), 'utf-8')

packages/client/helpers/build.ts

@@ -1,30 +1,45 @@
 import type { BuildOptions } from '../../../helpers/compile/build'
 import { build } from '../../../helpers/compile/build'
 import { fillPlugin } from '../../../helpers/compile/plugins/fill-plugin/fillPlugin'
+import { replaceWithPlugin } from '../../../helpers/compile/plugins/replaceWithPlugin'
 import { Extractor, ExtractorConfig } from '@microsoft/api-extractor'
+import resolve from 'resolve'
 import path from 'path'
+import fs from 'fs'
 
-const external = ['_http_common']
+const inlineUndiciWasm = replaceWithPlugin([
+  [
+    /(await WebAssembly\.compile\().*?'(.*?)'\)\)\)/g,
+    async (regex, contents) => {
+      for (const match of contents.matchAll(regex)) {
+        if (match[2].includes('simd') === false) {
+          // we only bundle lhttp wasm files that are not simd compiled
+          const engineCoreDir = resolve.sync('@prisma/engine-core')
+          const undiciPackage = resolve.sync('undici/package.json', { basedir: engineCoreDir })
+          const lhttpWasmPath = path.join(path.dirname(undiciPackage), 'lib', match[2])
+          const wasmContents = (await fs.promises.readFile(lhttpWasmPath)).toString('base64')
+          const inlineWasm = `${match[1]}(Buffer.from("${wasmContents}", "base64")))`
 
-// we define the config for generator
-const generatorBuildConfig: BuildOptions = {
-  entryPoints: ['src/generation/generator.ts'],
-  outfile: 'generator-build/index',
-  bundle: true,
-  external: external,
-}
+          contents = contents.replace(match[0], inlineWasm)
+        }
+      }
+
+      return contents
+    },
+  ],
+])
 
 // we define the config for runtime
 const runtimeBuildConfig: BuildOptions = {
   entryPoints: ['src/runtime/index.ts'],
   outfile: 'runtime/index',
   bundle: true,
-  external: external,
   define: {
     'globalThis.NOT_PRISMA_DATA_PROXY': 'true',
     // that fixes an issue with lz-string umd builds
     'define.amd': 'false',
   },
+  plugins: [inlineUndiciWasm],
 }
 
 // we define the config for browser
@@ -33,7 +48,6 @@ const browserBuildConfig: BuildOptions = {
   outfile: 'runtime/index-browser',
   target: ['chrome58', 'firefox57', 'safari11', 'edge16'],
   bundle: true,
-  external: external,
 }
 
 // we define the config for proxy
@@ -43,7 +57,6 @@ const proxyBuildConfig: BuildOptions = {
   bundle: true,
   minify: true,
   legalComments: 'none',
-  external: external,
   define: {
     // that helps us to tree-shake unused things out
     'globalThis.NOT_PRISMA_DATA_PROXY': 'false',
@@ -69,6 +82,13 @@ const proxyBuildConfig: BuildOptions = {
   logLevel: 'error',
 }
 
+// we define the config for generator
+const generatorBuildConfig: BuildOptions = {
+  entryPoints: ['src/generation/generator.ts'],
+  outfile: 'generator-build/index',
+  bundle: true,
+}
+
 /**
  * Bundle all type definitions by using the API Extractor from RushStack
  * @param filename the source d.ts to bundle