diff --git a/.github/workflows/deno-test.yml b/.github/workflows/deno-test.yml index 803abf8e3a..24a76be0e5 100644 --- a/.github/workflows/deno-test.yml +++ b/.github/workflows/deno-test.yml @@ -11,8 +11,8 @@ jobs: - name: Setup Deno uses: denoland/setup-deno@v1 with: - deno-version: v1.x.x + deno-version: v2.x.x - name: Vendor Deno modules - run: deno vendor edge-runtime/vendor.ts --output=edge-runtime/vendor --force + run: deno --allow-import edge-runtime/vendor.ts - name: Test run: deno test -A edge-runtime/ diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index c523c269c4..e7a20467a6 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -24,7 +24,7 @@ jobs: uses: denoland/setup-deno@v1 with: # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20 - deno-version: v1.46.3 + deno-version: v2.3.1 - name: Extract tag and version id: extract run: |- diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 16f08ab457..4e88dcc883 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -32,7 +32,7 @@ jobs: uses: denoland/setup-deno@v1 with: # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20 - deno-version: v1.46.3 + deno-version: v2.3.1 - name: Build run: npm run build if: ${{ steps.release.outputs.release_created }} diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6b590db140..d23c4650cd 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -68,7 +68,7 @@ jobs: uses: denoland/setup-deno@v1 with: # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20 - deno-version: v1.46.3 + deno-version: v2.3.1 - name: 'Install dependencies' run: npm ci - name: 'Prepare Netlify CLI' @@ -146,7 +146,7 @@ jobs: uses: denoland/setup-deno@v1 with: # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/edge-bundler/blob/e55f825bd985d3c92e21d1b765d71e70d5628fba/node/bridge.ts#L17 - deno-version: v1.46.3 + deno-version: v2.3.1 - name: 'Install dependencies' run: npm ci - name: 'Build' @@ -213,7 +213,7 @@ jobs: uses: denoland/setup-deno@v1 with: # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20 - deno-version: v1.46.3 + deno-version: v2.3.1 - name: 'Install dependencies' run: npm ci - name: 'Build' diff --git a/.github/workflows/size-check.yml b/.github/workflows/size-check.yml index 7a61c3308c..52b887fa62 100644 --- a/.github/workflows/size-check.yml +++ b/.github/workflows/size-check.yml @@ -24,7 +24,7 @@ jobs: uses: denoland/setup-deno@v1 with: # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20 - deno-version: v1.46.3 + deno-version: v2.3.1 - run: npm ci - name: Package size report diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 7bfb352ee3..1acf6ef5b9 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -162,7 +162,7 @@ jobs: uses: denoland/setup-deno@v1 with: # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20 - deno-version: v1.46.3 + deno-version: v2.3.1 - name: install runtime run: npm install --ignore-scripts diff --git a/deno.json b/deno.json index 561c910ed5..fa5e81d84c 100644 --- a/deno.json +++ b/deno.json @@ -7,5 +7,5 @@ "imports": { "@netlify/edge-functions": "https://edge.netlify.com/v1/index.ts" }, - "importMap": "./edge-runtime/vendor/import_map.json" + "vendor": true } diff --git a/edge-runtime/lib/middleware.ts b/edge-runtime/lib/middleware.ts index 28f923a794..a5511fc059 100644 --- a/edge-runtime/lib/middleware.ts +++ b/edge-runtime/lib/middleware.ts @@ -1,7 +1,7 @@ import type { Context } from '@netlify/edge-functions' -import type { ElementHandlers } from '../vendor/deno.land/x/htmlrewriter@v1.0.0/src/index.ts' -import { getCookies } from '../vendor/deno.land/std@0.175.0/http/cookie.ts' +import type { ElementHandlers } from '../../vendor/deno.land/x/htmlrewriter@v1.0.0/src/index.ts' +import { getCookies } from '../../vendor/deno.land/std@0.175.0/http/cookie.ts' type NextDataTransform = (data: T) => T diff --git a/edge-runtime/lib/response.ts b/edge-runtime/lib/response.ts index 60cf9fd4b9..685749cafb 100644 --- a/edge-runtime/lib/response.ts +++ b/edge-runtime/lib/response.ts @@ -2,7 +2,7 @@ import type { Context } from '@netlify/edge-functions' import { HTMLRewriter, type TextChunk, -} from '../vendor/deno.land/x/htmlrewriter@v1.0.0/src/index.ts' +} from '../../vendor/deno.land/x/htmlrewriter@v1.0.0/src/index.ts' import { updateModifiedHeaders } from './headers.ts' import type { StructuredLogger } from './logging.ts' diff --git a/tools/build-helpers.js b/tools/build-helpers.js index 0d2feb0f06..e614544a7a 100644 --- a/tools/build-helpers.js +++ b/tools/build-helpers.js @@ -38,8 +38,7 @@ export async function vendorDeno({ } console.log(`📦 Vendoring Deno modules for '${vendorSource}' into '${vendorDest}'...`) - // --output=${vendorDest} - await execaCommand(`deno vendor ${vendorSource} --force`, { + await execaCommand(`deno --allow-import ${vendorSource}`, { cwd, })