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

feat(react): BREAKING CHANGE Upgrade to React 18 #3556

Merged
merged 26 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f426141
WIP
greg-in-a-box Apr 25, 2024
520014e
chore(react): unit tests
greg-in-a-box Jul 3, 2024
39df245
chore(react): types and unit tests
greg-in-a-box Jul 4, 2024
61b3766
chore(react): fix component tests
tjiang-box Jul 8, 2024
5f1e986
chore(react): unit tests
greg-in-a-box Jul 8, 2024
000851f
chore(react): unit tests
greg-in-a-box Jul 9, 2024
f6c1bd3
chore(react): storybook
greg-in-a-box Jul 9, 2024
ec4cb6c
feat(react-18): fix lint ts issue
tjiang-box Jul 9, 2024
991e08c
chore(react): storybook
greg-in-a-box Jul 9, 2024
25b062d
chore(react): storybook
greg-in-a-box Jul 9, 2024
5a63ad7
chore(react): storybook
greg-in-a-box Jul 10, 2024
1637bd0
chore(react): flow
greg-in-a-box Jul 10, 2024
6ee6e89
chore(react): element test
tjiang-box Jul 10, 2024
cf372ba
chore(react): undo makeDroppable changes
tjiang-box Jul 10, 2024
66cf44a
chore(react): unit tests
greg-in-a-box Jul 10, 2024
5a7b8b0
chore(react): unit tests
greg-in-a-box Jul 10, 2024
696a695
chore(react): unit tests
greg-in-a-box Jul 10, 2024
96defb5
chore(react): clean up
greg-in-a-box Jul 10, 2024
abc4309
chore(react): clean up
greg-in-a-box Jul 10, 2024
dc13c71
chore(react): rebase
greg-in-a-box Jul 10, 2024
f2b47ec
chore(react): clean up
greg-in-a-box Jul 11, 2024
f40ee07
chore(react): eslint
greg-in-a-box Jul 11, 2024
8855ab2
chore(react): linter ts
greg-in-a-box Jul 11, 2024
8a0ec9d
chore(react): snaps
greg-in-a-box Jul 12, 2024
8af6c71
chore(react): add missing isDisabled in dropdown menu
tjiang-box Jul 12, 2024
bb261c7
chore(react): deps
greg-in-a-box Jul 12, 2024
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
1 change: 1 addition & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<PROJECT_ROOT>/node_modules/react-styleguidist*
<PROJECT_ROOT>/node_modules/immer*
<PROJECT_ROOT>/.*/__tests__/.*
<PROJECT_ROOT>/.*/*.stories.*
# ignoring the flow check for this component specifically because it increased the scope too much when we are planning to switch to typescript anyways
<PROJECT_ROOT>/src/components/pill-selector-dropdown/PillSelectorDropdown.stories.js

Expand Down
25 changes: 23 additions & 2 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
/* eslint-disable */
// @ts-nocheck

import path from 'path';

const language = process.env.LANGUAGE;

