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.

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

fix: bump react-redux to 7.2.5 #5601

Merged
merged 7 commits into from
Sep 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [ 12.x, 14.x ]
node-version: [ 14.x ]

steps:
- name: Checkout source code
Expand Down
6 changes: 5 additions & 1 deletion applications/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,10 @@
"@blueprintjs/core": "^3.7.0",
"@nteract/data-explorer": "^8.0.0",
"@nteract/examples": "3.2.0",
"@nteract/jupyter-widgets": "^4.1.16",
"@nteract/mathjax": "4.0.16",
"@nteract/transform-geojson": "^5.1.13",
"@nteract/transform-model-debug": "^5.0.1",
"@nteract/transform-plotly": "^6.1.10",
"@nteract/transform-vdom": "^4.0.15",
"@nteract/transform-vega": "^7.0.10",
Expand All @@ -151,7 +153,9 @@
"mathjax-electron": "^3.0.0",
"nteract-assets": "^4.0.0",
"plist": "^3.0.1",
"rxjs": "^6.6.0"
"rxjs": "^6.6.0",
"symbol-observable": "^4.0.0",
"yargs": "17.1.1"
},
"devDependencies": {
"@types/fs-extra": "^9.0.0",
Expand Down
8 changes: 7 additions & 1 deletion applications/desktop/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const mainConfig = {
],
},
resolve: {
mainFields: ["nteractDesktop", "es2015", "jsnext:main", "module", "main"],
mainFields: ["nteractDesktop", "main", "es2015", "jsnext:main", "module"],
extensions: [".js", ".jsx", ".ts", ".tsx"],
alias: {
...configurator.mergeDefaultAliases(),
Expand Down Expand Up @@ -102,6 +102,12 @@ const rendererConfig = {
// Max. one of those two, please
react: path.resolve('./node_modules/react'),
"react-dom": path.resolve('./node_modules/react-dom'),
"react-redux": path.resolve(
"..",
"..",
"node_modules",
"react-redux"
),
},
},
plugins: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ export class DirectoryApp extends React.PureComponent<DirectoryProps> {
href={urljoin(this.props.appBase, entry.path)}
// When it's a notebook, we open a new tab
target={entry.type === "notebook" ? "_blank" : undefined}
rel="noreferrer"
>
{entry.name}
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"dependencies": {
"@nteract/data-explorer": "^8.0.0",
"@nteract/directory-listing": "^2.1.0",
"@nteract/jupyter-widgets": "^4.4.14",
"@nteract/jupyter-widgets": "^4.1.16",
"@nteract/logos": "^1.0.0",
"@nteract/mathjax": "4.0.16",
"@nteract/octicons": "^2.0.0",
Expand All @@ -37,7 +37,6 @@
"react-dom": "^16.3.2",
"react-hot-loader": "^4.1.2",
"react-hotkeys": "^2.0.0",
"react-redux": "^6.0.0",
"react-router-dom": "^5.0.0",
"redux": "^4.0.0",
"redux-observable": "^2.0.0-alpha.0",
Expand Down
2 changes: 1 addition & 1 deletion applications/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"prismjs": "^1.20.0",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-redux": "^6.0.0",
"react-redux": "^7.2.5",
"redux": "^4.0.0",
"redux-observable": "^2.0.0-alpha.0",
"rx-jupyter": "^5.5.21",
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@
"@types/lodash": "^4.14.117",
"@types/numeral": "^0.0.30",
"@types/pidusage": "^2.0.0",
"@types/react": "^16.4.18",
"@types/react": "16.9.56",
"@types/react-color": "^3.0.0",
"@types/react-dom": "^16.0.10",
"@types/react-dom": "16.9.10",
"@types/react-json-tree": "^0.6.8",
"@types/react-redux": "^7.0.0",
"@types/react-redux": "7.1.7",
"@types/react-syntax-highlighter": "^11.0.1",
"@types/react-table": "^7.0.0",
"@types/react-test-renderer": "^16.0.3",
Expand Down Expand Up @@ -227,10 +227,10 @@
"prettier": "2.2.1",
"prop-types": "^15.6.2",
"raf": "^3.4.0",
"react": "^16.3.2",
"react": "16.14.0",
"react-docgen-typescript": "^1.12.0",
"react-dom": "^16.3.2",
"react-redux": "^6.0.0",
"react-dom": "16.14.0",
"react-redux": "7.2.5",
"react-styleguidist": "^11.0.0",
"react-test-renderer": "^16.2.0",
"redux": "^4.0.0",
Expand Down Expand Up @@ -266,10 +266,10 @@
"webpack-cli": "^3.3.7",
"webpack-dev-server": "3.11.0",
"webpack-merge": "^5.0.0",
"yargs": "^14.0.0"
"yargs": "^17.0.0"
},
"engines": {
"node": ">=12.0.0",
"node": ">= 14.0.0",
"npm": "please-use-yarn",
"yarn": ">= 1.16.0"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/connected-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@
"@nteract/commutable": "^7.4.5",
"@nteract/core": "^15.1.9",
"@nteract/types": "^7.1.9",
"react-redux": "^6.0.0",
"react-redux": "7.2.5",
"redux": "^4.0.0"
},
"peerDependencies": {
"immutable": "^4.0.0-rc.12",
"react": "^16.3.2",
"react-redux": "^7.2.5",
"styled-components": ">= 5.0.1"
},
"author": "Kyle Kelley <rgbkrk@gmail.com>",
Expand Down
2 changes: 1 addition & 1 deletion packages/monaco-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"styled-components": "^4.4.1"
},
"dependencies": {
"@nteract/core": "^14.0.0",
"@nteract/core": "^15.0.0",
"@nteract/messaging": "^7.0.19",
"lodash.debounce": "^4.0.6",
"monaco-editor": "0.22.3",
Expand Down
5 changes: 3 additions & 2 deletions packages/myths/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
"access": "public"
},
"dependencies": {
"react-redux": "^6.0.0",
"react-redux": "7.2.5",
"redux": "^4.0.0",
"redux-observable": "^2.0.0-alpha.0",
"rxjs": "^6.3.3"
},
"peerDependencies": {
"immutable": "^4.0.0-rc.12",
"react": "^16.3.2",
"react-dom": "^16.3.2"
"react-dom": "^16.3.2",
"react-redux": "^7.2.0"
},
"devDependencies": {
"utility-types": "^3.10.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ import { emptyMarkdownCell } from "@nteract/commutable";
import { actions } from "@nteract/core";
import { mount, shallow } from "enzyme";
import React from "react";
import { Provider } from "react-redux";

import { fixtureStore } from "@nteract/fixtures";

import { cell } from "@nteract/selectors";
import DraggableCell, {
cellTarget,
DraggableCellView,
Expand All @@ -26,7 +28,10 @@ const dragDropManager = {

describe("DraggableCell", () => {
test("can be rendered", () => {
const cell = shallow(<DraggableCell cell={emptyMarkdownCell} />, {
const store = fixtureStore();
const cell = shallow(<Provider store={store}>
<DraggableCell cell={emptyMarkdownCell} />
</Provider>, {
context: { dragDropManager }
});
expect(cell).not.toBeNull();
Expand Down