Skip to content

Commit 4447aca

Browse files
authored
Merge pull request #9713 from OEvgeny/chore/update-electron-26
chore: update dependencies
2 parents a284398 + 5016800 commit 4447aca

File tree

785 files changed

+38132
-55764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

785 files changed

+38132
-55764
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set Node Version
2525
uses: actions/setup-node@v1
2626
with:
27-
node-version: 14.15.5
27+
node-version: 14.21.3
2828
- name: Get yarn cache directory path
2929
id: yarn-cache-dir-path
3030
run: echo "::set-output name=dir::$(yarn cache dir)"

Composer/.eslintrc.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,22 @@ module.exports = {
77
'plugin:prettier/recommended',
88
'plugin:@typescript-eslint/recommended',
99
'plugin:@typescript-eslint/eslint-recommended',
10-
'prettier/@typescript-eslint',
1110
'plugin:@bfc/bfcomposer/recommended',
12-
'plugin:security/recommended',
11+
'plugin:security/recommended-legacy',
1312
],
1413
plugins: ['import', 'notice', 'security', 'lodash', 'security'],
1514
env: {
1615
browser: true,
1716
es6: true,
1817
node: true,
1918
},
19+
parserOptions: {
20+
ecmaVersion: 6,
21+
sourceType: 'module',
22+
ecmaFeatures: {
23+
jsx: true,
24+
},
25+
},
2026
rules: {
2127
'notice/notice': [
2228
'error',
@@ -27,11 +33,11 @@ module.exports = {
2733
],
2834

2935
// typescript
30-
'@typescript-eslint/ban-ts-ignore': 'warn',
3136
'@typescript-eslint/explicit-function-return-type': 'off',
3237
'@typescript-eslint/interface-name-prefix': 'off',
3338
'@typescript-eslint/no-empty-function': 'off',
3439
'@typescript-eslint/no-unnecessary-type-assertion': 'off',
40+
'@typescript-eslint/no-var-requires': 0,
3541
'@typescript-eslint/no-use-before-define': 'warn',
3642
'@typescript-eslint/prefer-optional-chain': 'error',
3743

Composer/.eslintrc.react.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT License.
33

44
module.exports = {
5-
extends: ['./.eslintrc.js', 'plugin:react/recommended', 'plugin:security/recommended'],
5+
extends: ['./.eslintrc.js', 'plugin:react/recommended', 'plugin:security/recommended-legacy'],
66
plugins: ['react-hooks', 'format-message', '@emotion', 'jsx-a11y', 'security'],
77
settings: {
88
react: {
@@ -31,7 +31,7 @@ module.exports = {
3131
'react/no-danger': 'error',
3232
'react/no-deprecated': 'warn',
3333
'react/prop-types': 'warn',
34-
'react/no-unknown-property': 'error',
34+
'react/no-unknown-property': ['error', { 'ignore': ['css'] }],
3535
'react/jsx-boolean-value': ['error', 'never'],
3636
'react/jsx-filename-extension': ['error', { extensions: ['.jsx', '.tsx'] }],
3737
// https://github.com/yannickcr/eslint-plugin-react/blob/HEAD/docs/rules/jsx-sort-props.md

Composer/.glf.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"inputs": ["./package.json"],
3+
"output": "../ThirdPartyNotices.txt",
4+
"overwrite": true,
5+
"eol": "lf",
6+
"no-spinner": true,
7+
"replace": {
8+
"@bcoe/[email protected]": "./node_modules/@bcoe/v8-coverage/LICENSE.txt",
9+
"[email protected]": "./node_modules/through/./LICENSE.MIT",
10+
"[email protected]": "./node_modules/rc/LICENSE.MIT",
11+
"[email protected]": "./node_modules/microsoft-cognitiveservices-speech-sdk/LICENSE",
12+
"[email protected]": "./node_modules/doctrine/LICENSE",
13+
"[email protected]": "./node_modules/sax/LICENSE",
14+
"[email protected]": "./node_modules/atob/LICENSE",
15+
"[email protected]": "./node_modules/JSONStream/LICENSE.MIT"
16+
}
17+
}

Composer/package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -140,46 +140,46 @@
140140
]
141141
},
142142
"devDependencies": {
143-
"@babel/cli": "7.18.6",
144-
"@babel/core": "7.18.6",
143+
"@babel/cli": "7.23.9",
144+
"@babel/core": "7.24.0",
145145
"@babel/plugin-proposal-class-properties": "7.18.6",
146-
"@babel/plugin-transform-runtime": "7.18.6",
147-
"@babel/preset-env": "7.18.6",
148-
"@babel/preset-react": "7.18.6",
149-
"@babel/preset-typescript": "7.18.6",
146+
"@babel/plugin-transform-runtime": "7.24.0",
147+
"@babel/preset-env": "7.24.0",
148+
"@babel/preset-react": "7.23.3",
149+
"@babel/preset-typescript": "7.23.3",
150150
"@bfc/eslint-plugin-bfcomposer": "workspace:*",
151-
"@emotion/babel-preset-css-prop": "11.2.0",
152-
"@emotion/eslint-plugin": "11.7.0",
153-
"@typescript-eslint/eslint-plugin": "2.34.0",
154-
"@typescript-eslint/parser": "2.34.0",
155-
"concurrently": "7.2.2",
151+
"@emotion/babel-preset-css-prop": "11.11.0",
152+
"@emotion/eslint-plugin": "11.11.0",
153+
"@typescript-eslint/eslint-plugin": "5.62.0",
154+
"@typescript-eslint/parser": "5.62.0",
155+
"concurrently": "8.2.2",
156156
"coveralls": "3.1.1",
157157
"cross-env": "7.0.3",
158-
"eslint": "7.0.0",
159-
"eslint-config-prettier": "6.11.0",
158+
"eslint": "8.57.0",
159+
"eslint-config-prettier": "9.1.0",
160160
"eslint-formatter-github-actions": "1.1.0",
161161
"eslint-plugin-format-message": "6.2.4",
162-
"eslint-plugin-import": "2.26.0",
163-
"eslint-plugin-jsx-a11y": "6.6.0",
162+
"eslint-plugin-import": "2.29.1",
163+
"eslint-plugin-jsx-a11y": "6.8.0",
164164
"eslint-plugin-lodash": "7.4.0",
165165
"eslint-plugin-notice": "0.9.10",
166-
"eslint-plugin-prettier": "3.1.3",
167-
"eslint-plugin-react": "7.30.1",
166+
"eslint-plugin-prettier": "5.1.3",
167+
"eslint-plugin-react": "7.34.0",
168168
"eslint-plugin-react-hooks": "4.6.0",
169-
"eslint-plugin-security": "1.5.0",
169+
"eslint-plugin-security": "2.1.1",
170170
"format-message": "6.2.4",
171171
"format-message-cli": "6.2.4",
172-
"get-port": "6.1.2",
173-
"husky": "8.0.1",
172+
"get-port": "7.0.0",
173+
"husky": "9.0.11",
174174
"jest": "27.4.7",
175175
"jest-cli": "27.4.7",
176-
"lint-staged": "13.0.3",
177-
"prettier": "2.0.5",
176+
"lint-staged": "15.2.2",
177+
"prettier": "3.2.5",
178178
"rimraf": "3.0.2",
179-
"ts-loader": "9.3.1",
180-
"tslib": "2.4.0",
181-
"typescript": "3.9.2",
182-
"wait-on": "6.0.1",
179+
"ts-loader": "9.5.1",
180+
"tslib": "2.6.2",
181+
"typescript": "5.4.2",
182+
"wait-on": "7.2.0",
183183
"wsrun": "5.2.4"
184184
}
185185
}

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('<VisualDesigner/>', () => {
2020
}}
2121
>
2222
<AdaptiveFlowEditor />
23-
</EditorExtensionContext.Provider>
23+
</EditorExtensionContext.Provider>,
2424
);
2525
expect(visualDesigner).toBeTruthy();
2626
});

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/components/KeyboardZone.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe('KeyboardZone', () => {
1919
const zone = render(
2020
<KeyboardZone onCommand={() => undefined}>
2121
<span data-testid="zone-child">children</span>
22-
</KeyboardZone>
22+
</KeyboardZone>,
2323
);
2424
expect(zone).toBeTruthy();
2525
expect(zone.getByTestId('zone-child')).toBeTruthy();
@@ -30,7 +30,7 @@ describe('KeyboardZone', () => {
3030
const zone = render(
3131
<KeyboardZone onCommand={mockOnCommand}>
3232
<span data-testid="zone-child">children</span>
33-
</KeyboardZone>
33+
</KeyboardZone>,
3434
).getByTestId('keyboard-zone');
3535

3636
fireEvent.focus(zone);
@@ -40,7 +40,7 @@ describe('KeyboardZone', () => {
4040
key: 'C',
4141
code: 'C',
4242
ctrlKey: true,
43-
})
43+
}),
4444
);
4545
expect(mockOnCommand).toHaveBeenCalled();
4646
});

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/NodeRendererContext.test.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ import { NodeRendererContext } from '../../../src/adaptive-flow-editor/contexts/
99

