mirror of
https://github.com/oven-sh/bun
synced 2026-02-09 10:28:47 +00:00
### What does this PR do? Fix bytecode CJS pragma detection when source file contains a shebang. When bundling with `--bytecode` and the source file has a shebang, the output silently fails to execute (exits 0, no output). Reproduction: [github.com/kjanat/bun-bytecode-banner-bug](https://github.com/kjanat/bun-bytecode-banner-bug) ```js // Bundled output: #!/usr/bin/env bun // shebang preserved // @bun @bytecode @bun-cjs // pragma on line 2 (function(exports, require, module, __filename, __dirname) { ... }) ``` The pragma parser in `hasBunPragma()` correctly skips the shebang line, but uses `self.lexer.end` instead of `contents.len` when scanning for `@bun-cjs`/`@bytecode` tokens. This causes the pragma to not be recognized. **Fix:** ```zig // Before while (cursor < self.lexer.end) : (cursor += 1) { // After while (cursor < end) : (cursor += 1) { ``` Where `end` is already defined as `contents.len` at the top of the function. ### How did you verify your code works? - Added bundler test `banner/SourceHashbangWithBytecodeAndCJSTargetBun` in `test/bundler/bundler_banner.test.ts` - Added regression tests in `test/regression/issue/bun-bytecode-shebang.test.ts` that verify: - CJS wrapper executes when source has shebang - CJS wrapper executes when source has shebang + bytecode pragma - End-to-end: bundled bytecode output with source shebang runs correctly - Ran the tests in the [kjanat/bun-bytecode-banner-bug](https://github.com/kjanat/bun-bytecode-banner-bug) repo to verify the issue is fixed --------- Signed-off-by: Kaj Kowalski <info@kajkowalski.nl> Co-authored-by: Dylan Conway <dylan.conway567@gmail.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
236 lines
6.8 KiB
TypeScript
236 lines
6.8 KiB
TypeScript
import { describe, expect } from "bun:test";
|
|
import { itBundled } from "./expectBundled";
|
|
|
|
describe("bundler", () => {
|
|
itBundled("banner/CommentBanner", {
|
|
banner: "// developed with love in SF",
|
|
files: {
|
|
"/a.js": `console.log("Hello, world!")`,
|
|
},
|
|
onAfterBundle(api) {
|
|
api.expectFile("out.js").toContain("// developed with love in SF");
|
|
},
|
|
});
|
|
itBundled("banner/MultilineBanner", {
|
|
banner: `"use client";
|
|
// This is a multiline banner
|
|
// It can contain multiple lines of comments or code`,
|
|
files: {
|
|
/* js*/ "index.js": `console.log("Hello, world!")`,
|
|
},
|
|
onAfterBundle(api) {
|
|
api.expectFile("out.js").toContain(`"use client";
|
|
// This is a multiline banner
|
|
// It can contain multiple lines of comments or code`);
|
|
},
|
|
});
|
|
itBundled("banner/UseClientBanner", {
|
|
banner: '"use client";',
|
|
files: {
|
|
/* js*/ "index.js": `console.log("Hello, world!")`,
|
|
},
|
|
onAfterBundle(api) {
|
|
api.expectFile("out.js").toContain('"use client";');
|
|
},
|
|
});
|
|
|
|
itBundled("banner/BannerWithCJSAndTargetBun", {
|
|
banner: "// Copyright 2024 Example Corp",
|
|
format: "cjs",
|
|
target: "bun",
|
|
backend: "api",
|
|
outdir: "/out",
|
|
minifyWhitespace: true,
|
|
files: {
|
|
"a.js": `module.exports = 1;`,
|
|
},
|
|
onAfterBundle(api) {
|
|
const content = api.readFile("/out/a.js");
|
|
expect(content).toMatchInlineSnapshot(`
|
|
"// @bun @bun-cjs
|
|
(function(exports, require, module, __filename, __dirname) {// Copyright 2024 Example Corp
|
|
module.exports=1;})
|
|
"
|
|
`);
|
|
},
|
|
});
|
|
|
|
itBundled("banner/HashbangBannerWithCJSAndTargetBun", {
|
|
banner: "#!/usr/bin/env -S node --enable-source-maps\n// Additional banner content",
|
|
format: "cjs",
|
|
target: "bun",
|
|
backend: "api",
|
|
outdir: "/out",
|
|
minifyWhitespace: true,
|
|
files: {
|
|
"/a.js": `module.exports = 1;`,
|
|
},
|
|
onAfterBundle(api) {
|
|
const content = api.readFile("/out/a.js");
|
|
expect(content).toMatchInlineSnapshot(`
|
|
"#!/usr/bin/env -S node --enable-source-maps
|
|
// @bun @bun-cjs
|
|
(function(exports, require, module, __filename, __dirname) {// Additional banner content
|
|
module.exports=1;})
|
|
"
|
|
`);
|
|
},
|
|
});
|
|
|
|
itBundled("banner/SourceHashbangWithBannerAndCJSTargetBun", {
|
|
banner: "// Copyright 2024 Example Corp",
|
|
format: "cjs",
|
|
target: "bun",
|
|
outdir: "/out",
|
|
minifyWhitespace: true,
|
|
backend: "api",
|
|
files: {
|
|
"/a.js": `#!/usr/bin/env node
|
|
module.exports = 1;`,
|
|
},
|
|
onAfterBundle(api) {
|
|
const content = api.readFile("/out/a.js");
|
|
expect(content).toMatchInlineSnapshot(`
|
|
"#!/usr/bin/env node
|
|
// @bun @bun-cjs
|
|
(function(exports, require, module, __filename, __dirname) {// Copyright 2024 Example Corp
|
|
module.exports=1;})
|
|
"
|
|
`);
|
|
},
|
|
});
|
|
|
|
itBundled("banner/BannerWithESMAndTargetBun", {
|
|
banner: "// Copyright 2024 Example Corp",
|
|
format: "esm",
|
|
target: "bun",
|
|
backend: "api",
|
|
minifyWhitespace: true,
|
|
files: {
|
|
"/a.js": `export default 1;`,
|
|
},
|
|
onAfterBundle(api) {
|
|
const content = api.readFile("out.js");
|
|
// @bun comment should come first, then banner
|
|
const bunCommentIndex = content.indexOf("// @bun");
|
|
const bannerIndex = content.indexOf("// Copyright 2024 Example Corp");
|
|
|
|
expect(bunCommentIndex).toBe(0);
|
|
expect(bannerIndex).toBeGreaterThan(bunCommentIndex);
|
|
// No CJS wrapper in ESM format
|
|
expect(content).not.toContain("(function(exports, require, module, __filename, __dirname)");
|
|
expect(content).toMatchInlineSnapshot(`
|
|
"// @bun
|
|
// Copyright 2024 Example Corp
|
|
var a_default=1;export{a_default as default};
|
|
"
|
|
`);
|
|
},
|
|
});
|
|
|
|
itBundled("banner/HashbangBannerWithESMAndTargetBun", {
|
|
banner: "#!/usr/bin/env -S node --enable-source-maps\n// Additional banner content",
|
|
format: "esm",
|
|
target: "bun",
|
|
backend: "api",
|
|
outdir: "/out",
|
|
minifyWhitespace: true,
|
|
files: {
|
|
"/a.js": `export default 1;`,
|
|
},
|
|
onAfterBundle(api) {
|
|
const content = api.readFile("/out/a.js");
|
|
expect(content).toMatchInlineSnapshot(`
|
|
"#!/usr/bin/env -S node --enable-source-maps
|
|
// @bun
|
|
// Additional banner content
|
|
var a_default=1;export{a_default as default};
|
|
"
|
|
`);
|
|
},
|
|
});
|
|
|
|
itBundled("banner/BannerWithBytecodeAndCJSTargetBun", {
|
|
banner: "// Copyright 2024 Example Corp",
|
|
format: "cjs",
|
|
target: "bun",
|
|
backend: "api",
|
|
bytecode: true,
|
|
minifyWhitespace: true,
|
|
outdir: "/out",
|
|
files: {
|
|
"/a.js": `module.exports = 1;`,
|
|
},
|
|
onAfterBundle(api) {
|
|
const content = api.readFile("/out/a.js");
|
|
expect(content).toMatchInlineSnapshot(`
|
|
"// @bun @bytecode @bun-cjs
|
|
(function(exports, require, module, __filename, __dirname) {// Copyright 2024 Example Corp
|
|
module.exports=1;})
|
|
"
|
|
`);
|
|
// @bun @bytecode @bun-cjs comment should come first, then CJS wrapper, then banner
|
|
const bunBytecodeIndex = content.indexOf("// @bun @bytecode @bun-cjs");
|
|
const wrapperIndex = content.indexOf("(function(exports, require, module, __filename, __dirname) {");
|
|
const bannerIndex = content.indexOf("// Copyright 2024 Example Corp");
|
|
|
|
expect(bunBytecodeIndex).toBe(0);
|
|
expect(wrapperIndex).toBeGreaterThan(bunBytecodeIndex);
|
|
expect(bannerIndex).toBeGreaterThan(wrapperIndex);
|
|
},
|
|
});
|
|
|
|
itBundled("banner/HashbangBannerWithBytecodeAndCJSTargetBun", {
|
|
banner: "#!/usr/bin/env bun\n// Production build",
|
|
format: "cjs",
|
|
target: "bun",
|
|
bytecode: true,
|
|
backend: "api",
|
|
outdir: "/out",
|
|
minifyWhitespace: true,
|
|
files: {
|
|
"/a.js": `module.exports = 1;`,
|
|
},
|
|
onAfterBundle(api) {
|
|
const content = api.readFile("/out/a.js");
|
|
|
|
expect(content).toMatchInlineSnapshot(`
|
|
"#!/usr/bin/env bun
|
|
// @bun @bytecode @bun-cjs
|
|
(function(exports, require, module, __filename, __dirname) {// Production build
|
|
module.exports=1;})
|
|
"
|
|
`);
|
|
},
|
|
});
|
|
|
|
itBundled("banner/SourceHashbangWithBytecodeAndCJSTargetBun", {
|
|
banner: "// Copyright 2024 Example Corp",
|
|
format: "cjs",
|
|
target: "bun",
|
|
bytecode: true,
|
|
outdir: "/out",
|
|
minifyWhitespace: true,
|
|
backend: "api",
|
|
files: {
|
|
"/a.js": `#!/usr/bin/env bun
|
|
module.exports = 1;
|
|
console.log("bun!");`,
|
|
},
|
|
onAfterBundle(api) {
|
|
const content = api.readFile("/out/a.js");
|
|
// Shebang from source should come first, then @bun pragma
|
|
expect(content).toMatchInlineSnapshot(`
|
|
"#!/usr/bin/env bun
|
|
// @bun @bytecode @bun-cjs
|
|
(function(exports, require, module, __filename, __dirname) {// Copyright 2024 Example Corp
|
|
module.exports=1;console.log("bun!");})
|
|
"
|
|
`);
|
|
},
|
|
run: {
|
|
stdout: "bun!\n",
|
|
},
|
|
});
|
|
});
|