aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Colin McDonnell <colinmcd94@gmail.com> 2023-04-28 08:35:20 -0700
committerGravatar GitHub <noreply@github.com> 2023-04-28 08:35:20 -0700
commit1483d73c3a9a4a045287df62c85b2173d80e8ceb (patch)
tree77aa6307d7b452b2759c3e7d53f3ebdc8761dd78 /src
parent52c50e37371ed0bf208de2b2e8dbf7c2cc1bd97c (diff)
downloadbun-1483d73c3a9a4a045287df62c85b2173d80e8ceb.tar.gz
bun-1483d73c3a9a4a045287df62c85b2173d80e8ceb.tar.zst
bun-1483d73c3a9a4a045287df62c85b2173d80e8ceb.zip
Bundler docs updates + support for `naming` string (#2767)
* Bundler docs updates * Remove comments * Updates * Fix bunx usages * Add info about metafile
Diffstat (limited to '')
-rw-r--r--src/bun.js/api/JSBundler.zig41
-rw-r--r--src/cli.zig2
2 files changed, 27 insertions, 16 deletions
diff --git a/src/bun.js/api/JSBundler.zig b/src/bun.js/api/JSBundler.zig
index 50160f1dc..eae4da646 100644
--- a/src/bun.js/api/JSBundler.zig
+++ b/src/bun.js/api/JSBundler.zig
@@ -167,23 +167,34 @@ pub const JSBundler = struct {
this.public_path.appendSliceExact(slice.slice()) catch unreachable;
}
- if (try config.getObject(globalThis, "naming")) |naming| {
- if (try naming.getOptional(globalThis, "entrypoint", ZigString.Slice)) |slice| {
- defer slice.deinit();
- this.names.owned_entry_point.appendSliceExact(slice.slice()) catch unreachable;
- this.names.entry_point.data = this.names.owned_entry_point.list.items;
- }
+ if (config.getTruthy(globalThis, "naming")) |naming| {
+ if (naming.isString()) {
+ if (try config.getOptional(globalThis, "naming", ZigString.Slice)) |slice| {
+ defer slice.deinit();
+ this.names.owned_entry_point.appendSliceExact(slice.slice()) catch unreachable;
+ this.names.entry_point.data = this.names.owned_entry_point.list.items;
+ }
+ } else if (naming.isObject()) {
+ if (try naming.getOptional(globalThis, "entrypoint", ZigString.Slice)) |slice| {
+ defer slice.deinit();
+ this.names.owned_entry_point.appendSliceExact(slice.slice()) catch unreachable;
+ this.names.entry_point.data = this.names.owned_entry_point.list.items;
+ }
- if (try naming.getOptional(globalThis, "chunk", ZigString.Slice)) |slice| {
- defer slice.deinit();
- this.names.owned_chunk.appendSliceExact(slice.slice()) catch unreachable;
- this.names.chunk.data = this.names.owned_chunk.list.items;
- }
+ if (try naming.getOptional(globalThis, "chunk", ZigString.Slice)) |slice| {
+ defer slice.deinit();
+ this.names.owned_chunk.appendSliceExact(slice.slice()) catch unreachable;
+ this.names.chunk.data = this.names.owned_chunk.list.items;
+ }
- if (try naming.getOptional(globalThis, "asset", ZigString.Slice)) |slice| {
- defer slice.deinit();
- this.names.owned_asset.appendSliceExact(slice.slice()) catch unreachable;
- this.names.asset.data = this.names.owned_asset.list.items;
+ if (try naming.getOptional(globalThis, "asset", ZigString.Slice)) |slice| {
+ defer slice.deinit();
+ this.names.owned_asset.appendSliceExact(slice.slice()) catch unreachable;
+ this.names.asset.data = this.names.owned_asset.list.items;
+ }
+ } else {
+ globalThis.throwInvalidArguments("Expected naming to be a string or an object", .{});
+ return error.JSException;
}
}
diff --git a/src/cli.zig b/src/cli.zig
index 142ab06e3..86dce4dca 100644
--- a/src/cli.zig
+++ b/src/cli.zig
@@ -162,7 +162,7 @@ pub const Arguments = struct {
clap.parseParam("-d, --define <STR>... Substitute K:V while parsing, e.g. --define process.env.NODE_ENV:\"development\". Values are parsed as JSON.") catch unreachable,
clap.parseParam("-e, --external <STR>... Exclude module from transpilation (can use * wildcards). ex: -e react") catch unreachable,
clap.parseParam("-h, --help Display this help and exit. ") catch unreachable,
- clap.parseParam("-l, --loader <STR>... Parse files with .ext:loader, e.g. --loader .js:jsx. Valid loaders: jsx, js, json, tsx, ts, css") catch unreachable,
+ clap.parseParam("-l, --loader <STR>... Parse files with .ext:loader, e.g. --loader .js:jsx. Valid loaders: js, jsx, ts, tsx, json, toml, text, file, wasm, napi") catch unreachable,
clap.parseParam("-u, --origin <STR> Rewrite import URLs to start with --origin. Default: \"\"") catch unreachable,
clap.parseParam("-p, --port <STR> Port to serve bun's dev server on. Default: \"3000\"") catch unreachable,
clap.parseParam("--minify Minify (experimental)") catch unreachable,