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

Jump to bottom

ui: bump dependencies #1066

Merged
merged 2 commits into from
Nov 23, 2021
Merged

ui: bump dependencies #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0924000
update ui dependencies
breezewish Nov 22, 2021
6267c75
Merge branch 'master' into bump-ui-versions
breezewish Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 0 additions & 15 deletions ui/config-overrides.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,6 @@ function isBuildAsDevServer() {
return process.env.NODE_ENV !== 'production'
}

const enableEslintIgnore = () => (config) => {
const eslintRule = config.module.rules.filter(
(r) =>
r.use && r.use.some((u) => u.options && u.options.useEslintrc !== void 0)
)[0]
const options = eslintRule.use[0].options
options.ignore = true
options.ignorePattern = 'lib/client/api/*.ts'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why can we remote this ignore pattern?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are lint disable hints in the file. For some unknown reasons previously they are not taking effect:

/* tslint:disable */
/* eslint-disable */

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops..

options.baseConfig.rules = {
'jsx-a11y/anchor-is-valid': 'off',
}
return config
}

const disableMinimize = () => (config) => {
config.optimization.minimize = false
config.optimization.splitChunks = false
Expand Down Expand Up @@ -187,7 +173,6 @@ module.exports = override(
}),
addAlias(),
addDecoratorsLegacy(),
enableEslintIgnore(),
addYaml,
addWebpackBundleSize(),
addWebpackPlugin(new WebpackBar()),
Expand Down
6 changes: 3 additions & 3 deletions ui/diagnoseReportApp/components/DiagnosisTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ export default function DiagnosisTable({ diagnosis }: Props) {
</h1>
))}
<h3 className="is-size-4">{t(`diagnosis.tables.title.${title}`)}</h3>
<p>
<ReactMarkdown source={t(`diagnosis.tables.comment.${title}`, '')} />
</p>
<ReactMarkdown>
{t(`diagnosis.tables.comment.${title}`, '')}
</ReactMarkdown>
<table
className="table is-bordered is-hoverable is-narrow is-fullwidth"
style={{ position: 'relative' }}
Expand Down
2 changes: 1 addition & 1 deletion ui/lib/apps/UserProfile/Form.Session.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ function ShareSessionButton() {
onCancel={handleClose}
width={600}
>
<ReactMarkdown source={t('user_profile.share_session.text')} />
<ReactMarkdown>{t('user_profile.share_session.text')}</ReactMarkdown>
<Alert
message={t('user_profile.share_session.warning')}
type="warning"
Expand Down
19 changes: 11 additions & 8 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"ace-builds": "^1.4.12",
"ahooks": "^2.9.2",
"antd": "~4.8.5",
"axios": "^0.21.1",
"axios": "^0.21.4",
"bulma": "^0.9.0",
"classnames": "^2.2.6",
"d3": "^5.16.0",
Expand All @@ -31,14 +31,15 @@
"moize": "^5.4.7",
"nprogress": "^0.2.0",
"office-ui-fabric-react": "^7.123.10",
"pullstate": "^1.22.1",
"pullstate": "^1.23.0",
"rc-animate": "^3.1.0",
"react": "^16.13.1",
"react-ace": "^9.1.1",
"react-copy-to-clipboard": "^5.0.2",
"react-dom": "^16.13.1",
"react-highlight-words": "^0.16.0",
"react-i18next": "^11.7.0",
"react-markdown": "^7.1.0",
"react-router": "^6.0.0-alpha.3",
"react-router-dom": "^6.0.0-alpha.3",
"react-split": "^2.0.9",
Expand Down Expand Up @@ -79,11 +80,11 @@
"devDependencies": {
"@babel/plugin-proposal-decorators": "^7.10.5",
"@openapitools/openapi-generator-cli": "^1.0.15-4.3.1",
"@storybook/addon-actions": "^6.0.0-rc.3",
"@storybook/addon-links": "^6.0.0-rc.3",
"@storybook/addons": "^6.0.0-rc.3",
"@storybook/addon-actions": "^6.3.12",
"@storybook/addon-links": "^6.3.12",
"@storybook/addons": "^6.3.12",
"@storybook/preset-create-react-app": "^3.1.4",
"@storybook/react": "^6.0.0-rc.3",
"@storybook/react": "^6.3.12",
"@types/d3": "^5.7.2",
"@types/lodash": "^4.14.158",
"@types/node": "^14.0.27",
Expand All @@ -110,10 +111,12 @@
"react-app-rewire-multiple-entry": "^2.1.0",
"react-app-rewire-yaml": "^1.1.0",
"react-app-rewired": "^2.1.5",
"react-markdown": "^4.3.1",
"react-scripts": "3.4.1",
"react-scripts": "^4.0.3",
"typescript": "^3.9.7",
"webpack-bundle-analyzer": "^3.7.0",
"webpackbar": "^4.0.0"
},
"resolutions": {
"babel-loader": "8.1.0"
}
}
3 changes: 2 additions & 1 deletion ui/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"isolatedModules": true,
"noEmit": true,
"experimentalDecorators": true,
"jsx": "react"
"jsx": "react",
"noFallthroughCasesInSwitch": true
},
"include": [
"src",
Expand Down