fix: import straight from vendor directory

Author: Skn0tt

.eslintignore

@@ -5,6 +5,7 @@ demos
 packages/runtime/src/templates/edge
 packages/runtime/src/templates/edge-shared
 packages/runtime/src/templates/vendor
+packages/runtime/src/templates/vendor.ts
 packages/runtime/lib
 packages/runtime/dist-types
 jestSetup.js

.vscode/settings.json

@@ -2,6 +2,8 @@
   "deno.enablePaths": [
     "packages/runtime/src/templates/edge",
     "packages/runtime/src/templates/edge-shared",
+    "packages/runtime/src/templates/vendor", 
+    "packages/runtime/src/templates/vendor.ts", 
     "demos/middleware/.netlify/edge-functions",
     "demos/server-components/.netlify/edge-functions",
   ],

packages/runtime/fix-import-map.js

@@ -53,7 +53,7 @@
     "publish:test": "cd .. && npm ci && npm test",
     "clean": "rimraf lib dist-types",
     "build": "run-s build:*",
-    "build:vendor": "rimraf src/templates/vendor && deno vendor src/templates/edge/shims.js src/templates/edge-shared/next-utils.ts https://deno.land/x/[email protected]/index.ts --output=src/templates/vendor && node fix-import-map.js",
+    "build:vendor": "rimraf src/templates/vendor && deno vendor src/templates/vendor.ts --output=src/templates/vendor",
     "build:tsc": "tsc",
     "watch": "tsc --watch",
     "prepare": "npm run build"

packages/runtime/package.json

@@ -356,7 +356,7 @@ export const getEdgeFunctionPatternForPage = ({
 export const writeEdgeFunctions = async ({
   netlifyConfig,
   routesManifest,
-  constants: { PACKAGE_PATH = '', INTERNAL_EDGE_FUNCTIONS_SRC },
+  constants: { PACKAGE_PATH = '' },
 }: {
   netlifyConfig: NetlifyConfig
   routesManifest: RoutesManifest
@@ -379,10 +379,6 @@ export const writeEdgeFunctions = async ({
   const usesAppDir = nextConfig.experimental?.appDir
 
   await copy(getEdgeTemplatePath('../vendor'), join(edgeFunctionRoot, 'vendor'))
-  netlifyConfig.functions['*'] = {
-    deno_import_map: join(INTERNAL_EDGE_FUNCTIONS_SRC, 'vendor', 'import_map.json'),
-  }
-
   await copy(getEdgeTemplatePath('../edge-shared'), join(edgeFunctionRoot, 'edge-shared'))
   await writeJSON(join(edgeFunctionRoot, 'edge-shared', 'nextConfig.json'), nextConfig)
   await copy(join(publish, 'prerender-manifest.json'), join(edgeFunctionRoot, 'edge-shared', 'prerender-manifest.json'))

packages/runtime/src/helpers/edge.ts

@@ -7,10 +7,10 @@
  */
 
 // Deno imports
-import type { Key } from 'https://deno.land/x/[email protected]/index.ts'
+import type { Key } from '../vendor/deno.land/x/[email protected]/index.ts'
 
-import { compile, pathToRegexp } from 'https://deno.land/x/[email protected]/index.ts'
-import { getCookies } from 'https://deno.land/std@0.148.0/http/cookie.ts'
+import { compile, pathToRegexp } from '../vendor/deno.land/x/[email protected]/index.ts'
+import { getCookies } from '../vendor/deno.land/std@0.175.0/http/cookie.ts'
 
 // Inlined/re-implemented types
 

packages/runtime/src/templates/edge-shared/next-utils.ts

@@ -1,5 +1,5 @@
 import type { Context } from 'https://edge.netlify.com'
-import { ElementHandlers, HTMLRewriter } from 'https://deno.land/x/[email protected]/index.ts'
+import { ElementHandlers, HTMLRewriter } from '../vendor/deno.land/x/[email protected]/index.ts'
 
 export interface FetchEventResult {
   response: Response

packages/runtime/src/templates/edge-shared/utils.ts

@@ -1,6 +1,6 @@
-import { NextRequest } from 'https://esm.sh/v91/[email protected]/deno/dist/server/web/spec-extension/request.js'
-import { NextResponse } from 'https://esm.sh/v91/[email protected]/deno/dist/server/web/spec-extension/response.js'
-import { fromFileUrl } from 'https://deno.land/std@0.151.0/path/mod.ts'
+import { NextRequest } from '../vendor/esm.sh/v91/[email protected]/deno/dist/server/web/spec-extension/request.js'
+import { NextResponse } from '../vendor/esm.sh/v91/[email protected]/deno/dist/server/web/spec-extension/response.js'
+import { fromFileUrl } from '../vendor/deno.land/std@0.175.0/path/mod.ts'
 import { buildResponse, isFunction } from '../edge-shared/utils.ts'
 
 globalThis.NFRequestContextMap ||= new Map()

packages/runtime/src/templates/edge/next-dev.js

@@ -1,11 +1,11 @@
 // @ts-check
 // deno-lint-ignore-file prefer-const no-unused-vars
-import { decode as _base64Decode } from 'https://deno.land/[email protected]/encoding/base64.ts'
-import BufferCompat from 'https://deno.land/[email protected]/node/buffer.ts'
-import EventsCompat from 'https://deno.land/[email protected]/node/events.ts'
-import AsyncHooksCompat from 'https://deno.land/[email protected]/node/async_hooks.ts'
-import AssertCompat from 'https://deno.land/[email protected]/node/assert.ts'
-import UtilCompat from 'https://deno.land/[email protected]/node/util.ts'
+import { decode as _base64Decode } from '../vendor/deno.land/[email protected]/encoding/base64.ts'
+import BufferCompat from '../vendor/deno.land/[email protected]/node/buffer.ts'
+import EventsCompat from '../vendor/deno.land/[email protected]/node/events.ts'
+import AsyncHooksCompat from '../vendor/deno.land/[email protected]/node/async_hooks.ts'
+import AssertCompat from '../vendor/deno.land/[email protected]/node/assert.ts'
+import UtilCompat from '../vendor/deno.land/[email protected]/node/util.ts'
 
 /**
  * These are the shims, polyfills and other kludges to make Next.js work in standards-compliant runtime.

packages/runtime/src/templates/edge/shims.js

@@ -0,0 +1,19 @@
+// this file isn't meant to be imported.
+// it's a list of all external modules that we use,
+// and we vendor those into the `vendor/` directory
+// for consumption in other files.
+
+import 'https://deno.land/[email protected]/encoding/base64.ts'
+import 'https://deno.land/[email protected]/http/cookie.ts'
+import 'https://deno.land/[email protected]/node/buffer.ts'
+import 'https://deno.land/[email protected]/node/events.ts'
+import 'https://deno.land/[email protected]/node/async_hooks.ts'
+import 'https://deno.land/[email protected]/node/assert.ts'
+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]/index.ts'
+
+import 'https://esm.sh/v91/[email protected]/deno/dist/server/web/spec-extension/request.js'
+import 'https://esm.sh/v91/[email protected]/deno/dist/server/web/spec-extension/response.js'