Skip to content

Commit 461f15a

Browse files
authored
Update minor dependency versions (#1041)
1 parent d77720e commit 461f15a

File tree

15 files changed

+8359
-6909
lines changed

15 files changed

+8359
-6909
lines changed

.storybook/main.ts renamed to .storybook/main.cjs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
import { dirname, join } from "path";
2-
import linaria from "@linaria/vite";
3-
import { mergeConfig } from "vite";
1+
const { dirname, join } = require("path");
42

5-
export default {
3+
module.exports = {
64
stories: ["../**/src/**/*.stories.tsx"],
75
addons: [getAbsolutePath("@storybook/addon-docs")],
86

@@ -11,15 +9,17 @@ export default {
119
},
1210

1311
async viteFinal(config) {
12+
const { mergeConfig } = await import("vite");
13+
const linaria = await import("@linaria/vite");
1414
return mergeConfig(config, {
15-
plugins: [linaria()],
15+
plugins: [linaria.default()],
1616
});
1717
},
1818

1919
framework: {
2020
name: getAbsolutePath("@storybook/react-vite"),
2121
options: {},
22-
}
22+
},
2323
};
2424

2525
function getAbsolutePath(value) {

package-lock.json

Lines changed: 8252 additions & 6803 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -28,76 +28,76 @@
2828
"./packages/source"
2929
],
3030
"devDependencies": {
31-
"@babel/cli": "^7.16.0",
32-
"@babel/core": "^7.9.0",
33-
"@babel/plugin-proposal-class-properties": "^7.8.3",
34-
"@babel/preset-env": "^7.16.4",
35-
"@babel/preset-react": "^7.8.3",
36-
"@babel/preset-typescript": "^7.9.0",
31+
"@babel/cli": "^7.27.2",
32+
"@babel/core": "^7.27.4",
33+
"@babel/plugin-proposal-class-properties": "^7.18.6",
34+
"@babel/preset-env": "^7.27.2",
35+
"@babel/preset-react": "^7.27.1",
36+
"@babel/preset-typescript": "^7.27.1",
3737
"@faker-js/faker": "^7.6.0",
38-
"@linaria/babel-preset": "^4.5.3",
39-
"@linaria/cli": "^4.5.3",
40-
"@linaria/core": "^4.5.3",
41-
"@linaria/esbuild": "^4.5.3",
42-
"@linaria/react": "^4.5.3",
38+
"@linaria/babel-preset": "^4.5.4",
39+
"@linaria/cli": "^4.5.4",
40+
"@linaria/core": "^4.5.4",
41+
"@linaria/esbuild": "^4.5.4",
42+
"@linaria/react": "^4.5.4",
4343
"@linaria/shaker": "^4.5.3",
44-
"@linaria/vite": "^4.5.3",
45-
"@linaria/webpack-loader": "^4.5.3",
46-
"@storybook/addon-docs": "^9.0.1",
47-
"@storybook/addon-links": "^9.0.1",
48-
"@storybook/addons": "^7.6.17",
49-
"@storybook/react-vite": "^9.0.1",
50-
"@storybook/react-webpack5": "^9.0.1",
44+
"@linaria/vite": "^4.5.4",
45+
"@linaria/webpack-loader": "^4.5.4",
46+
"@storybook/addon-docs": "^9.0.11",
47+
"@storybook/addon-links": "^9.0.11",
48+
"@storybook/addons": "^7.6.20",
49+
"@storybook/react-vite": "^9.0.11",
50+
"@storybook/react-webpack5": "^9.0.11",
5151
"@testing-library/dom": "^10.4.0",
5252
"@testing-library/react": "^16.3.0",
5353
"@testing-library/react-hooks": "^8.0.1",
54-
"@testing-library/user-event": "^14.5.1",
55-
"@types/cheerio": "^0.22.30",
56-
"@types/lodash": "^4.14.177",
57-
"@types/marked": "^4.0.2",
58-
"@types/node": "^18.7.13",
59-
"@types/prosemirror-commands": "^1.0.4",
60-
"@types/prosemirror-inputrules": "^1.0.4",
61-
"@types/prosemirror-model": "^1.16.1",
62-
"@types/prosemirror-state": "^1.2.8",
54+
"@testing-library/user-event": "^14.6.1",
55+
"@types/cheerio": "^0.22.35",
56+
"@types/lodash": "^4.17.17",
57+
"@types/marked": "^4.3.2",
58+
"@types/node": "^18.19.112",
59+
"@types/prosemirror-commands": "^1.3.0",
60+
"@types/prosemirror-inputrules": "^1.2.0",
61+
"@types/prosemirror-model": "^1.17.0",
62+
"@types/prosemirror-state": "^1.4.0",
6363
"@types/react": "^16.14.21 || 17.x || 18.x || 19.x",
6464
"@types/react-dom": "^16.9.5 || 17.x || 18.x || 19.x",
65-
"@types/react-syntax-highlighter": "^15.5.5",
66-
"@typescript-eslint/eslint-plugin": "^5.30.5",
67-
"@typescript-eslint/parser": "^6.4.1",
68-
"@typescript-eslint/typescript-estree": "^5.30.5",
69-
"@vitejs/plugin-react": "^4.2.0",
70-
"babel-loader": "^8.1.0",
65+
"@types/react-syntax-highlighter": "^15.5.13",
66+
"@typescript-eslint/eslint-plugin": "^5.62.0",
67+
"@typescript-eslint/parser": "^6.21.0",
68+
"@typescript-eslint/typescript-estree": "^5.62.0",
69+
"@vitejs/plugin-react": "^4.5.2",
70+
"babel-loader": "^8.4.1",
7171
"chokidar-cli": "^3.0.0",
72-
"clean-css-cli": "^5.6.2",
72+
"clean-css-cli": "^5.6.3",
7373
"concurrently": "^8.2.2",
74-
"esbuild": "^0.19.2",
75-
"eslint": "^8.19.0",
76-
"eslint-plugin-import": "^2.26.0",
77-
"eslint-plugin-react": "^7.30.1",
78-
"eslint-plugin-react-hooks": "^4.6.0",
79-
"eslint-plugin-sonarjs": "^0.13.0",
80-
"eslint-plugin-unicorn": "^43.0.1",
74+
"esbuild": "^0.25.5",
75+
"eslint": "^8.57.1",
76+
"eslint-plugin-import": "^2.31.0",
77+
"eslint-plugin-react": "^7.37.5",
78+
"eslint-plugin-react-hooks": "^4.6.2",
79+
"eslint-plugin-sonarjs": "^0.25.1",
80+
"eslint-plugin-unicorn": "^43.0.2",
8181
"http-server": "^14.1.1",
8282
"jsdom": "^22.1.0",
8383
"lodash": "^4.17.21",
84-
"marked": "^4.0.10",
85-
"mini-css-extract-plugin": "^2.6.1",
86-
"prettier": "^3.0.2",
84+
"marked": "^4.3.0",
85+
"mini-css-extract-plugin": "^2.9.2",
86+
"prettier": "^3.5.3",
8787
"react": "^19.1.0",
8888
"react-dom": "^19.1.0",
89-
"react-laag": "^2.0.3",
90-
"react-responsive-carousel": "^3.2.7",
91-
"react-syntax-highlighter": "^15.4.5",
89+
"react-laag": "^2.0.5",
90+
"react-responsive-carousel": "^3.2.23",
91+
"react-syntax-highlighter": "^15.6.1",
9292
"react-test-renderer": "^19.1.0",
9393
"resolve-typescript-plugin": "^2.0.1",
94-
"storybook": "^9.0.1",
95-
"tsc-esm-fix": "^2.7.8",
96-
"typedoc": "^0.25.4",
97-
"typescript": "^5.1.6",
94+
"storybook": "^9.0.11",
95+
"tsc-esm-fix": "^2.20.27",
96+
"typedoc": "^0.28.5",
97+
"typescript": "^5.8.3",
9898
"vitest": "^0.34.6",
9999
"vitest-canvas-mock": "^0.3.3",
100-
"webpack": "^5.73.0"
100+
"webpack": "^5.99.9"
101101
},
102102
"overrides": {
103103
"storybook": "$storybook"

packages/cells/package.json

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,24 @@
5151
],
5252
"dependencies": {
5353
"@glideapps/glide-data-grid": "6.0.4-alpha9",
54-
"@linaria/react": "^4.5.3",
55-
"@toast-ui/editor": "3.1.10",
56-
"@toast-ui/react-editor": "3.1.10",
57-
"react-select": "^5.8.0"
54+
"@linaria/react": "^4.5.4",
55+
"@toast-ui/editor": "3.2.2",
56+
"@toast-ui/react-editor": "3.2.3",
57+
"react-select": "^5.10.1"
5858
},
5959
"peerDependencies": {
6060
"react": "^16.12.0 || 17.x || 18.x || 19.x",
6161
"react-dom": "^16.12.0 || 17.x || 18.x || 19.x"
6262
},
6363
"devDependencies": {
64-
"@babel/cli": "^7.16.0",
65-
"@types/prosemirror-commands": "^1.0.4",
66-
"@types/react": "16.14.21",
67-
"eslint": "^8.19.0",
68-
"eslint-plugin-import": "^2.22.0",
69-
"eslint-plugin-react": "^7.21.5",
70-
"eslint-plugin-react-hooks": "^4.2.0",
64+
"@babel/cli": "^7.27.2",
65+
"@types/prosemirror-commands": "^1.3.0",
66+
"eslint": "^8.57.1",
67+
"eslint-plugin-import": "^2.31.0",
68+
"eslint-plugin-react": "^7.37.5",
69+
"eslint-plugin-react-hooks": "^4.6.2",
7170
"react-resize-detector": "^7.1.2",
72-
"tsc-esm-fix": "^2.7.8",
73-
"typescript": "^5.1.6"
71+
"tsc-esm-fix": "^2.20.27",
72+
"typescript": "^5.8.3"
7473
}
7574
}

