Another config change to keep nextjs happy, cleanup wasm import hack

compute-toys · Aug 4, 2024 · 9e4ed57 · 9e4ed57
1 parent a5d6545
commit 9e4ed57
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/lib/atoms/wgputoyatoms.tsx b/lib/atoms/wgputoyatoms.tsx
@@ -1,6 +1,6 @@
 'use client';
 import { atom } from 'jotai';
-import { WgpuToyRenderer } from 'lib/wgputoy';
+import { create_renderer, WgpuToyRenderer } from 'lib/wgputoy';
 import { getDimensions } from '../../types/canvasdimensions';
 
 // just to check if the object has already been freed (ptr=0)
@@ -29,14 +29,9 @@ type WgpuStatus = 'available' | 'unavailable' | 'unknown';
 export const wgpuAvailabilityAtom = atom<WgpuStatus>('unknown');
 
 export const wgputoyAtom = atom<Promise<WgpuToyRenderer | false>>(async get => {
-    // https://github.com/webpack/webpack/issues/11347
-    const wasm = await import('lib/wgputoy/wgputoy_bg.wasm');
-    const { __wbg_set_wasm, create_renderer } = await import('lib/wgputoy/wgputoy_bg.js');
     if (!isSSR && get(canvasElAtom) !== false && get(canvasParentElAtom)) {
         const parentEl = get(canvasParentElAtom);
         const dim = getDimensions(parentEl.offsetWidth * window.devicePixelRatio);
-        console.log('Initialising WebGPU renderer');
-        __wbg_set_wasm(wasm);
         return create_renderer(dim.x, dim.y, (get(canvasElAtom) as HTMLCanvasElement).id);
     } else {
         return false;

diff --git a/next.config.js b/next.config.js
@@ -22,6 +22,9 @@ function getImageConfig() {
 const nextConfig = {
     reactStrictMode: true,
     images: getImageConfig(),
+    experimental: {
+        esmExternals: 'loose'
+    },
     async redirects() {
         return [
             {
@@ -41,7 +44,7 @@ const nextConfig = {
     },
     webpack(config, { isServer, dev }) {
         config.experiments = {
-            syncWebAssembly: true,
+            asyncWebAssembly: true,
             layers: true
         };
         if (isServer && !dev) {