Skip to content

Switch to TypeScript #149

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

Merged
merged 31 commits into from
May 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
96a6444
Update dependencies
modularcoder Apr 29, 2021
3f1e7b3
Fix lint errors
modularcoder Apr 29, 2021
9567ed0
Setup typescript for dashboards
modularcoder Apr 29, 2021
9012444
Setup ES and TS versions of project
modularcoder Apr 29, 2021
309929e
Implement switching betwween different project languages
modularcoder Apr 29, 2021
633fcac
Setup ES/TS switch utils
modularcoder Apr 29, 2021
bcd0b89
Fix dashboard charts
modularcoder Apr 29, 2021
6c07005
Setup subscription plans
modularcoder Apr 29, 2021
6eba59b
Remove notifications service
modularcoder Apr 29, 2021
cad7851
Make AppSidebar a typescript component
modularcoder Apr 30, 2021
ae44e02
Re-implement SidebarNav
modularcoder Apr 30, 2021
d6e5a5e
Remove es compiled version
modularcoder Apr 30, 2021
2c83639
Setup basic Jest tests
modularcoder Apr 30, 2021
5f04180
Merge branch 'master' into dev
modularcoder Apr 30, 2021
ec54bd9
Merge branch 'master' into dev
modularcoder Apr 30, 2021
4776a3b
Always use mocks when running in NODE_ENV=‘test’ environment
modularcoder Apr 30, 2021
6643cd2
Setup Jest test providers
modularcoder Apr 30, 2021
df3dd8f
Fix app crashing
modularcoder Apr 30, 2021
808fbf2
Setup tests
modularcoder Apr 30, 2021
7af7295
Migrate BasePageToolbar to TypeScript
modularcoder Apr 30, 2021
dde6e00
Merge branch 'master' into dev
modularcoder Apr 30, 2021
7b9761f
Implement TypeScript typings
modularcoder May 1, 2021
1cf073a
Use types instead of interfaces
modularcoder May 1, 2021
6d67b7f
Remove unused modules
modularcoder May 1, 2021
d28a176
Migrate project to typescript
modularcoder May 1, 2021
f8b8207
Switch to legacy navigation
modularcoder May 1, 2021
712131d
Update MSW
modularcoder May 1, 2021
71a0229
Fix MSW
modularcoder May 1, 2021
dbca5e2
Migrate Dashboard layout to TypeScript
modularcoder May 1, 2021
e9d6699
Add support for external links in SidebarNav component
modularcoder May 1, 2021
fbdb26e
Fix lint warning
modularcoder May 1, 2021
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
5 changes: 3 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "react-app",
"plugins": ["prettier"],
"rules": {
"prettier/prettier": "error"
"prettier/prettier": "error",
"import/no-anonymous-default-export": [0]
}
}
}
7 changes: 7 additions & 0 deletions REFERENCES.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,11 @@ http://bit.ly/2E3uMER
https://gumroad.com/l/UAxnr


### Materials

https://www.carlrippon.com/react-forwardref-typescript/





64,844 changes: 35,600 additions & 29,244 deletions package-lock.json

Large diffs are not rendered by default.