const config: { webpackFinal: (config: any) => Promise<any>; staticDirs: string[]; stories: string[]; framework: { name: string }; addons: (string | { name: string; options: { sass: { implementation: any } } } | { name: string; options: { mdxPluginOptions: { mdxCompileOptions: { remarkPlugins: any[] } } } })[] } = {
stories: ['../src/**/*.mdx','../src/**/*.stories.@(js|jsx|ts|tsx)'],
const config: {
stories: string[];
addons: (string | { name: string; options: { sass: { implementation: any } } })[],
framework: { name: string };
staticDirs: string[];
webpackFinal: (config: any) => Promise<any>;
typescript: any
} = {
stories: ['../src/**/*.stories.@(js|jsx|ts|tsx)'],

addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
Expand All @@ -17,11 +28,18 @@ const config: { webpackFinal: (config: any) => Promise<any>; staticDirs: string[
},
},
'@storybook/addon-styling-webpack',
'@storybook/addon-docs',
'@storybook/addon-webpack5-compiler-babel',
'@chromatic-com/storybook',
'storybook-react-intl'
],

framework: {
name: '@storybook/react-webpack5',
},

staticDirs: ['public'],

webpackFinal: async (config: any) => {
// `configType` has a value of 'DEVELOPMENT' or 'PRODUCTION'
// You can change the configuration based on that.
Expand All @@ -39,6 +57,9 @@ const config: { webpackFinal: (config: any) => Promise<any>; staticDirs: string[

return config;
},
typescript: {
reactDocgen: 'react-docgen-typescript'
}
};

export default config;
2 changes: 1 addition & 1 deletion .storybook/manager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addons } from '@storybook/addons';
import { addons } from '@storybook/manager-api';
import customTheme from './customTheme';

addons.setConfig({
Expand Down
3 changes: 3 additions & 0 deletions .storybook/typings.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* eslint-disable */
// @ts-nocheck

declare module '*.md' {
const content: string;
export = content;
Expand Down
4 changes: 2 additions & 2 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Most hooks can be tested with `shallow` rendering except for lifecycle hooks suc
To test a `useEffect` hook, you must use `act()` from `react-dom/test-utils` and `mount()` from `enzyme`.

```jsx
import { act } from 'react-dom/test-utils';
import { act } from 'react';

test('something happens', () => {
let wrapper;
Expand All @@ -164,7 +164,7 @@ test('something happens', () => {

// Assert
expect(wrapper...);
}
})
```

See [React Testing Recipes](https://reactjs.org/docs/testing-recipes.html) for more examples.
Expand Down
1 change: 1 addition & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable */
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
Expand Down
1 change: 1 addition & 0 deletions examples/src/SelectorDropdownExamples.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class SelectorDropdownContainer extends Component {

return (
<div style={{ paddingBottom: '330px' }}>
{/* eslint-disable-next-line react/no-unknown-property */}
<label labelFor="title-check">
<input
type="checkbox"
Expand Down
78 changes: 39 additions & 39 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@
"@box/frontend": "^10.0.0",
"@box/languages": "^1.0.0",
"@box/react-virtualized": "9.22.3-rc-box.7",
"@cfaester/enzyme-adapter-react-18": "^0.8.0",
"@chromatic-com/storybook": "^1.6.1",
"@commitlint/cli": "^8.3.5",
"@commitlint/config-conventional": "^8.3.4",
"@eslint/eslintrc": "^3.1.0",
Expand All @@ -144,47 +146,45 @@
"@formatjs/intl-relativetimeformat": "^4.5.9",
"@formatjs/intl-unified-numberformat": "^3.2.0",
"@hapi/address": "2.1.1",
"@storybook/addon-actions": "^7.5.3",
"@storybook/addon-docs": "^8.0.8",
"@storybook/addon-essentials": "^7.5.3",
"@storybook/addon-interactions": "^7.5.3",
"@storybook/addon-knobs": "^7.0.2",
"@storybook/addon-links": "^7.5.3",
"@storybook/addon-storyshots": "^7.5.3",
"@storybook/addon-actions": "^8.1.11",
"@storybook/addon-docs": "^8.1.11",
"@storybook/addon-essentials": "^8.1.11",
"@storybook/addon-interactions": "^8.1.11",
"@storybook/addon-knobs": "^8.0.1",
"@storybook/addon-links": "^8.1.11",
"@storybook/addon-styling": "^1.3.7",
"@storybook/addon-styling-webpack": "^0.0.5",
"@storybook/addons": "^7.5.3",
"@storybook/blocks": "^7.6.11",
"@storybook/preview-api": "^7.6.11",
"@storybook/react-webpack5": "^7.5.3",
"@storybook/testing-library": "^0.2.2",
"@storybook/theming": "^7.5.3",
"@storybook/addon-styling-webpack": "^1.0.0",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/blocks": "^8.1.11",
"@storybook/preview-api": "^8.1.11",
"@storybook/react-webpack5": "^8.1.11",
"@storybook/test": "^8.1.11",
"@storybook/theming": "^8.1.11",
"@svgr/core": "^5.0.1",
"@svgr/plugin-prettier": "^5.0.1",
"@svgr/plugin-svgo": "^5.1.0",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "12.1.5",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/react": "^16.0.0",
"@testing-library/react-hooks": "^8.0.1",
"@types/classnames": "^2.2.9",
"@types/color": "^3.0.2",
"@types/enzyme": "^3.10.4",
"@types/enzyme": "^3.10.18",
"@types/history": "^4.7.5",
"@types/jest": "^29.5.11",
"@types/jest-image-snapshot": "^2.11.0",
"@types/lodash": "^4.14.149",
"@types/node": "^13.5.2",
"@types/pikaday": "^1.7.4",
"@types/puppeteer": "^2.0.1",
"@types/react": "^16.9.18",
"@types/react": "18.3.0",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/react-dom": "^16.9.5",
"@types/react-dom": "18.3.0",
"@types/react-measure": "^2.0.6",
"@types/react-router-dom": "^5.1.3",
"@types/sinon": "^7.5.1",
"@types/webpack": "^4.41.3",
"@typescript-eslint/eslint-plugin": "^7.3.1",
"@typescript-eslint/parser": "^7.3.1",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
"autoprefixer": "^9.7.4",
"axios": "0.25.0",
"babel-core": "^7.0.0-bridge.0",
Expand Down Expand Up @@ -258,7 +258,7 @@
"mini-css-extract-plugin": "^2.9.0",
"mousetrap": "^1.6.3",
"msw": "^2.1.5",
"msw-storybook-addon": "2.0.0-beta.0",
"msw-storybook-addon": "^2.0.2",
"mutationobserver-shim": "^0.3.3",
"npm-run-all": "^4.1.3",
"nsp": "^3.2.1",
Expand All @@ -272,21 +272,21 @@
"puppeteer": "^2.0.0",
"query-string": "5.1.1",
"raf": "^3.4.1",
"react": "^17.0.1",
"react-animate-height": "^2.0.8",
"react": "^18.3.1",
"react-animate-height": "^3.2.3",
"react-beautiful-dnd": "^13.1.1",
"react-docgen-typescript": "^1.16.1",
"react-docgen-typescript-loader": "^3.6.0",
"react-dom": "^17.0.1",
"react-draggable": "^3.3.0",
"react-dom": "^18.3.1",
"react-draggable": "^4.4.6",
"react-immutable-proptypes": "^2.1.0",
"react-intl": "6.4.2",
"react-intl": "^6.6.8",
"react-measure": "^2.3.0",
"react-modal": "^3.8.1",
"react-popper": "^1.3.4",
"react-process-string": "^1.2.0",
"react-responsive": "8.2.0",
"react-router-dom": "^5.0.0",
"react-responsive": "^10.0.0",
"react-router-dom": "5.3.4",
"react-scrollbars-custom": "^4.0.21",
"react-styleguidist": "12.0.1",
"react-test-renderer": "^16.13.1",
Expand All @@ -304,7 +304,8 @@
"sinon": "^2.3.7",
"source-map-loader": "^0.2.4",
"start-server-and-test": "^1.10.8",
"storybook": "^7.6.11",
"storybook": "^8.1.11",
"storybook-react-intl": "^3.0.1",
"string-replace-loader": "^2.2.0",
"style-loader": "^1.0.0",
"styled-components": "5.0.0",
Expand All @@ -314,7 +315,7 @@
"stylelint-order": "^3.1.1",
"tabbable": "^1.1.3",
"ts-loader": "^6.2.1",
"typescript": "^5.2.2",
"typescript": "5.2.2",
"uniqid": "^5.2.0",
"uuid": "^8.3.2",
"wait-on": "^3.3.0",
Expand Down Expand Up @@ -346,21 +347,21 @@
"mousetrap": "^1.6.3",
"pikaday": "^1.8.0",
"query-string": "5.1.1",
"react": "^17.0.1",
"react-animate-height": "^2.0.8",
"react": "^17.0.1 || ^18.0.0",
"react-animate-height": "^3.2.3",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^17.0.1",
"react-draggable": "^3.3.0",
"react-dom": "^17.0.1 || ^18.0.0",
"react-draggable": "^4.4.6",
"react-immutable-proptypes": "^2.1.0",
"react-intl": ">=2.9.0",
"react-measure": "^2.3.0",
"react-modal": "^3.8.1",
"react-popper": "^1.3.4",
"react-process-string": "^1.2.0",
"react-responsive": "8.2.0",
"react-router-dom": "^5.0.0",
"react-responsive": "^10.0.0",
"react-router-dom": "5.3.4",
"react-scrollbars-custom": "^4.0.21",
"react-tether": "^1.0.0",
"react-tether": "1.0.5",
"react-textarea-autosize": "^8.5.3",
"regenerator-runtime": "^0.13.2",
"sanitize-html": "1.21.1",
Expand All @@ -376,8 +377,7 @@
}
},
"resolutions": {
"ip": "1.1.8",
"**/react-intl/**/@types/react": "^16.9.18"
"ip": "1.1.8"
},
"overrides": {
"draft-js": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/jest/enzyme-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'core-js/es/set';
import 'raf/polyfill';
import 'mutationobserver-shim';
import Enzyme, { mount, shallow } from 'enzyme';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import Adapter from '@cfaester/enzyme-adapter-react-18';

Enzyme.configure({ adapter: new Adapter() });

Expand Down
5 changes: 5 additions & 0 deletions scripts/jest/jest-setup.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
// @ts-nocheck override setImmediate to use setTimeout
import '@testing-library/jest-dom';
import util from 'util';

global.setImmediate = cb => {
setTimeout(cb, 0);
};

Object.defineProperty(global, 'TextEncoder', {
value: util.TextEncoder,
});
Comment on lines +9 to +11
Copy link
Contributor Author

Choose a reason for hiding this comment

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

error was thrown and said to add this to the setup

3 changes: 2 additions & 1 deletion src/components/button/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable react/button-has-type */

import * as React from 'react';
import classNames from 'classnames';
import omit from 'lodash/omit';
Expand Down Expand Up @@ -90,7 +92,6 @@ class Button extends React.Component<ButtonProps> {
);

let button = (
// eslint-disable-next-line react/button-has-type
<button
ref={element => {
this.btnElement = element;
Expand Down
Loading
Loading