Merge pull request #9713 from OEvgeny/chore/update-electron-26

chore: update dependencies
microsoft · Mar 28, 2024 · 4447aca · 4447aca
2 parents a284398 + 5016800
commit 4447aca
Show file tree

Hide file tree

Showing 785 changed files with 38,132 additions and 55,764 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set Node Version
         uses: actions/setup-node@v1
         with:
-          node-version: 14.15.5
+          node-version: 14.21.3
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"

diff --git a/Composer/.eslintrc.js b/Composer/.eslintrc.js
@@ -7,16 +7,22 @@ module.exports = {
     'plugin:prettier/recommended',
     'plugin:@typescript-eslint/recommended',
     'plugin:@typescript-eslint/eslint-recommended',
-    'prettier/@typescript-eslint',
     'plugin:@bfc/bfcomposer/recommended',
-    'plugin:security/recommended',
+    'plugin:security/recommended-legacy',
   ],
   plugins: ['import', 'notice', 'security', 'lodash', 'security'],
   env: {
     browser: true,
     es6: true,
     node: true,
   },
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module',
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
   rules: {
     'notice/notice': [
       'error',
@@ -27,11 +33,11 @@ module.exports = {
     ],
 
     // typescript
-    '@typescript-eslint/ban-ts-ignore': 'warn',
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/interface-name-prefix': 'off',
     '@typescript-eslint/no-empty-function': 'off',
     '@typescript-eslint/no-unnecessary-type-assertion': 'off',
+    '@typescript-eslint/no-var-requires': 0,
     '@typescript-eslint/no-use-before-define': 'warn',
     '@typescript-eslint/prefer-optional-chain': 'error',
 

diff --git a/Composer/.eslintrc.react.js b/Composer/.eslintrc.react.js
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 module.exports = {
-  extends: ['./.eslintrc.js', 'plugin:react/recommended', 'plugin:security/recommended'],
+  extends: ['./.eslintrc.js', 'plugin:react/recommended', 'plugin:security/recommended-legacy'],
   plugins: ['react-hooks', 'format-message', '@emotion', 'jsx-a11y', 'security'],
   settings: {
     react: {
@@ -31,7 +31,7 @@ module.exports = {
     'react/no-danger': 'error',
     'react/no-deprecated': 'warn',
     'react/prop-types': 'warn',
-    'react/no-unknown-property': 'error',
+    'react/no-unknown-property': ['error', { 'ignore': ['css'] }],
     'react/jsx-boolean-value': ['error', 'never'],
     'react/jsx-filename-extension': ['error', { extensions: ['.jsx', '.tsx'] }],
     // https://github.com/yannickcr/eslint-plugin-react/blob/HEAD/docs/rules/jsx-sort-props.md

diff --git a/Composer/.glf.json b/Composer/.glf.json
@@ -0,0 +1,17 @@
+{
+  "inputs": ["./package.json"],
+  "output": "../ThirdPartyNotices.txt",
+  "overwrite": true,
+  "eol": "lf",
+  "no-spinner": true,
+  "replace": {
+    "@bcoe/v8-coverage@0.2.3": "./node_modules/@bcoe/v8-coverage/LICENSE.txt",
+    "through@2.3.8": "./node_modules/through/./LICENSE.MIT",
+    "rc@1.2.8": "./node_modules/rc/LICENSE.MIT",
+    "microsoft-cognitiveservices-speech-sdk@1.17.0": "./node_modules/microsoft-cognitiveservices-speech-sdk/LICENSE",
+    "doctrine@3.0.0": "./node_modules/doctrine/LICENSE",
+    "sax@0.5.8": "./node_modules/sax/LICENSE",
+    "atob@2.1.2": "./node_modules/atob/LICENSE",
+    "JSONStream@1.3.5": "./node_modules/JSONStream/LICENSE.MIT"
+  }
+}
diff --git a/Composer/package.json b/Composer/package.json
@@ -140,46 +140,46 @@
     ]
   },
   "devDependencies": {
-    "@babel/cli": "7.18.6",
-    "@babel/core": "7.18.6",
+    "@babel/cli": "7.23.9",
+    "@babel/core": "7.24.0",
     "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-transform-runtime": "7.18.6",
-    "@babel/preset-env": "7.18.6",
-    "@babel/preset-react": "7.18.6",
-    "@babel/preset-typescript": "7.18.6",
+    "@babel/plugin-transform-runtime": "7.24.0",
+    "@babel/preset-env": "7.24.0",
+    "@babel/preset-react": "7.23.3",
+    "@babel/preset-typescript": "7.23.3",
     "@bfc/eslint-plugin-bfcomposer": "workspace:*",
-    "@emotion/babel-preset-css-prop": "11.2.0",
-    "@emotion/eslint-plugin": "11.7.0",
-    "@typescript-eslint/eslint-plugin": "2.34.0",
-    "@typescript-eslint/parser": "2.34.0",
-    "concurrently": "7.2.2",
+    "@emotion/babel-preset-css-prop": "11.11.0",
+    "@emotion/eslint-plugin": "11.11.0",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/parser": "5.62.0",
+    "concurrently": "8.2.2",
     "coveralls": "3.1.1",
     "cross-env": "7.0.3",
-    "eslint": "7.0.0",
-    "eslint-config-prettier": "6.11.0",
+    "eslint": "8.57.0",
+    "eslint-config-prettier": "9.1.0",
     "eslint-formatter-github-actions": "1.1.0",
     "eslint-plugin-format-message": "6.2.4",
-    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-jsx-a11y": "6.6.0",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-jsx-a11y": "6.8.0",
     "eslint-plugin-lodash": "7.4.0",
     "eslint-plugin-notice": "0.9.10",
-    "eslint-plugin-prettier": "3.1.3",
-    "eslint-plugin-react": "7.30.1",
+    "eslint-plugin-prettier": "5.1.3",
+    "eslint-plugin-react": "7.34.0",
     "eslint-plugin-react-hooks": "4.6.0",
-    "eslint-plugin-security": "1.5.0",
+    "eslint-plugin-security": "2.1.1",
     "format-message": "6.2.4",
     "format-message-cli": "6.2.4",
-    "get-port": "6.1.2",
-    "husky": "8.0.1",
+    "get-port": "7.0.0",
+    "husky": "9.0.11",
     "jest": "27.4.7",
     "jest-cli": "27.4.7",
-    "lint-staged": "13.0.3",
-    "prettier": "2.0.5",
+    "lint-staged": "15.2.2",
+    "prettier": "3.2.5",
     "rimraf": "3.0.2",
-    "ts-loader": "9.3.1",
-    "tslib": "2.4.0",
-    "typescript": "3.9.2",
-    "wait-on": "6.0.1",
+    "ts-loader": "9.5.1",
+    "tslib": "2.6.2",
+    "typescript": "5.4.2",
+    "wait-on": "7.2.0",
     "wsrun": "5.2.4"
   }
 }
diff --git a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx
@@ -20,7 +20,7 @@ describe('<VisualDesigner/>', () => {
         }}
       >
         <AdaptiveFlowEditor />
-      </EditorExtensionContext.Provider>
+      </EditorExtensionContext.Provider>,
     );
     expect(visualDesigner).toBeTruthy();
   });