packages/cells/tsconfig.cjs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"rootDir": "./src",
1515
"outDir": "./dist/cjs",
1616
"declarationDir": "./dist/dts",
17-
"module": "CommonJS",
17+
"module": "Node16",
1818
"verbatimModuleSyntax": false,
1919
"sourceMap": true
2020
}

packages/core/.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"unicorn/prefer-dom-node-text-content": "off",
4848
"unicorn/consistent-destructuring": "off",
4949
"unicorn/no-array-reduce": "off",
50+
"unicorn/expiring-todo-comments": "off",
5051
"@typescript-eslint/no-misused-promises": [
5152
"error",
5253
{

packages/core/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
},
5858
"homepage": "https://grid.glideapps.com",
5959
"dependencies": {
60-
"@linaria/react": "^4.5.3",
60+
"@linaria/react": "^4.5.4",
6161
"canvas-hypertxt": "^1.0.3",
62-
"react-number-format": "^5.0.0"
62+
"react-number-format": "^5.4.4"
6363
},
6464
"peerDependencies": {
6565
"lodash": "^4.17.19",
@@ -69,13 +69,13 @@
6969
"react-responsive-carousel": "^3.2.7"
7070
},
7171
"devDependencies": {
72-
"@babel/cli": "^7.16.0",
72+
"@babel/cli": "^7.27.2",
7373
"@glideapps/ts-helper": "5.0.0",
7474
"@skypack/package-check": "^0.2.2",
7575
"@vitest/coverage-v8": "^0.34.6",
76-
"eslint": "^8.19.0",
76+
"eslint": "^8.57.1",
7777
"react-resize-detector": "^7.1.2",
78-
"tsc-esm-fix": "^2.7.8",
79-
"typedoc": "^0.23.13"
78+
"tsc-esm-fix": "^2.20.27",
79+
"typedoc": "^0.28.5"
8080
}
8181
}

