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

Jump to bottom

prefer worker package export conditionals if available #93

Merged
merged 8 commits into from
Dec 15, 2021
Merged

prefer worker package export conditionals if available #93

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
21dfabd
feat(build): configure esbuild to prefer cloudflare-worker then worke…
nicksrandall Dec 10, 2021
0f4bee4
also adding support for 'production' and 'development' exports condit…
nicksrandall Dec 14, 2021
c89382f
remove 'cloudflare-worker' condition
nicksrandall Dec 14, 2021
f72f1e0
make 'module' and 'imports' conditions synonymous
nicksrandall Dec 14, 2021
24a3ed9
adding changeset
nicksrandall Dec 14, 2021
b0f826b
remove "development" and "production" conditionals
nicksrandall Dec 14, 2021
ada913b
Update packages/wrangler/src/dev.tsx
threepointone Dec 15, 2021
6470f98
Update packages/wrangler/src/publish.ts
threepointone Dec 15, 2021
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
5 changes: 5 additions & 0 deletions .changeset/three-cooks-type.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"wrangler": patch
---

Improve support for package exports conditionals, including "worker" condition
8 changes: 8 additions & 0 deletions packages/wrangler/src/dev.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,14 @@ function useEsbuild(props: {
...(jsxFactory && { jsxFactory }),
...(jsxFragment && { jsxFragment }),
external: ["__STATIC_CONTENT_MANIFEST"],
nicksrandall marked this conversation as resolved.
Show resolved Hide resolved
conditions: [
"worker",
"browser",
"development",
nicksrandall marked this conversation as resolved.
Show resolved Hide resolved
"module",
"imports",
"default",
],
plugins: [moduleCollector.plugin],
// TODO: import.meta.url
watch: {
Expand Down
9 changes: 9 additions & 0 deletions packages/wrangler/src/publish.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,15 @@ export default async function publish(props: Props): Promise<void> {
format: "esm",
sourcemap: true,
metafile: true,
mainFields: ["browser", "module", "main"],
conditions: [
"worker",
"browser",
envName === "production" ? "production" : false,
nicksrandall marked this conversation as resolved.
Show resolved Hide resolved
"module",
"imports",
"default",
].filter(Boolean) as string[],
loader: {
".js": "jsx",
},
Expand Down