Skip to content

Commit

Permalink
Demo project to typescript
Browse files Browse the repository at this point in the history
  • Loading branch information
Bnaya committed Feb 4, 2020
1 parent 76902de commit 8bf3480
Show file tree
Hide file tree
Showing 57 changed files with 187 additions and 361 deletions.
21 changes: 12 additions & 9 deletions examples/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
"ra-input-rich-text": "^3.0.0",
"ra-language-english": "^3.0.0",
"ra-language-french": "^3.0.0",
"react": "^16.9.0",
"react": "^16.12.0",
"react-admin": "^3.0.0",
"react-app-polyfill": "^1.0.4",
"react-dom": "^16.9.0",
"react-redux": "^7.1.0",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"react-scripts": "^3.0.0",
"react-dom": "^16.12.0",
"react-redux": "^7.1.3",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
"react-scripts": "^3.3.1",
"recompose": "~0.26.0",
"redux-saga": "^1.0.0"
},
Expand All @@ -46,9 +46,12 @@
"@types/jest": "^24.0.23",
"@types/node": "^12.12.14",
"@types/query-string": "5.1.0",
"@types/react": "^16.9.13",
"@types/react-dom": "^16.9.4",
"source-map-explorer": "^2.0.0",
"@types/react": "^16.9.19",
"@types/react-dom": "^16.9.5",
"@types/react-redux": "^7.1.7",
"@typescript-eslint/eslint-plugin": "^2.19.0",
"@typescript-eslint/parser": "^2.19.0",
"source-map-explorer": "^2.2.2",
"typescript": "^3.7.5"
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const useEditStyles = makeStyles({
root: { alignItems: 'flex-start' },
});

const OrderEdit = props => {
const OrderEdit = (/** @type {any} */ props) => {
const classes = useEditStyles();
return (
<Edit
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion examples/demo/src/react-admin.d.ts

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 5 additions & 2 deletions examples/demo/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"allowJs": false,
"checkJs": false,
"skipLibCheck": false,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
// "noImplicitAny": false,
// "strictNullChecks": false,
"forceConsistentCasingInFileNames": true,
"module": "esnext",
"moduleResolution": "node",
Expand Down
22 changes: 11 additions & 11 deletions examples/simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"author": "",
"license": "MIT",
"devDependencies": {
"@babel/cli": "^7.1.2",
"@babel/core": "^7.1.2",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.1.0",
"@babel/cli": "^7.8.4",
"@babel/core": "^7.8.4",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-object-rest-spread": "^7.8.3",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/preset-env": "^7.8.4",
"@babel/preset-react": "^7.8.3",
"@babel/preset-typescript": "^7.8.3",
"babel-loader": "^8.0.4",
"hard-source-webpack-plugin": "^0.11.2",
"html-loader": "~0.5.5",
Expand All @@ -34,16 +34,16 @@
"webpack-dev-server": "~3.1.11"
},
"dependencies": {
"@babel/polyfill": "^7.0.0",
"@babel/polyfill": "^7.8.3",
"@material-ui/core": "^4.9.0",
"@material-ui/icons": "^4.5.1",
"ra-data-fakerest": "^3.0.0",
"ra-i18n-polyglot": "^3.0.0",
"ra-input-rich-text": "^3.0.0",
"ra-language-english": "^3.0.0",
"ra-language-french": "^3.0.0",
"react": "^16.9.0",
"react": "^16.12.0",
"react-admin": "^3.0.0",
"react-dom": "^16.9.0"
"react-dom": "^16.12.0"
}
}
4 changes: 2 additions & 2 deletions examples/tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"dependencies": {
"@material-ui/core": "^4.9.0",
"ra-data-json-server": "^3.0.0",
"react": "^16.9.0",
"react": "^16.12.0",
"react-admin": "^3.0.0",
"react-dom": "^16.9.0",
"react-dom": "^16.12.0",
"react-scripts": "^3.0.0"
},
"scripts": {
Expand Down
14 changes: 7 additions & 7 deletions packages/ra-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
"watch": "rimraf ./lib && tsc --watch"
},
"devDependencies": {
"@redux-saga/testing-utils": "^1.0.2",
"@types/history": "^4.7.2",
"@redux-saga/testing-utils": "^1.1.3",
"@types/history": "^4.7.5",
"@types/node-polyglot": "^0.4.31",
"@types/query-string": "5.1.0",
"@types/react-redux": "^7.1.1",
"@types/react-router": "^5.1.0",
"@types/react-router-dom": "^5.1.0",
"@types/react-redux": "^7.1.7",
"@types/react-router": "^5.1.4",
"@types/react-router-dom": "^5.1.3",
"@types/recompose": "^0.27.0",
"connected-react-router": "^6.5.2",
"cross-env": "^5.2.0",
Expand All @@ -49,8 +49,8 @@
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"react-test-renderer": "^16.9.0",
"redux": "^3.7.2 || ^4.0.3",
"redux-saga": "^1.0.0",
"redux": "^4.0.5",
"redux-saga": "^1.1.3",
"rimraf": "^2.6.3"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/ra-ui-materialui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"watch": "rimraf ./lib && tsc --watch"
},
"devDependencies": {
"@material-ui/core": "^4.3.3",
"@material-ui/icons": "^4.2.1",
"@material-ui/styles": "^4.3.3",
"@material-ui/core": "^4.9.1",
"@material-ui/icons": "^4.9.1",
"@material-ui/styles": "^4.9.0",
"@testing-library/react": "^8.0.7",
"@types/query-string": "5.1.0",
"cross-env": "^5.2.0",
Expand All @@ -47,7 +47,7 @@
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"react-test-renderer": "~16.8.6",
"redux": "^3.7.2 || ^4.0.3",
"redux": "^4.0.5",
"rimraf": "^2.6.3"
},
"peerDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions packages/react-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@
"@material-ui/icons": "^4.2.1",
"@material-ui/styles": "^4.3.3",
"connected-react-router": "^6.5.2",
"final-form": "^4.18.5",
"final-form-arrays": "^3.0.1",
"final-form": "^4.18.7",
"final-form-arrays": "^3.0.2",
"ra-core": "^3.2.0",
"ra-i18n-polyglot": "^3.2.0",
"ra-language-english": "^3.2.0",
"ra-ui-materialui": "^3.2.0",
"react-final-form": "^6.3.3",
"react-final-form": "^6.3.5",
"react-final-form-arrays": "^3.1.1",
"react-redux": "^7.1.0",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"react-redux": "^7.1.3",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
"redux": "^3.7.2 || ^4.0.3",
"redux-saga": "^1.0.0"
}
Expand Down
7 changes: 1 addition & 6 deletions packages/react-admin/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ import AdminRouter from './AdminRouter';
import defaultI18nProvider from './defaultI18nProvider';

export * from 'ra-core';
/*
error - what do to? which one is the correct symbol?
Module 'ra-core' has already exported a member named 'Notification'. Consider explicitly re-exporting to resolve the ambiguity.ts(2308)
Module 'ra-core' has already exported a member named 'Pagination'. Consider explicitly re-exporting to resolve the ambiguity.ts(2308)
*/
// @ts-ignore
export { Notification, Pagination } from 'ra-core';
export * from 'ra-ui-materialui';
export { Admin, AdminContext, AdminRouter, AdminUI, defaultI18nProvider };
Loading

0 comments on commit 8bf3480

Please sign in to comment.