Merge remote-tracking branch 'origin/main' into fix-tidal-package

Merge pull request 'remove supradough' (#2147 ) from remove-supradough into main
Reviewed-on: https://codeberg.org/uzu/strudel/pulls/2147
2026-10-16 04:46:02 -04:00 · 2026-10-15 16:12:59 +02:00 · 2026-10-15 15:07:11 +02:00 · 2026-10-12 18:28:41 +02:00
4 changed files with 15 additions and 8 deletions
@@ -29,10 +29,10 @@
  },
  "homepage": "https://codeberg.org/uzu/strudel/",
  "dependencies": {
-    "web-tree-sitter": "^0.24.7"
+    "web-tree-sitter": "^0.24.7",
+    "tree-sitter-haskell": "^0.23.1"
  },
  "devDependencies": {
-    "tree-sitter-haskell": "^0.23.1",
    "vite": "^6.0.11"
  },
  "engines": {
@@ -1,6 +1,8 @@
 import Parser from 'web-tree-sitter';
+import treeSitterWasm from 'web-tree-sitter/tree-sitter.wasm?url';
+import grammarWasm from 'tree-sitter-haskell/tree-sitter-haskell.wasm?url';

-let base = '/';
+let base;
 export function setBase(path) {
  base = path;
 }
@@ -10,11 +12,15 @@ let isReady = false,
 async function _loadParser() {
  await Parser.init({
    locateFile(scriptName, scriptDirectory) {
-      return `${base}${scriptName}`;
+      if (base) {
+        return `${base}${scriptName}`;
+      }
+      return treeSitterWasm;
    },
  });
  parser = new Parser();
-  const Lang = await Parser.Language.load(`${base}tree-sitter-haskell.wasm`);
+  let grammarUrl = base ? `${base}tree-sitter-haskell.wasm` : grammarWasm;
+  const Lang = await Parser.Language.load(grammarUrl);
  parser.setLanguage(Lang);
  isReady = true;
  return parser;
@@ -3,6 +3,7 @@
  "version": "0.2.0",
  "private": true,
  "description": "Experimental Tidal Code interpreter",
+  "main": "tidal.mjs",
  "module": "tidal.mjs",
  "repository": {
    "type": "git",
@@ -359,13 +359,13 @@ importers:

  packages/hs2js:
    dependencies:
+      tree-sitter-haskell:
+        specifier: ^0.23.1
+        version: 0.23.1(tree-sitter@0.21.1)
      web-tree-sitter:
        specifier: ^0.24.7
        version: 0.24.7
    devDependencies:
-      tree-sitter-haskell:
-        specifier: ^0.23.1
-        version: 0.23.1(tree-sitter@0.21.1)
      vite:
        specifier: ^6.0.11
        version: 6.0.11(@types/node@22.10.10)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
Author	SHA1	Message	Date
Felix Roos	dedd687a1f	Merge remote-tracking branch 'origin/main' into fix-tidal-package	2026-10-15 16:12:59 +02:00
froos	6abb9f85a8	Merge pull request 'remove supradough' (#2147 ) from remove-supradough into main Reviewed-on: https://codeberg.org/uzu/strudel/pulls/2147	2026-10-15 15:07:11 +02:00
Felix Roos	d385ceba39	fix tidal package wasm url for vite build	2026-10-12 18:28:41 +02:00