Skip to content

Commit

Permalink
Bump all deps to latest
Browse files Browse the repository at this point in the history
 * Including those two that I've held back all the way up to this point
 * Re-generate yarn lockfile
  • Loading branch information
Ameobea committed Feb 8, 2024
1 parent 11d4575 commit 4f09f9d
Show file tree
Hide file tree
Showing 8 changed files with 481 additions and 581 deletions.
9 changes: 9 additions & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { defineConfig } from 'cypress'

export default defineConfig({
projectId: 'gahph7',
e2e: {
setupNodeEvents(on, config) {},
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
},
})
3 changes: 0 additions & 3 deletions cypress.json

This file was deleted.

6 changes: 6 additions & 0 deletions cypress/integration/basic.js → cypress/e2e/basic.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,10 @@ context('Entrypoint', () => {
.should('have.attr', 'data-selected', 'true')
.and('contain.text', '0.24');
});

it('Should render the standalone FM synth demo without errors', () => {
cy.visit('http://localhost:9000/fm.html');

cy.get('.ReactPiano__Keyboard').should('exist');
});
});
File renamed without changes.
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@ianvs/prettier-plugin-sort-imports": "^4.1.1",
"@types/chartist": "^0.11.1",
"@types/chartist": "^1.0.0",
"@types/d3": "^7.4.3",
"@types/downloadjs": "^1.4.6",
"@types/node": "^20.11.14",
"@types/node": "^20.11.16",
"@types/react-window": "^1.8.8",
"@types/showdown": "^2.0.6",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@webpack-cli/serve": "^2.0.5",
"babel-eslint": "^10.1.0",
"babel-loader": "^9.1.3",
"css-loader": "^6.10.0",
"cypress": "^9.2.0",
"cypress": "^13.6.4",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react": "^7.33.2",
Expand All @@ -32,7 +32,7 @@
"handlebars": "^4.7.8",
"handlebars-loader": "^1.7.3",
"html-webpack-plugin": "^5.6",
"prettier": "^3.2.4",
"prettier": "^3.2.5",
"prettier-plugin-svelte": "^3.1.2",
"sass": "^1.70.0",
"sass-loader": "^14.1.0",
Expand All @@ -43,7 +43,7 @@
"svelte-preprocess": "^5.1.3",
"ts-loader": "^9.5.1",
"typescript": "^5.3.3",
"webpack": "^5.90.0",
"webpack": "^5.90.1",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15"
Expand All @@ -70,15 +70,15 @@
"@pixi/sprite": "^7.4.0",
"@pixi/text": "^7.4.0",
"@reduxjs/toolkit": "^2.1.0",
"@sentry/react": "^7.99.0",
"@sentry/tracing": "^7.99.0",
"@sentry/react": "^7.100.1",
"@sentry/tracing": "^7.100.1",
"@types/ramda": "^0.29.10",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
"@types/react-redux": "^7.1.33",
"@types/webmidi": "^2.0.10",
"ace-builds": "^1.32",
"chartist": "^0.11.4",
"chartist": "^1.3.0",
"comlink": "^4.4.1",
"d3": "^7.8.5",
"d3-scale-chromatic": "^3.0.0",
Expand All @@ -105,7 +105,7 @@
"reselect": "^5.1.0",
"showdown": "^2.1.0",
"showdown-xss-filter": "^0.2.0",
"svelte": "^4.2.9",
"svelte": "^4.2.10",
"svelte-loading-spinners": "^0.3.4"
}
}
8 changes: 4 additions & 4 deletions src/graphEditor/GraphEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,6 @@ const GraphEditor: React.FC<{ stateKey: string }> = ({ stateKey }) => {
const subgraphID = state.viewContextManager.activeViewContexts.find(
vc => vc.uuid === vcId
)?.subgraphId;
if (!subgraphID) {
throw new Error('Unable to determine subgraph ID for graph editor');
}

return {
...R.pick(['patchNetwork', 'activeViewContexts', 'isLoaded'], state.viewContextManager),
Expand Down Expand Up @@ -533,6 +530,9 @@ const GraphEditor: React.FC<{ stateKey: string }> = ({ stateKey }) => {
if (nodeType === 'ADD_SUBGRAPH') {
addSubgraph();
} else {
if (!subgraphID) {
throw new Error('No subgraph ID');
}
createNode(nodeType, subgraphID);
}
};
Expand All @@ -554,7 +554,7 @@ const GraphEditor: React.FC<{ stateKey: string }> = ({ stateKey }) => {

const lastPatchNetwork = useRef<typeof patchNetwork | null>(null);
useEffect(() => {
if (lastPatchNetwork.current === patchNetwork || !lGraphInstance) {
if (lastPatchNetwork.current === patchNetwork || !lGraphInstance || !subgraphID) {
return;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as Chartist from 'chartist';
import { BarChart } from 'chartist';

import 'chartist/dist/chartist.min.css';
import 'chartist/dist/index.css';
import React, { useEffect, useRef } from 'react';
import { shallowEqual, useSelector } from 'react-redux';

Expand All @@ -13,7 +13,7 @@ const Histogram: React.FC = () => {
shallowEqual
);
const histogramContainer = useRef<null | HTMLDivElement>(null);
const chartHandle = useRef<Chartist.IChartistBarChart | null>(null);
const chartHandle = useRef<BarChart | null>(null);

const uniqueId = useUniqueId();
const histogramContainerId = `histogram-${uniqueId}`;
Expand All @@ -23,8 +23,8 @@ const Histogram: React.FC = () => {
return;
}

chartHandle.current = new Chartist.Bar(`#${histogramContainerId}`, { series: [] }, {});
return () => chartHandle.current!.detach();
chartHandle.current = new BarChart(`#${histogramContainerId}`, { series: [] }, {});
return () => void chartHandle.current!.detach();
}, [histogramContainer, histogramContainerId]);

useEffect(() => {
Expand Down
Loading

0 comments on commit 4f09f9d

Please sign in to comment.