Skip to content

Commit

Permalink
Merge branch 'main' into 317-py5
Browse files Browse the repository at this point in the history
  • Loading branch information
taconi committed Jan 5, 2025
2 parents 37959fc + b3dad73 commit 13f348d
Show file tree
Hide file tree
Showing 22 changed files with 655 additions and 53 deletions.
1 change: 0 additions & 1 deletion .prettierignore

This file was deleted.

17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.3.0] - 2025-01-05

### New Features

- Vim keybindings (#280)
- Themes and font families (#283, #303)
- Display settings dialog for changing canvas resolution (#301)
- Define `fft`, `P` and `useStrudelCanvas` functions for Hydra (#310, #309)

### Bugfixes and minor changes

- Use line separator for Windows on REPL command copy dialog (#285)
- Initialize audio on Strudel on first user interaction (keydown/mouse) (#294)
- Fix flash/highlight stuck on multiple evaluations (#308)
- Add angle brackets to Tidal language autoclose (#302)
- Upgrade `@strudel/*` packages to v1.1.0; add `@strudel/draw` (#292)

## [1.2.0] - 2024-04-26

### New Features
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"useWorkspaces": true,
"version": "1.2.0"
"version": "1.3.0"
}
52 changes: 31 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"scripts": {
"build": "lerna run build",
"check": "lerna run check",
"lint": "prettier -c .",
"format": "prettier -w ."
"lint": "lerna run lint",
"format": "lerna run format"
},
"keywords": [
"codemirror",
Expand All @@ -26,8 +26,7 @@
},
"homepage": "https://github.com/munshkr/flok#readme",
"devDependencies": {
"lerna": "^6.5.1",
"prettier": "^3.4.2"
"lerna": "^6.5.1"
},
"workspaces": [
"packages/*"
Expand Down
3 changes: 2 additions & 1 deletion packages/cm-eval/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flok-editor/cm-eval",
"version": "1.0.1",
"version": "1.3.0",
"description": "CodeMirror 6 extension for code evaluation",
"author": "Damián Silvani <munshkr@gmail.com>",
"license": "GPL-3.0+",
Expand Down Expand Up @@ -29,6 +29,7 @@
"@types/lodash": "^4.14.191",
"@types/node": "^18.14.6",
"@types/uuid": "^9.0.1",
"prettier": "^3.4.2",
"typescript": "^4.9.4"
},
"peerDependencies": {
Expand Down
7 changes: 4 additions & 3 deletions packages/example-vanilla-js/package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
{
"name": "example-vanilla-js",
"private": true,
"version": "1.2.0",
"version": "1.3.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"devDependencies": {
"prettier": "^3.4.2",
"vite": "^5.0.12"
},
"dependencies": {
"@codemirror/lang-javascript": "^6.1.4",
"@codemirror/state": "^6.2.0",
"@codemirror/theme-one-dark": "^6.1.1",
"@codemirror/view": "^6.9.3",
"@flok-editor/cm-eval": "^1.0.1",
"@flok-editor/session": "^1.1.0",
"@flok-editor/cm-eval": "^1.3.0",
"@flok-editor/session": "^1.3.0",
"codemirror": "^6.0.1",
"y-codemirror.next": "^0.3.2",
"y-indexeddb": "^9.0.9",
Expand Down
3 changes: 2 additions & 1 deletion packages/lang-tidal/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flok-editor/lang-tidal",
"version": "1.0.1",
"version": "1.3.0",
"description": "TidalCycles language support for CodeMirror",
"scripts": {
"build": "rollup -c"
Expand All @@ -23,6 +23,7 @@
"devDependencies": {
"@lezer/generator": "^1.0.0",
"mocha": "^9.0.1",
"prettier": "^3.4.2",
"rollup": "^2.60.2",
"rollup-plugin-dts": "^4.0.1",
"rollup-plugin-ts": "^3.0.2",
Expand Down
3 changes: 2 additions & 1 deletion packages/pubsub/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flok-editor/pubsub",
"version": "1.0.1",
"version": "1.3.0",
"description": "Pub/Sub client-server, used for remote code execution and message passing on Flok",
"author": "Damián Silvani <munshkr@gmail.com>",
"license": "GPL-3.0+",
Expand Down Expand Up @@ -35,6 +35,7 @@
"@types/node": "^18.14.6",
"@types/uuid": "^9.0.1",
"@types/ws": "^8.5.4",
"prettier": "^3.4.2",
"typescript": "^4.9.4"
}
}
5 changes: 3 additions & 2 deletions packages/repl/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flok-repl",
"version": "1.2.0",
"version": "1.3.0",
"description": "REPL client for Flok",
"author": "Damián Silvani <munshkr@gmail.com>",
"license": "GPL-3.0+",
Expand All @@ -24,7 +24,7 @@
"build": "tsc"
},
"dependencies": {
"@flok-editor/pubsub": "^1.0.1",
"@flok-editor/pubsub": "^1.3.0",
"command-exists": "^1.2.9",
"commander": "^10.0.0",
"debug": "^4.3.4",
Expand All @@ -36,6 +36,7 @@
"@types/commander": "^2.12.2",
"@types/debug": "^4.1.7",
"@types/node": "^18.14.6",
"prettier": "^3.4.2",
"typescript": "^4.9.4"
}
}
5 changes: 3 additions & 2 deletions packages/server-middleware/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flok-editor/server-middleware",
"version": "1.0.1",
"version": "1.3.0",
"description": "Server middleware for Flok, handles WebSocket connections and WebRTC signaling",
"author": "Damián Silvani <munshkr@gmail.com>",
"license": "GPL-3.0+",
Expand All @@ -23,12 +23,13 @@
"build": "tsc"
},
"dependencies": {
"@flok-editor/pubsub": "^1.0.1",
"@flok-editor/pubsub": "^1.3.0",
"debug": "^4.3.4"
},
"devDependencies": {
"@types/debug": "^4.1.7",
"@types/node": "^18.14.6",
"prettier": "^3.4.2",
"typescript": "^4.9.4"
},
"peerDependencies": {
Expand Down
Loading

0 comments on commit 13f348d

Please sign in to comment.