diff --git a/...er/packages/adaptive-flow/__tests__/adaptive-flow-editor/components/KeyboardZone.test.tsx b/...er/packages/adaptive-flow/__tests__/adaptive-flow-editor/components/KeyboardZone.test.tsx
@@ -19,7 +19,7 @@ describe('KeyboardZone', () => {
     const zone = render(
       <KeyboardZone onCommand={() => undefined}>
         <span data-testid="zone-child">children</span>
-      </KeyboardZone>
+      </KeyboardZone>,
     );
     expect(zone).toBeTruthy();
     expect(zone.getByTestId('zone-child')).toBeTruthy();
@@ -30,7 +30,7 @@ describe('KeyboardZone', () => {
     const zone = render(
       <KeyboardZone onCommand={mockOnCommand}>
         <span data-testid="zone-child">children</span>
-      </KeyboardZone>
+      </KeyboardZone>,
     ).getByTestId('keyboard-zone');
 
     fireEvent.focus(zone);
@@ -40,7 +40,7 @@ describe('KeyboardZone', () => {
         key: 'C',
         code: 'C',
         ctrlKey: true,
-      })
+      }),
     );
     expect(mockOnCommand).toHaveBeenCalled();
   });

diff --git a/...ckages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/NodeRendererContext.test.tsx b/...ckages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/NodeRendererContext.test.tsx
@@ -9,9 +9,8 @@ import { NodeRendererContext } from '../../../src/adaptive-flow-editor/contexts/
 
 describe('NodeRendererContext', () => {
   const CtxtConsumer = () => {
-    const { focusedId, focusedEvent, focusedTab, clipboardActions, dialogFactory, customSchemas } = useContext(
-      NodeRendererContext
-    );
+    const { focusedId, focusedEvent, focusedTab, clipboardActions, dialogFactory, customSchemas } =
+      useContext(NodeRendererContext);
 
     return (
       <div>
@@ -37,7 +36,7 @@ describe('NodeRendererContext', () => {
         }}
       >
         <CtxtConsumer />
-      </NodeRendererContext.Provider>
+      </NodeRendererContext.Provider>,
     );
 
     expect(ele.getByTestId('focusedId-value').textContent).toEqual('id1');

diff --git a/.../packages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/SelectionContext.test.tsx b/.../packages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/SelectionContext.test.tsx
@@ -8,9 +8,8 @@ import { SelectionContext } from '../../../src/adaptive-flow-editor/contexts/Sel
 
 describe('SelectionContext', () => {
   const ContextConsumer = () => {
-    const { getNodeIndex, getSelectableIds, selectedIds, setSelectedIds, selectableElements } = useContext(
-      SelectionContext
-    );
+    const { getNodeIndex, getSelectableIds, selectedIds, setSelectedIds, selectableElements } =
+      useContext(SelectionContext);
     return (
       <div>
         <span data-testid="getNodeIndex-result">{getNodeIndex('')}</span>
@@ -33,7 +32,7 @@ describe('SelectionContext', () => {
         }}
       >
         <ContextConsumer />
-      </SelectionContext.Provider>
+      </SelectionContext.Provider>,
     );
 
     expect(ele.getByTestId('getNodeIndex-result').textContent).toEqual('1');

diff --git a/...ser/packages/adaptive-flow/__tests__/adaptive-flow-editor/hooks/useEditorEventApi.test.ts b/...ser/packages/adaptive-flow/__tests__/adaptive-flow-editor/hooks/useEditorEventApi.test.ts
@@ -18,8 +18,8 @@ describe('useEditorEventApi', () => {
         nodeContext: { ...defaultRendererContextValue, focusedId: 'a' },
         selectionContext: { ...defaultSelectionContextValue, selectedIds: ['a'] },
       },
-      ShellApiStub
-    )
+      ShellApiStub,
+    ),
   ).result.current;
 
   it('returns necessary apis.', () => {

diff --git a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/EdgeMenu.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/EdgeMenu.test.tsx
@@ -31,7 +31,7 @@ describe('createActionMenu()', () => {
           label: 'Begin skill',
           submenu: [SDKKinds.BeginSkill],
         },
-      }
+      },
     );
     const sdkBeginSkill = menuItems.find((item) => item.key === SDKKinds.BeginSkill);
 
@@ -61,7 +61,7 @@ describe('createActionMenu()', () => {
       { isSelfHosted: false, enablePaste: false },
       [],
       {},
-      []
+      [],
     );
     expect(menuItemsWithoutCustomActions.findIndex((x) => x.key === 'Custom Actions')).toEqual(-1);
 
@@ -74,7 +74,7 @@ describe('createActionMenu()', () => {
       { isSelfHosted: false, enablePaste: false },
       [],
       {},
-      customActions
+      customActions,
     );
     expect(withCustomActions.findIndex((x) => x.key === 'Custom Actions')).toEqual(withCustomActions.length - 1);
     expect(withCustomActions[withCustomActions.length - 1].subMenuProps?.items.length).toEqual(3); // 2 action labels + 1 sep line

diff --git a/...r/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/ElementWrapper.test.tsx b/...r/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/ElementWrapper.test.tsx
@@ -11,7 +11,7 @@ describe('<ElementWrapper>', () => {
     const ele = render(
       <ElementWrapper nodeId="test" tagId="1">
         <span data-testid="wrapped-content">Content</span>
-      </ElementWrapper>
+      </ElementWrapper>,
     );
 
     expect(ele).toBeTruthy();

diff --git a/...oser/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx b/...oser/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx
@@ -20,7 +20,7 @@ describe('<ActionNodeWrapper>', () => {
         }}
       >
         <ActionNodeWrapper data={{}} id="test" onEvent={mockOnEvent} />
-      </EditorExtensionContext.Provider>
+      </EditorExtensionContext.Provider>,
     );
     expect(ele.getByTestId('ActionNodeWrapper')).toBeTruthy();
 

diff --git a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/stubs/ShellApiStub.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/stubs/ShellApiStub.ts
@@ -3,7 +3,7 @@
 
 import { ShellApi } from '@bfc/shared';
 
-const fn = () => ({} as any);
+const fn = () => ({}) as any;
 const fnList = () => [] as any[];
 const fnPromise = () => Promise.resolve({} as any);
 

diff --git a/...r/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/index.test.ts b/...r/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/index.test.ts
@@ -23,8 +23,8 @@ describe('moveCursor', () => {
           } as any,
         ],
         'test',
-        KeyboardCommandTypes.Cursor.MoveNext
-      )
+        KeyboardCommandTypes.Cursor.MoveNext,
+      ),
     ).toEqual({ focused: 'test-focused', selected: 'test', tab: '' });
   });
 
@@ -39,8 +39,8 @@ describe('moveCursor', () => {
           } as any,
         ],
         'test',
-        KeyboardCommandTypes.Cursor.MoveLeft
-      )
+        KeyboardCommandTypes.Cursor.MoveLeft,
+      ),
     ).toEqual({ focused: 'test-focused', selected: 'test', tab: '' });
   });
 });
