Skip to content

Commit 4c21036

Browse files
Merge pull request #356 from eccenca/feature/upgradeDependencies-CMEM-6825
Upgrade dependencies
2 parents 5fb0ee4 + 79956c7 commit 4c21036

File tree

18 files changed

+1699
-926
lines changed

18 files changed

+1699
-926
lines changed

eslint.config.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
import { fixupPluginRules } from "@eslint/compat";
2+
import { FlatCompat } from "@eslint/eslintrc";
3+
import js from "@eslint/js";
14
import typescriptEslint from "@typescript-eslint/eslint-plugin";
5+
import tsParser from "@typescript-eslint/parser";
26
import react from "eslint-plugin-react";
37
import reactHooks from "eslint-plugin-react-hooks";
48
import simpleImportSort from "eslint-plugin-simple-import-sort";
5-
import { fixupPluginRules } from "@eslint/compat";
6-
import tsParser from "@typescript-eslint/parser";
79
import path from "node:path";
810
import { fileURLToPath } from "node:url";
9-
import js from "@eslint/js";
10-
import { FlatCompat } from "@eslint/eslintrc";
1111

1212
const __filename = fileURLToPath(import.meta.url);
1313
const __dirname = path.dirname(__filename);

package.json

Lines changed: 49 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -68,37 +68,37 @@
6868
"autolint:all": "yarn autolint:scripts && yarn autolint:styles && yarn autolint:prettier"
6969
},
7070
"dependencies": {
71-
"@blueprintjs/colors": "^5.1.8",
72-
"@blueprintjs/core": "^5.18.0",
73-
"@blueprintjs/select": "^5.3.19",
74-
"@carbon/icons": "^11.58.0",
75-
"@carbon/react": "^1.80.1",
76-
"@codemirror/lang-html": "^6.4.9",
77-
"@codemirror/lang-javascript": "^6.2.3",
78-
"@codemirror/lang-json": "^6.0.1",
79-
"@codemirror/lang-markdown": "^6.3.2",
80-
"@codemirror/lang-sql": "^6.8.0",
71+
"@blueprintjs/colors": "^5.1.11",
72+
"@blueprintjs/core": "^5.19.1",
73+
"@blueprintjs/select": "^5.3.21",
74+
"@carbon/icons": "^11.70.0",
75+
"@carbon/react": "^1.96.0",
76+
"@codemirror/lang-html": "^6.4.11",
77+
"@codemirror/lang-javascript": "^6.2.4",
78+
"@codemirror/lang-json": "^6.0.2",
79+
"@codemirror/lang-markdown": "^6.5.0",
80+
"@codemirror/lang-sql": "^6.10.0",
8181
"@codemirror/lang-xml": "^6.1.0",
8282
"@codemirror/lang-yaml": "^6.1.2",
83-
"@codemirror/legacy-modes": "^6.5.0",
83+
"@codemirror/legacy-modes": "^6.5.2",
8484
"@mavrin/remark-typograf": "^2.2.0",
85-
"@xyflow/react": "^12.6.0",
85+
"@xyflow/react": "^12.9.3",
8686
"classnames": "^2.5.1",
87-
"codemirror": "^6.0.1",
87+
"codemirror": "^6.0.2",
8888
"color": "^4.2.3",
8989
"compute-scroll-into-view": "^3.1.1",
9090
"he": "^1.2.0",
9191
"jshint": "^2.13.6",
9292
"lodash": "^4.17.21",
93-
"n3": "^1.25.1",
93+
"n3": "^1.26.0",
9494
"re-resizable": "^6.10.3",
9595
"react": "^16.13.1",
9696
"react-dom": "^16.14.0",
9797
"react-flow-renderer": "9.7.4",
9898
"react-inlinesvg": "^3.0.3",
9999
"react-is": "^16.13.1",
100100
"react-markdown": "^10.1.0",
101-
"react-syntax-highlighter": "^15.6.1",
101+
"react-syntax-highlighter": "^15.6.6",
102102
"rehype-external-links": "^3.0.0",
103103
"rehype-raw": "^7.0.0",
104104
"remark-definition-list": "^2.0.0",
@@ -107,55 +107,54 @@
107107
"reset-css": "^5.0.2",
108108
"unified": "^11.0.5",
109109
"wicg-inert": "^3.1.3",
110-
"xml-formatter": "^3.6.5"
110+
"xml-formatter": "^3.6.7"
111111
},
112112
"devDependencies": {
113-
"@babel/core": "^7.26.10",
114-
"@babel/plugin-transform-class-properties": "^7.25.9",
115-
"@babel/plugin-transform-private-methods": "^7.25.9",
116-
"@babel/plugin-transform-private-property-in-object": "^7.25.9",
117-
"@babel/preset-env": "^7.26.9",
118-
"@babel/preset-flow": "^7.25.9",
119-
"@babel/preset-react": "^7.26.3",
120-
"@babel/preset-typescript": "^7.27.0",
121-
"@eslint/compat": "^1.2.8",
113+
"@babel/core": "^7.28.5",
114+
"@babel/plugin-transform-class-properties": "^7.27.1",
115+
"@babel/plugin-transform-private-methods": "^7.27.1",
116+
"@babel/plugin-transform-private-property-in-object": "^7.27.1",
117+
"@babel/preset-env": "^7.28.5",
118+
"@babel/preset-flow": "^7.27.1",
119+
"@babel/preset-react": "^7.28.5",
120+
"@babel/preset-typescript": "^7.28.5",
121+
"@eslint/compat": "^1.4.1",
122122
"@eslint/eslintrc": "^3.3.1",
123-
"@eslint/js": "^9.24.0",
124-
"@storybook/addon-actions": "^8.6.12",
125-
"@storybook/addon-essentials": "^8.6.12",
126-
"@storybook/addon-jest": "^8.6.12",
127-
"@storybook/addon-links": "^8.6.12",
123+
"@eslint/js": "^9.39.1",
124+
"@storybook/addon-actions": "^8.6.14",
125+
"@storybook/addon-essentials": "^8.6.14",
126+
"@storybook/addon-jest": "^8.6.14",
127+
"@storybook/addon-links": "^8.6.14",
128128
"@storybook/addon-webpack5-compiler-babel": "^3.0.6",
129-
"@storybook/cli": "^8.6.12",
129+
"@storybook/cli": "^8.6.14",
130130
"@storybook/preset-scss": "^1.0.3",
131-
"@storybook/react": "^8.6.12",
132-
"@storybook/react-webpack5": "^8.6.12",
133-
"@storybook/test": "^8.6.12",
134-
"@testing-library/jest-dom": "^6.6.3",
131+
"@storybook/react": "^8.6.14",
132+
"@storybook/react-webpack5": "^8.6.14",
133+
"@storybook/test": "^8.6.14",
134+
"@testing-library/jest-dom": "^6.9.1",
135135
"@testing-library/react": "^12.1.5",
136-
"@types/codemirror": "^5.60.15",
137136
"@types/color": "^3.0.6",
138137
"@types/he": "^1.2.3",
139-
"@types/jest": "^29.5.14",
138+
"@types/jest": "^30.0.0",
140139
"@types/jshint": "^2.12.4",
141-
"@types/lodash": "^4.17.16",
142-
"@types/n3": "^1.24.2",
143-
"@types/react-is": "^19.0.0",
140+
"@types/lodash": "^4.17.21",
141+
"@types/n3": "^1.26.1",
142+
"@types/react-is": "^19.2.0",
144143
"@types/react-syntax-highlighter": "^15.5.13",
145-
"@typescript-eslint/eslint-plugin": "^8.30.1",
146-
"@typescript-eslint/parser": "^8.30.1",
147-
"babel-jest": "^29.7.0",
148-
"chromatic": "^11.28.0",
149-
"eslint": "^9.24.0",
144+
"@typescript-eslint/eslint-plugin": "^8.47.0",
145+
"@typescript-eslint/parser": "^8.47.0",
146+
"babel-jest": "^30.2.0",
147+
"chromatic": "^13.3.4",
148+
"eslint": "^9.39.1",
150149
"eslint-plugin-react": "^7.37.5",
151-
"eslint-plugin-react-hooks": "^5.2.0",
150+
"eslint-plugin-react-hooks": "^7.0.1",
152151
"eslint-plugin-simple-import-sort": "^12.1.1",
153152
"husky": "4",
154153
"identity-obj-proxy": "^3.0.0",
155154
"jest": "^30.2.0",
156155
"jest-environment-jsdom": "^30.2.0",
157156
"jest-pnp-resolver": "^1.2.3",
158-
"lint-staged": "^15.5.1",
157+
"lint-staged": "^15.5.2",
159158
"node-sass-package-importer": "^5.3.3",
160159
"path": "^0.12.7",
161160
"prettier": "^2.8.8",
@@ -165,7 +164,7 @@
165164
"rimraf": "^5.0.10",
166165
"sass": "1.62.1",
167166
"sass-loader": "10.3.1",
168-
"storybook": "^8.6.12",
167+
"storybook": "^8.6.14",
169168
"stylelint": "^16.18.0",
170169
"stylelint-config-recess-order": "^6.0.0",
171170
"stylelint-config-standard-scss": "^14.0.0",
@@ -180,8 +179,8 @@
180179
"react": ">=16"
181180
},
182181
"resolutions": {
183-
"**/@types/react": "^17.0.85",
184-
"node-sass-package-importer/**/postcss": "^8.4.49",
182+
"**/@types/react": "^17.0.90",
183+
"node-sass-package-importer/**/postcss": "^8.5.6",
185184
"string-width": "^4.2.3",
186185
"wrap-ansi": "^7.0.0",
187186
"hast-util-from-parse5": "8.0.0"

src/cmem/ActivityControl/SilkActivityControl.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export function useSilkActivityControl({
196196
registerForUpdates(updateActivityStatus);
197197
return unregisterFromUpdates;
198198
},
199-
// eslint-disable-next-line react-hooks/exhaustive-deps
199+
200200
[]
201201
);
202202

src/cmem/react-flow/ReactFlow/ReactFlowV12.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
} from "@xyflow/react";
1010