1010
describe('NodeRendererContext', () => {
1111
const CtxtConsumer = () => {
12-
const { focusedId, focusedEvent, focusedTab, clipboardActions, dialogFactory, customSchemas } = useContext(
13-
NodeRendererContext
14-
);
12+
const { focusedId, focusedEvent, focusedTab, clipboardActions, dialogFactory, customSchemas } =
13+
useContext(NodeRendererContext);
1514

1615
return (
1716
<div>
@@ -37,7 +36,7 @@ describe('NodeRendererContext', () => {
3736
}}
3837
>
3938
<CtxtConsumer />
40-
</NodeRendererContext.Provider>
39+
</NodeRendererContext.Provider>,
4140
);
4241

4342
expect(ele.getByTestId('focusedId-value').textContent).toEqual('id1');

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/SelectionContext.test.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ import { SelectionContext } from '../../../src/adaptive-flow-editor/contexts/Sel
88

99
describe('SelectionContext', () => {
1010
const ContextConsumer = () => {
11-
const { getNodeIndex, getSelectableIds, selectedIds, setSelectedIds, selectableElements } = useContext(
12-
SelectionContext
13-
);
11+
const { getNodeIndex, getSelectableIds, selectedIds, setSelectedIds, selectableElements } =
12+
useContext(SelectionContext);
1413
return (
1514
<div>
1615
<span data-testid="getNodeIndex-result">{getNodeIndex('')}</span>
@@ -33,7 +32,7 @@ describe('SelectionContext', () => {
3332
}}
3433
>
3534
<ContextConsumer />
36-
</SelectionContext.Provider>
35+
</SelectionContext.Provider>,
3736
);
3837

3938
expect(ele.getByTestId('getNodeIndex-result').textContent).toEqual('1');

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/hooks/useEditorEventApi.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ describe('useEditorEventApi', () => {
1818
nodeContext: { ...defaultRendererContextValue, focusedId: 'a' },
1919
selectionContext: { ...defaultSelectionContextValue, selectedIds: ['a'] },
2020
},
21-
ShellApiStub
22-
)
21+
ShellApiStub,
22+
),
2323
).result.current;
2424

2525
it('returns necessary apis.', () => {

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/EdgeMenu.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('createActionMenu()', () => {
3131
label: 'Begin skill',
3232
submenu: [SDKKinds.BeginSkill],
3333
},
34-
}
34+
},
3535
);
3636
const sdkBeginSkill = menuItems.find((item) => item.key === SDKKinds.BeginSkill);
3737

@@ -61,7 +61,7 @@ describe('createActionMenu()', () => {
6161
{ isSelfHosted: false, enablePaste: false },
6262
[],
6363
{},
64-
[]
64+
[],
6565
);
6666
expect(menuItemsWithoutCustomActions.findIndex((x) => x.key === 'Custom Actions')).toEqual(-1);
6767

@@ -74,7 +74,7 @@ describe('createActionMenu()', () => {
7474
{ isSelfHosted: false, enablePaste: false },
7575
[],
7676
{},
77-
customActions
77+
customActions,
7878
);
7979
expect(withCustomActions.findIndex((x) => x.key === 'Custom Actions')).toEqual(withCustomActions.length - 1);
8080
expect(withCustomActions[withCustomActions.length - 1].subMenuProps?.items.length).toEqual(3); // 2 action labels + 1 sep line

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/ElementWrapper.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('<ElementWrapper>', () => {
1111
const ele = render(
1212
<ElementWrapper nodeId="test" tagId="1">
1313
<span data-testid="wrapped-content">Content</span>
14-
</ElementWrapper>
14+
</ElementWrapper>,
1515
);
1616

1717
expect(ele).toBeTruthy();

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('<ActionNodeWrapper>', () => {
2020
}}
2121
>
2222
<ActionNodeWrapper data={{}} id="test" onEvent={mockOnEvent} />
23-
</EditorExtensionContext.Provider>
23+
</EditorExtensionContext.Provider>,
2424
);
2525
expect(ele.getByTestId('ActionNodeWrapper')).toBeTruthy();
2626

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/stubs/ShellApiStub.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import { ShellApi } from '@bfc/shared';
55

6-
const fn = () => ({} as any);
6+
const fn = () => ({}) as any;
77
const fnList = () => [] as any[];
88
const fnPromise = () => Promise.resolve({} as any);
99

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/index.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ describe('moveCursor', () => {
2323
} as any,
2424
],
2525
'test',
26-
KeyboardCommandTypes.Cursor.MoveNext
27-
)
26+
KeyboardCommandTypes.Cursor.MoveNext,
27+
),
2828
).toEqual({ focused: 'test-focused', selected: 'test', tab: '' });
2929
});
3030

@@ -39,8 +39,8 @@ describe('moveCursor', () => {
3939
} as any,
4040
],
4141
'test',
42-
KeyboardCommandTypes.Cursor.MoveLeft
43-
)
42+
KeyboardCommandTypes.Cursor.MoveLeft,
43+
),
4444
).toEqual({ focused: 'test-focused', selected: 'test', tab: '' });
4545
});
4646
});

Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveDialog.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ describe('<AdaptiveDialog />', () => {
4040
uischema={uischema}
4141
widgets={widgets}
4242
onEvent={() => null}
43-
/>
43+
/>,
4444
);
4545
expect(renderResult.getAllByText('hello')).toHaveLength(1);
4646
});

Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveTrigger.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('<AdaptiveTrigger />', () => {
3232
const renderResult = render(
3333
<SchemaContext.Provider value={{ widgets, schemaProvider: new WidgetSchemaProvider(uischema) }}>
3434
<AdaptiveTrigger triggerData={triggerData} triggerId="triggers[0]" onEvent={() => null} />
35-
</SchemaContext.Provider>
35+
</SchemaContext.Provider>,
3636
);
3737
expect(renderResult.getAllByText('hello')).toHaveLength(1);
3838
});

Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/ElementMeasurer.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('<ElementMeasurer />', () => {
1111
const ele = render(
1212
<ElementMeasurer onResize={() => null}>
1313
<div data-testid="measurer-content" />
14-
</ElementMeasurer>
14+
</ElementMeasurer>,
1515
);
1616

1717
expect(ele.getByTestId('measurer-content')).toBeTruthy();

Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/OffsetContainer.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('<OffsetContainer />', () => {
1111
const offsetContainer = render(
1212
<OffsetContainer offset={{ x: 0, y: 0 }}>
1313
<></>
14-
</OffsetContainer>
14+
</OffsetContainer>,
1515
);
1616

1717
expect(offsetContainer).toBeTruthy();
@@ -22,7 +22,7 @@ describe('<OffsetContainer />', () => {
2222
const offsetContainer = render(
2323
<OffsetContainer offset={{ x: 0, y: 0 }}>
2424
<div data-testid="offset-content" />
25-
</OffsetContainer>
25+
</OffsetContainer>,
2626
);
2727

2828
expect(offsetContainer.getByTestId('offset-content')).toBeTruthy();

Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/SVGContainer.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('<SVGContainer />', () => {
1111
const svgContainer = render(
1212
<SVGContainer>
1313
<></>
14-
</SVGContainer>
14+
</SVGContainer>,
1515
);
1616

1717
expect(svgContainer).toBeTruthy();
@@ -22,7 +22,7 @@ describe('<SVGContainer />', () => {
2222
const svgContainer = render(
2323
<SVGContainer>
2424
<circle data-testid="svg-content" />
25-
</SVGContainer>
25+
</SVGContainer>,
2626
);
2727

2828
expect(svgContainer.getByTestId('svg-content')).toBeTruthy();

0 commit comments

Comments
 (0)