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

Upgrade React version of manager #20420

Closed
wants to merge 11 commits into from
Closed

Upgrade React version of manager #20420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
271daff
Upgrade React version
shogohida Dec 27, 2022
d183d24
Upgrade react versions of yarn.lock
shogohida Jan 7, 2023
d34635c
Add package-lock.json
shogohida Jan 7, 2023
93fa075
Add createRoot
shogohida Jan 7, 2023
17b0bf7
Add dependencies
shogohida Jan 7, 2023
91a3b51
Merge branch 'next' into upgrade-react-of-ui-manager
ndelangen Jan 13, 2023
510ed25
apply effects of upgrade
ndelangen Jan 13, 2023
9dcf29a
Add createRoot
shogohida Jan 13, 2023
dafd602
Add children to prop definition
shogohida Jan 14, 2023
71f8488
Add non-null assertion operator
shogohida Jan 14, 2023
25b1281
Remove unnecessary files
shogohida Jan 14, 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
7 changes: 5 additions & 2 deletions code/ui/manager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
"check": "../../../scripts/node_modules/.bin/tsc --noEmit",
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@types/react-dom": "^18.0.10"
},
Comment on lines +55 to +57
Copy link
Contributor

Choose a reason for hiding this comment

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

fwiw, I think this can be moved into devDependencies

"devDependencies": {
"@fal-works/esbuild-plugin-global-externals": "^2.1.2",
"@storybook/addons": "7.0.0-beta.26",
Expand All @@ -78,8 +81,8 @@
"memoizerific": "^1.11.3",
"polished": "^4.2.2",
"qs": "^6.10.0",
"react": "^16.14.0",
"react-dom": "^16.8.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-draggable": "^4.4.3",
"react-helmet-async": "^1.0.7",
"react-resize-detector": "^7.1.2",
Expand Down
1 change: 1 addition & 0 deletions code/ui/manager/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export interface AppProps {
viewMode: State['viewMode'];
layout: State['layout'];
panelCount: number;
children?: React.ReactNode;
}

const App: React.FC<AppProps> = ({ viewMode, layout, panelCount }) => {
Expand Down
10 changes: 9 additions & 1 deletion code/ui/manager/src/globals/exports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,36 @@ export default {
'isValidElement',
'lazy',
'memo',
'startTransition',
'unstable_act',
'useCallback',
'useContext',
'useDebugValue',
'useDeferredValue',
'useEffect',
'useId',
'useImperativeHandle',
'useInsertionEffect',
'useLayoutEffect',
'useMemo',
'useReducer',
'useRef',
'useState',
'useSyncExternalStore',
'useTransition',
'version',
],
'react-dom': [
'__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED',
'createPortal',
'createRoot',
'findDOMNode',
'flushSync',
'hydrate',
'hydrateRoot',
'render',
'unmountComponentAtNode',
'unstable_batchedUpdates',
'unstable_createPortal',
'unstable_renderSubtreeIntoContainer',
'version',
],
Expand Down
5 changes: 3 additions & 2 deletions code/ui/manager/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { global } from '@storybook/global';
import type { FC } from 'react';
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';

import { Location, LocationProvider, useNavigate } from '@storybook/router';
import { Provider as ManagerProvider } from '@storybook/manager-api';
Expand Down Expand Up @@ -82,7 +82,8 @@ export function renderStorybookUI(domNode: HTMLElement, provider: Provider) {
throw new Error('provider is not extended from the base Provider');
}

ReactDOM.render(<Root key="root" provider={provider} />, domNode);
const root = createRoot(domNode!);
root.render(<Root key="root" provider={provider} />);
ndelangen marked this conversation as resolved.
Show resolved Hide resolved
}

export { Provider };
44 changes: 42 additions & 2 deletions code/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6810,6 +6810,7 @@ __metadata:
"@storybook/theming": 7.0.0-beta.26
"@storybook/types": 7.0.0-beta.26
"@testing-library/react": ^11.2.2
"@types/react-dom": ^18.0.10
"@types/semver": ^7.3.4
copy-to-clipboard: ^3.3.1
downshift: ^6.0.15
Expand All @@ -6820,8 +6821,8 @@ __metadata:
memoizerific: ^1.11.3
polished: ^4.2.2
qs: ^6.10.0
react: ^16.14.0
react-dom: ^16.8.0
react: ^18.2.0
react-dom: ^18.2.0
react-draggable: ^4.4.3
react-helmet-async: ^1.0.7
react-resize-detector: ^7.1.2
Expand Down Expand Up @@ -8889,6 +8890,15 @@ __metadata:
languageName: node
linkType: hard

"@types/react-dom@npm:^18.0.10":
version: 18.0.10
resolution: "@types/react-dom@npm:18.0.10"
dependencies:
"@types/react": "*"
checksum: a07b900a2d5559830f88b3e525cf279f9f04b4893f4d17e64f5adb08d8abe0e3151e0d3c0ea17d836104ae47594be577529a004265600e4304a43a93b0d5d61e
languageName: node
linkType: hard

"@types/react-syntax-highlighter@npm:11.0.5":
version: 11.0.5
resolution: "@types/react-syntax-highlighter@npm:11.0.5"
Expand Down Expand Up @@ -24961,6 +24971,18 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:^18.2.0":
version: 18.2.0
resolution: "react-dom@npm:18.2.0"
dependencies:
loose-envify: ^1.1.0
scheduler: ^0.23.0
peerDependencies:
react: ^18.2.0
checksum: 66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a
languageName: node
linkType: hard

"react-draggable@npm:^4.4.3":
version: 4.4.5
resolution: "react-draggable@npm:4.4.5"
Expand Down Expand Up @@ -25193,6 +25215,15 @@ __metadata:
languageName: node
linkType: hard

"react@npm:^18.2.0":
version: 18.2.0
resolution: "react@npm:18.2.0"
dependencies:
loose-envify: ^1.1.0
checksum: b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8
languageName: node
linkType: hard

"read-cache@npm:^1.0.0":
version: 1.0.0
resolution: "read-cache@npm:1.0.0"
Expand Down Expand Up @@ -26447,6 +26478,15 @@ __metadata:
languageName: node
linkType: hard

"scheduler@npm:^0.23.0":
version: 0.23.0
resolution: "scheduler@npm:0.23.0"
dependencies:
loose-envify: ^1.1.0
checksum: b777f7ca0115e6d93e126ac490dbd82642d14983b3079f58f35519d992fa46260be7d6e6cede433a92db70306310c6f5f06e144f0e40c484199e09c1f7be53dd
languageName: node
linkType: hard

"schema-utils@npm:^2.6.5":
version: 2.7.1
resolution: "schema-utils@npm:2.7.1"
Expand Down