Skip to content

Commit c36443e

Browse files
[docs] Transpile demo .ts files (#22388)
Co-authored-by: Olivier Tassinari <[email protected]>
1 parent 4e57752 commit c36443e

25 files changed

+44
-56
lines changed

docs/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"@types/react-virtualized": "^9.21.4",
4646
"@types/react-window": "^1.7.0",
4747
"@types/styled-components": "5.1.2",
48-
"@types/validator": "^13.1.0",
4948
"accept-language": "^3.0.18",
5049
"address": "^1.0.3",
5150
"ast-types": "^0.14.1",
@@ -109,7 +108,6 @@
109108
"redux-logger": "^3.0.6",
110109
"rimraf": "^3.0.0",
111110
"styled-components": "^5.0.0",
112-
"validator": "^13.1.1",
113111
"webfontloader": "^1.6.28",
114112
"webpack": "^4.41.0",
115113
"webpack-bundle-analyzer": "^3.5.1"

docs/scripts/formattedTSDemos.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ async function getFiles(root) {
4343
files.push(...(await getFiles(filePath)));
4444
} else if (
4545
stat.isFile() &&
46-
filePath.endsWith('.tsx') &&
46+
/\.tsx?$/.test(filePath) &&
47+
!filePath.endsWith('.d.ts') &&
4748
!ignoreList.some((ignorePath) => filePath.endsWith(path.normalize(ignorePath)))
4849
) {
4950
files.push(filePath);
@@ -61,7 +62,7 @@ const TranspileResult = {
6162
};
6263

6364
async function transpileFile(tsxPath, program, ignoreCache = false) {
64-
const jsPath = tsxPath.replace('.tsx', '.js');
65+
const jsPath = tsxPath.replace(/\.tsx?$/, '.js');
6566
try {
6667
if (!ignoreCache && (await fse.exists(jsPath))) {
6768
const [jsStat, tsxStat] = await Promise.all([fse.stat(jsPath), fse.stat(tsxPath)]);

docs/src/pages/premium-themes/onepirate/ForgotPassword.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function ForgotPassword() {
3434
if (!errors.email) {
3535
const emailError = email(values.email);
3636
if (emailError) {
37-
errors.email = email(values.email);
37+
errors.email = emailError;
3838
}
3939
}
4040

docs/src/pages/premium-themes/onepirate/ForgotPassword.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function ForgotPassword() {
3434
if (!errors.email) {
3535
const emailError = email(values.email);
3636
if (emailError) {
37-
errors.email = email(values.email);
37+
errors.email = emailError;
3838
}
3939
}
4040

docs/src/pages/premium-themes/onepirate/SignIn.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function SignIn() {
3535
if (!errors.email) {
3636
const emailError = email(values.email);
3737
if (emailError) {
38-
errors.email = email(values.email);
38+
errors.email = emailError;
3939
}
4040
}
4141

docs/src/pages/premium-themes/onepirate/SignIn.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function SignIn() {
3535
if (!errors.email) {
3636
const emailError = email(values.email);
3737
if (emailError) {
38-
errors.email = email(values.email);
38+
errors.email = emailError;
3939
}
4040
}
4141

docs/src/pages/premium-themes/onepirate/SignUp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function SignUp() {
3939
if (!errors.email) {
4040
const emailError = email(values.email);
4141
if (emailError) {
42-
errors.email = email(values.email);
42+
errors.email = emailError;
4343
}
4444
}
4545

docs/src/pages/premium-themes/onepirate/SignUp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function SignUp() {
3939
if (!errors.email) {
4040
const emailError = email(values.email);
4141
if (emailError) {
42-
errors.email = email(values.email);
42+
errors.email = emailError;
4343
}
4444
}
4545

docs/src/pages/premium-themes/onepirate/modules/components/AppBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import { withStyles } from '@material-ui/core/styles';
33
import MuiAppBar from '@material-ui/core/AppBar';
44

docs/src/pages/premium-themes/onepirate/modules/components/AppBar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import { withStyles, Theme, WithStyles } from '@material-ui/core/styles';
33
import MuiAppBar, { AppBarProps } from '@material-ui/core/AppBar';
44

docs/src/pages/premium-themes/onepirate/modules/components/Button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { withStyles } from '@material-ui/core/styles';
22
import MuiButton from '@material-ui/core/Button';
3-
import React from 'react';
3+
import * as React from 'react';
44

55
const styles = (theme) => ({
66
root: {

docs/src/pages/premium-themes/onepirate/modules/components/Button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
createStyles,
66
} from '@material-ui/core/styles';
77
import MuiButton, { ButtonProps } from '@material-ui/core/Button';
8-
import React from 'react';
8+
import * as React from 'react';
99

1010
const styles = (theme: Theme) =>
1111
createStyles({

docs/src/pages/premium-themes/onepirate/modules/components/Markdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import ReactMarkdown from 'markdown-to-jsx';
33
import { withStyles } from '@material-ui/core/styles';
44
import Typography from '@material-ui/core/Typography';

docs/src/pages/premium-themes/onepirate/modules/components/Markdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import ReactMarkdown from 'markdown-to-jsx';
33
import {
44
Theme,

docs/src/pages/premium-themes/onepirate/modules/components/Paper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import PropTypes from 'prop-types';
33
import clsx from 'clsx';
44
import MuiPaper from '@material-ui/core/Paper';

docs/src/pages/premium-themes/onepirate/modules/components/Paper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import clsx from 'clsx';
33
import MuiPaper, { PaperProps } from '@material-ui/core/Paper';
44
import { withStyles, Theme, WithStyles } from '@material-ui/core/styles';

docs/src/pages/premium-themes/onepirate/modules/components/Snackbar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import PropTypes from 'prop-types';
33
import { withStyles } from '@material-ui/core/styles';
44
import MuiSnackbar from '@material-ui/core/Snackbar';

docs/src/pages/premium-themes/onepirate/modules/components/Snackbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import {
33
withStyles,
44
WithStyles,

docs/src/pages/premium-themes/onepirate/modules/components/TextField.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import PropTypes from 'prop-types';
33
import clsx from 'clsx';
44
import { withStyles } from '@material-ui/core/styles';
@@ -81,14 +81,9 @@ function TextField(props) {
8181
...InputPropsOther
8282
} = InputProps;
8383

84-
const disableUnderline = {
85-
disableUnderline: true,
86-
};
87-
8884
return (
8985
<MuiTextField
9086
InputProps={{
91-
...disableUnderline,
9287
classes: {
9388
root: classes.root,
9489
input: clsx(
@@ -102,6 +97,7 @@ function TextField(props) {
10297
disabled: classes.disabled,
10398
...InputPropsClassesOther,
10499
},
100+
disableUnderline: true,
105101
...InputPropsOther,
106102
}}
107103
InputLabelProps={{

docs/src/pages/premium-themes/onepirate/modules/components/TextField.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import clsx from 'clsx';
33
import { withStyles, WithStyles, createStyles } from '@material-ui/core/styles';
4-
import MuiTextField, { TextFieldProps } from '@material-ui/core/TextField';
4+
import MuiTextField, {
5+
FilledTextFieldProps,
6+
StandardTextFieldProps,
7+
} from '@material-ui/core/TextField';
58

69
const inputSyleMapping = {
710
small: 'inputSizeSmall',
@@ -65,7 +68,8 @@ const styles = (theme: any) =>
6568
},
6669
});
6770

68-
export interface OnePirateTextFieldProps extends Omit<TextFieldProps, 'size'> {
71+
export interface OnePirateTextFieldProps
72+
extends Omit<FilledTextFieldProps | StandardTextFieldProps, 'size'> {
6973
noBorder?: boolean;
7074
size?: 'small' | 'medium' | 'large' | 'xlarge';
7175
}
@@ -86,14 +90,9 @@ function TextField(props: OnePirateTextFieldProps & WithStyles<typeof styles>) {
8690
...InputPropsOther
8791
} = InputProps;
8892

89-
const disableUnderline = {
90-
disableUnderline: true,
91-
};
92-
9393
return (
9494
<MuiTextField
9595
InputProps={{
96-
...disableUnderline,
9796
classes: {
9897
root: classes.root,
9998
input: clsx(
@@ -107,6 +106,7 @@ function TextField(props: OnePirateTextFieldProps & WithStyles<typeof styles>) {
107106
disabled: classes.disabled,
108107
...InputPropsClassesOther,
109108
},
109+
disableUnderline: true,
110110
...InputPropsOther,
111111
}}
112112
InputLabelProps={{

docs/src/pages/premium-themes/onepirate/modules/components/Typography.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import PropTypes from 'prop-types';
33
import { withStyles } from '@material-ui/core/styles';
44
import MuiTypography from '@material-ui/core/Typography';

docs/src/pages/premium-themes/onepirate/modules/components/Typography.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import {
33
withStyles,
44
WithStyles,

docs/src/pages/premium-themes/onepirate/modules/form/validation.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
import validator from 'validator';
1+
// Simplified method of validator/lib/isEmail
2+
function isEmail(string: string) {
3+
const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
4+
return re.test(string);
5+
}
26

37
export function email(value: string) {
4-
return value && !validator.isEmail(value.trim()) ? 'Invalid email' : null;
8+
return value && !isEmail(value.trim()) ? 'Invalid email' : null;
59
}
610

7-
function isDirty(value: string) {
8-
return value;
11+
function isDirty(value: string | number) {
12+
return value || value === 0;
913
}
1014

1115
export function required(
1216
requiredFields: string[],
13-
values: { [index: string]: string },
14-
): { [index: string]: string | null } {
17+
values: Record<string, string>,
18+
): Record<string, string> {
1519
return requiredFields.reduce(
1620
(fields, field) => ({
1721
...fields,

docs/src/pages/premium-themes/onepirate/modules/theme.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ const rawTheme = createMuiTheme({
1818
dark: '#ffb25e',
1919
},
2020
error: {
21-
xLight: red[50],
21+
light: red[50],
2222
main: red[500],
2323
dark: red[700],
2424
},
2525
success: {
26-
xLight: green[50],
26+
light: green[50],
2727
main: green[500],
2828
dark: green[700],
2929
},
@@ -34,14 +34,13 @@ const rawTheme = createMuiTheme({
3434
fontWeightLight: 300, // Work Sans
3535
fontWeightRegular: 400, // Work Sans
3636
fontWeightMedium: 700, // Roboto Condensed
37-
fontFamilySecondary: "'Roboto Condensed', sans-serif",
3837
},
3938
});
4039

4140
const fontHeader = {
4241
color: rawTheme.palette.text.primary,
4342
fontWeight: rawTheme.typography.fontWeightMedium,
44-
fontFamily: rawTheme.typography.fontFamilySecondary,
43+
fontFamily: "'Roboto Condensed', sans-serif",
4544
textTransform: 'uppercase',
4645
};
4746

yarn.lock

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2917,11 +2917,6 @@
29172917
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.0.tgz#215c231dff736d5ba92410e6d602050cce7e273f"
29182918
integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==
29192919

2920-
"@types/validator@^13.1.0":
2921-
version "13.1.0"
2922-
resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.1.0.tgz#3d776127dbce7dd31fc06f86d3428b072e631eba"
2923-
integrity sha512-gHUHI6pJaANIO2r6WcbT7+WMgbL9GZooR4tWpuBOETpDIqFNxwaJluE+6rj6VGYe8k6OkfhbHz2Fkm8kl06Igw==
2924-
29252920
"@types/yargs-parser@*":
29262921
version "15.0.0"
29272922
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
@@ -16493,11 +16488,6 @@ validate-npm-package-name@^3.0.0:
1649316488
dependencies:
1649416489
builtins "^1.0.3"
1649516490

16496-
validator@^13.1.1:
16497-
version "13.1.1"
16498-
resolved "https://registry.yarnpkg.com/validator/-/validator-13.1.1.tgz#f8811368473d2173a9d8611572b58c5783f223bf"
16499-
integrity sha512-8GfPiwzzRoWTg7OV1zva1KvrSemuMkv07MA9TTl91hfhe+wKrsrgVN4H2QSFd/U/FhiU3iWPYVgvbsOGwhyFWw==
16500-
1650116491
value-equal@^0.4.0:
1650216492
version "0.4.0"
1650316493
resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"

0 commit comments

Comments
 (0)