1111
import { CLASSPREFIX as eccgui } from "../../../configuration/constants";
12+
1213
import { EdgeNew } from "./../../../extensions/react-flow/edges/EdgeNew";
1314

1415
export type ReactFlowV12ContainerProps = ReactFlowV12Props;

src/common/Intent/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { CLASSPREFIX as eccgui } from "../../configuration/constants";
21
import { Intent as BlueprintIntent } from "@blueprintjs/core";
32

3+
import { CLASSPREFIX as eccgui } from "../../configuration/constants";
4+
45
export type IntentBlueprint = BlueprintIntent;
56
export const DefinitionsBlueprint = BlueprintIntent;
67

src/components/AutoSuggestion/tests/ExtendedCodeEditor.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
2-
import { render } from "@testing-library/react";
32
import { EditorView } from "@codemirror/view";
3+
import { render } from "@testing-library/react";
44

55
import "@testing-library/jest-dom";
66

src/components/Icon/IconButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import React from "react";
22

33
import { CLASSPREFIX as eccgui } from "../../configuration/constants";
44
import Button, { ButtonProps } from "../Button/Button";
5+
import {TestableComponent} from "../interfaces";
56

67
import { ValidIconName } from "./canonicalIconNames";
78
import Icon, { IconProps } from "./Icon";
89
import { TestIconProps } from "./TestIcon";
9-
import {TestableComponent} from "../interfaces";
1010

