Skip to content

Commit 67095b2

Browse files
committed
ci: build with deno v2
1 parent ae86215 commit 67095b2

File tree

10 files changed

+14
-15
lines changed

10 files changed

+14
-15
lines changed

.github/workflows/deno-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
- name: Setup Deno
1212
uses: denoland/setup-deno@v1
1313
with:
14-
deno-version: v1.x.x
14+
deno-version: v2.x.x
1515
- name: Vendor Deno modules
16-
run: deno vendor edge-runtime/vendor.ts --output=edge-runtime/vendor --force
16+
run: deno --allow-import edge-runtime/vendor.ts
1717
- name: Test
1818
run: deno test -A edge-runtime/

.github/workflows/pre-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: denoland/setup-deno@v1
2525
with:
2626
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
27-
deno-version: v1.46.3
27+
deno-version: v2.3.1
2828
- name: Extract tag and version
2929
id: extract
3030
run: |-

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: denoland/setup-deno@v1
3333
with:
3434
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
35-
deno-version: v1.46.3
35+
deno-version: v2.3.1
3636
- name: Build
3737
run: npm run build
3838
if: ${{ steps.release.outputs.release_created }}

.github/workflows/run-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
uses: denoland/setup-deno@v1
6969
with:
7070
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
71-
deno-version: v1.46.3
71+
deno-version: v2.3.1
7272
- name: 'Install dependencies'
7373
run: npm ci
7474
- name: 'Prepare Netlify CLI'
@@ -146,7 +146,7 @@ jobs:
146146
uses: denoland/setup-deno@v1
147147
with:
148148
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/edge-bundler/blob/e55f825bd985d3c92e21d1b765d71e70d5628fba/node/bridge.ts#L17
149-
deno-version: v1.46.3
149+
deno-version: v2.3.1
150150
- name: 'Install dependencies'
151151
run: npm ci
152152
- name: 'Build'
@@ -213,7 +213,7 @@ jobs:
213213
uses: denoland/setup-deno@v1
214214
with:
215215
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
216-
deno-version: v1.46.3
216+
deno-version: v2.3.1
217217
- name: 'Install dependencies'
218218
run: npm ci
219219
- name: 'Build'

.github/workflows/size-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: denoland/setup-deno@v1
2525
with:
2626
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
27-
deno-version: v1.46.3
27+
deno-version: v2.3.1
2828
- run: npm ci
2929

3030
- name: Package size report

.github/workflows/test-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
uses: denoland/setup-deno@v1
163163
with:
164164
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
165-
deno-version: v1.46.3
165+
deno-version: v2.3.1
166166

167167
- name: install runtime
168168
run: npm install --ignore-scripts

deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
"imports": {
88
"@netlify/edge-functions": "https://edge.netlify.com/v1/index.ts"
99
},
10-
"importMap": "./edge-runtime/vendor/import_map.json"
10+
"vendor": true
1111
}

edge-runtime/lib/middleware.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Context } from '@netlify/edge-functions'
22

3-
import type { ElementHandlers } from '../vendor/deno.land/x/htmlrewriter@v1.0.0/src/index.ts'
4-
import { getCookies } from '../vendor/deno.land/std@0.175.0/http/cookie.ts'
3+
import type { ElementHandlers } from '../../vendor/deno.land/x/htmlrewriter@v1.0.0/src/index.ts'
4+
import { getCookies } from '../../vendor/deno.land/std@0.175.0/http/cookie.ts'
55

66
type NextDataTransform = <T>(data: T) => T
77

edge-runtime/lib/response.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Context } from '@netlify/edge-functions'
22
import {
33
HTMLRewriter,
44
type TextChunk,
5-
} from '../vendor/deno.land/x/htmlrewriter@v1.0.0/src/index.ts'
5+
} from '../../vendor/deno.land/x/htmlrewriter@v1.0.0/src/index.ts'
66

77
import { updateModifiedHeaders } from './headers.ts'
88
import type { StructuredLogger } from './logging.ts'

tools/build-helpers.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ export async function vendorDeno({
3838
}
3939

4040
console.log(`📦 Vendoring Deno modules for '${vendorSource}' into '${vendorDest}'...`)
41-
// --output=${vendorDest}
42-
await execaCommand(`deno vendor ${vendorSource} --force`, {
41+
await execaCommand(`deno --allow-import ${vendorSource}`, {
4342
cwd,
4443
})
4544

0 commit comments

Comments
 (0)