feat: update bootstrap layer to 6256b369f54728000a74a8d5 (#22)

netlify · Apr 13, 2022 · e243837 · e243837
1 parent 392b5fe
commit e243837
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 36 deletions.
diff --git a/deno/bundle.ts b/deno/bundle.ts
@@ -1,4 +1,4 @@
-import { writeStage2 } from 'https://dinosaurs:are-the-future!@deploy-preview-20--edge-bootstrap.netlify.app/bundler/mod.ts'
+import { writeStage2 } from 'https://dinosaurs:are-the-future!@6256b369f54728000a74a8d5--edge-bootstrap.netlify.app/bundler/mod.ts'
 
 const [payload] = Deno.args
 const { basePath, destPath, functions } = JSON.parse(payload)

diff --git a/src/bootstrap.ts b/src/bootstrap.ts
diff --git a/src/formats/javascript.ts b/src/formats/javascript.ts
@@ -13,7 +13,7 @@ import type { FormatFunction } from '../server/server.js'
 import { getFileHash } from '../utils/sha256.js'
 
 const BOOTSTRAP_LATEST =
-  'https://dinosaurs:are-the-future!@624accb72787800009364b4f--edge-bootstrap.netlify.app/index.ts'
+  'https://dinosaurs:are-the-future!@6256b369f54728000a74a8d5--edge-bootstrap.netlify.app/bootstrap/index-combined.ts'
 
 interface BundleJSOptions {
   buildID: string
@@ -145,4 +145,4 @@ const getProductionEntryPoint = (functions: EdgeFunction[]) => {
   return [bootImport, importLines, exportDeclaration, defaultExport].join('\n\n')
 }
 
-export { bundleJS, generateStage2 }
+export { bundleJS, generateStage2, getBootstrapURL }
diff --git a/test/bootstrap.ts b/test/bootstrap.ts
@@ -4,22 +4,10 @@ import { env } from 'process'
 import test from 'ava'
 import fetch, { Headers } from 'node-fetch'
 
-import { getBootstrapImport } from '../src/bootstrap.js'
-
-const importURLRegex = /^import { boot } from "(.*)";$/m
+import { getBootstrapURL } from '../src/formats/javascript.js'
 
 test.serial('Imports the bootstrap layer from a valid URL', async (t) => {
-  const importLine = getBootstrapImport()
-  const match = importLine.match(importURLRegex)
-  const url = match?.[1]
-
-  if (url === undefined) {
-    t.fail('Import expression is invalid')
-
-    return
-  }
-
-  const importURL = new URL(url)
+  const importURL = new URL(getBootstrapURL())
   const headers = new Headers()
 
   // `node-fetch` doesn't let us send credentials as part of the URL, so we
@@ -46,18 +34,8 @@ test.serial(
 
     env.NETLIFY_EDGE_BOOTSTRAP = mockURL
 
-    const importLine = getBootstrapImport()
-    const match = importLine.match(importURLRegex)
-    const url = match?.[1]
+    t.is(getBootstrapURL(), mockURL)
 
     env.NETLIFY_EDGE_BOOTSTRAP = undefined
-
-    if (url === undefined) {
-      t.fail('Import expression is invalid')
-
-      return
-    }
-
-    t.is(url, mockURL)
   },
 )