112 changes: 68 additions & 44 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,68 +1,84 @@
{
"name": "modular-admin-react",
"version": "0.1.0",
"version": "0.2.0",
"private": true,
"scripts": {
"start": "react-app-rewired start",
"build": "react-app-rewired build",
"test": "react-app-rewired test",
"eject": "react-scripts eject",
"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",
"build-preview": "cross-env PUBLIC_PATH='/' npm run build && echo modular-admin-react.modularcode.io > ./build/CNAME",
"build-docs": "build-storybook --docs -s ./public -o build/docs",
"build-storybook": "build-storybook",
"storybook": "start-storybook -p 6060"
"storybook": "start-storybook -p 6060",
"use:es": "symlink-dir ./src-es ./src/",
"use:ts": "symlink-dir ./src-ts ./src/",
"es:init": "npm run es:clean && npm run es:build && npm run es:prettify",
"es:clean": "rimraf src-es/",
"es:build": "tsc --project ./tsconfig.to-es.json",
"es:prettify": "prettier --config ./.prettierrc.js --write \"src-es/**/*.(js|jsx|ts)\"",
"eject": "react-scripts eject"
},
"homepage": "http://modular-admin-react.modularcode.io",
"dependencies": {
"@material-ui/core": "4.9.11",
"@material-ui/icons": "4.9.1",
"@material-ui/lab": "^4.0.0-alpha.51",
"@material-ui/core": "^4.11.4",
"@material-ui/icons": "4.11.2",
"@material-ui/lab": "^4.0.0-alpha.58",
"@rehooks/component-size": "^1.0.3",
"@types/lodash": "^4.14.149",
"@types/uuid": "^3.4.6",
"axios": "^0.19.0",
"axios-mock-adapter": "^1.17.0",
"chart.js": "^2.9.3",
"cross-env": "^7.0.0",
"disqus-react": "^1.0.7",
"@types/lodash": "^4.14.168",
"@types/react-router-dom": "^5.1.7",
"@types/uuid": "^8.3.0",
"axios": "^0.21.1",
"axios-mock-adapter": "^1.19.0",
"chart.js": "^3.2.0",
"cross-env": "^7.0.3",
"disqus-react": "^1.0.11",
"faker": "^5.5.3",
"lodash": "^4.17.15",
"moment": "^2.24.0",
"lodash": "^4.17.21",
"moment": "^2.29.1",
"prop-types": "^15.7.2",
"react": "^16.12.0",
"react-chartjs-2": "^2.9.0",
"react-dom": "^16.11.0",
"react-intl": "^4.4.0",
"react-router-dom": "^5.1.2",
"react": "^16",
"react-chartjs-2": "^3.0.3",
"react-dom": "^16",
"react-intl": "^5.17.1",
"react-router-dom": "^5.2.0",
"react-script": "^2.0.5",
"react-scripts": "3.2.0",
"react-scripts": "^4.0.3",
"store": "^2.0.12",
"storybook-chromatic": "^3.4.1",
"typeface-roboto": "0.0.75",
"typescript": "^3.7.4",
"uuid": "^3.3.3"
"storybook-chromatic": "^4.0.2",
"typeface-roboto": "1.1.13",
"typescript": "^4.2.4",
"uuid": "^8.3.2"
},
"devDependencies": {
"@storybook/addon-a11y": "^5.3.0-rc.4",
"@storybook/addon-actions": "^5.3.0-rc.4",
"@storybook/addon-docs": "^5.3.0-rc.4",
"@storybook/addon-knobs": "^5.3.0-rc.4",
"@storybook/addon-storysource": "^5.3.0-rc.4",
"@storybook/addons": "^5.3.0-rc.4",
"@storybook/preset-create-react-app": "^1.5.0",
"@storybook/preset-typescript": "^1.2.0",
"@storybook/react": "^5.3.0-rc.4",
"@storybook/source-loader": "^5.3.0-rc.4",
"babel-loader": "^8.0.6",
"eslint-plugin-prettier": "^3.1.1",
"fork-ts-checker-webpack-plugin": "^3.1.1",
"gh-pages": "^2.2.0",
"msw": "^0.15.4",
"prettier": "1.18.2",
"react-app-rewired": "^2.1.5",
"react-docgen-typescript-loader": "^3.6.0",
"ts-loader": "^6.2.1"
"@storybook/addon-a11y": "^6.2.9",
"@storybook/addon-actions": "^6.2.9",
"@storybook/addon-docs": "^6.2.9",
"@storybook/addon-knobs": "^6.2.9",
"@storybook/addon-storysource": "^6.2.9",
"@storybook/addons": "^6.2.9",
"@storybook/preset-create-react-app": "^3.1.7",
"@storybook/preset-typescript": "^3.0.0",
"@storybook/react": "^6.2.9",
"@storybook/source-loader": "^6.2.9",
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^11.2.6",
"@types/jest": "^26.0.23",
"@types/node": "^15.0.1",
"@types/react": "^17.0.4",
"@types/react-dom": "^17.0.3",
"babel-loader": "^8.1.0",
"eslint-plugin-prettier": "^3.4.0",
"fork-ts-checker-webpack-plugin": "^6.2.5",
"gh-pages": "^3.1.0",
"jest-canvas-mock": "^2.3.1",
"msw": "^0.28.2",
"prettier": "2.2.1",
"react-app-rewired": "^2.1.8",
"react-docgen-typescript-loader": "^3.7.2",
"rimraf": "^3.0.2",
"symlink-dir": "^5.0.0",
"ts-loader": "^9.1.1"
},
"eslintConfig": {
"extends": "react-app"
Expand All @@ -78,5 +94,13 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"jest": {
"moduleNameMapper": {
"@/(.*)": "<rootDir>/src/$1"
}
},
"msw": {
"workerDirectory": "public"
}
}
Loading