1111
interface ExtendedButtonProps
1212
extends Omit<ButtonProps, "name" | "icon" | "rightIcon" | "text" | "minimal" | "tooltip">, TestableComponent {

src/components/TextReducer/TextReducer.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import {render, RenderResult} from "@testing-library/react";
2+
import { render, RenderResult } from "@testing-library/react";
33

44
import "@testing-library/jest-dom";
55

@@ -9,10 +9,10 @@ import { Default as TextReducerStory } from "./TextReducer.stories";
99
describe("TextReducer", () => {
1010
const textMustExist = (queryByText: RenderResult["queryByText"], text: string) => {
1111
expect(queryByText(text, { exact: false })).not.toBeNull();
12-
}
12+
};
1313
const textMustNotExist = (queryByText: RenderResult["queryByText"], text: string) => {
1414
expect(queryByText(text, { exact: false })).toBeNull();
15-
}
15+
};
1616
it("should display encoded HTML entities by default if they are used in the transformed markup", () => {
1717
const { queryByText } = render(<TextReducer {...TextReducerStory.args} />);
1818
textMustExist(queryByText, "&#x27;entities&#x27; &amp; &quot;quotes&quot;");

src/extensions/codemirror/CodeMirror.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import React, { useMemo, useRef } from "react";
22
import { defaultKeymap, indentWithTab } from "@codemirror/commands";
33
import { defaultHighlightStyle, foldKeymap } from "@codemirror/language";
4-
import { EditorState, Extension, Compartment } from "@codemirror/state";
4+
import { Compartment,EditorState, Extension } from "@codemirror/state";
55
import { DOMEventHandlers, EditorView, KeyBinding, keymap, Rect, ViewUpdate } from "@codemirror/view";
66
import { minimalSetup } from "codemirror";
77

8+
import { Markdown } from "../../cmem/markdown/Markdown";
89
import { IntentTypes } from "../../common/Intent";
910
import { markField } from "../../components/AutoSuggestion/extensions/markText";
1011
import { TestableComponent } from "../../components/interfaces";
11-
import { MarkdownToolbar } from "./toolbars/markdown.toolbar";
12-
import { Markdown } from "../../cmem/markdown/Markdown";
1312
import { CLASSPREFIX as eccgui } from "../../configuration/constants";
1413

1514
//hooks
@@ -31,9 +30,10 @@ import {
3130
adaptedLineNumbers,
3231
adaptedLintGutter,
3332
adaptedPlaceholder,
34-
compartment,
3533
adaptedSyntaxHighlighting,
34+
compartment,
3635
} from "./tests/codemirrorTestHelper";
36+
import { MarkdownToolbar } from "./toolbars/markdown.toolbar";
3737
import { ExtensionCreator } from "./types";
3838

3939
export interface CodeEditorProps extends Omit<React.HTMLAttributes<HTMLDivElement>, "translate" | "onChange" | "onKeyDown" | "onMouseDown" | "onScroll">, TestableComponent {

src/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
//adapted v6 modes imports
2+
import {html} from "@codemirror/lang-html"
23
import { javascript } from "@codemirror/lang-javascript";
34
import { json } from "@codemirror/lang-json";
45
import { markdown } from "@codemirror/lang-markdown";
56
import { sql } from "@codemirror/lang-sql";
67
import { xml } from "@codemirror/lang-xml";
78
import { yaml } from "@codemirror/lang-yaml";
8-
import {html} from "@codemirror/lang-html"
9-
109
import { defaultHighlightStyle, LanguageSupport, StreamLanguage, StreamParser } from "@codemirror/language";
1110
//legacy mode imports
1211
import { jinja2 } from "@codemirror/legacy-modes/mode/jinja2";

0 commit comments

Comments
 (0)