diff --git a/packages/codemirror/codemirror.mjs b/packages/codemirror/codemirror.mjs index 3209ef87..512c873a 100644 --- a/packages/codemirror/codemirror.mjs +++ b/packages/codemirror/codemirror.mjs @@ -13,7 +13,7 @@ import { drawSelection, } from '@codemirror/view'; import { Pattern, repl } from '@strudel/core'; -import { Drawer, cleanupDraw } from '@strudel/canvas'; +import { Drawer, cleanupDraw } from '@strudel/draw'; import { isAutoCompletionEnabled } from './autocomplete.mjs'; import { isTooltipEnabled } from './tooltip.mjs'; import { flash, isFlashEnabled } from './flash.mjs'; diff --git a/packages/codemirror/package.json b/packages/codemirror/package.json index 79d2e022..0b39ebdd 100644 --- a/packages/codemirror/package.json +++ b/packages/codemirror/package.json @@ -45,7 +45,7 @@ "@replit/codemirror-vim": "^6.1.0", "@replit/codemirror-vscode-keymap": "^6.0.2", "@strudel/core": "workspace:*", - "@strudel/canvas": "workspace:*", + "@strudel/draw": "workspace:*", "@uiw/codemirror-themes": "^4.21.21", "@uiw/codemirror-themes-all": "^4.21.21", "nanostores": "^0.9.5" diff --git a/packages/canvas/README.md b/packages/draw/README.md similarity index 100% rename from packages/canvas/README.md rename to packages/draw/README.md diff --git a/packages/canvas/animate.mjs b/packages/draw/animate.mjs similarity index 100% rename from packages/canvas/animate.mjs rename to packages/draw/animate.mjs diff --git a/packages/canvas/color.mjs b/packages/draw/color.mjs similarity index 100% rename from packages/canvas/color.mjs rename to packages/draw/color.mjs diff --git a/packages/canvas/draw.mjs b/packages/draw/draw.mjs similarity index 100% rename from packages/canvas/draw.mjs rename to packages/draw/draw.mjs diff --git a/packages/canvas/index.mjs b/packages/draw/index.mjs similarity index 100% rename from packages/canvas/index.mjs rename to packages/draw/index.mjs diff --git a/packages/canvas/package.json b/packages/draw/package.json similarity index 88% rename from packages/canvas/package.json rename to packages/draw/package.json index f87a7e19..346a4723 100644 --- a/packages/canvas/package.json +++ b/packages/draw/package.json @@ -1,7 +1,7 @@ { - "name": "@strudel/canvas", + "name": "@strudel/draw", "version": "1.0.1", - "description": "Helpers for drawing with the Canvas API and Strudel", + "description": "Helpers for drawing with Strudel", "main": "index.mjs", "type": "module", "publishConfig": { diff --git a/packages/canvas/pianoroll.mjs b/packages/draw/pianoroll.mjs similarity index 100% rename from packages/canvas/pianoroll.mjs rename to packages/draw/pianoroll.mjs diff --git a/packages/canvas/spiral.mjs b/packages/draw/spiral.mjs similarity index 100% rename from packages/canvas/spiral.mjs rename to packages/draw/spiral.mjs diff --git a/packages/canvas/vite.config.js b/packages/draw/vite.config.js similarity index 100% rename from packages/canvas/vite.config.js rename to packages/draw/vite.config.js diff --git a/packages/hydra/hydra.mjs b/packages/hydra/hydra.mjs index 17830d81..e784228d 100644 --- a/packages/hydra/hydra.mjs +++ b/packages/hydra/hydra.mjs @@ -1,4 +1,4 @@ -import { getDrawContext } from '@strudel/canvas'; +import { getDrawContext } from '@strudel/draw'; let latestOptions; diff --git a/packages/hydra/package.json b/packages/hydra/package.json index c635314c..77fab126 100644 --- a/packages/hydra/package.json +++ b/packages/hydra/package.json @@ -34,7 +34,7 @@ "homepage": "https://github.com/tidalcycles/strudel#readme", "dependencies": { "@strudel/core": "workspace:*", - "@strudel/canvas": "workspace:*", + "@strudel/draw": "workspace:*", "hydra-synth": "^1.3.29" }, "devDependencies": { diff --git a/packages/repl/package.json b/packages/repl/package.json index 742c5bb7..70687d1c 100644 --- a/packages/repl/package.json +++ b/packages/repl/package.json @@ -35,7 +35,7 @@ "dependencies": { "@strudel/codemirror": "workspace:*", "@strudel/core": "workspace:*", - "@strudel/canvas": "workspace:*", + "@strudel/draw": "workspace:*", "@strudel/hydra": "workspace:*", "@strudel/midi": "workspace:*", "@strudel/mini": "workspace:*", diff --git a/packages/repl/prebake.mjs b/packages/repl/prebake.mjs index 1858580b..9fc1c881 100644 --- a/packages/repl/prebake.mjs +++ b/packages/repl/prebake.mjs @@ -6,7 +6,7 @@ export async function prebake() { const modulesLoading = evalScope( // import('@strudel/core'), core, - import('@strudel/canvas'), + import('@strudel/draw'), import('@strudel/mini'), import('@strudel/tonal'), import('@strudel/webaudio'), diff --git a/packages/repl/repl-component.mjs b/packages/repl/repl-component.mjs index 4bdd6fe6..4fa8d6d2 100644 --- a/packages/repl/repl-component.mjs +++ b/packages/repl/repl-component.mjs @@ -1,5 +1,5 @@ import { silence } from '@strudel/core'; -import { getDrawContext } from '@strudel/canvas'; +import { getDrawContext } from '@strudel/draw'; import { transpiler } from '@strudel/transpiler'; import { getAudioContext, webaudioOutput } from '@strudel/webaudio'; import { StrudelMirror, codemirrorSettings } from '@strudel/codemirror'; diff --git a/packages/webaudio/package.json b/packages/webaudio/package.json index 29348f48..f9cd7cc7 100644 --- a/packages/webaudio/package.json +++ b/packages/webaudio/package.json @@ -34,7 +34,7 @@ "homepage": "https://github.com/tidalcycles/strudel#readme", "dependencies": { "@strudel/core": "workspace:*", - "@strudel/canvas": "workspace:*", + "@strudel/draw": "workspace:*", "superdough": "workspace:*" }, "devDependencies": { diff --git a/packages/webaudio/scope.mjs b/packages/webaudio/scope.mjs index 288880c0..0371366c 100644 --- a/packages/webaudio/scope.mjs +++ b/packages/webaudio/scope.mjs @@ -1,5 +1,5 @@ import { Pattern, clamp } from '@strudel/core'; -import { getDrawContext } from '@strudel/canvas'; +import { getDrawContext } from '../draw/index.mjs'; import { analyser, getAnalyzerData } from 'superdough'; export function drawTimeScope( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1ef01efc..b123e2b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -140,16 +140,6 @@ importers: specifier: ^5.0.10 version: 5.0.10 - packages/canvas: - dependencies: - '@strudel/core': - specifier: workspace:* - version: link:../core - devDependencies: - vite: - specifier: ^5.0.10 - version: 5.0.11(@types/node@20.10.6) - packages/codemirror: dependencies: '@codemirror/autocomplete': @@ -188,12 +178,12 @@ importers: '@replit/codemirror-vscode-keymap': specifier: ^6.0.2 version: 6.0.2(@codemirror/autocomplete@6.11.1)(@codemirror/commands@6.3.3)(@codemirror/language@6.10.0)(@codemirror/lint@6.4.2)(@codemirror/search@6.5.5)(@codemirror/state@6.4.0)(@codemirror/view@6.23.0) - '@strudel/canvas': - specifier: workspace:* - version: link:../canvas '@strudel/core': specifier: workspace:* version: link:../core + '@strudel/draw': + specifier: workspace:* + version: link:../draw '@uiw/codemirror-themes': specifier: ^4.21.21 version: 4.21.21(@codemirror/language@6.10.0)(@codemirror/state@6.4.0)(@codemirror/view@6.23.0) @@ -246,16 +236,26 @@ importers: specifier: ^1.5.3 version: 1.5.3 + packages/draw: + dependencies: + '@strudel/core': + specifier: workspace:* + version: link:../core + devDependencies: + vite: + specifier: ^5.0.10 + version: 5.0.11(@types/node@20.10.6) + packages/embed: {} packages/hydra: dependencies: - '@strudel/canvas': - specifier: workspace:* - version: link:../canvas '@strudel/core': specifier: workspace:* version: link:../core + '@strudel/draw': + specifier: workspace:* + version: link:../draw hydra-synth: specifier: ^1.3.29 version: 1.3.29 @@ -317,15 +317,15 @@ importers: packages/repl: dependencies: - '@strudel/canvas': - specifier: workspace:* - version: link:../canvas '@strudel/codemirror': specifier: workspace:* version: link:../codemirror '@strudel/core': specifier: workspace:* version: link:../core + '@strudel/draw': + specifier: workspace:* + version: link:../draw '@strudel/hydra': specifier: workspace:* version: link:../hydra @@ -474,12 +474,12 @@ importers: packages/webaudio: dependencies: - '@strudel/canvas': - specifier: workspace:* - version: link:../canvas '@strudel/core': specifier: workspace:* version: link:../core + '@strudel/draw': + specifier: workspace:* + version: link:../draw superdough: specifier: workspace:* version: link:../superdough @@ -545,9 +545,6 @@ importers: '@nanostores/react': specifier: ^0.7.1 version: 0.7.1(nanostores@0.9.5)(react@18.2.0) - '@strudel/canvas': - specifier: workspace:* - version: link:../packages/canvas '@strudel/codemirror': specifier: workspace:* version: link:../packages/codemirror @@ -560,6 +557,9 @@ importers: '@strudel/desktopbridge': specifier: workspace:* version: link:../packages/desktopbridge + '@strudel/draw': + specifier: workspace:* + version: link:../packages/draw '@strudel/hydra': specifier: workspace:* version: link:../packages/hydra diff --git a/website/package.json b/website/package.json index ed40b005..7af9e61e 100644 --- a/website/package.json +++ b/website/package.json @@ -26,7 +26,7 @@ "@nanostores/react": "^0.7.1", "@strudel/codemirror": "workspace:*", "@strudel/core": "workspace:*", - "@strudel/canvas": "workspace:*", + "@strudel/draw": "workspace:*", "@strudel/csound": "workspace:*", "@strudel/desktopbridge": "workspace:*", "@strudel/hydra": "workspace:*", diff --git a/website/src/docs/Colors.jsx b/website/src/docs/Colors.jsx index f11a7440..34cc2e49 100644 --- a/website/src/docs/Colors.jsx +++ b/website/src/docs/Colors.jsx @@ -1,4 +1,4 @@ -import { colorMap } from '@strudel/canvas'; +import { colorMap } from '@strudel/draw'; const Colors = () => { return ( diff --git a/website/src/docs/MiniRepl.jsx b/website/src/docs/MiniRepl.jsx index 9a886109..cb0f26f7 100644 --- a/website/src/docs/MiniRepl.jsx +++ b/website/src/docs/MiniRepl.jsx @@ -1,7 +1,7 @@ import { useState, useRef, useCallback, useMemo, useEffect } from 'react'; import { Icon } from './Icon'; import { silence, noteToMidi, _mod } from '@strudel/core'; -import { getPunchcardPainter } from '@strudel/canvas'; +import { getPunchcardPainter } from '@strudel/draw'; import { transpiler } from '@strudel/transpiler'; import { getAudioContext, webaudioOutput, initAudioOnFirstClick } from '@strudel/webaudio'; import { StrudelMirror } from '@strudel/codemirror'; diff --git a/website/src/pages/img/example-[name].png.js b/website/src/pages/img/example-[name].png.js index 1361df79..a38a0616 100644 --- a/website/src/pages/img/example-[name].png.js +++ b/website/src/pages/img/example-[name].png.js @@ -1,5 +1,5 @@ import { createCanvas } from 'canvas'; -import { pianoroll } from '@strudel/canvas'; +import { pianoroll } from '@strudel/draw'; import { evaluate } from '@strudel/transpiler'; import '../../../../test/runtime.mjs'; import * as tunes from '../../repl/tunes.mjs'; diff --git a/website/src/pages/swatch/[name].png.js b/website/src/pages/swatch/[name].png.js index 809a64ec..ac150cfe 100644 --- a/website/src/pages/swatch/[name].png.js +++ b/website/src/pages/swatch/[name].png.js @@ -1,5 +1,5 @@ import { createCanvas } from 'canvas'; -import { pianoroll } from '@strudel/canvas'; +import { pianoroll } from '@strudel/draw'; import { evaluate } from '@strudel/transpiler'; import '../../../../test/runtime.mjs'; import { getMyPatterns } from '../../my_patterns'; diff --git a/website/src/repl/Repl.jsx b/website/src/repl/Repl.jsx index fd5892bd..dd164965 100644 --- a/website/src/repl/Repl.jsx +++ b/website/src/repl/Repl.jsx @@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th */ import { code2hash, logger, silence } from '@strudel/core'; -import { getDrawContext } from '@strudel/canvas'; +import { getDrawContext } from '@strudel/draw'; import cx from '@src/cx.mjs'; import { transpiler } from '@strudel/transpiler'; import { diff --git a/website/src/repl/util.mjs b/website/src/repl/util.mjs index d9c80ca9..6dba7dab 100644 --- a/website/src/repl/util.mjs +++ b/website/src/repl/util.mjs @@ -72,7 +72,7 @@ export async function getRandomTune() { export function loadModules() { let modules = [ import('@strudel/core'), - import('@strudel/canvas'), + import('@strudel/draw'), import('@strudel/tonal'), import('@strudel/mini'), import('@strudel/xen'),