From 1483d73c3a9a4a045287df62c85b2173d80e8ceb Mon Sep 17 00:00:00 2001 From: Colin McDonnell Date: Fri, 28 Apr 2023 08:35:20 -0700 Subject: Bundler docs updates + support for `naming` string (#2767) * Bundler docs updates * Remove comments * Updates * Fix bunx usages * Add info about metafile --- src/bun.js/api/JSBundler.zig | 41 ++++++++++++++++++++++++++--------------- src/cli.zig | 2 +- 2 files changed, 27 insertions(+), 16 deletions(-) (limited to 'src') 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 ... Substitute K:V while parsing, e.g. --define process.env.NODE_ENV:\"development\". Values are parsed as JSON.") catch unreachable, clap.parseParam("-e, --external ... 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 ... Parse files with .ext:loader, e.g. --loader .js:jsx. Valid loaders: jsx, js, json, tsx, ts, css") catch unreachable, + clap.parseParam("-l, --loader ... 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 Rewrite import URLs to start with --origin. Default: \"\"") catch unreachable, clap.parseParam("-p, --port Port to serve bun's dev server on. Default: \"3000\"") catch unreachable, clap.parseParam("--minify Minify (experimental)") catch unreachable, -- cgit v1.2.3