feat: support specifying browser platform

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
           workspaces: src/rs_lib
 
       - name: build
-        run: deno task wasmbuild
+        run: deno task build
 
       - name: fmt
         run: deno fmt --check
@@ -58,6 +58,6 @@ jobs:
         with:
           workspaces: src/rs_lib
       - name: build
-        run: deno task wasmbuild
+        run: deno task build
       - name: Publish to JSR on tag
         run: deno run -A jsr:@david/publish-on-tag@0.2.0

deno.json

@@ -1,7 +1,7 @@
 {
   "name": "@deno/loader",
   "tasks": {
-    "wasmbuild": "cd src/rs_lib && deno run -A jsr:@deno/wasmbuild@0.19.2 --out ../lib"
+    "build": "cd src/rs_lib && deno run -A jsr:@deno/wasmbuild@0.19.2 --out ../lib"
   },
   "lint": {
     "rules": {

src/mod.ts

@@ -53,6 +53,11 @@ export interface WorkspaceOptions {
   configPath?: string;
   /** Node resolution conditions to use for resolving package.json exports. */
   nodeConditions?: string[];
+  /**
+   * Platform to bundle for.
+   * @default "node"
+   */
+  platform?: "node" | "browser";
   /** Whether to force using the cache. */
   cachedOnly?: boolean;
   /** Enable debug logs. */

src/rs_lib/lib.rs

@@ -121,6 +121,8 @@ pub struct DenoWorkspaceOptions {
   #[serde(default)]
   pub no_lock: Option<bool>,
   #[serde(default)]
+  pub platform: Option<String>,
+  #[serde(default)]
   pub config_path: Option<String>,
   #[serde(default)]
   pub node_conditions: Option<Vec<String>>,
@@ -162,8 +164,20 @@ impl DenoWorkspace {
   }
 
   fn new_inner(options: DenoWorkspaceOptions) -> Result<Self, anyhow::Error> {
+    fn resolve_is_browser_platform(
+      options: &DenoWorkspaceOptions,
+    ) -> Result<bool, anyhow::Error> {
+      Ok(match options.platform.as_deref() {
+        Some("node" | "deno") => false,
+        Some("browser") => true,
+        Some(value) => bail!("Unknown platform '{}'", value),
+        None => false,
+      })
+    }
+
     let sys = RealSys;
     let cwd = sys.env_current_dir()?;
+    let is_browser_platform = resolve_is_browser_platform(&options)?;
     let config_discovery = if options.no_config.unwrap_or_default() {
       ConfigDiscoveryOption::Disabled
     } else if let Some(config_path) = options.config_path {
@@ -213,9 +227,8 @@ impl DenoWorkspace {
         unstable_sloppy_imports: true,
         npm_system_info: npm_system_info()?,
         node_resolver_options: NodeResolverOptions {
-          // todo: support these
-          prefer_browser_field: false,
-          bundle_mode: false,
+          is_browser_platform,
+          bundle_mode: true,
           conditions: NodeConditionOptions {
             conditions: options
               .node_conditions

tests/platform_browser/main.test.ts

@@ -0,0 +1,27 @@
+import { ResolutionMode } from "@deno/loader";
+import { createLoader } from "../helpers.ts";
+import { assert } from "@std/assert";
+
+Deno.test("resolves to browser locations", async () => {
+  const { loader } = await createLoader({
+    configPath: import.meta.dirname + "/testdata/deno.json",
+    platform: "browser",
+  }, {
+    entrypoints: [],
+  });
+
+  assert(
+    loader.resolveSync(
+      "package",
+      import.meta.resolve("./testdata/main.js"),
+      ResolutionMode.Import,
+    ).endsWith("browser.js"),
+  );
+  assert(
+    loader.resolveSync(
+      "browser-main",
+      import.meta.resolve("./testdata/main.js"),
+      ResolutionMode.Import,
+    ).endsWith("browser.js"),
+  );
+});

tests/platform_browser/testdata/deno.json

@@ -0,0 +1,2 @@
+{
+}

tests/platform_browser/testdata/package.json

@@ -0,0 +1,2 @@
+{
+}