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

chore: update dependencies, cod hygiene #572

Merged
merged 6 commits into from
Sep 15, 2023
Merged

chore: update dependencies, cod hygiene #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36122cb
chore: update dependencies
Klaus-Keller Sep 15, 2023
c640dc5
chore: update devDependencies
Klaus-Keller Sep 15, 2023
7e1996b
chore: code smells
Klaus-Keller Sep 15, 2023
d9f2c3f
chore: fix build warning for postcss
Klaus-Keller Sep 15, 2023
3630284
chore: changeset
Klaus-Keller Sep 15, 2023
5ac8c1d
Merge remote-tracking branch 'origin/main' into chore/update-deps-audit
Klaus-Keller Sep 15, 2023
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
8 changes: 8 additions & 0 deletions .changeset/lovely-owls-move.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'sap-guided-answers-extension': patch
'@sap/guided-answers-extension-webapp': patch
'@sap/guided-answers-extension-core': patch
'@sap/guided-answers-extension-types': patch
---

Update dependencies, code hygiene
19 changes: 7 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
"@commitlint/config-conventional": "17.7.0",
"@types/jest": "29.5.4",
"@types/node": "16.18.14",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"@typescript-eslint/eslint-plugin": "6.7.0",
"@typescript-eslint/parser": "6.7.0",
"changelog-parser": "3.0.1",
"eslint": "8.49.0",
"eslint-config-prettier": "8.10.0",
"eslint-config-prettier": "9.0.0",
"eslint-import-resolver-typescript": "3.6.0",
"eslint-plugin-import": "2.28.1",
"eslint-plugin-jsdoc": "46.6.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-jsdoc": "46.8.0",
"eslint-plugin-prettier": "5.0.0",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-sonarjs": "0.21.0",
"husky": "8.0.3",
"jest": "29.7.0",
"jest-sonar": "0.2.16",
"prettier": "2.8.8",
"prettier": "3.0.3",
"pretty-quick": "3.1.3",
"rimraf": "5.0.1",
"ts-jest": "29.1.1",
Expand All @@ -50,11 +50,6 @@
},
"packageManager": "pnpm@8.6.3",
"pnpm": {
"overrides": {
"strip-ansi@3.0.1>ansi-regex": "^5.0.1",
"generic-names@4.0.0>loader-utils": "^3.2.1",
"@vscode/vsce@2.18.0>xml2js": "^0.5.0",
"semver": "^7.5.3"
}
"overrides": {}
}
}
4 changes: 2 additions & 2 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"watch": "tsc --watch"
},
"dependencies": {
"@sap/bas-sdk": "3.4.0",
"@sap/bas-sdk": "3.6.0",
"@sap/guided-answers-extension-types": "workspace:*",
"axios": "1.4.0",
"axios": "1.5.0",
"xss": "1.0.14"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export async function getDevSpace(): Promise<string> {
} catch {
// Ignore exceptions and return empty string
}
return devSpace ? devSpace : '';
return devSpace;
}

