Skip to content

Commit 42b9dc7

Browse files
committed
fix: use --vendor instead of vendor config to ensure vendor runs at next runtime publish time (instead of site deploy time)
1 parent ceebee3 commit 42b9dc7

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

.github/workflows/deno-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: npm ci
2626

2727
- name: Vendor Deno modules
28-
run: deno --allow-import edge-runtime/vendor.ts
28+
run: deno --allow-import --vendor edge-runtime/vendor.ts
2929

3030
- name: Test
3131
run: deno test -A edge-runtime/

edge-runtime/deno.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@
66
},
77
"imports": {
88
"@netlify/edge-functions": "https://edge.netlify.com/v1/index.ts"
9-
},
10-
"vendor": true
9+
}
1110
}

edge-runtime/lib/logging.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ export {
22
logger,
33
LogLevel,
44
StructuredLogger,
5-
} from 'https://v1-7-0--edge-utils.netlify.app/logger/mod.ts'
5+
} from '../vendor/v1-7-0--edge-utils.netlify.app/logger/mod.ts'

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 'https://deno.land/x/[email protected]/src/index.ts'
4-
import { getCookies } from 'https://deno.land/x/[email protected]/http/cookie.ts'
3+
import type { ElementHandlers } from '../vendor/deno.land/x/[email protected]/src/index.ts'
4+
import { getCookies } from '../vendor/deno.land/[email protected]/http/cookie.ts'
55

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

edge-runtime/lib/response.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import type { Context } from '@netlify/edge-functions'
2-
import { HTMLRewriter, type TextChunk } from 'https://deno.land/x/[email protected]/src/index.ts'
2+
import {
3+
HTMLRewriter,
4+
type TextChunk,
5+
} from '../vendor/deno.land/x/[email protected]/src/index.ts'
36

47
import { updateModifiedHeaders } from './headers.ts'
58
import type { StructuredLogger } from './logging.ts'

edge-runtime/lib/routing.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
* Some types have been re-implemented to be more compatible with Deno or avoid chains of dependent files
66
*/
77

8-
import type { Key } from 'https://deno.land/x/[email protected]/index.ts'
8+
import type { Key } from '../vendor/deno.land/x/[email protected]/index.ts'
99

10-
import { compile, pathToRegexp } from 'https://deno.land/x/[email protected]/index.ts'
11-
import { getCookies } from 'https://deno.land/[email protected]/http/cookie.ts'
10+
import { compile, pathToRegexp } from '../vendor/deno.land/x/[email protected]/index.ts'
11+
import { getCookies } from '../vendor/deno.land/[email protected]/http/cookie.ts'
1212

1313
/*
1414
┌─────────────────────────────────────────────────────────────────────────┐

tools/build-helpers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ export async function vendorDeno({
3434
if (initEmptyDenoJson) {
3535
const denoJsonPath = join(cwd, 'deno.json')
3636
console.log(`🧹 Generating clean '${denoJsonPath}`)
37-
await writeFile(denoJsonPath, '{ "vendor": true }')
37+
await writeFile(denoJsonPath, '{}')
3838
}
3939

4040
console.log(`📦 Vendoring Deno modules for '${vendorSource}' into '${vendorDest}'...`)
41-
await execaCommand(`deno --allow-import ${vendorSource}`, {
41+
await execaCommand(`deno --allow-import --vendor ${vendorSource}`, {
4242
cwd,
4343
})
4444

0 commit comments

Comments
 (0)