diff --git a/.../packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveDialog.test.tsx b/.../packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveDialog.test.tsx
@@ -40,7 +40,7 @@ describe('<AdaptiveDialog />', () => {
         uischema={uischema}
         widgets={widgets}
         onEvent={() => null}
-      />
+      />,
     );
     expect(renderResult.getAllByText('hello')).toHaveLength(1);
   });

diff --git a/...packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveTrigger.test.tsx b/...packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveTrigger.test.tsx
@@ -32,7 +32,7 @@ describe('<AdaptiveTrigger />', () => {
     const renderResult = render(
       <SchemaContext.Provider value={{ widgets, schemaProvider: new WidgetSchemaProvider(uischema) }}>
         <AdaptiveTrigger triggerData={triggerData} triggerId="triggers[0]" onEvent={() => null} />
-      </SchemaContext.Provider>
+      </SchemaContext.Provider>,
     );
     expect(renderResult.getAllByText('hello')).toHaveLength(1);
   });

diff --git a/...ckages/adaptive-flow/__tests__/adaptive-flow-renderer/components/ElementMeasurer.test.tsx b/...ckages/adaptive-flow/__tests__/adaptive-flow-renderer/components/ElementMeasurer.test.tsx
@@ -11,7 +11,7 @@ describe('<ElementMeasurer />', () => {
     const ele = render(
       <ElementMeasurer onResize={() => null}>
         <div data-testid="measurer-content" />
-      </ElementMeasurer>
+      </ElementMeasurer>,
     );
 
     expect(ele.getByTestId('measurer-content')).toBeTruthy();

diff --git a/...ckages/adaptive-flow/__tests__/adaptive-flow-renderer/components/OffsetContainer.test.tsx b/...ckages/adaptive-flow/__tests__/adaptive-flow-renderer/components/OffsetContainer.test.tsx
@@ -11,7 +11,7 @@ describe('<OffsetContainer />', () => {
     const offsetContainer = render(
       <OffsetContainer offset={{ x: 0, y: 0 }}>
         <></>
-      </OffsetContainer>
+      </OffsetContainer>,
     );
 
     expect(offsetContainer).toBeTruthy();
@@ -22,7 +22,7 @@ describe('<OffsetContainer />', () => {
     const offsetContainer = render(
       <OffsetContainer offset={{ x: 0, y: 0 }}>
         <div data-testid="offset-content" />
-      </OffsetContainer>
+      </OffsetContainer>,
     );
 
     expect(offsetContainer.getByTestId('offset-content')).toBeTruthy();

diff --git a/.../packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/SVGContainer.test.tsx b/.../packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/SVGContainer.test.tsx
@@ -11,7 +11,7 @@ describe('<SVGContainer />', () => {
     const svgContainer = render(
       <SVGContainer>
         <></>
-      </SVGContainer>
+      </SVGContainer>,
     );
 
     expect(svgContainer).toBeTruthy();
@@ -22,7 +22,7 @@ describe('<SVGContainer />', () => {
     const svgContainer = render(
       <SVGContainer>
         <circle data-testid="svg-content" />
-      </SVGContainer>
+      </SVGContainer>,
     );
 
     expect(svgContainer.getByTestId('svg-content')).toBeTruthy();