From fe1e10297c7eef6e3f96f75f55714d28da446dbd Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Sun, 19 May 2024 11:45:15 +0200 Subject: [PATCH 1/4] remove hs2js dep from website package --- pnpm-lock.yaml | 9 --------- website/package.json | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2f9956e5..5b32727a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -674,9 +674,6 @@ importers: date-fns: specifier: ^3.2.0 version: 3.2.0 - hs2js: - specifier: ^0.0.2 - version: 0.0.2 nanoid: specifier: ^5.0.4 version: 5.0.4 @@ -8522,12 +8519,6 @@ packages: lru-cache: 10.1.0 dev: true - /hs2js@0.0.2: - resolution: {integrity: sha512-ABgqMkNP3aTDm+zi8nmyEKkqIeL74T921cDb9fVbqozDnHE9SzvED995aNJqZt+wY+1roTcN29zgsg3RWVSmBw==} - dependencies: - web-tree-sitter: 0.20.8 - dev: false - /html-escaper@3.0.3: resolution: {integrity: sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==} diff --git a/website/package.json b/website/package.json index 16d86d93..2ab91dd0 100644 --- a/website/package.json +++ b/website/package.json @@ -10,7 +10,7 @@ "build": "astro build", "preview": "astro preview --port 3009 --host 0.0.0.0", "astro": "astro", - "postinstall": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public" + "postinstall": "cp ../packages/tidal/node_modules/hs2js/dist/tree-sitter.wasm public && cp ../packages/tidal/node_modules/hs2js/dist/tree-sitter-haskell.wasm public" }, "dependencies": { "@algolia/client-search": "^4.22.0", @@ -51,7 +51,6 @@ "astro": "^4.0.8", "claviature": "^0.1.0", "date-fns": "^3.2.0", - "hs2js": "^0.0.2", "nanoid": "^5.0.4", "nanostores": "^0.9.5", "react": "^18.2.0", From 41444ccd58475ced61b88622ef792d6be0d7764f Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Sun, 19 May 2024 11:47:16 +0200 Subject: [PATCH 2/4] Revert "remove hs2js dep from website package" This reverts commit fe1e10297c7eef6e3f96f75f55714d28da446dbd. --- pnpm-lock.yaml | 9 +++++++++ website/package.json | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5b32727a..2f9956e5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -674,6 +674,9 @@ importers: date-fns: specifier: ^3.2.0 version: 3.2.0 + hs2js: + specifier: ^0.0.2 + version: 0.0.2 nanoid: specifier: ^5.0.4 version: 5.0.4 @@ -8519,6 +8522,12 @@ packages: lru-cache: 10.1.0 dev: true + /hs2js@0.0.2: + resolution: {integrity: sha512-ABgqMkNP3aTDm+zi8nmyEKkqIeL74T921cDb9fVbqozDnHE9SzvED995aNJqZt+wY+1roTcN29zgsg3RWVSmBw==} + dependencies: + web-tree-sitter: 0.20.8 + dev: false + /html-escaper@3.0.3: resolution: {integrity: sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==} diff --git a/website/package.json b/website/package.json index 2ab91dd0..16d86d93 100644 --- a/website/package.json +++ b/website/package.json @@ -10,7 +10,7 @@ "build": "astro build", "preview": "astro preview --port 3009 --host 0.0.0.0", "astro": "astro", - "postinstall": "cp ../packages/tidal/node_modules/hs2js/dist/tree-sitter.wasm public && cp ../packages/tidal/node_modules/hs2js/dist/tree-sitter-haskell.wasm public" + "postinstall": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public" }, "dependencies": { "@algolia/client-search": "^4.22.0", @@ -51,6 +51,7 @@ "astro": "^4.0.8", "claviature": "^0.1.0", "date-fns": "^3.2.0", + "hs2js": "^0.0.2", "nanoid": "^5.0.4", "nanostores": "^0.9.5", "react": "^18.2.0", From 373b63c7002d2457c0a4fc875ca56faef8ae04d1 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Sun, 19 May 2024 11:48:48 +0200 Subject: [PATCH 3/4] fix: add back hs2js as workspace dep --- pnpm-lock.yaml | 10 ++-------- website/package.json | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2f9956e5..1a16f066 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -675,8 +675,8 @@ importers: specifier: ^3.2.0 version: 3.2.0 hs2js: - specifier: ^0.0.2 - version: 0.0.2 + specifier: workspace:* + version: link:../packages/hs2js nanoid: specifier: ^5.0.4 version: 5.0.4 @@ -8522,12 +8522,6 @@ packages: lru-cache: 10.1.0 dev: true - /hs2js@0.0.2: - resolution: {integrity: sha512-ABgqMkNP3aTDm+zi8nmyEKkqIeL74T921cDb9fVbqozDnHE9SzvED995aNJqZt+wY+1roTcN29zgsg3RWVSmBw==} - dependencies: - web-tree-sitter: 0.20.8 - dev: false - /html-escaper@3.0.3: resolution: {integrity: sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==} diff --git a/website/package.json b/website/package.json index 16d86d93..aae90a27 100644 --- a/website/package.json +++ b/website/package.json @@ -51,7 +51,7 @@ "astro": "^4.0.8", "claviature": "^0.1.0", "date-fns": "^3.2.0", - "hs2js": "^0.0.2", + "hs2js": "workspace:*", "nanoid": "^5.0.4", "nanostores": "^0.9.5", "react": "^18.2.0", From 1bc1346f5481bc627fb5694fe45b30d739450a9b Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Sun, 19 May 2024 11:50:15 +0200 Subject: [PATCH 4/4] try static dep --- pnpm-lock.yaml | 2 +- website/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1a16f066..8e2996a8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -675,7 +675,7 @@ importers: specifier: ^3.2.0 version: 3.2.0 hs2js: - specifier: workspace:* + specifier: 0.0.9 version: link:../packages/hs2js nanoid: specifier: ^5.0.4 diff --git a/website/package.json b/website/package.json index aae90a27..ace4cbca 100644 --- a/website/package.json +++ b/website/package.json @@ -51,7 +51,7 @@ "astro": "^4.0.8", "claviature": "^0.1.0", "date-fns": "^3.2.0", - "hs2js": "workspace:*", + "hs2js": "0.0.9", "nanoid": "^5.0.4", "nanostores": "^0.9.5", "react": "^18.2.0",