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

Implement --polyfill-node/ config.polyfill_node #72

Merged
merged 1 commit into from
Dec 5, 2021
Merged

Implement --polyfill-node/ config.polyfill_node #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
160 changes: 160 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/wrangler/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
"esbuild": "0.14.1",
"miniflare": "2.0.0-rc.2",
"semiver": "^1.1.0",
"serve": "^13.0.2"
"serve": "^13.0.2",
"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
"@esbuild-plugins/node-modules-polyfill": "^0.1.2"
},
"optionalDependencies": {
"fsevents": "~2.3.2"
Expand Down
9 changes: 8 additions & 1 deletion packages/wrangler/scripts/bundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ async function run() {
platform: "node",
format: "cjs",
// minify: true, // TODO: enable this again
external: ["fsevents", "esbuild", "miniflare", "@miniflare/core"], // todo - bundle miniflare too
external: [
"fsevents",
"esbuild",
"miniflare",
"@miniflare/core",
"@esbuild-plugins/node-globals-polyfill",
"@esbuild-plugins/node-modules-polyfill",
], // todo - bundle miniflare too
sourcemap: true,
inject: [path.join(__dirname, "../import_meta_url.js")],
define: {
Expand Down
2 changes: 2 additions & 0 deletions packages/wrangler/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ type Env = {
site?: Site;
jsx_factory?: string; // inherited
jsx_fragment?: string; // inherited
polyfill_node?: boolean; //inherited
// we should use typescript to parse cron patterns
triggers?: { crons: Cron[] }; // inherited
vars?: Vars;
Expand All @@ -107,6 +108,7 @@ export type Config = {
webpack_config?: string; // inherited
jsx_factory?: string; // inherited
jsx_fragment?: string; // inherited
polyfill_node?: boolean; //inherited
vars?: Vars;
migrations?: DOMigration[];
durable_objects?: { bindings: DurableObject[] };
Expand Down
22 changes: 20 additions & 2 deletions packages/wrangler/src/dev.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import commandExists from "command-exists";
import assert from "assert";
import { getAPIToken } from "./user";
import fetch from "node-fetch";
import NodeModulesPolyfills from "@esbuild-plugins/node-modules-polyfill";
import NodeGlobalsPolyfills from "@esbuild-plugins/node-globals-polyfill";

type CfScriptFormat = void | "modules" | "service-worker";

Expand All @@ -40,6 +42,7 @@ type Props = {
compatibilityDate: void | string;
compatibilityFlags: void | string[];
usageModel: void | "bundled" | "unbound";
polyfillNode: void | boolean;
};

export function Dev(props: Props): JSX.Element {
Expand All @@ -58,6 +61,7 @@ export function Dev(props: Props): JSX.Element {
staticRoot: props.public,
jsxFactory: props.jsxFactory,
jsxFragment: props.jsxFragment,
polyfillNode: props.polyfillNode,
});
if (bundle && bundle.type === "commonjs" && !props.format && props.public) {
throw new Error(
Expand Down Expand Up @@ -348,15 +352,26 @@ function useEsbuild(props: {
staticRoot: void | string;
jsxFactory: string | void;
jsxFragment: string | void;
polyfillNode: boolean | void;
}): EsbuildBundle | void {
const { entry, destination, staticRoot, jsxFactory, jsxFragment } = props;
const {
entry,
destination,
staticRoot,
jsxFactory,
jsxFragment,
polyfillNode,
} = props;
const [bundle, setBundle] = useState<EsbuildBundle>();
useEffect(() => {
let result: esbuild.BuildResult;
async function build() {
if (!destination) return;
result = await esbuild.build({
entryPoints: [entry],
define: {
...(polyfillNode && { global: "globalThis" }),
},
bundle: true,
outdir: destination,
metafile: true,
Expand All @@ -365,6 +380,9 @@ function useEsbuild(props: {
loader: {
".js": "jsx",
},
plugins: polyfillNode
? [NodeGlobalsPolyfills({ buffer: true }), NodeModulesPolyfills()]
: undefined,
...(jsxFactory && { jsxFactory }),
...(jsxFragment && { jsxFragment }),
external: ["__STATIC_CONTENT_MANIFEST"],
Expand Down Expand Up @@ -397,7 +415,7 @@ function useEsbuild(props: {
return () => {
result?.stop();
};
}, [entry, destination, staticRoot, jsxFactory, jsxFragment]);
}, [entry, destination, staticRoot, jsxFactory, jsxFragment, polyfillNode]);
return bundle;
}

Expand Down
Loading