packages/core/src/data-editor/stories/utils.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ interface BeautifulProps {
238238
scale?: string;
239239
}
240240

241-
export const BeautifulWrapper: React.FC<BeautifulProps> = p => {
241+
export const BeautifulWrapper: React.FC<React.PropsWithChildren<BeautifulProps>> = p => {
242242
const { title, children, description, className, scale } = p;
243243

244244
const { ref, width, height } = useResizeDetector();

packages/core/src/docs/examples/shadow-dom.stories.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
defaultProps,
1010
} from "../../data-editor/stories/utils.js";
1111
import { SimpleThemeWrapper } from "../../stories/story-utils.js";
12-
import ReactDOM from "react-dom";
12+
import { createRoot } from "react-dom/client";
1313

1414
export default {
1515
title: "Glide-Data-Grid/DataEditor Demos",
@@ -94,12 +94,12 @@ const ShadowDOMWrapper: React.FC<{
9494
shadowRoot.append(reactRootContainer);
9595

9696
// Create a React root and render the children inside it
97-
ReactDOM.render(<>{render()}</>, reactRootContainer);
97+
const root = createRoot(reactRootContainer);
98+
root.render(<>{render()}</>);
9899

99100
// Clean up when the component unmounts
100101
return () => {
101-
// reactRoot.unmount()
102-
reactRootContainer.remove();
102+
root.unmount();
103103
};
104104
}, [render]);
105105

packages/core/src/internal/data-grid/data-grid-types.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import type { Theme } from "../../common/styles.js";
2-
import { assertNever, proveType } from "../../common/support.js";
31
import has from "lodash/has.js";
42
import type React from "react";
53
import type { CSSProperties } from "react";
6-
import type { SpriteManager } from "./data-grid-sprites.js";
4+
import type { Theme } from "../../common/styles.js";
5+
import { assertNever, proveType } from "../../common/support.js";
76
import type { OverlayImageEditorProps } from "../data-grid-overlay-editor/private/image-overlay-editor.js";
8-
import type { ImageWindowLoader } from "./image-window-loader-interface.js";
7+
import type { SpriteManager } from "./data-grid-sprites.js";
98
import type { BaseGridMouseEventArgs } from "./event-args.js";
9+
import type { ImageWindowLoader } from "./image-window-loader-interface.js";
1010

1111
// Thoughts:
1212
// rows/columns are called out as selected, but when selected they must also be added
@@ -259,17 +259,17 @@ export function isInnerOnlyCell(cell: InnerGridCell): cell is InnerOnlyGridCell
259259
export function isReadWriteCell(cell: GridCell): cell is ReadWriteGridCell {
260260
if (!isEditableGridCell(cell) || cell.kind === GridCellKind.Image) return false;
261261

262-
if (
263-
cell.kind === GridCellKind.Text ||
264-
cell.kind === GridCellKind.Number ||
265-
cell.kind === GridCellKind.Markdown ||
266-
cell.kind === GridCellKind.Uri ||
267-
cell.kind === GridCellKind.Custom ||
268-
cell.kind === GridCellKind.Boolean
269-
) {
270-
return cell.readonly !== true;
262+
switch (cell.kind) {
263+
case GridCellKind.Text:
264+
case GridCellKind.Number:
265+
case GridCellKind.Markdown:
266+
case GridCellKind.Uri:
267+
case GridCellKind.Custom:
268+
case GridCellKind.Boolean:
269+
return cell.readonly !== true;
270+
default:
271+
assertNever(cell, "A cell was passed with an invalid kind");
271272
}
272-
assertNever(cell, "A cell was passed with an invalid kind");
273273
}
274274

275275
/** @category Cells */

0 commit comments

Comments
 (0)