Skip to content

Commit

Permalink
Bump dependencies (equinor#293)
Browse files Browse the repository at this point in the history
* Control node version with volta

* Bump reactour

Bumps reactour from 1.18.3 to 1.19.0.
Bumps @types/reactour from 1.18.1 to 1.18.2.

* Bump @equinor/eds-core-react and @equinor/eds-icons

* Bump notistack to latest version

Bumps notistack from 1.0.5 to 3.0.1.

* Bump react-draggable and remove react-is

Bumps react-draggable from 4.4.4 to 4.4.5.
Removes react-is.

* Bump classnames, html2canvas and styled-components

Bumps classnames from 2.2.6 to 2.3.2.
Bumps html2canvas from 1.0.0-rc.7 to 1.4.1.
Bumps styled-components from 5.2.1 to 5.3.11.

* Bump @equinor/eds-icons

Bumps @equinor/eds-icons from 0.19.1 to 0.19.2.

* Update CHANGELOG.md

* Update CHANGELOG.md

* Fix formatting

* Fix lint scripts and bump lint dependencies

* Pin selenium python test dependency.

* test: pin python test dependency flask < 2.3

---------

Co-authored-by: Christophe Winkler <[email protected]>
Co-authored-by: Anders Fredrik Kiær <[email protected]>
Co-authored-by: Havard Bjerke <[email protected]>
  • Loading branch information
4 people authored Aug 9, 2023
1 parent 1254599 commit cba53f3
Show file tree
Hide file tree
Showing 9 changed files with 4,181 additions and 2,982 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- [#275](https://github.com/equinor/webviz-core-components/pull/275) - Added `WebvizDialog` component. New dialog component which handles multiple instances simultaneously, where the currently active dialog is placed on top and highlighted with box shadow.

### Changed

- [#290](https://github.com/equinor/webviz-core-components/pull/290) - Updated various JavaScript dependencies.

## [0.6.1] - 2022-10-10

### Fixed
Expand Down
6,966 changes: 4,086 additions & 2,880 deletions react/package-lock.json

Large diffs are not rendered by default.

40 changes: 21 additions & 19 deletions react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"prepublishOnly": "npm test && npm run lint",
"preversion": "npm run lint",
"typecheck": "tsc --noEmit",
"format": "eslint --fix 'src/**/*.+(ts|tsx|js|jsx|json|css)' 'tests/**/*.+(ts|tsx|js|jsx|json|css)'",
"lint": "eslint 'src/**/*.+(ts|tsx|js|jsx|json|css)' 'tests/**/*.+(ts|tsx|js|jsx|json|css)'",
"format": "eslint --fix \"src/**/*.{ts,tsx,js,jsx,json,css}\" \"tests/**/*.{ts,tsx,js,jsx,json,css}\"",
"lint": "eslint \"src/**/*.{ts,tsx,js,jsx,json,css}\" \"tests/**/*.{ts,tsx,js,jsx,json,css}\"",
"validate": "npm run typecheck && npm run lint",
"test": "jest",
"storybook": "start-storybook -p 6006",
Expand All @@ -41,21 +41,20 @@
"author": "Equinor <[email protected]>",
"license": "MIT",
"dependencies": {
"@equinor/eds-core-react": "^0.17.0",
"@equinor/eds-icons": "^0.10.0",
"@equinor/eds-core-react": "^0.31.1",
"@equinor/eds-icons": "^0.19.2",
"@material-ui/core": "^4.11.3",
"@material-ui/lab": "^4.0.0-alpha.57",
"@react-hook/size": "^2.1.2",
"animate.css": "^4.1.1",
"classnames": "^2.2.6",
"html2canvas": "^1.0.0-rc.7",
"classnames": "^2.3.2",
"html2canvas": "^1.4.1",
"lodash": "^4.17.21",
"notistack": "^1.0.5",
"notistack": "^3.0.1",
"react-colorscales": "^0.7.3",
"react-draggable": "^4.4.4",
"react-is": "^17.0.2",
"reactour": "^1.18.3",
"styled-components": "^5.2.1",
"react-draggable": "^4.4.5",
"reactour": "^1.19.0",
"styled-components": "^5.3.11",
"uuid": "^8.3.2"
},
"devDependencies": {
Expand All @@ -76,21 +75,21 @@
"@types/lodash": "^4.14.176",
"@types/react": "^17.0.3",
"@types/react-dom": "^17.0.3",
"@types/reactour": "^1.18.1",
"@types/reactour": "^1.18.2",
"@types/uuid": "^8.3.2",
"@typescript-eslint/eslint-plugin": "^4.19.0",
"@typescript-eslint/parser": "^4.19.0",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"babel-jest": "^26.6.3",
"babel-loader": "^8.2.2",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
"copyfiles": "^2.4.1",
"css-loader": "^5.1.3",
"css-minimizer-webpack-plugin": "^4.2.2",
"dotenv-webpack": "^7.0.2",
"eslint": "^7.22.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-react": "^7.23.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-react": "^7.32.2",
"file-loader": "^6.2.0",
"jest": "^26.6.3",
"mini-css-extract-plugin": "^1.3.9",
Expand All @@ -113,5 +112,8 @@
"engines": {
"node": ">=16",
"npm": ">=7"
},
"volta": {
"node": "16.18.1"
}
}
}
146 changes: 68 additions & 78 deletions react/tests/__snapshots__/WebvizPluginPlaceholder.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ exports[`WebvizPluginPlaceholder Renders correctly (compare to snapshot in ./__s
<path
class="Icon__StyledPath-sc-6evbi1-1"
clip-rule="evenodd"
d="M16.83 5H20c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V7c0-1.1.9-2 2-2h3.17L9 3h6l1.83 2zM4 19h16V7h-4.05l-.59-.65L14.12 5H9.88L8.64 6.35 8.05 7H4v12zm8-11c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm-3.2 5c0 1.77 1.43 3.2 3.2 3.2 1.77 0 3.2-1.43 3.2-3.2 0-1.77-1.43-3.2-3.2-3.2-1.77 0-3.2 1.43-3.2 3.2z"
d="M16.83 5H20c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V7c0-1.1.9-2 2-2h3.17L9 3h6l1.83 2ZM4 19h16V7h-4.05l-.59-.65L14.12 5H9.88L8.64 6.35 8.05 7H4v12Zm8-11c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5Zm-3.2 5c0 1.77 1.43 3.2 3.2 3.2 1.77 0 3.2-1.43 3.2-3.2 0-1.77-1.43-3.2-3.2-3.2-1.77 0-3.2 1.43-3.2 3.2Z"
data-testid="eds-icon-path"
fill-rule="evenodd"
height="24"
Expand All @@ -64,7 +64,7 @@ exports[`WebvizPluginPlaceholder Renders correctly (compare to snapshot in ./__s
<path
class="Icon__StyledPath-sc-6evbi1-1"
clip-rule="evenodd"
d="M7 10H5V5h5v2H7v3zm-2 4h2v3h3v2H5v-5zm12 3h-3v2h5v-5h-2v3zM14 7V5h5v5h-2V7h-3z"
d="M7 10H5V5h5v2H7v3Zm-2 4h2v3h3v2H5v-5Zm12 3h-3v2h5v-5h-2v3ZM14 7V5h5v5h-2V7h-3Z"
data-testid="eds-icon-path"
fill-rule="evenodd"
height="24"
Expand All @@ -91,7 +91,7 @@ exports[`WebvizPluginPlaceholder Renders correctly (compare to snapshot in ./__s
<path
class="Icon__StyledPath-sc-6evbi1-1"
clip-rule="evenodd"
d="M19 9.5h-4v-6H9v6H5l7 7 7-7zm-8 2v-6h2v6h1.17L12 13.67 9.83 11.5H11zm8 9v-2H5v2h14z"
d="M19 9.5h-4v-6H9v6H5l7 7 7-7Zm-8 2v-6h2v6h1.17L12 13.67 9.83 11.5H11Zm8 9v-2H5v2h14Z"
data-testid="eds-icon-path"
fill-rule="evenodd"
height="24"
Expand All @@ -118,7 +118,7 @@ exports[`WebvizPluginPlaceholder Renders correctly (compare to snapshot in ./__s
<path
class="Icon__StyledPath-sc-6evbi1-1"
clip-rule="evenodd"
d="M2 12C2 6.48 6.48 2 12 2s10 4.48 10 10-4.48 10-10 10S2 17.52 2 12zm11 4v2h-2v-2h2zm-1 4c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zM8 10c0-2.21 1.79-4 4-4s4 1.79 4 4c0 1.283-.79 1.973-1.56 2.646C13.712 13.283 13 13.905 13 15h-2c0-1.821.942-2.543 1.77-3.178.65-.498 1.23-.943 1.23-1.822 0-1.1-.9-2-2-2s-2 .9-2 2H8z"
d="M2 12C2 6.48 6.48 2 12 2s10 4.48 10 10-4.48 10-10 10S2 17.52 2 12Zm11 4v2h-2v-2h2Zm-1 4c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8ZM8 10c0-2.21 1.79-4 4-4s4 1.79 4 4c0 1.283-.79 1.973-1.56 2.646C13.712 13.283 13 13.905 13 15h-2c0-1.821.942-2.543 1.77-3.178.65-.498 1.23-.943 1.23-1.822 0-1.1-.9-2-2-2s-2 .9-2 2H8Z"
data-testid="eds-icon-path"
fill-rule="evenodd"
height="24"
Expand Down Expand Up @@ -146,7 +146,7 @@ exports[`WebvizPluginPlaceholder Renders correctly (compare to snapshot in ./__s
<path
class="Icon__StyledPath-sc-6evbi1-1"
clip-rule="evenodd"
d="m23 21.5-11-19-11 19h22zm-12-3v-2h2v2h-2zm0-4h2v-4h-2v4z"
d="m23 21.5-11-19-11 19h22Zm-12-3v-2h2v2h-2Zm0-4h2v-4h-2v4Z"
data-testid="eds-icon-path"
fill-rule="evenodd"
height="24"
Expand All @@ -161,109 +161,99 @@ exports[`WebvizPluginPlaceholder Renders correctly (compare to snapshot in ./__s
</div>
</div>
<div
class="makeStyles-bottom-4 makeStyles-right-6 makeStyles-root-1"
class="notistack-SnackbarContainer go1453831412 go2989568495 go1141946668"
>
<div
class="MuiCollapse-root MuiCollapse-entered"
style="min-height: 0px;"
class="go1475592160 go1671063245"
style="pointer-events: all; overflow: visible; min-height: 0px; transition: height 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
>
<div
class="MuiCollapse-wrapper"
class="notistack-CollapseWrapper"
style="display: flex; width: 100%;"
>
<div
class="MuiCollapse-wrapperInner"
class="notistack-Snackbar go3963613292"
>
<div
class="SnackbarItem-root-8 SnackbarItem-wrappedRoot-23 SnackbarItem-anchorOriginBottomRight-12"
aria-describedby="notistack-snackbar"
class="go1888806478 notistack-MuiContent notistack-MuiContent-warning go167266335 go4215275574 go3162094071"
role="alert"
style="webkit-transform: none; transform: none; webkit-transition: -webkit-transform 225ms cubic-bezier(0.0, 0, 0.2, 1) 0ms; transition: transform 225ms cubic-bezier(0.0, 0, 0.2, 1) 0ms;"
>
<div
aria-describedby="notistack-snackbar"
class="ForwardRef-root-24 SnackbarItem-contentRoot-15 SnackbarItem-variantWarning-20 SnackbarItem-lessPadding-16"
role="alert"
style="webkit-transform: none; transform: none; webkit-transition: -webkit-transform 225ms cubic-bezier(0.0, 0, 0.2, 1) 0ms; transition: transform 225ms cubic-bezier(0.0, 0, 0.2, 1) 0ms;"
class="go946087465"
id="notistack-snackbar"
>
<div
class="SnackbarItem-message-21"
id="notistack-snackbar"
<svg
focusable="false"
style="font-size: 20px; margin-inline-end: 8px; user-select: none; width: 1em; height: 1em; display: inline-block; fill: currentColor; flex-shrink: 0;"
viewBox="0 0 24 24"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root"
focusable="false"
style="font-size: 20px; margin-inline-end: 8px;"
viewBox="0 0 24 24"
>
<path
d="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z"
/>
</svg>
Deprecated 1
</div>
<div
class="SnackbarItem-action-22"
<path
d="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z"
/>
</svg>
Deprecated 1
</div>
<div
class="go703367398"
>
<a
class="webviz-config-plugin-deprecation-link"
href="https://github.com/equinor/webviz-core-components"
rel="noopener noreferrer"
target="_blank"
>
<a
class="webviz-config-plugin-deprecation-link"
href="https://github.com/equinor/webviz-core-components"
rel="noopener noreferrer"
target="_blank"
>
More info
</a>
</div>
More info
</a>
</div>
</div>
</div>
</div>
</div>
<div
class="MuiCollapse-root MuiCollapse-entered"
style="min-height: 0px;"
class="go1475592160 go1671063245"
style="pointer-events: all; overflow: visible; min-height: 0px; transition: height 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
>
<div
class="MuiCollapse-wrapper"
class="notistack-CollapseWrapper"
style="display: flex; width: 100%;"
>
<div
class="MuiCollapse-wrapperInner"
class="notistack-Snackbar go3963613292"
>
<div
class="SnackbarItem-root-8 SnackbarItem-wrappedRoot-23 SnackbarItem-anchorOriginBottomRight-12"
aria-describedby="notistack-snackbar"
class="go1888806478 notistack-MuiContent notistack-MuiContent-warning go167266335 go4215275574 go3162094071"
role="alert"
style="webkit-transform: none; transform: none; webkit-transition: -webkit-transform 225ms cubic-bezier(0.0, 0, 0.2, 1) 0ms; transition: transform 225ms cubic-bezier(0.0, 0, 0.2, 1) 0ms;"
>
<div
aria-describedby="notistack-snackbar"
class="ForwardRef-root-24 SnackbarItem-contentRoot-15 SnackbarItem-variantWarning-20 SnackbarItem-lessPadding-16"
role="alert"
style="webkit-transform: none; transform: none; webkit-transition: -webkit-transform 225ms cubic-bezier(0.0, 0, 0.2, 1) 0ms; transition: transform 225ms cubic-bezier(0.0, 0, 0.2, 1) 0ms;"
class="go946087465"
id="notistack-snackbar"
>
<div
class="SnackbarItem-message-21"
id="notistack-snackbar"
<svg
focusable="false"
style="font-size: 20px; margin-inline-end: 8px; user-select: none; width: 1em; height: 1em; display: inline-block; fill: currentColor; flex-shrink: 0;"
viewBox="0 0 24 24"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root"
focusable="false"
style="font-size: 20px; margin-inline-end: 8px;"
viewBox="0 0 24 24"
>
<path
d="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z"
/>
</svg>
Deprecated 2
</div>
<div
class="SnackbarItem-action-22"
<path
d="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z"
/>
</svg>
Deprecated 2
</div>
<div
class="go703367398"
>
<a
class="webviz-config-plugin-deprecation-link"
href="https://github.com/equinor/webviz-core-components"
rel="noopener noreferrer"
target="_blank"
>
<a
class="webviz-config-plugin-deprecation-link"
href="https://github.com/equinor/webviz-core-components"
rel="noopener noreferrer"
target="_blank"
>
More info
</a>
</div>
More info
</a>
</div>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
"bandit",
"black>=22.12",
"dash[testing]",
"flask<2.3",
"pylint",
"selenium",
"selenium>=3.141.0,<=4.2.0",
]

# 'dash[testing]' to be added in tests_require when
Expand Down
1 change: 0 additions & 1 deletion tests/test_color_scales.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@


def test_colorscale(dash_duo):

app = Dash(__name__)

app.layout = html.Div(
Expand Down
1 change: 0 additions & 1 deletion tests/test_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@


def test_container_placeholder(dash_duo):

app = Dash(__name__)

app.layout = html.Div(
Expand Down
1 change: 0 additions & 1 deletion tests/test_plugin_placeholder.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@


def test_plugin_placeholder(dash_duo):

app = Dash(__name__)

app.layout = html.Div(
Expand Down
1 change: 0 additions & 1 deletion webviz_core_components/wrapped_components/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ class Graph(dcc.Graph):
"""

def __init__(self, *args, **kwargs):

args, kwargs = argument_modifier(
dcc.Graph, "config", Graph.populate_config, args, kwargs
)
Expand Down

0 comments on commit cba53f3

Please sign in to comment.