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

updated react and react-dom #899

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/annotated-pkgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
Copy link
Contributor

Choose a reason for hiding this comment

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

This is causing tests to fail due to the following issue: actions/setup-node#317

with:
node-version: "14"
node-version: 16

- name: Install yarn 3
run: npm i -g yarn
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/cypress-end-to-end-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 2
- uses: actions/setup-node@v3
with:
cache: "yarn"
node-version: 16
- uses: dorny/paths-filter@v2
id: filter
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
working-directory: docs/web
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: 16.x
cache: yarn
cache: "yarn"
node-version: 16
- uses: actions/setup-python@v2

- name: 🤖 Install Mephisto
Expand Down
546 changes: 546 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,7 @@ plugins:
spec: "@yarnpkg/plugin-workspace-tools"
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
spec: "@yarnpkg/plugin-version"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.2.1.cjs
38 changes: 19 additions & 19 deletions docs/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
"@annotated/keypoint": "workspace:packages/annotated/keypoint",
"@annotated/shell": "workspace:packages/annotated/shell",
"@annotated/video-player": "workspace:packages/annotated/video-player",
"@blueprintjs/core": "^3.50.1",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"eslint-config-react-app": "^6.0.0",
"@blueprintjs/core": "^4.9.4",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^14.4.3",
"eslint-config-react-app": "^7.0.1",
"global-context-store": "^1.0.3",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
"react-scripts": "4.0.3",
"web-vitals": "^1.0.1"
"react-scripts": "5.0.1",
"web-vitals": "^3.0.1"
},
"scripts": {
"storybook": "start-storybook -p 6006 -s public",
Expand All @@ -36,16 +36,16 @@
]
},
"devDependencies": {
"@mdx-js/react": "^1.6.22",
"@storybook/addon-actions": "^6.3.8",
"@storybook/addon-docs": "^6.3.8",
"@storybook/addon-essentials": "^6.3.8",
"@storybook/addon-links": "^6.3.8",
"@storybook/node-logger": "^6.3.8",
"@storybook/preset-create-react-app": "^3.2.0",
"@storybook/react": "^6.3.8",
"prop-types": "^15.7.2",
"webpack-hot-middleware": "^2.25.1"
"@mdx-js/react": "^2.1.3",
"@storybook/addon-actions": "^6.5.10",
"@storybook/addon-docs": "^6.5.10",
"@storybook/addon-essentials": "^6.5.10",
"@storybook/addon-links": "^6.5.10",
"@storybook/node-logger": "^6.5.10",
"@storybook/preset-create-react-app": "^4.1.2",
"@storybook/react": "^6.5.10",
"prop-types": "^15.8.1",
"webpack-hot-middleware": "^2.25.2"
},
"eslintConfig": {
"overrides": [
Expand Down
20 changes: 10 additions & 10 deletions docs/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
"write-heading-ids": "docusaurus write-heading-ids"
},
"dependencies": {
"@docsearch/css": "3",
"@docsearch/react": "3",
"@docusaurus/core": "2.0.0-beta.9",
"@docusaurus/preset-classic": "2.0.0-beta.9",
"@mdx-js/react": "^1.6.21",
"@svgr/webpack": "^5.5.0",
"clsx": "^1.1.1",
"@docsearch/css": "3.2.1",
"@docsearch/react": "3.2.1",
"@docusaurus/core": "2.1.0",
"@docusaurus/preset-classic": "2.1.0",
"@mdx-js/react": "^2.1.3",
"@svgr/webpack": "^6.3.1",
"clsx": "^1.2.1",
"file-loader": "^6.2.0",
"prism-react-renderer": "^1.2.1",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"prism-react-renderer": "^1.3.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-player": "^2.10.1",
"url-loader": "^4.1.1"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/parlai_chat_task_demo/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"bootstrap-chat": "^2.0.1",
"mephisto-task": "2.0.2",
"rc-slider": "^8.6.3",
"react": "16.13.1",
"react": "^18.2.0",
"react-bootstrap": "^0.32.4",
"react-dom": "16.13.1",
"react-dom": "^18.2.0",
"react-table": "^6.8.6"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/remote_procedure/mnist/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"bootstrap": "^4.6.0",
"mephisto-task": "2.0.2",
"rc-slider": "^8.6.3",
"react": "16.13.1",
"react": "^18.2.0",
"react-bootstrap": "^1.6.0",
"react-canvas-draw": "^1.2.1",
"react-dom": "16.13.1",
"react-dom": "^18.2.0",
"react-table": "^6.8.6"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/remote_procedure/template/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"bootstrap": "^4.6.0",
"mephisto-task": "2.0.2",
"rc-slider": "^8.6.3",
"react": "16.13.1",
"react": "^18.2.0",
"react-bootstrap": "^1.6.0",
"react-dom": "16.13.1",
"react-dom": "^18.2.0",
"react-table": "^6.8.6"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"bootstrap": "^4.6.0",
"mephisto-task": "2.0.2",
"rc-slider": "^8.6.3",
"react": "16.13.1",
"react": "^18.2.0",
"react-bootstrap": "^1.6.0",
"react-dom": "16.13.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/static_react_task/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"bootstrap": "^4.3.1",
"mephisto-task": "2.0.2",
"react": "16.13.1",
"react": "^18.2.0",
"react-dom": "16.13.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/static_react_task_with_tips/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"mephisto-task": "2.0.2",
"mephisto-worker-addons": "1.0.0",
"react": "16.13.1",
"react": "^18.2.0",
"react-dom": "16.13.1"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"bootstrap-chat": "^2.0.1",
"mephisto-task": "2.0.2",
"rc-slider": "^8.6.3",
"react": "16.13.1",
"react": "^18.2.0",
"react-bootstrap": "^0.32.4",
"react-dom": "16.13.1",
"react-dom": "^18.2.0",
"react-table": "^6.8.6"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"bootstrap": "^4.3.1",
"mephisto-task": "2.0.2",
"rc-slider": "^8.6.3",
"react": "16.13.1",
"react": "^18.2.0",
"react-bootstrap": "^0.32.4",
"react-dom": "16.13.1",
"react-dom": "^18.2.0",
"react-table": "^6.8.6"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "root",
"private": true,
"devDependencies": {
"lerna": "^5.1.8"
"lerna": "^5.5.1"
},
"scripts": {
"bootstrap": "lerna bootstrap --hoist='{react,react-dom}'",
Expand Down
18 changes: 9 additions & 9 deletions packages/annotated/dev-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
"url-loader": "^4.1.1"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@babel/preset-env": "^7.9.5",
"@babel/preset-react": "^7.9.4",
"babel-loader": "^8.1.0",
"chalk": "^4.1.2",
"@babel/core": "^7.19.0",
"@babel/preset-env": "^7.19.0",
"@babel/preset-react": "^7.18.6",
"babel-loader": "^8.2.5",
"chalk": "^5.0.1",
"cross-spawn": "^7.0.3",
"fs-extra": "^10.0.0",
"mini-css-extract-plugin": "^1.4.1",
"fs-extra": "^10.1.0",
"mini-css-extract-plugin": "^2.6.1",
"pnp-webpack-plugin": "^1.7.0",
"webpack": "^5.70.0",
"webpack-cli": "^4.9.0",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0",
"webpack-merge": "^5.8.0"
}
}
2 changes: 1 addition & 1 deletion packages/annotated/video-player/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@annotated/dev-scripts": "workspace:packages/annotated/dev-scripts"
},
"devDependencies": {
"react-player": "^2.9.0"
"react-player": "^2.10.1"
},
"peerDependencies": {
"global-context-store": "^1.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/annotation-toolkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"global-context-store": "^1.0.1",
"lodash.mapvalues": "^4.6.0",
"mini-css-extract-plugin": "^1.4.1",
"react": "16.13.1",
"react-dom": "16.13.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-json-inspector": "^7.1.1",
"react-player": "^2.9.0",
"style-loader": "^1.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap-chat/build/bundle.js

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions packages/bootstrap-chat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,42 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@babel/cli": "^7.8.4",
"@babel/core": "^7.9.0",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/preset-env": "^7.9.5",
"@babel/preset-react": "^7.9.4",
"@typescript-eslint/eslint-plugin": "2.x",
"@typescript-eslint/parser": "2.x",
"babel-loader": "^8.1.0",
"css-loader": "^3.5.1",
"eslint": "6.x",
"eslint-config-react-app": "^5.2.1",
"eslint-plugin-flowtype": "4.x",
"eslint-plugin-import": "2.x",
"eslint-plugin-jsx-a11y": "6.x",
"eslint-plugin-react": "7.x",
"eslint-plugin-react-hooks": "2.x",
"@babel/cli": "^7.18.10",
"@babel/core": "^7.19.0",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/preset-env": "^7.19.0",
"@babel/preset-react": "^7.18.6",
"@typescript-eslint/eslint-plugin": "^5.36.2",
"@typescript-eslint/parser": "^5.36.2",
"babel-loader": "^8.2.5",
"css-loader": "^6.7.1",
"eslint": "^8.23.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-react": "^7.31.8",
"eslint-plugin-react-hooks": "^4.6.0",
"mephisto-task": "^2.0.1",
"react": "16.13.1",
"react-dom": "16.13.1",
"style-loader": "^1.1.3",
"url-loader": "^4.1.0",
"webpack": "^5.68.0",
"webpack-cli": "^4.9.0"
"react": "^18.2.0",
"react-dom": "^18.2.0",
"style-loader": "^3.3.1",
"url-loader": "^4.1.1",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0"
},
"peerDependencies": {
"mephisto-task": "^2.0.1",
"react": "16.13.1",
"react": "^18.2.0",
"react-dom": "16.13.1"
},
"dependencies": {
"axios": "^0.21.1",
"babel-eslint": "10.x",
"bootstrap": "4.3.1",
"bowser": "^2.9.0",
"jquery": "3.5.0",
"rc-slider": "^9.3.1",
"react-bootstrap": "0.32.4"
"axios": "^0.27.2",
"babel-eslint": "^10.1.0",
"bootstrap": "5.2.1",
"bowser": "^2.11.0",
"jquery": "3.6.1",
"rc-slider": "^10.0.1",
"react-bootstrap": "2.5.0"
}
}
Loading