Skip to content

Commit eb0a556

Browse files
authored
Merge pull request #149 from modularcode/dev
Switch to TypeScript
2 parents 457dd38 + fbdb26e commit eb0a556

File tree

125 files changed

+37152
-46124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+37152
-46124
lines changed

.eslintrc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"extends": "react-app",
33
"plugins": ["prettier"],
44
"rules": {
5-
"prettier/prettier": "error"
5+
"prettier/prettier": "error",
6+
"import/no-anonymous-default-export": [0]
67
}
7-
}
8+
}

REFERENCES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,11 @@ http://bit.ly/2E3uMER
99
https://gumroad.com/l/UAxnr
1010

1111

12+
### Materials
13+
14+
https://www.carlrippon.com/react-forwardref-typescript/
15+
16+
17+
18+
1219

package-lock.json

Lines changed: 35600 additions & 29244 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 68 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,84 @@
11
{
22
"name": "modular-admin-react",
3-
"version": "0.1.0",
3+
"version": "0.2.0",
44
"private": true,
55
"scripts": {
66
"start": "react-app-rewired start",
77
"build": "react-app-rewired build",
88
"test": "react-app-rewired test",
9-
"eject": "react-scripts eject",
109
"deploy": "npm run build-preview && npm run build-docs && gh-pages -d build --repo git@github.com:modularcode/modular-admin-react.git --branch gh-pages",
1110
"build-preview": "cross-env PUBLIC_PATH='/' npm run build && echo modular-admin-react.modularcode.io > ./build/CNAME",
1211
"build-docs": "build-storybook --docs -s ./public -o build/docs",
1312
"build-storybook": "build-storybook",
14-
"storybook": "start-storybook -p 6060"
13+
"storybook": "start-storybook -p 6060",
14+
"use:es": "symlink-dir ./src-es ./src/",
15+
"use:ts": "symlink-dir ./src-ts ./src/",
16+
"es:init": "npm run es:clean && npm run es:build && npm run es:prettify",
17+
"es:clean": "rimraf src-es/",
18+
"es:build": "tsc --project ./tsconfig.to-es.json",
19+
"es:prettify": "prettier --config ./.prettierrc.js --write \"src-es/**/*.(js|jsx|ts)\"",
20+
"eject": "react-scripts eject"
1521
},
1622
"homepage": "http://modular-admin-react.modularcode.io",
1723
"dependencies": {
18-
"@material-ui/core": "4.9.11",
19-
"@material-ui/icons": "4.9.1",
20-
"@material-ui/lab": "^4.0.0-alpha.51",
24+
"@material-ui/core": "^4.11.4",
25+
"@material-ui/icons": "4.11.2",
26+
"@material-ui/lab": "^4.0.0-alpha.58",
2127
"@rehooks/component-size": "^1.0.3",
22-
"@types/lodash": "^4.14.149",
23-
"@types/uuid": "^3.4.6",
24-
"axios": "^0.19.0",
25-
"axios-mock-adapter": "^1.17.0",
26-
"chart.js": "^2.9.3",
27-
"cross-env": "^7.0.0",
28-
"disqus-react": "^1.0.7",
28+
"@types/lodash": "^4.14.168",
29+
"@types/react-router-dom": "^5.1.7",
30+
"@types/uuid": "^8.3.0",
31+
"axios": "^0.21.1",
32+
"axios-mock-adapter": "^1.19.0",
33+
"chart.js": "^3.2.0",
34+
"cross-env": "^7.0.3",
35+
"disqus-react": "^1.0.11",
2936
"faker": "^5.5.3",
30-
"lodash": "^4.17.15",
31-
"moment": "^2.24.0",
37+
"lodash": "^4.17.21",
38+
"moment": "^2.29.1",
3239
"prop-types": "^15.7.2",
33-
"react": "^16.12.0",
34-
"react-chartjs-2": "^2.9.0",
35-
"react-dom": "^16.11.0",
36-
"react-intl": "^4.4.0",
37-
"react-router-dom": "^5.1.2",
40+
"react": "^16",
41+
"react-chartjs-2": "^3.0.3",
42+
"react-dom": "^16",
43+
"react-intl": "^5.17.1",
44+
"react-router-dom": "^5.2.0",
3845
"react-script": "^2.0.5",
39-
"react-scripts": "3.2.0",
46+
"react-scripts": "^4.0.3",
4047
"store": "^2.0.12",
41-
"storybook-chromatic": "^3.4.1",
42-
"typeface-roboto": "0.0.75",
43-
"typescript": "^3.7.4",
44-
"uuid": "^3.3.3"
48+
"storybook-chromatic": "^4.0.2",
49+
"typeface-roboto": "1.1.13",
50+
"typescript": "^4.2.4",
51+
"uuid": "^8.3.2"
4552
},
4653
"devDependencies": {
47-
"@storybook/addon-a11y": "^5.3.0-rc.4",
48-
"@storybook/addon-actions": "^5.3.0-rc.4",
49-
"@storybook/addon-docs": "^5.3.0-rc.4",
50-
"@storybook/addon-knobs": "^5.3.0-rc.4",
51-
"@storybook/addon-storysource": "^5.3.0-rc.4",
52-
"@storybook/addons": "^5.3.0-rc.4",
53-
"@storybook/preset-create-react-app": "^1.5.0",
54-
"@storybook/preset-typescript": "^1.2.0",
55-
"@storybook/react": "^5.3.0-rc.4",
56-
"@storybook/source-loader": "^5.3.0-rc.4",
57-
"babel-loader": "^8.0.6",
58-
"eslint-plugin-prettier": "^3.1.1",
59-
"fork-ts-checker-webpack-plugin": "^3.1.1",
60-
"gh-pages": "^2.2.0",
61-
"msw": "^0.15.4",
62-
"prettier": "1.18.2",
63-
"react-app-rewired": "^2.1.5",
64-
"react-docgen-typescript-loader": "^3.6.0",
65-
"ts-loader": "^6.2.1"
54+
"@storybook/addon-a11y": "^6.2.9",
55+
"@storybook/addon-actions": "^6.2.9",
56+
"@storybook/addon-docs": "^6.2.9",
57+
"@storybook/addon-knobs": "^6.2.9",
58+
"@storybook/addon-storysource": "^6.2.9",
59+
"@storybook/addons": "^6.2.9",
60+
"@storybook/preset-create-react-app": "^3.1.7",
61+
"@storybook/preset-typescript": "^3.0.0",
62+
"@storybook/react": "^6.2.9",
63+
"@storybook/source-loader": "^6.2.9",
64+
"@testing-library/jest-dom": "^5.12.0",
65+
"@testing-library/react": "^11.2.6",
66+
"@types/jest": "^26.0.23",
67+
"@types/node": "^15.0.1",
68+
"@types/react": "^17.0.4",
69+
"@types/react-dom": "^17.0.3",
70+
"babel-loader": "^8.1.0",
71+
"eslint-plugin-prettier": "^3.4.0",
72+
"fork-ts-checker-webpack-plugin": "^6.2.5",
73+
"gh-pages": "^3.1.0",
74+
"jest-canvas-mock": "^2.3.1",
75+
"msw": "^0.28.2",
76+
"prettier": "2.2.1",
77+
"react-app-rewired": "^2.1.8",
78+
"react-docgen-typescript-loader": "^3.7.2",
79+
"rimraf": "^3.0.2",
80+
"symlink-dir": "^5.0.0",
81+
"ts-loader": "^9.1.1"
6682
},
6783
"eslintConfig": {
6884
"extends": "react-app"
@@ -78,5 +94,13 @@
7894
"last 1 firefox version",
7995
"last 1 safari version"
8096
]
97+
},
98+
"jest": {
99+
"moduleNameMapper": {
100+
"@/(.*)": "<rootDir>/src/$1"
101+
}
102+
},
103+
"msw": {
104+
"workerDirectory": "public"
81105
}
82106
}

0 commit comments

Comments
 (0)