Adds rust_to_wasm and rust_to_wasm support to transpile_web_ui

.semgrepignore

@@ -27,3 +27,4 @@ tests/
 # Ignore third_party rust libraries
 third_party/rust/
 tools/crates/cargo_audit/
+tools/crates/wasm_pack/

BUILD.gn

@@ -7,6 +7,7 @@ import(
     "//brave/browser/brave_vpn/win/brave_vpn_wireguard_service/allowlist.gni")
 import("//brave/build/config.gni")
 import("//brave/components/brave_vpn/common/buildflags/buildflags.gni")
+import("//brave/tools/crates/sources.gni")
 import("//build/config/locales.gni")
 import("//build/config/zip.gni")
 import("//chrome/browser/buildflags.gni")
@@ -608,37 +609,6 @@ if (is_mac) {
   }
 }
 
-cargo_audit_target_dir = "$root_build_dir/cargo_audit"
-cargo_audit_exe = "$cargo_audit_target_dir/release/cargo-audit"
-cargo_audit_src = "//brave/tools/crates/cargo_audit/v0_21/crate"
-if (host_os == "win") {
-  cargo_audit_exe += ".exe"
-}
-
-action("build_cargo_audit") {
-  script = "//build/gn_run_binary.py"
-
-  cargo_exe = "//third_party/rust-toolchain/bin/cargo"
-  if (host_os == "win") {
-    cargo_exe += ".exe"
-  }
-
-  inputs = [
-    cargo_exe,
-    "$cargo_audit_src/Cargo.lock",
-  ]
-  outputs = [ cargo_audit_exe ]
-  args = [
-    rebase_path(cargo_exe),
-    "build",
-    "--release",
-    "--manifest-path",
-    rebase_path("$cargo_audit_src/Cargo.toml"),
-    "--target-dir",
-    rebase_path(cargo_audit_target_dir),
-  ]
-}
-
 action("audit_deps") {
   script = "//brave/script/audit_deps.py"
 
@@ -653,7 +623,7 @@ action("audit_deps") {
     args += [ "--audit_dev_deps" ]
   }
 
-  deps = [ ":build_cargo_audit" ]
+  deps = [ "//brave/tools/crates:build_cargo_audit" ]
 }
 
 if (is_redirect_cc_build) {

components/brave_extension/extension/brave_extension/BUILD.gn

@@ -36,6 +36,8 @@ transpile_web_ui("brave_extension") {
 
   public_asset_path = "/out/"
 
+  sync_wasm = true
+
   deps =
       [ "//brave/components/brave_extension:web_discovery_project_resources" ]
 }

components/common/rust_to_wasm.gni

@@ -0,0 +1,64 @@
+# Copyright (c) 2025 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at https://mozilla.org/MPL/2.0/.
+
+import("//brave/tools/crates/sources.gni")
+
+template("rust_to_wasm") {
+  assert(defined(invoker.rust_packages),
+         "Need rust_packages in $target_name listing the Config.toml files.")
+  if (defined(invoker.wasm_pack_target)) {
+    assert(invoker.wasm_pack_target == "bundler" ||
+               invoker.wasm_pack_target == "nodejs" ||
+               invoker.wasm_pack_target == "web",
+           "${invoker.wasm_pack_target} is not a supported wasm-pack target.")
+  }
+
+  action_foreach(target_name) {
+    deps = [ "//brave/tools/crates:build_wasm_pack" ]
+    if (defined(invoker.deps)) {
+      deps += invoker.deps
+    }
+
+    inputs = [ wasm_pack_exe ]
+    sources = invoker.rust_packages
+    inputs += sources
+
+    script = "//build/gn_run_binary.py"
+
+    wasm_pack_target = "bundler"
+    if (defined(invoker.wasm_pack_target)) {
+      wasm_pack_target = invoker.wasm_pack_target
+    }
+
+    args = [
+      rebase_path(wasm_pack_exe),
+      "build",
+      "{{source_dir}}",
+      "--target",
+      wasm_pack_target,
+      "--out-dir",
+      rebase_path("$root_out_dir/{{source_gen_dir}}/$wasm_pack_target/pkg"),
+      "--out-name",
+      "index",
+      "--",
+      "--target-dir",
+      rebase_path("$root_out_dir/{{source_gen_dir}}/$wasm_pack_target/target"),
+    ]
+
+    # common output files for all the wasm-pack targets
+    outputs = [
+      "{{source_gen_dir}}/$wasm_pack_target/pkg/index_bg.wasm",
+      "{{source_gen_dir}}/$wasm_pack_target/pkg/index_bg.wasm.d.ts",
+      "{{source_gen_dir}}/$wasm_pack_target/pkg/index.d.ts",
+      "{{source_gen_dir}}/$wasm_pack_target/pkg/index.js",
+      "{{source_gen_dir}}/$wasm_pack_target/pkg/package.json",
+    ]
+
+    # additional output file for the bundler wasm-pack target
+    if (wasm_pack_target == "bundler") {
+      outputs += [ "{{source_gen_dir}}/$wasm_pack_target/pkg/index_bg.js" ]
+    }
+  }
+}

components/common/typescript.gni

@@ -4,6 +4,7 @@
 # You can obtain one at https://mozilla.org/MPL/2.0/.
 
 import("//brave/resources/brave_grit.gni")
+import("rust_to_wasm.gni")
 
 # JS / TS imports via `require` or `import` will be added to a list and
 # provided to GN so it knows which projects to re-build when you modify a file
@@ -34,6 +35,7 @@ brave_common_web_compile_inputs = [
   rebase_path("../webpack/gen-webpack-grd.js"),
   rebase_path("../webpack/path-map.js"),
   rebase_path("../webpack/webpack-plugin-depfile.js"),
+  rebase_path("../webpack/xhr-compile-async-wasm-plugin.js"),
 
   # typescript config changes warrant a re-build of all typescript builds
   "//brave/tsconfig.json",
@@ -84,6 +86,12 @@ brave_common_web_compile_inputs = [
 #     If true, the resulting bundle will be a JS module that can import other
 #     modules using `import` syntax.
 template("transpile_web_ui") {
+  if (defined(invoker.rust_packages)) {
+    rust_to_wasm("build_rust_packages") {
+      rust_packages = invoker.rust_packages
+    }
+  }
+
   action(target_name) {
     script = "//brave/script/transpile-web-ui.py"
 
@@ -109,6 +117,10 @@ template("transpile_web_ui") {
       deps += invoker.deps
     }
 
+    if (defined(invoker.rust_packages)) {
+      deps += [ ":build_rust_packages" ]
+    }
+
     # This depfile will be generated by the build script.
     # We keep it outside the output_dir since we don't want
     # it to be included in the packaged output.
@@ -192,6 +204,18 @@ template("transpile_web_ui") {
       args += [ "--production" ]
     }
 
+    if (defined(invoker.module_library_type) && invoker.module_library_type) {
+      args += [ "--module_library_type" ]
+    }
+
+    if (defined(invoker.sync_wasm) && invoker.sync_wasm) {
+      args += [ "--sync_wasm" ]
+    }
+
+    if (defined(invoker.xhr_wasm_loading) && invoker.xhr_wasm_loading) {
+      args += [ "--xhr_wasm_loading" ]
+    }
+
     forward_variables_from(invoker,
                            [
                              "public_deps",

components/webpack/webpack.config.js

@@ -6,6 +6,7 @@
 const path = require('path')
 const webpack = require('webpack')
 const GenerateDepfilePlugin = require('./webpack-plugin-depfile')
+const XHRCompileAsyncWasmPlugin = require('./xhr-compile-async-wasm-plugin.js')
 const { fallback, provideNodeGlobals } = require('./polyfill')
 const pathMap = require('./path-map')(process.env.ROOT_GEN_DIR)
 
@@ -73,9 +74,25 @@ module.exports = async function (env, argv) {
     chunkFilename: '[name].chunk.js',
     publicPath: '/'
   }
+  if (env.module_library_type) {
+    output.library = { type: 'module' }
+  }
   if (env.output_public_path) {
     output.publicPath = env.output_public_path
   }
+  if (env.xhr_wasm_loading) {
+    output.enabledWasmLoadingTypes = [ 'xhr' ]
+    output.wasmLoading = 'xhr'
+  }
+
+  const experiments = {
+    outputModule: Boolean(env.output_module)
+  }
+  if (env.sync_wasm) {
+    experiments.syncWebAssembly = true
+  } else {
+    experiments.asyncWebAssembly = true
+  }
 
   return {
     entry,
@@ -89,10 +106,7 @@ module.exports = async function (env, argv) {
       // Define NO_CONCATENATE for analyzing module size.
       concatenateModules: !process.env.NO_CONCATENATE
     },
-    experiments: {
-      syncWebAssembly: true,
-      outputModule: Boolean(env.output_module)
-    },
+    experiments,
     externals: [
       function ({ context, request }, callback) {
         if (env.output_module) {
@@ -133,6 +147,7 @@ module.exports = async function (env, argv) {
       ...Object.keys(pathMap)
         .filter(p => p.startsWith('chrome://'))
         .map(p => prefixReplacer(p, pathMap[p])),
+      env.xhr_wasm_loading && new XHRCompileAsyncWasmPlugin(),
     ],
     module: {
       rules: [

components/webpack/xhr-compile-async-wasm-plugin.js

@@ -0,0 +1,75 @@
+/* Copyright (c) 2025 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("webpack/lib/ModuleTypeConstants");
+const AsyncWasmLoadingRuntimeModule = require("webpack/lib/wasm-async/AsyncWasmLoadingRuntimeModule");
+
+const PLUGIN_NAME = "XHRCompileAsyncWasmPlugin";
+
+class XHRCompileAsyncWasmPlugin {
+  type = "xhr";
+
+  apply(compiler) {
+    const { webpack } = compiler;
+    const { RuntimeGlobals, Template, wasm } = webpack;
+    wasm.EnableWasmLoadingPlugin.setEnabled(compiler, this.type);
+
+    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+      const { outputOptions, runtimeTemplate } = compilation;
+      const globalWasmLoading = outputOptions.wasmLoading;
+
+      const isEnabledForChunk = chunk => {
+        const options = chunk.getEntryOptions();
+        const wasmLoading =
+          options && options.wasmLoading !== undefined
+            ? options.wasmLoading
+            : globalWasmLoading;
+        return wasmLoading === this.type;
+      };
+
+      const generateLoadBinaryCode = path =>
+        Template.asString([
+          `new Promise(${runtimeTemplate.basicFunction(
+            "resolve",
+            [
+              "const request = new XMLHttpRequest();",
+              `request.onload = ${runtimeTemplate.returningFunction(
+                "resolve({ arrayBuffer() { return request.response }})",
+                ""
+              )};`,
+              `request.open("GET", ${RuntimeGlobals.publicPath} + ${path});`,
+              'request.responseType = "arraybuffer";',
+              "request.send();",
+            ]
+          )})`
+        ]);
+
+      compilation.hooks.runtimeRequirementInTree
+        .for(RuntimeGlobals.instantiateWasm)
+        .tap(PLUGIN_NAME, (chunk, set, { chunkGraph }) => {
+          if (!isEnabledForChunk(chunk)) return;
+          if (
+            !chunkGraph.hasModuleInGraph(
+              chunk,
+              m => m.type === WEBASSEMBLY_MODULE_TYPE_ASYNC
+            )
+          ) {
+            return;
+          }
+          set.add(RuntimeGlobals.publicPath);
+          compilation.addRuntimeModule(
+            chunk,
+            new class extends AsyncWasmLoadingRuntimeModule {
+              constructor(generateLoadBinaryCode) {
+                super({ generateLoadBinaryCode, supportsStreaming: false });
+              }
+            }(generateLoadBinaryCode)
+          );
+        });
+    });
+  }
+}
+
+module.exports = XHRCompileAsyncWasmPlugin;