wip: swap import paths for urls

Author: mrstork

edge-runtime/lib/middleware.ts

@@ -1,7 +1,7 @@
 import type { Context } from '@netlify/edge-functions'
 
-import type { ElementHandlers } from '../../vendor/deno.land/x/[email protected]/src/index.ts'
-import { getCookies } from '../../vendor/deno.land/[email protected]/http/cookie.ts'
+import type { ElementHandlers } from 'https://deno.land/x/[email protected]/src/index.ts'
+import { getCookies } from 'https://deno.land/x/[email protected]/http/cookie.ts'
 
 type NextDataTransform = <T>(data: T) => T
 

edge-runtime/lib/response.ts

@@ -1,8 +1,5 @@
 import type { Context } from '@netlify/edge-functions'
-import {
-  HTMLRewriter,
-  type TextChunk,
-} from '../../vendor/deno.land/x/[email protected]/src/index.ts'
+import { HTMLRewriter, type TextChunk } from 'https://deno.land/x/[email protected]/src/index.ts'
 
 import { updateModifiedHeaders } from './headers.ts'
 import type { StructuredLogger } from './logging.ts'

edge-runtime/lib/routing.ts

@@ -5,10 +5,10 @@
  * Some types have been re-implemented to be more compatible with Deno or avoid chains of dependent files
  */
 
-import type { Key } from '../vendor/deno.land/x/[email protected]/index.ts'
+import type { Key } from 'https://deno.land/x/[email protected]/index.ts'
 
-import { compile, pathToRegexp } from '../vendor/deno.land/x/[email protected]/index.ts'
-import { getCookies } from '../vendor/deno.land/[email protected]/http/cookie.ts'
+import { compile, pathToRegexp } from 'https://deno.land/x/[email protected]/index.ts'
+import { getCookies } from 'https://deno.land/x/[email protected]/http/cookie.ts'
 
 /*
   ┌─────────────────────────────────────────────────────────────────────────┐

edge-runtime/vendor.ts

@@ -11,6 +11,7 @@ import 'https://deno.land/[email protected]/node/util.ts'
 import 'https://deno.land/[email protected]/path/mod.ts'
 
 import 'https://deno.land/x/[email protected]/index.ts'
-import 'https://deno.land/x/[email protected]/src/index.ts'
+// import 'https://deno.land/x/[email protected]/src/index.ts'
+import { HTMLRewriter } from 'https://deno.land/x/[email protected]/pkg/htmlrewriter_bg.wasm'
 
 import 'https://v1-7-0--edge-utils.netlify.app/logger/mod.ts'

tools/build-helpers.js

@@ -42,28 +42,28 @@ export async function vendorDeno({
     cwd,
   })
 
-  if (wasmFilesToDownload.length !== 0) {
-    console.log(`⬇️ Downloading wasm files...`)
+  // if (wasmFilesToDownload.length !== 0) {
+  //   console.log(`⬇️ Downloading wasm files...`)
 
-    // deno vendor doesn't work well with wasm files
-    // see https://github.com/denoland/deno/issues/14123
-    // to workaround this we copy the wasm files manually
-    // (note Deno 2 allows to vendor wasm files, but it also require modules to import them and not fetch and instantiate them
-    // se being able to drop downloading is dependent on implementation of wasm handling in external modules as well)
-    await Promise.all(
-      wasmFilesToDownload.map(async (urlString) => {
-        const url = new URL(urlString)
+  //   // deno vendor doesn't work well with wasm files
+  //   // see https://github.com/denoland/deno/issues/14123
+  //   // to workaround this we copy the wasm files manually
+  //   // (note Deno 2 allows to vendor wasm files, but it also require modules to import them and not fetch and instantiate them
+  //   // so being able to drop downloading is dependent on implementation of wasm handling in external modules as well)
+  //   await Promise.all(
+  //     wasmFilesToDownload.map(async (urlString) => {
+  //       const url = new URL(urlString)
 
-        const destination = join(vendorDest, url.hostname, url.pathname)
+  //       const destination = join(vendorDest, url.hostname, url.pathname)
 
-        const res = await fetch(url)
-        if (!res.ok)
-          throw new Error(`Failed to fetch .wasm file to vendor. Response status: ${res.status}`)
-        const fileStream = createWriteStream(destination, { flags: 'wx' })
-        await finished(Readable.fromWeb(res.body).pipe(fileStream))
-      }),
-    )
-  }
+  //       const res = await fetch(url)
+  //       if (!res.ok)
+  //         throw new Error(`Failed to fetch .wasm file to vendor. Response status: ${res.status}`)
+  //       const fileStream = createWriteStream(destination, { flags: 'wx' })
+  //       await finished(Readable.fromWeb(res.body).pipe(fileStream))
+  //     }),
+  //   )
+  // }
 
   console.log(`✅ Vendored Deno modules for '${vendorSource}' into '${vendorDest}'`)
 }