Migrate to rollup-plugin-rust

wipplelang · Jul 29, 2023 · 0915ada · 0915ada
1 parent 869ceb9
commit 0915ada
Show file tree

Hide file tree

Showing 12 changed files with 615 additions and 97 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,2 +1,5 @@
 [env]
 CARGO_WORKSPACE_DIR = { value = "", relative = true }
+
+[target.'cfg(target_arch = "wasm32")']
+rustflags = ["-C", "link-arg=--max-memory=4294967296"]
diff --git a/website/embed/package.json b/website/embed/package.json
@@ -23,6 +23,7 @@
         "@types/react": "^18.0.27",
         "@types/react-dom": "^18.0.10",
         "@vitejs/plugin-react-swc": "^3.0.0",
+        "@wasm-tool/rollup-plugin-rust": "^2.4.0",
         "autoprefixer": "^10.4.13",
         "nodemon": "^2.0.20",
         "postcss": "^8.4.21",

diff --git a/website/embed/vite.config.ts b/website/embed/vite.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig, loadEnv } from "vite";
 import react from "@vitejs/plugin-react-swc";
-import wasm from "vite-plugin-wasm";
-import topLevelAwait from "vite-plugin-top-level-await";
+import rust from "@wasm-tool/rollup-plugin-rust";
+import { rustOptions } from "../shared/build";
 import path from "path";
 import pkg from "./package.json";
 
@@ -17,14 +17,9 @@ export default defineConfig(({ command, mode }) => {
                 formats: ["es"],
             },
         },
-        plugins: [react(), wasm(), topLevelAwait()],
+        plugins: [react(), rust(rustOptions(env))],
         worker: {
-            plugins: [wasm(), topLevelAwait()],
-            rollupOptions: {
-                output: {
-                    inlineDynamicImports: true,
-                },
-            },
+            plugins: [rust(rustOptions(env))],
         },
         server: {
             port: 3000,