Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-03-31 22:51:25 -05:00
Code Issues Activity

Merge pull request #1731 from logto-io/renovate/major-react-monorepo

Browse source 
chore(deps): update react monorepo to v18 (major)
This commit is contained in:
Charles Zhao 2022-08-08 13:58:15 +08:00 • committed by GitHub
commit c7e5ae3b6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 324 additions and 324 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
package.json
View file

@ -40,5 +40,12 @@
"html-parse-stringify": "html-parse-stringify/dist/html-parse-stringify.module.js",
"react-hook-form": "react-hook-form/dist/index.esm.mjs",
"superstruct": "superstruct/lib/index.es.js"
},
"pnpm": {
"peerDependencyRules": {
"allowedVersions": {
"react": "^18.0.0"
}
}
}
}

24
packages/console/package.json
View file

@ -38,8 +38,8 @@
"@types/lodash.kebabcase": "^4.1.6",
"@types/mdx": "^2.0.1",
"@types/mdx-js__react": "^1.5.5",
"@types/react": "^17.0.14",
"@types/react-dom": "^17.0.9",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@types/react-modal": "^3.13.1",
"@types/react-syntax-highlighter": "^15.5.1",
"classnames": "^2.3.1",
@ -49,8 +49,8 @@
"dnd-core": "^16.0.0",
"eslint": "^8.21.0",
"history": "^5.3.0",
"i18next": "^21.6.12",
"i18next-browser-languagedetector": "^6.1.3",
"i18next": "^21.8.16",
"i18next-browser-languagedetector": "^6.1.4",
"ky": "^0.31.0",
"lint-staged": "^13.0.0",
"lodash.kebabcase": "^4.1.1",
@ -61,23 +61,23 @@
"prettier": "^2.7.1",
"process": "^0.11.10",
"prop-types": "^15.8.1",
"react": "^17.0.2",
"react": "^18.0.0",
"react-animate-height": "^3.0.4",
"react-dnd": "^16.0.0",
"react-dnd-html5-backend": "^16.0.0",
"react-dom": "^17.0.2",
"react-hook-form": "^7.27.1",
"react-dom": "^18.0.0",
"react-hook-form": "^7.34.0",
"react-hot-toast": "^2.2.0",
"react-i18next": "^11.15.4",
"react-i18next": "^11.18.3",
"react-markdown": "^8.0.0",
"react-modal": "^3.14.4",
"react-paginate": "^8.1.2",
"react-modal": "^3.15.1",
"react-paginate": "^8.1.3",
"react-router-dom": "6.3.0",
"react-syntax-highlighter": "^15.5.0",
"recharts": "^2.1.10",
"recharts": "^2.1.13",
"remark-gfm": "^3.0.1",
"stylelint": "^14.9.1",
"swr": "^1.2.2",
"swr": "^1.3.0",
"typescript": "^4.7.4",
"zod": "^3.14.3"
},

2
packages/console/src/assets/index.d.ts vendored
View file

