Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update packages #289

Merged
merged 2 commits into from
May 13, 2024
Merged

update packages #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2970927
update packages
bobnik May 11, 2024
fe0edb6
fix tests
bobnik May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,231 changes: 1,559 additions & 1,672 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

78 changes: 39 additions & 39 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
"version": "1.0.0",
"private": true,
"dependencies": {
"@dnd-kit/core": "^6.0.8",
"@dnd-kit/modifiers": "^6.0.1",
"@dnd-kit/sortable": "^7.0.2",
"@reduxjs/toolkit": "^1.9.5",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0",
"@dnd-kit/sortable": "^8.0",
"@reduxjs/toolkit": "^2.2.4",
"array-move": "^4.0.0",
"bootstrap": "^5.3.1",
"bootstrap": "^5.3.3",
"buffer": "^6.0.3",
"canvas": "^2.11.2",
"color": "^4.2.3",
"convexhull-js": "^1.0.0",
"core-js": "^3.11.0",
"core-js": "^3.37.0",
"curve-matcher": "^1.1.1",
"d3": "^7.6.1",
"d3": "^7.9",
"d3-fisheye": "^2.0.1",
"gcode-toolpath": "^2.2.0",
"geokdbush": "^1.1.0",
Expand All @@ -25,58 +25,58 @@
"konva": "^9.2.0",
"liang-barsky": "^1.0.4",
"lodash": "^4.17.21",
"lru-cache": "^10.0.1",
"mathjs": "^11.11.0",
"lru-cache": "^10.2.2",
"mathjs": "^12.4.2",
"opentype.js": "^1.3.4",
"point-in-polygon": "^1.1.0",
"points-on-path": "^0.2.1",
"rc-slider": "^10.2.1",
"re-reselect": "^4.0.1",
"react": "18.2",
"react-bootstrap": "^2.8.0",
"react-dom": "^18.2",
"react-error-boundary": "^4.0.11",
"rc-slider": "^10.6.2",
"re-reselect": "^5.1.0",
"react": "18.3",
"react-bootstrap": "^2.10.2",
"react-dom": "^18.3.1",
"react-error-boundary": "^4.0.13",
"react-ga": "^3.3.1",
"react-icons": "^4.2.0",
"react-icons": "^5.2.1",
"react-konva": "^18.2.10",
"react-redux": "^8.1.2",
"react-select": "^5.7.4",
"react-redux": "^9.1.2",
"react-select": "^5.8.0",
"react-switch": "^7.0.0",
"react-toastify": "^9.1.3",
"react-tooltip": "^5.20.0",
"react-toastify": "^10.0.5",
"react-tooltip": "^5.26.4",
"reduce-reducers": "^1.0.4",
"redux": "^4.2.1",
"redux": "^5.0.1",
"redux-mock-store": "^1.5.4",
"reselect": "^4.1.8",
"sass": "^1.49.11",
"reselect": "^5.1.0",
"sass": "^1.77.1",
"seedrandom": "^3.0.5",
"uuid": "^9.0.0",
"victor": "^1.1.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.16.11",
"@babel/preset-react": "^7.16.7",
"@babel/eslint-parser": "^7.24.5",
"@babel/plugin-transform-runtime": "^7.24.3",
"@babel/preset-env": "^7.24.5",
"@babel/preset-react": "^7.24.1",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.43.0",
"@vitejs/plugin-react": "^4.0.4",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"@vitejs/plugin-react": "^4.2.1",
"babel-jest": "^29.6.4",
"eslint": "^8.13.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-jest": "^27.2.3",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-redux": "^4.0.0",
"gh-pages": "^6.0.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-jest": "^28.5.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-redux": "^4.1.0",
"gh-pages": "^6.1.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.6.4",
"jest-canvas-mock": "^2.3.1",
"jest-environment-jsdom": "^29.6.4",
"prettier": "3.0.3",
"prettier": "3.2.5",
"vite": "^4.5.3",
"vite-plugin-node-polyfills": "^0.12.0"
"vite-plugin-node-polyfills": "^0.21.0"
},
"scripts": {
"start": "vite",
Expand Down
4 changes: 2 additions & 2 deletions src/common/geometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ export const horizontalAlign = (selections, align = "left") => {
align === "center"
? hAlignCenter
: align === "left"
? hAlignLeft
: hAlignRight
? hAlignLeft
: hAlignRight
const allBounds = findBounds(selections.flat())
const dAll = dFn(allBounds)

Expand Down
4 changes: 2 additions & 2 deletions src/features/effects/Mask.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ export default class Mask extends Effect {
? PolarInvertedMachine
: PolarMachine
: effect.maskInvert
? RectInvertedMachine
: RectMachine
? RectInvertedMachine
: RectMachine

const machine = new machineClass({
minX: 0,
Expand Down
4 changes: 2 additions & 2 deletions src/features/effects/effectsSlice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createSlice, createEntityAdapter } from "@reduxjs/toolkit"
import { createSelector, createSelectorCreator, defaultMemoize } from "reselect"
import { createSelector, createSelectorCreator, lruMemoize } from "reselect"
import { createCachedSelector } from "re-reselect"
import { isEqual } from "lodash"
import {
Expand Down Expand Up @@ -146,7 +146,7 @@ export const selectEffectSelectionVertices = createCachedSelector(
},
)({
keySelector: (state, id) => id,
selectorCreator: createSelectorCreator(defaultMemoize, {
selectorCreator: createSelectorCreator(lruMemoize, {
equalityCheck: isEqual,
}),
})
14 changes: 7 additions & 7 deletions src/features/layers/layersSlice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createSlice, createEntityAdapter } from "@reduxjs/toolkit"
import { createSelector, createSelectorCreator, defaultMemoize } from "reselect"
import { createSelector, createSelectorCreator, lruMemoize } from "reselect"
import { createCachedSelector } from "re-reselect"
import { v4 as uuidv4 } from "uuid"
import Color from "color"
Expand Down Expand Up @@ -345,7 +345,7 @@ export const selectLayerVertices = createCachedSelector(
},
)({
keySelector: (state, id) => id,
selectorCreator: createSelectorCreator(defaultMemoize, {
selectorCreator: createSelectorCreator(lruMemoize, {
equalityCheck: isEqual,
}),
})
Expand Down Expand Up @@ -399,7 +399,7 @@ export const selectShapePreviewVertices = createCachedSelector(
},
)({
keySelector: (state, id) => id,
selectorCreator: createSelectorCreator(defaultMemoize, {
selectorCreator: createSelectorCreator(lruMemoize, {
equalityCheck: isEqual,
}),
})
Expand Down Expand Up @@ -454,7 +454,7 @@ export const selectDraggingEffectVertices = createCachedSelector(
},
)({
keySelector: (state, id, effectId) => id + effectId,
selectorCreator: createSelectorCreator(defaultMemoize, {
selectorCreator: createSelectorCreator(lruMemoize, {
equalityCheck: isEqual,
}),
})
Expand Down Expand Up @@ -490,7 +490,7 @@ export const selectShapeWhileEffectDraggingVertices = createCachedSelector(
},
)({
keySelector: (state, id, effectId) => id + effectId,
selectorCreator: createSelectorCreator(defaultMemoize, {
selectorCreator: createSelectorCreator(lruMemoize, {
equalityCheck: isEqual,
}),
})
Expand Down Expand Up @@ -518,7 +518,7 @@ export const selectIsUpstreamEffectDragging = createCachedSelector(
},
)({
keySelector: (state, id) => id,
selectorCreator: createSelectorCreator(defaultMemoize, {
selectorCreator: createSelectorCreator(lruMemoize, {
equalityCheck: isEqual,
}),
})
Expand Down Expand Up @@ -670,7 +670,7 @@ export const selectLayerPreviewBounds = createCachedSelector(
},
)({
keySelector: (state, id, isCurrent) => `${id}-${isCurrent}`,
selectorCreator: createSelectorCreator(defaultMemoize, {
selectorCreator: createSelectorCreator(lruMemoize, {
equalityCheck: isEqual,
}),
})
Expand Down
5 changes: 3 additions & 2 deletions src/features/layers/layersSlice.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import configureMockStore from "redux-mock-store"
import thunk from "redux-thunk"
import { thunk } from "redux-thunk"
import { resetUniqueId } from "@/common/mocks"
import { configureStore } from "@reduxjs/toolkit"
import layersReducer, {
Expand All @@ -25,7 +25,8 @@ import fontsReducer from "@/features/fonts/fontsSlice"
import EffectLayer from "@/features/effects/EffectLayer"
import Layer from "./Layer"

const mockStore = configureMockStore([thunk])
const middleware = [thunk]
const mockStore = configureMockStore(middleware)

beforeEach(() => {
resetUniqueId()
Expand Down
4 changes: 2 additions & 2 deletions src/features/preview/ConnectorPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ const ConnectorPreview = (ownProps) => {
let color = isCurrent
? currentColor
: currentLayerId || currentEffectId
? unselectedShapeColor
: noSelectionColor
? unselectedShapeColor
: noSelectionColor

context.beginPath()
context.lineWidth = 1
Expand Down
Loading