Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: vendor deno dependencies #2302

Merged
merged 14 commits into from
Sep 29, 2023
Merged

fix: vendor deno dependencies #2302

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1addb01
fix: vendor deno dependencies
Skn0tt Sep 25, 2023
4988b83
chore: install deno along node
Skn0tt Sep 25, 2023
88ac9a9
fix: install deno in cypress tests
Skn0tt Sep 25, 2023
30416b5
fix: try scoping down the import map
Skn0tt Sep 29, 2023
187aae1
fix: import straight from vendor directory
Skn0tt Sep 29, 2023
b5ae8db
fix: run vendoring before testing deno
Skn0tt Sep 29, 2023
4ffa6b1
fix: npm install needs deno
Skn0tt Sep 29, 2023
7201a27
fix: run build:vendor in right dir
Skn0tt Sep 29, 2023
1848684
refactor: move deno tests into normal test file
Skn0tt Sep 29, 2023
1ec8485
fix: include vendor files in package
Skn0tt Sep 29, 2023
e8428c8
fix: patch html rewriter to fetch wasm from web, not from disk
Skn0tt Sep 29, 2023
226f5c7
Merge branch 'main' into vendor-deno-deps
Skn0tt Sep 29, 2023
9a2b90d
chore: use precise path
Skn0tt Sep 29, 2023
35886e1
Update packages/runtime/src/templates/vendor.ts
Skn0tt Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ lib
demos
packages/runtime/src/templates/edge
packages/runtime/src/templates/edge-shared
packages/runtime/src/templates/vendor
packages/runtime/lib
packages/runtime/dist-types
jestSetup.js
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ test/e2e

**/CHANGELOG.md
packages/runtime/lib
packages/runtime/dist-types
packages/runtime/dist-types
packages/runtime/src/templates/vendor
1 change: 1 addition & 0 deletions packages/runtime/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/templates/vendor
4 changes: 3 additions & 1 deletion packages/runtime/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@
"publish:install": "npm ci",
"publish:test": "cd .. && npm ci && npm test",
"clean": "rimraf lib dist-types",
"build": "tsc",
"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",
"build:tsc": "tsc",
"watch": "tsc --watch",
"prepare": "npm run build"
},
Expand Down
7 changes: 6 additions & 1 deletion packages/runtime/src/helpers/edge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ export const getEdgeFunctionPatternForPage = ({
export const writeEdgeFunctions = async ({
netlifyConfig,
routesManifest,
constants: { PACKAGE_PATH = '' },
constants: { PACKAGE_PATH = '', INTERNAL_EDGE_FUNCTIONS_SRC },
}: {
netlifyConfig: NetlifyConfig
routesManifest: RoutesManifest
Expand All @@ -378,6 +378,11 @@ export const writeEdgeFunctions = async ({
const nextConfig = nextConfigFile.config
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'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This gives a TypeScript error as deno_import_map doesn't exist in FunctionsObject. Do we need to update the type to support import maps?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup, good catch! doing that in netlify/build#5305

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me know when it's released and when this PR is updated. We'll get this merged. 👍🏻

}

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'))
Expand Down
3 changes: 2 additions & 1 deletion packages/runtime/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
],
"exclude": [
"src/templates/edge/*",
"src/templates/edge-shared/*"
"src/templates/edge-shared/*",
"src/templates/vendor/*"
]
}