@ -1,4 +1,4 @@
interface SvgComponent extends React.StatelessComponent<React.SVGAttributes<SVGElement>> {}
interface SvgComponent extends React.FunctionComponent<React.SVGAttributes<SVGElement>> {}
declare module '*.svg' {
const value: SvgComponent;

2
packages/console/src/components/AppBoundary/index.tsx
View file

@ -7,7 +7,7 @@ import initI18n from '@/i18n/init';
import * as styles from './index.module.scss';
type Props = {
children?: ReactNode;
children: ReactNode;
};
const AppBoundary = ({ children }: Props) => {

6
packages/console/src/components/Dropdown/DropdownItem.tsx
View file

@ -1,13 +1,13 @@
import classNames from 'classnames';
import { MouseEvent } from 'react';
import { MouseEvent, ReactNode } from 'react';
import * as styles from './DropdownItem.module.scss';
type Props = {
onClick?: (event: MouseEvent<HTMLLIElement>) => void;
className?: string;
children: React.ReactNode;
icon?: React.ReactNode;
children: ReactNode | Record<string, unknown>;
icon?: ReactNode;
iconClassName?: string;
type?: 'default' | 'danger';
};

2
packages/console/src/components/Tooltip/index.tsx
View file

@ -7,7 +7,7 @@ import usePosition, { HorizontalAlignment } from '@/hooks/use-position';
import * as styles from './index.module.scss';
type Props = {
content: ReactNode;
content: ReactNode | Record<string, unknown>;
anchorRef: RefObject<Element>;
className?: string;
isKeepOpen?: boolean;

2
packages/console/src/hooks/use-user-preferences.ts
View file

@ -70,7 +70,7 @@ const useUserPreferences = () => {
return {
isLoading: !data && !error,
isLoaded: data && !error,
isLoaded: Boolean(data && !error),
data: userPreferences,
update,
error,

11
packages/console/src/include.d/react-i18next.d.ts vendored
View file

@ -1,11 +1,14 @@
// https://react.i18next.com/latest/typescript#create-a-declaration-file
// eslint-disable-next-line import/no-unassigned-import
import 'react-i18next';
import en from '@logto/phrases/lib/locales/en.js';
import { Translation, Errors } from '@logto/phrases';
import { CustomTypeOptions } from 'react-i18next';
declare module 'react-i18next' {
interface CustomTypeOptions {
resources: typeof en;
allowObjectInHTMLChildren: true;
resources: {
translation: Translation;
errors: Errors;
};
}
}

4
packages/console/src/mdx-components/DetailsSummary/index.tsx
View file

@ -7,11 +7,11 @@ import ArrowRight from '@/assets/images/triangle-right.svg';
import * as styles from './index.module.scss';
type Props = {
children: ReactNode[];
children?: ReactNode[] | ReactNode;
};
const DetailsSummary = ({ children }: Props) => {
const [summary, details] = children;
const [summary, details] = Array.isArray(children) ? children : [children];
const [isExpanded, setIsExpanded] = useState(false);
const [height, setHeight] = useState<Height>(0);

2
packages/console/src/pages/Connectors/components/CreateForm/index.tsx
View file

@ -99,7 +99,7 @@ const CreateForm = ({ onClose, isOpen: isFormOpen, type }: Props) => {
onClose={onClose}
>
{isLoading && 'Loading...'}
{error && error}
{error?.message}
{groups && (
<RadioGroup name="group" value={activeGroupId} type="card" onChange={handleGroupChange}>
{groups.map(({ id, name, logo, description, connectors }) => (

2
packages/core/package.json
View file

@ -47,7 +47,7 @@
"dotenv": "^16.0.0",
"etag": "^1.8.1",
"got": "^11.8.2",
"i18next": "^21.0.0",
"i18next": "^21.8.16",
"iconv-lite": "0.6.3",
"inquirer": "^8.2.2",
"jose": "^4.0.0",

14
packages/demo-app/package.json
View file

@ -27,19 +27,19 @@
"@silverhand/eslint-config-react": "1.0.0-rc.2",
"@silverhand/ts-config": "1.0.0-rc.2",
"@silverhand/ts-config-react": "1.0.0-rc.2",
"@types/react": "^17.0.14",
"@types/react-dom": "^17.0.9",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"cross-env": "^7.0.3",
"eslint": "^8.21.0",
"i18next": "^21.6.12",
"i18next-browser-languagedetector": "^6.1.3",
"i18next": "^21.8.16",
"i18next-browser-languagedetector": "^6.1.4",
"lint-staged": "^13.0.0",
"parcel": "2.6.2",
"postcss": "^8.4.6",
"prettier": "^2.7.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-i18next": "^11.15.4",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-i18next": "^11.18.3",
"stylelint": "^14.9.1",
"typescript": "^4.7.4"
},

3
packages/console/src/i18n/react-i18next.d.ts → packages/demo-app/src/include.d/react-i18next.d.ts vendored
View file

@ -1,8 +1,11 @@
// https://react.i18next.com/latest/typescript#create-a-declaration-file
import { Translation, Errors } from '@logto/phrases';
import { CustomTypeOptions } from 'react-i18next';
declare module 'react-i18next' {
interface CustomTypeOptions {
allowObjectInHTMLChildren: true;
resources: {
translation: Translation;
errors: Errors;

18
packages/ui/package.json
View file

@ -29,11 +29,11 @@
"@silverhand/jest-config": "1.0.0-rc.3",
"@silverhand/ts-config": "1.0.0-rc.2",
"@silverhand/ts-config-react": "1.0.0-rc.2",
"@testing-library/react": "^12.0.0",
"@testing-library/react": "^13.3.0",
"@types/color": "^3.0.3",
"@types/jest": "^28.1.6",
"@types/react": "^17.0.14",
"@types/react-dom": "^17.0.9",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@types/react-modal": "^3.13.1",
"@types/react-router-dom": "^5.3.2",
"camelcase-keys": "^7.0.2",
@ -41,8 +41,8 @@
"color": "^4.2.3",
"cross-env": "^7.0.3",
"eslint": "^8.21.0",
"i18next": "^21.6.12",
"i18next-browser-languagedetector": "^6.1.3",
"i18next": "^21.8.16",
"i18next-browser-languagedetector": "^6.1.4",
"jest": "^28.1.3",
"jest-environment-jsdom": "^28.1.3",
"jest-transformer-svg": "^2.0.0",
@ -54,11 +54,11 @@
"postcss": "^8.4.6",
"postcss-modules": "^4.3.0",
"prettier": "^2.7.1",
"react": "^17.0.2",
"react": "^18.0.0",
"react-device-detect": "^2.2.2",
"react-dom": "^17.0.2",
"react-i18next": "^11.15.4",
"react-modal": "^3.14.4",
"react-dom": "^18.0.0",
"react-i18next": "^11.18.3",
"react-modal": "^3.15.1",
"react-modal-promise": "^1.0.2",
"react-router-dom": "^6.2.2",
"react-string-replace": "^1.0.0",

2
packages/ui/src/assets/index.d.ts vendored
View file

@ -1,4 +1,4 @@
interface SvgComponent extends React.StatelessComponent<React.SVGAttributes<SVGElement>> {}
interface SvgComponent extends React.FunctionComponent<React.SVGAttributes<SVGElement>> {}
declare module '@/assets/icons/*.svg' {
const value: SvgComponent;

2
packages/ui/src/components/Button/index.tsx
View file

@ -7,7 +7,7 @@ export type Props = {
htmlType?: 'button' | 'submit' | 'reset';
isDisabled?: boolean;
className?: string;
children: ReactNode;
children: ReactNode | Record<string, unknown>;
type?: 'primary' | 'secondary' | 'outline';
size?: 'small' | 'large';
onClick?: React.MouseEventHandler;

6
packages/ui/src/containers/PasscodeValidation/index.test.tsx
View file

@ -22,14 +22,14 @@ describe('<PasscodeValidation />', () => {
});
it('render counter', () => {
const { queryByText } = renderWithPageContext(
const { queryByText, debug } = renderWithPageContext(
<PasscodeValidation type="sign-in" method="email" target={email} />
);
expect(queryByText('description.resend_after_seconds')).not.toBeNull();
act(() => {
jest.runAllTimers();
jest.advanceTimersByTime(1e3 * 60);
});
expect(queryByText('description.resend_passcode')).not.toBeNull();
@ -40,7 +40,7 @@ describe('<PasscodeValidation />', () => {
<PasscodeValidation type="sign-in" method="email" target={email} />
);
act(() => {
jest.runAllTimers();
jest.advanceTimersByTime(1e3 * 60);
});
const resendButton = getByText('description.resend_passcode');

10
packages/ui/src/containers/SocialSignIn/SecondarySocialSignIn/index.test.tsx
View file

@ -1,4 +1,4 @@
import { fireEvent, waitFor } from '@testing-library/react';
import { fireEvent, waitFor, act } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import renderWithPageContext from '@/__mocks__/RenderWithPageContext';
@ -112,12 +112,14 @@ describe('SecondarySocialSignIn', () => {
const socialButton = container.querySelector('button');
if (socialButton) {
await waitFor(() => {
act(() => {
fireEvent.click(socialButton);
});
expect(invokeSocialSignInSpy).toBeCalled();
expect(logtoNativeSdk?.getPostMessage).toBeCalled();
void waitFor(() => {
expect(invokeSocialSignInSpy).toBeCalled();
expect(logtoNativeSdk?.getPostMessage).toBeCalled();
});
}
});
});

30
packages/ui/src/containers/UsernameSignin/index.test.tsx
View file

@ -1,4 +1,5 @@
import { fireEvent, waitFor } from '@testing-library/react';
import { act } from 'react-dom/test-utils';
import renderWithPageContext from '@/__mocks__/RenderWithPageContext';
import SettingsProvider from '@/__mocks__/RenderWithPageContext/SettingsProvider';
@ -87,11 +88,13 @@ describe('<UsernameSignin>', () => {
fireEvent.change(passwordInput, { target: { value: 'password' } });
}
await waitFor(() => {
await act(async () => {
fireEvent.click(submitButton);
});
expect(signInBasic).toBeCalledWith('username', 'password', undefined);
await waitFor(() => {
expect(termsOfUseConfirmModalPromiseMock).toBeCalled();
});
});
});
test('should show terms detail modal', async () => {
@ -115,11 +118,15 @@ describe('<UsernameSignin>', () => {
fireEvent.change(passwordInput, { target: { value: 'password' } });
}
await waitFor(() => {
act(() => {
fireEvent.click(submitButton);
});
expect(termsOfUseIframeModalPromiseMock).toBeCalledWith();
expect(signInBasic).not.toBeCalled();
await waitFor(() => {
expect(termsOfUseIframeModalPromiseMock).toBeCalled();
});
});
test('submit form', async () => {
@ -142,12 +149,19 @@ describe('<UsernameSignin>', () => {
}
const termsButton = getByText('description.agree_with_terms');
fireEvent.click(termsButton);
await waitFor(() => {
act(() => {
fireEvent.click(termsButton);
});
act(() => {
fireEvent.click(submitButton);
});
expect(signInBasic).toBeCalledWith('username', 'password', undefined);
act(() => {
void waitFor(() => {
expect(signInBasic).toBeCalledWith('username', 'password', undefined);
});
});
});
});

2
packages/ui/src/hooks/use-bind-social.ts
View file

@ -23,7 +23,7 @@ const useBindSocial = () => {
);
const bindRelatedUserHandler = useCallback(
(connectorId) => {
(connectorId: string) => {
void asyncBindSocialRelatedUser(connectorId);
},
[asyncBindSocialRelatedUser]

1
packages/ui/src/include.d/react-i18next.d.ts vendored
View file

@ -6,6 +6,7 @@ import en from '@logto/phrases-ui/lib/locales/en.js';
declare module 'react-i18next' {
interface CustomTypeOptions {
allowObjectInHTMLChildren: true;
resources: typeof en;
}
}

2
packages/ui/src/pages/ErrorPage/index.tsx
View file

@ -25,7 +25,7 @@ const ErrorPage = ({ title = 'description.not_found', message, rawMessage }: Pro
<div className={styles.container}>
<ErrorImage />
<div className={styles.title}>{t(title)}</div>
{errorMessage && <div className={styles.message}>{errorMessage}</div>}
{errorMessage && <div className={styles.message}>{String(errorMessage)}</div>}
</div>
<Button
className={styles.backButton}

494
pnpm-lock.yaml generated
View file

File diff suppressed because it is too large Load diff