/**
Expand Down
8 changes: 4 additions & 4 deletions packages/ide-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@
"devDependencies": {
"@sap/guided-answers-extension-core": "workspace:*",
"@sap/guided-answers-extension-types": "workspace:*",
"@types/uuid": "9.0.2",
"@types/uuid": "9.0.4",
"@types/vscode": "1.74.1",
"@vscode/vsce": "2.19.0",
"@vscode/vsce": "2.21.0",
"applicationinsights": "2.5.0",
"esbuild": "0.18.10",
"esbuild": "0.19.3",
"esbuild-plugin-copy": "2.1.1",
"uuid": "9.0.0",
"uuid": "9.0.1",
"vscode-uri": "3.0.7"
},
"galleryBanner": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ide-extension/test/links/link-info.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { extractLinkInfo, generateExtensionLink, generateWebLink } from '../../src/links/link-info';
import { extractLinkInfo, generateExtensionLink, generateWebLink } from '../../src/links';

describe('Test extractLinkInfo()', () => {
test('Valid link with information', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/webapp/esbuild.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ const buildConfig = {
],
plugins: [
sassPlugin({
async transform(source) {
const { css } = await postcss([autoprefixer]).process(source);
async transform(source, _ ,filePath) {
const { css } = await postcss([autoprefixer]).process(source, { from: filePath });
return css;
}
}),
Expand Down
37 changes: 18 additions & 19 deletions packages/webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,40 +20,39 @@
"@reduxjs/toolkit": "1.9.5",
"@sap/guided-answers-extension-types": "workspace:*",
"@testing-library/dom": "8.20.1",
"@testing-library/jest-dom": "5.16.5",
"@testing-library/jest-dom": "6.1.3",
"@testing-library/react": "12.1.5",
"@types/react": "17.0.62",
"@types/react-copy-to-clipboard": "5.0.4",
"@types/react-dom": "17.0.20",
"@types/react-redux": "7.1.25",
"@types/react-redux": "7.1.26",
"@types/redux-mock-store": "1.0.3",
"@types/testing-library__jest-dom": "5.14.6",
"autoprefixer": "10.4.14",
"esbuild": "0.18.10",
"esbuild-css-modules-plugin": "2.7.1",
"autoprefixer": "10.4.15",
"esbuild": "0.19.3",
"esbuild-css-modules-plugin": "3.0.1",
"esbuild-plugin-replace": "1.4.0",
"esbuild-plugin-svgr": "1.1.0",
"esbuild-sass-plugin": "2.10.0",
"html-react-parser": "4.0.0",
"i18next": "23.2.6",
"esbuild-plugin-svgr": "2.1.0",
"esbuild-sass-plugin": "2.15.0",
"html-react-parser": "4.2.2",
"i18next": "23.5.1",
"jest-css-modules-transform": "4.4.2",
"jest-environment-jsdom": "29.5.0",
"jest-environment-jsdom": "29.7.0",
"path": "0.12.7",
"postcss": "8.4.24",
"postcss": "8.4.29",
"react": "16.14.0",
"react-dom": "16.14.0",
"react-i18next": "13.0.1",
"react-redux": "8.1.1",
"react-i18next": "13.2.2",
"react-redux": "8.1.2",
"redux": "4.2.1",
"redux-mock-store": "1.5.4",
"uuid": "9.0.0"
"uuid": "9.0.1"
},
"dependencies": {
"@fluentui/react": "8.110.7",
"@fluentui/react-focus": "8.8.30",
"@fluentui/style-utilities": "8.9.16",
"@fluentui/react": "8.111.2",
"@fluentui/react-focus": "8.8.31",
"@fluentui/style-utilities": "8.9.17",
"@fluentui/utilities": "8.13.18",
"@sap-ux/ui-components": "1.11.0",
"@sap-ux/ui-components": "1.11.7",
"react-copy-to-clipboard": "5.1.0",
"react-infinite-scroll-component": "6.1.0"
}
Expand Down
3 changes: 1 addition & 2 deletions ...ages/webapp/src/webview/ui/components/DialogBoxes/FeedbackDialogBox/FeedbackDialogBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ export function FeedbackDialogBox(): ReactElement {
};

return treeId ? (
<UIDialog modalProps={modalProps} isOpen={isVisible} title={dialogContentProps.title}>
<p className="ms-Dialog-subText">{i18next.t('FEEDBACK_DIALOG_SUBTEXT')}</p>
<UIDialog modalProps={modalProps} hidden={!isVisible} dialogContentProps={dialogContentProps}>
<UITextInput
id="feedbackDialogTextArea"
label={i18next.t('FEEDBACK_DIALOG_SUGGESTION')}
Expand Down
5 changes: 2 additions & 3 deletions packages/webapp/src/webview/ui/components/Header/Filters/Filters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,9 @@ export function Filters() {
selectedComponentFilters.length > 0 ? 'filter-button-selected' : ''
}`}></UIIconButton>
<UIDialog
className="dialog-filter"
dialogContentProps={{ title: filterType[filter].title }}
isOpen={filterType[filter].visibility}
isBlocking={true}
hidden={!filterType[filter].visibility}
modalProps={{ className: 'dialog-filter', isBlocking: true }}
acceptButtonText={'Apply Filter'}
cancelButtonText={'Cancel'}
styles={{ main }}
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/test/FeedbackSection/__snapshots__/FeedbackSection.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports[`Feedback Section component Should render a FeedbackSection component 1`
Please tell us if this answer was helpful
</h3>
<div
class="ms-FocusZone css-109 feedback-subcontainer"
class="ms-FocusZone css-166 feedback-subcontainer"
data-focuszone-id="FocusZone0"
role="tree"
>
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/test/GuidedAnswerNode/__snapshots__/GuidedAnswerNode.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ exports[`<GuidedAnswerNode /> Should render a GuidedAnswerNode component 1`] = `
class="guided-answer__node__commands"
>
<div
class="ms-FocusZone css-109"
class="ms-FocusZone css-166"
data-focuszone-id="FocusZone0"
/>
</div>
Expand Down
14 changes: 7 additions & 7 deletions packages/webapp/test/GuidedAnswerNode/__snapshots__/Middle.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exports[`<Middle /> Should render a Middle component 1`] = `
id="hr"
/>
<div
class="ms-FocusZone css-109"
class="ms-FocusZone css-166"
data-focuszone-id="FocusZone0"
>
<div
Expand All @@ -35,7 +35,7 @@ exports[`<Middle /> Should render a Middle component 1`] = `
</p>
</div>
<div
class="ms-FocusZone css-109"
class="ms-FocusZone css-166"
data-focuszone-id="FocusZone1"
role="listbox"
>
Expand Down Expand Up @@ -87,7 +87,7 @@ exports[`<Middle /> Should render a Middle component with FeedbackDialogBox 1`]
id="hr"
/>
<div
class="ms-FocusZone css-109"
class="ms-FocusZone css-166"
data-focuszone-id="FocusZone37"
>
<div
Expand All @@ -105,7 +105,7 @@ exports[`<Middle /> Should render a Middle component with FeedbackDialogBox 1`]
</p>
</div>
<div
class="ms-FocusZone css-109"
class="ms-FocusZone css-166"
data-focuszone-id="FocusZone38"
role="listbox"
>
Expand Down Expand Up @@ -170,7 +170,7 @@ exports[`<Middle /> Should render a Middle component with NotSolvedMessage 1`] =
class="guided-answer__node"
>
<div
class="ms-FocusZone css-109 guided-answer__node"
class="ms-FocusZone css-166 guided-answer__node"
data-focuszone-id="FocusZone36"
>
<div
Expand Down Expand Up @@ -254,7 +254,7 @@ exports[`<Middle /> Should render a Middle component with enhancedBody 1`] = `
id="hr"
/>
<div
class="ms-FocusZone css-109"
class="ms-FocusZone css-166"
data-focuszone-id="FocusZone18"
>
<span
Expand All @@ -270,7 +270,7 @@ exports[`<Middle /> Should render a Middle component with enhancedBody 1`] = `
</p>
</div>
<div
class="ms-FocusZone css-109"
class="ms-FocusZone css-166"
data-focuszone-id="FocusZone19"
role="listbox"
>
Expand Down
6 changes: 3 additions & 3 deletions packages/webapp/test/GuidedAnswerNode/__snapshots__/Right.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`<Right /> Should render a Right component 1`] = `
class="guided-answer__node__commands"
>
<div
class="ms-FocusZone css-109"
class="ms-FocusZone css-166"
data-focuszone-id="FocusZone1"
>
<div
Expand All @@ -18,7 +18,7 @@ exports[`<Right /> Should render a Right component 1`] = `
>
<i
aria-hidden="true"
class="ts-icon guided-answer__node__command__header__icon root-105"
class="ts-icon guided-answer__node__command__header__icon root-162"
data-icon-name="CreateMockData"
/>
<div
Expand Down Expand Up @@ -46,7 +46,7 @@ exports[`<Right /> Should render a Right component without command 1`] = `
class="guided-answer__node__commands"
>
<div
class="ms-FocusZone css-109"
class="ms-FocusZone css-166"
data-focuszone-id="FocusZone0"
/>
</div>
Expand Down
Loading
Loading