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

Update to make React compatible with Node 18 #7480

Merged
merged 7 commits into from
Nov 22, 2023
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client-react/config-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module.exports = {
}),
];
/** @note Configure webpack to resolve `joi` module references as `joi-browser`. */
config.resolve = { ...config.resolve, alias: { ...config.resolve.alias, joi: 'joi-browser' } };
config.resolve = { ...config.resolve, alias: { ...config.resolve.alias, joi: 'joi-browser' }, fallback: { "fs": false } };
return config;
},
};
21,413 changes: 6,388 additions & 15,025 deletions client-react/package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion client-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"react-app-rewired": "^2.1.8",
"react-dom": "17.0.2",
"react-i18next": "^10.0.4",
"react-scripts": "^4.0.3",
"react-scripts": "^5.0.1",
"react-svg": "^7.2.14",
"react-use": "^5.4.1",
"rxjs": "^6.4.0",
Expand All @@ -43,6 +43,7 @@
"lint": "eslint --ext .tsx,.ts src --format visualstudio --quiet"
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.14.5",
"@types/applicationinsights-js": "^1.0.9",
"@types/enzyme": "^3.10.16",
"@types/jest": "^26.0.24",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';
import { FieldProps } from 'formik';
import { Link } from '@fluentui/react/lib/components/Link';
import { Text } from '@fluentui/react/lib/components/Text';
import { Link, Text } from '@fluentui/react';
import CustomPanel from '../CustomPanel/CustomPanel';
import { CipherSuite } from '../../models/site/site';
import { PanelType } from '@fluentui/react/lib/Panel';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useContext, useRef } from 'react';
import { IconButton, Stack, StackItem, TextField } from '@fluentui/react';
import { Text } from '@fluentui/react/lib/components/Text';
import { Text } from '@fluentui/react';
import { useTranslation } from 'react-i18next';
import { uploadStyle, stackStyle, stackTokens, FabricFolder, browseButtonStyle } from './ErrorPageGrid.styles';
import { ThemeContext } from '../../../../ThemeContext';
Expand All @@ -21,7 +21,7 @@ const extractErrorPageFromFile = (input): Promise<string> => {
});
};

const ErrorPageFileUploader: React.FC<ErrorPageFileUploaderProps> = props => {
const ErrorPageFileUploader: React.FC<ErrorPageFileUploaderProps> = (props: ErrorPageFileUploaderProps) => {
const { setFileUploadSuccess, setFile, fileUploadSuccess } = props;
const { t } = useTranslation();
const uploadFileRef = useRef<HTMLInputElement | null>(null);
Expand Down

This file was deleted.

Loading
Loading