Fix minified shader parsing in build

flatpickles · Nov 18, 2023 · 280d730 · 280d730
1 parent 36e580f
commit 280d730
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sketchbook2",
-    "version": "0.2.5",
+    "version": "0.2.6",
     "private": true,
     "scripts": {
         "dev": "vite dev",

diff --git a/vite.config.ts b/vite.config.ts
@@ -20,8 +20,8 @@ function viteGlslify() {
                 // Match a couple different formats of parsed files
                 if (code.startsWith('export default ')) {
                     code = code.replace('export default "', '').slice(0, -1);
-                } else if (code.includes('export {\n')) {
-                    const afterDef = code.split(/= "/)[1];
+                } else if (/export\s*{/.test(code)) {
+                    const afterDef = code.split(/=\s*"/)[1];
                     code = afterDef.split(/";\n/)[0];
                 } else {
                     throw new Error(`Unexpected shader file format for ${id}: ${code}`);