From 2338a1ee7d1cf3ddf6741478f2ab1f3ae86a4eb4 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Fri, 25 Mar 2022 18:51:20 +0100 Subject: [PATCH] fix more deps --- package.json | 3 +++ packages/eval/evaluate.mjs | 8 ++++---- packages/eval/shapeshifter.mjs | 2 +- packages/hooks/package.json | 3 --- packages/midi/midi.mjs | 2 +- packages/midi/package.json | 3 --- packages/mini/mini.mjs | 2 +- packages/tonal/test/tonal.test.mjs | 2 +- packages/tonal/tonal.mjs | 2 +- packages/tonal/voicings.mjs | 2 +- packages/tone/README.md | 1 + packages/tone/package.json | 3 --- packages/tone/test/tone.test.mjs | 2 +- packages/xen/tune.mjs | 2 +- packages/xen/xen.mjs | 2 +- 15 files changed, 17 insertions(+), 22 deletions(-) create mode 100644 packages/tone/README.md diff --git a/package.json b/package.json index 17d6d657..22c6b322 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,9 @@ "version": "0.0.1", "description": "Port of tidalcycles to javascript", "main": "strudel.mjs", + "scripts":{ + "test": "npm run test --workspaces --if-present" + }, "workspaces": [ "packages/*" ], diff --git a/packages/eval/evaluate.mjs b/packages/eval/evaluate.mjs index 97a3a4eb..3356373a 100644 --- a/packages/eval/evaluate.mjs +++ b/packages/eval/evaluate.mjs @@ -1,17 +1,17 @@ -import * as strudel from '../core/strudel.mjs'; +import * as strudel from '@strudel/core/strudel.mjs'; import '../tone/tone.mjs'; import '../midi/midi.mjs'; import '../tonal/voicings.mjs'; import '../../packages/tonal/tonal.mjs'; import '../../packages/xen/xen.mjs'; import '../../packages/xen/tune.mjs'; -import '../core/euclid.mjs'; -import euclid from '../core/euclid.mjs'; +import '@strudel/core/euclid.mjs'; +import euclid from '@strudel/core/euclid.mjs'; import '@strudel/tone/pianoroll.mjs'; import '@strudel/tone/draw.mjs'; import * as uiHelpers from '@strudel/tone/ui.mjs'; import * as drawHelpers from '@strudel/tone/draw.mjs'; -import gist from '../core/gist.js'; +import gist from '@strudel/core/gist.js'; import shapeshifter from './shapeshifter.mjs'; import { mini } from '../mini/mini.mjs'; import * as Tone from 'tone'; diff --git a/packages/eval/shapeshifter.mjs b/packages/eval/shapeshifter.mjs index 78bef6d9..d93cffbd 100644 --- a/packages/eval/shapeshifter.mjs +++ b/packages/eval/shapeshifter.mjs @@ -15,7 +15,7 @@ import { import shiftCodegen from 'shift-codegen'; const codegen = shiftCodegen.default; console.log('codegen', codegen); -import * as strudel from '../core/strudel.mjs'; +import * as strudel from '@strudel/core/strudel.mjs'; const { Pattern } = strudel; diff --git a/packages/hooks/package.json b/packages/hooks/package.json index 67272469..67af9df3 100644 --- a/packages/hooks/package.json +++ b/packages/hooks/package.json @@ -3,9 +3,6 @@ "version": "0.0.1", "description": "React Hooks for strudel", "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, "repository": { "type": "git", "url": "git+https://github.com/tidalcycles/strudel.git" diff --git a/packages/midi/midi.mjs b/packages/midi/midi.mjs index bc778b09..d64c3534 100644 --- a/packages/midi/midi.mjs +++ b/packages/midi/midi.mjs @@ -1,6 +1,6 @@ import { isNote } from 'tone'; import _WebMidi from 'webmidi'; -import { Pattern as _Pattern } from '../core/strudel.mjs'; +import { Pattern as _Pattern } from '@strudel/core/strudel.mjs'; import * as Tone from 'tone'; const WebMidi = _WebMidi; diff --git a/packages/midi/package.json b/packages/midi/package.json index 36dc09d9..a36dd04c 100644 --- a/packages/midi/package.json +++ b/packages/midi/package.json @@ -3,9 +3,6 @@ "version": "0.0.1", "description": "Midi API for strudel", "main": "midi.mjs", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, "repository": { "type": "git", "url": "git+https://github.com/tidalcycles/strudel.git" diff --git a/packages/mini/mini.mjs b/packages/mini/mini.mjs index 243b0753..ef91ca09 100644 --- a/packages/mini/mini.mjs +++ b/packages/mini/mini.mjs @@ -1,5 +1,5 @@ import * as krill from './krill-parser.js'; -import * as strudel from '../core/strudel.mjs'; +import * as strudel from '@strudel/core/strudel.mjs'; import { addMiniLocations } from '../eval/shapeshifter.mjs'; const { pure, Pattern, Fraction, stack, slowcat, sequence, timeCat, silence } = strudel; diff --git a/packages/tonal/test/tonal.test.mjs b/packages/tonal/test/tonal.test.mjs index 06628b5c..486ba404 100644 --- a/packages/tonal/test/tonal.test.mjs +++ b/packages/tonal/test/tonal.test.mjs @@ -1,6 +1,6 @@ import { strict as assert } from 'assert'; import '../tonal.mjs'; // need to import this to add prototypes -import { pure } from '../../core/strudel.mjs'; +import { pure } from '@strudel/core/strudel.mjs'; describe('tonal', () => { it('Should run tonal functions ', () => { diff --git a/packages/tonal/tonal.mjs b/packages/tonal/tonal.mjs index c1e0a440..5404b514 100644 --- a/packages/tonal/tonal.mjs +++ b/packages/tonal/tonal.mjs @@ -1,5 +1,5 @@ import { Note, Interval, Scale } from '@tonaljs/tonal'; -import { Pattern as _Pattern } from '../core/strudel.mjs'; +import { Pattern as _Pattern } from '@strudel/core/strudel.mjs'; import { mod, tokenizeNote } from '../../packages/core/util.mjs'; const Pattern = _Pattern; // as any; diff --git a/packages/tonal/voicings.mjs b/packages/tonal/voicings.mjs index 7951a8c8..a4d84ecd 100644 --- a/packages/tonal/voicings.mjs +++ b/packages/tonal/voicings.mjs @@ -1,4 +1,4 @@ -import { Pattern as _Pattern, stack, Hap, reify } from '../core/strudel.mjs'; +import { Pattern as _Pattern, stack, Hap, reify } from '@strudel/core/strudel.mjs'; import _voicings from 'chord-voicings'; const { dictionaryVoicing, minTopNoteDiff, lefthand } = _voicings; diff --git a/packages/tone/README.md b/packages/tone/README.md new file mode 100644 index 00000000..a3a78449 --- /dev/null +++ b/packages/tone/README.md @@ -0,0 +1 @@ +TODO: test \ No newline at end of file diff --git a/packages/tone/package.json b/packages/tone/package.json index 1d66b39e..9106f518 100644 --- a/packages/tone/package.json +++ b/packages/tone/package.json @@ -4,9 +4,6 @@ "description": "Tone.js API for strudel", "main": "tone.mjs", "type": "module", - "scripts": { - "test": "mocha --colors" - }, "repository": { "type": "git", "url": "git+https://github.com/tidalcycles/strudel.git" diff --git a/packages/tone/test/tone.test.mjs b/packages/tone/test/tone.test.mjs index fe0507ce..243f6841 100644 --- a/packages/tone/test/tone.test.mjs +++ b/packages/tone/test/tone.test.mjs @@ -1,6 +1,6 @@ import { strict as assert } from 'assert'; import '../tone.mjs'; -import { pure } from '../../core/strudel.mjs'; +import { pure } from '@strudel/core/strudel.mjs'; import Tone from 'tone'; describe('tone', () => { diff --git a/packages/xen/tune.mjs b/packages/xen/tune.mjs index 675b473a..fd6d388b 100644 --- a/packages/xen/tune.mjs +++ b/packages/xen/tune.mjs @@ -1,5 +1,5 @@ import Tune from './tunejs.js'; -import { Pattern } from '../core/strudel.mjs'; +import { Pattern } from '@strudel/core/strudel.mjs'; Pattern.prototype._tune = function (scale, tonic = 220) { const tune = new Tune(); diff --git a/packages/xen/xen.mjs b/packages/xen/xen.mjs index 6eb193d0..b07da1bc 100644 --- a/packages/xen/xen.mjs +++ b/packages/xen/xen.mjs @@ -1,4 +1,4 @@ -import { Pattern } from '../core/strudel.mjs'; +import { Pattern } from '@strudel/core/strudel.mjs'; import { mod } from '../../packages/core/util.mjs'; function edo(name) {