From ea2d8b2773c343ff1f8b451cf9cb17e12d3afc11 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Sat, 28 Jan 2023 20:37:56 +0100 Subject: [PATCH] use workspace protocol everywhere --- packages/midi/package.json | 2 - packages/mini/package.json | 6 +-- packages/react/package.json | 7 ++- packages/react/src/App.jsx | 1 - packages/soundfonts/package.json | 4 +- packages/tonal/package.json | 2 +- packages/tone/package.json | 2 +- packages/transpiler/package.json | 2 +- packages/webaudio/package.json | 2 +- packages/webdirt/package.json | 2 +- packages/xen/package.json | 2 +- pnpm-lock.yaml | 92 +++++++++++++++++++++++--------- test/runtime.mjs | 1 - website/src/docs/MiniRepl.jsx | 1 - 14 files changed, 82 insertions(+), 44 deletions(-) diff --git a/packages/midi/package.json b/packages/midi/package.json index 0ce2e088..856bf0fd 100644 --- a/packages/midi/package.json +++ b/packages/midi/package.json @@ -23,8 +23,6 @@ "dependencies": { "@strudel.cycles/core": "workspace:*", "@strudel.cycles/webaudio": "workspace:*", - "@strudel.cycles/tone": "workspace:*", - "tone": "^14.7.77", "webmidi": "^3.0.21" } } diff --git a/packages/mini/package.json b/packages/mini/package.json index 342116de..24caaff8 100644 --- a/packages/mini/package.json +++ b/packages/mini/package.json @@ -26,9 +26,9 @@ }, "homepage": "https://github.com/tidalcycles/strudel#readme", "dependencies": { - "@strudel.cycles/core": "^0.5.0", - "@strudel.cycles/eval": "^0.5.0", - "@strudel.cycles/tone": "^0.5.0" + "@strudel.cycles/core": "workspace:*", + "@strudel.cycles/eval": "workspace:*", + "@strudel.cycles/tone": "workspace:*" }, "devDependencies": { "peggy": "^2.0.1" diff --git a/packages/react/package.json b/packages/react/package.json index 96acd908..66e5d80f 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -42,10 +42,9 @@ "@codemirror/state": "^6.2.0", "@codemirror/view": "^6.7.3", "@lezer/highlight": "^1.1.3", - "@strudel.cycles/core": "^0.5.0", - "@strudel.cycles/tone": "^0.5.0", - "@strudel.cycles/transpiler": "^0.5.0", - "@strudel.cycles/webaudio": "^0.5.0", + "@strudel.cycles/core": "workspace:*", + "@strudel.cycles/transpiler": "workspace:*", + "@strudel.cycles/webaudio": "workspace:*", "@uiw/codemirror-themes": "^4.12.4", "@uiw/react-codemirror": "^4.12.4", "react-hook-inview": "^4.5.0" diff --git a/packages/react/src/App.jsx b/packages/react/src/App.jsx index 911fca0b..5dd47070 100644 --- a/packages/react/src/App.jsx +++ b/packages/react/src/App.jsx @@ -6,7 +6,6 @@ import { controls, evalScope } from '@strudel.cycles/core'; evalScope( controls, import('@strudel.cycles/core'), - // import('@strudel.cycles/tone'), import('@strudel.cycles/tonal'), import('@strudel.cycles/mini'), import('@strudel.cycles/midi'), diff --git a/packages/soundfonts/package.json b/packages/soundfonts/package.json index 6892b99a..fe30a5b5 100644 --- a/packages/soundfonts/package.json +++ b/packages/soundfonts/package.json @@ -22,8 +22,8 @@ }, "homepage": "https://github.com/tidalcycles/strudel#readme", "dependencies": { - "@strudel.cycles/core": "^0.5.0", - "@strudel.cycles/webaudio": "^0.5.0", + "@strudel.cycles/core": "workspace:*", + "@strudel.cycles/webaudio": "workspace:*", "sfumato": "^0.1.2", "soundfont2": "^0.4.0" }, diff --git a/packages/tonal/package.json b/packages/tonal/package.json index 4281533b..1e078a12 100644 --- a/packages/tonal/package.json +++ b/packages/tonal/package.json @@ -25,7 +25,7 @@ }, "homepage": "https://github.com/tidalcycles/strudel#readme", "dependencies": { - "@strudel.cycles/core": "^0.5.0", + "@strudel.cycles/core": "workspace:*", "@tonaljs/tonal": "^4.7.2", "chord-voicings": "^0.0.1", "webmidi": "^3.0.21" diff --git a/packages/tone/package.json b/packages/tone/package.json index 24a17e43..a5424278 100644 --- a/packages/tone/package.json +++ b/packages/tone/package.json @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/tidalcycles/strudel#readme", "dependencies": { - "@strudel.cycles/core": "^0.5.0", + "@strudel.cycles/core": "workspace:*", "tone": "^14.7.77" } } diff --git a/packages/transpiler/package.json b/packages/transpiler/package.json index 7fb2e63f..e6c39f58 100644 --- a/packages/transpiler/package.json +++ b/packages/transpiler/package.json @@ -24,7 +24,7 @@ }, "homepage": "https://github.com/tidalcycles/strudel#readme", "dependencies": { - "@strudel.cycles/core": "^0.5.0", + "@strudel.cycles/core": "workspace:*", "acorn": "^8.8.1", "escodegen": "^2.0.0", "estree-walker": "^3.0.1" diff --git a/packages/webaudio/package.json b/packages/webaudio/package.json index af70efb7..dacca26a 100644 --- a/packages/webaudio/package.json +++ b/packages/webaudio/package.json @@ -30,6 +30,6 @@ }, "homepage": "https://github.com/tidalcycles/strudel#readme", "dependencies": { - "@strudel.cycles/core": "^0.5.0" + "@strudel.cycles/core": "workspace:*" } } diff --git a/packages/webdirt/package.json b/packages/webdirt/package.json index 9c940b3f..f0bfa40f 100644 --- a/packages/webdirt/package.json +++ b/packages/webdirt/package.json @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/tidalcycles/strudel#readme", "dependencies": { - "@strudel.cycles/core": "^0.5.0", + "@strudel.cycles/core": "workspace:*", "WebDirt": "github:dktr0/WebDirt" } } diff --git a/packages/xen/package.json b/packages/xen/package.json index 726b09bb..b517ae90 100644 --- a/packages/xen/package.json +++ b/packages/xen/package.json @@ -24,6 +24,6 @@ }, "homepage": "https://github.com/tidalcycles/strudel#readme", "dependencies": { - "@strudel.cycles/core": "^0.5.0" + "@strudel.cycles/core": "workspace:*" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9fbc35d7..543843fb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -89,22 +89,18 @@ importers: packages/midi: specifiers: '@strudel.cycles/core': workspace:* - '@strudel.cycles/tone': workspace:* '@strudel.cycles/webaudio': workspace:* - tone: ^14.7.77 webmidi: ^3.0.21 dependencies: '@strudel.cycles/core': link:../core - '@strudel.cycles/tone': link:../tone '@strudel.cycles/webaudio': link:../webaudio - tone: 14.7.77 webmidi: 3.1.2 packages/mini: specifiers: - '@strudel.cycles/core': ^0.5.0 - '@strudel.cycles/eval': ^0.5.0 - '@strudel.cycles/tone': ^0.5.0 + '@strudel.cycles/core': workspace:* + '@strudel.cycles/eval': workspace:* + '@strudel.cycles/tone': workspace:* peggy: ^2.0.1 dependencies: '@strudel.cycles/core': link:../core @@ -130,10 +126,9 @@ importers: '@codemirror/state': ^6.2.0 '@codemirror/view': ^6.7.3 '@lezer/highlight': ^1.1.3 - '@strudel.cycles/core': ^0.5.0 - '@strudel.cycles/tone': ^0.5.0 - '@strudel.cycles/transpiler': ^0.5.0 - '@strudel.cycles/webaudio': ^0.5.0 + '@strudel.cycles/core': workspace:* + '@strudel.cycles/transpiler': workspace:* + '@strudel.cycles/webaudio': workspace:* '@types/react': ^17.0.2 '@types/react-dom': ^17.0.2 '@uiw/codemirror-themes': ^4.12.4 @@ -152,7 +147,6 @@ importers: '@codemirror/view': 6.7.3 '@lezer/highlight': 1.1.3 '@strudel.cycles/core': link:../core - '@strudel.cycles/tone': link:../tone '@strudel.cycles/transpiler': link:../transpiler '@strudel.cycles/webaudio': link:../webaudio '@uiw/codemirror-themes': 4.19.7_a4vbhepr4qhxm5cldqd4jpyase @@ -177,8 +171,8 @@ importers: packages/soundfonts: specifiers: - '@strudel.cycles/core': ^0.5.0 - '@strudel.cycles/webaudio': ^0.5.0 + '@strudel.cycles/core': workspace:* + '@strudel.cycles/webaudio': workspace:* node-fetch: ^3.2.6 sfumato: ^0.1.2 soundfont2: ^0.4.0 @@ -192,7 +186,7 @@ importers: packages/tonal: specifiers: - '@strudel.cycles/core': ^0.5.0 + '@strudel.cycles/core': workspace:* '@tonaljs/tonal': ^4.7.2 chord-voicings: ^0.0.1 webmidi: ^3.0.21 @@ -204,7 +198,7 @@ importers: packages/tone: specifiers: - '@strudel.cycles/core': ^0.5.0 + '@strudel.cycles/core': workspace:* tone: ^14.7.77 dependencies: '@strudel.cycles/core': link:../core @@ -212,7 +206,7 @@ importers: packages/transpiler: specifiers: - '@strudel.cycles/core': ^0.5.0 + '@strudel.cycles/core': workspace:* acorn: ^8.8.1 escodegen: ^2.0.0 estree-walker: ^3.0.1 @@ -224,13 +218,13 @@ importers: packages/webaudio: specifiers: - '@strudel.cycles/core': ^0.5.0 + '@strudel.cycles/core': workspace:* dependencies: '@strudel.cycles/core': link:../core packages/webdirt: specifiers: - '@strudel.cycles/core': ^0.5.0 + '@strudel.cycles/core': workspace:* WebDirt: github:dktr0/WebDirt dependencies: '@strudel.cycles/core': link:../core @@ -238,7 +232,7 @@ importers: packages/xen: specifiers: - '@strudel.cycles/core': ^0.5.0 + '@strudel.cycles/core': workspace:* dependencies: '@strudel.cycles/core': link:../core @@ -8836,6 +8830,17 @@ packages: - supports-color dev: true + /postcss-import/14.1.0: + resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==} + engines: {node: '>=10.0.0'} + peerDependencies: + postcss: ^8.0.0 + dependencies: + postcss-value-parser: 4.2.0 + read-cache: 1.0.0 + resolve: 1.22.1 + dev: false + /postcss-import/14.1.0_postcss@8.4.21: resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==} engines: {node: '>=10.0.0'} @@ -8846,6 +8851,16 @@ packages: postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.1 + dev: true + + /postcss-js/4.0.0: + resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==} + engines: {node: ^12 || ^14 || >= 16} + peerDependencies: + postcss: ^8.3.3 + dependencies: + camelcase-css: 2.0.1 + dev: false /postcss-js/4.0.0_postcss@8.4.21: resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==} @@ -8855,6 +8870,23 @@ packages: dependencies: camelcase-css: 2.0.1 postcss: 8.4.21 + dev: true + + /postcss-load-config/3.1.4: + resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} + engines: {node: '>= 10'} + peerDependencies: + postcss: '>=8.0.9' + ts-node: '>=9.0.0' + peerDependenciesMeta: + postcss: + optional: true + ts-node: + optional: true + dependencies: + lilconfig: 2.0.6 + yaml: 1.10.2 + dev: false /postcss-load-config/3.1.4_postcss@8.4.21: resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} @@ -8872,6 +8904,15 @@ packages: postcss: 8.4.21 yaml: 1.10.2 + /postcss-nested/6.0.0: + resolution: {integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==} + engines: {node: '>=12.0'} + peerDependencies: + postcss: ^8.2.14 + dependencies: + postcss-selector-parser: 6.0.11 + dev: false + /postcss-nested/6.0.0_postcss@8.4.21: resolution: {integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==} engines: {node: '>=12.0'} @@ -8880,6 +8921,7 @@ packages: dependencies: postcss: 8.4.21 postcss-selector-parser: 6.0.11 + dev: true /postcss-selector-parser/6.0.10: resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==} @@ -10385,6 +10427,8 @@ packages: resolution: {integrity: sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==} engines: {node: '>=12.13.0'} hasBin: true + peerDependencies: + postcss: ^8.0.9 dependencies: arg: 5.0.2 chokidar: 3.5.3 @@ -10401,10 +10445,10 @@ packages: object-hash: 3.0.0 picocolors: 1.0.0 postcss: 8.4.21 - postcss-import: 14.1.0_postcss@8.4.21 - postcss-js: 4.0.0_postcss@8.4.21 - postcss-load-config: 3.1.4_postcss@8.4.21 - postcss-nested: 6.0.0_postcss@8.4.21 + postcss-import: 14.1.0 + postcss-js: 4.0.0 + postcss-load-config: 3.1.4 + postcss-nested: 6.0.0 postcss-selector-parser: 6.0.11 postcss-value-parser: 4.2.0 quick-lru: 5.1.1 diff --git a/test/runtime.mjs b/test/runtime.mjs index 25fd2ec7..17e92954 100644 --- a/test/runtime.mjs +++ b/test/runtime.mjs @@ -11,7 +11,6 @@ import * as webaudio from '@strudel.cycles/webaudio'; import controls from '@strudel.cycles/core/controls.mjs'; // import gist from '@strudel.cycles/core/gist.js'; import { mini } from '@strudel.cycles/mini/mini.mjs'; -// import { Tone } from '@strudel.cycles/tone'; // import * as toneHelpers from '@strudel.cycles/tone/tone.mjs'; // import * as voicingHelpers from '@strudel.cycles/tonal/voicings.mjs'; // import * as uiHelpers from '@strudel.cycles/tone/ui.mjs'; diff --git a/website/src/docs/MiniRepl.jsx b/website/src/docs/MiniRepl.jsx index 0fba71d5..e80a3d80 100644 --- a/website/src/docs/MiniRepl.jsx +++ b/website/src/docs/MiniRepl.jsx @@ -8,7 +8,6 @@ if (typeof window !== 'undefined') { modules = evalScope( controls, import('@strudel.cycles/core'), - // import('@strudel.cycles/tone'), import('@strudel.cycles/tonal'), import('@strudel.cycles/mini'), import('@strudel.cycles/midi'),