Skip to content

Commit 31559b4

Browse files
author
Gildas Garcia
authored
Merge pull request #2426 from marmelab/typescript2
[RFR] Bootstrap TypeScript migration
2 parents 3bdcd03 + e3061b4 commit 31559b4

Some content is hidden

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

85 files changed

+4581
-2218
lines changed

Diff for: ‎.babelrc

-56
This file was deleted.

Diff for: ‎.eslintignore

-7
This file was deleted.

Diff for: ‎.eslintrc

-61
This file was deleted.

Diff for: ‎Makefile

+15-15
Original file line numberDiff line numberDiff line change
@@ -28,62 +28,62 @@ run-graphcool-demo: ## run the demo example
2828

2929
build-ra-core:
3030
@echo "Transpiling ra-core files...";
31-
@cd ./packages/ra-core && yarn -s build && yarn -s build-esm
31+
@cd ./packages/ra-core && yarn -s build
3232

3333
build-ra-ui-materialui:
3434
@echo "Transpiling ra-ui-materialui files...";
35-
@cd ./packages/ra-ui-materialui && yarn -s build && yarn -s build-esm
35+
@cd ./packages/ra-ui-materialui && yarn -s build
3636

3737
build-react-admin:
3838
@echo "Transpiling react-admin files...";
3939
@rm -rf ./packages/react-admin/docs
40-
@cd ./packages/react-admin && yarn -s build && yarn -s build-esm
40+
@cd ./packages/react-admin && yarn -s build
4141
@mkdir packages/react-admin/docs
4242
@cp docs/*.md packages/react-admin/docs
4343

4444
build-ra-data-fakerest:
4545
@echo "Transpiling ra-data-fakerest files...";
46-
@cd ./packages/ra-data-fakerest && yarn -s build && yarn -s build-esm
46+
@cd ./packages/ra-data-fakerest && yarn -s build
4747

4848
build-ra-data-json-server:
4949
@echo "Transpiling ra-data-json-server files...";
50-
@cd ./packages/ra-data-json-server && yarn -s build && yarn -s build-esm
50+
@cd ./packages/ra-data-json-server && yarn -s build
5151

5252
build-ra-data-simple-rest:
5353
@echo "Transpiling ra-data-simple-rest files...";
54-
@cd ./packages/ra-data-simple-rest && yarn -s build && yarn -s build-esm
54+
@cd ./packages/ra-data-simple-rest && yarn -s build
5555

5656
build-ra-data-graphql:
5757
@echo "Transpiling ra-data-graphql files...";
58-
@cd ./packages/ra-data-graphql && yarn -s build && yarn -s build-esm
58+
@cd ./packages/ra-data-graphql && yarn -s build
5959

6060
build-ra-data-graphcool:
6161
@echo "Transpiling ra-data-graphcool files...";
62-
@cd ./packages/ra-data-graphcool && yarn -s build && yarn -s build-esm
62+
@cd ./packages/ra-data-graphcool && yarn -s build
6363

6464
build-ra-data-graphql-simple:
6565
@echo "Transpiling ra-data-graphql-simple files...";
66-
@cd ./packages/ra-data-graphql-simple && yarn -s build && yarn -s build-esm
66+
@cd ./packages/ra-data-graphql-simple && yarn -s build
6767

6868
build-ra-input-rich-text:
6969
@echo "Transpiling ra-input-rich-text files...";
70-
@cd ./packages/ra-input-rich-text && yarn -s build && yarn -s build-esm
70+
@cd ./packages/ra-input-rich-text && yarn -s build
7171

7272
build-ra-realtime:
7373
@echo "Transpiling ra-realtime files...";
74-
@cd ./packages/ra-realtime && yarn -s build && yarn -s build-esm
74+
@cd ./packages/ra-realtime && yarn -s build
7575

7676
build-ra-tree-core:
7777
@echo "Transpiling ra-tree-core files...";
78-
@cd ./packages/ra-tree-core && yarn -s build && yarn -s build-esm
78+
@cd ./packages/ra-tree-core && yarn -s build
7979

8080
build-ra-tree-ui-materialui:
8181
@echo "Transpiling ra-tree-ui-materialui files...";
82-
@cd ./packages/ra-tree-ui-materialui && yarn -s build && yarn -s build-esm
82+
@cd ./packages/ra-tree-ui-materialui && yarn -s build
8383

8484
build-data-generator:
8585
@echo "Transpiling data-generator files...";
86-
@cd ./examples/data-generator && yarn -s build && yarn -s build-esm
86+
@cd ./examples/data-generator && yarn -s build
8787

8888
build: build-ra-core build-ra-ui-materialui build-react-admin build-ra-data-fakerest build-ra-data-json-server build-ra-data-simple-rest build-ra-data-graphql build-ra-data-graphcool build-ra-data-graphql-simple build-ra-input-rich-text build-ra-realtime build-ra-tree-core build-ra-tree-ui-materialui build-data-generator ## compile ES6 files to JS
8989

@@ -92,7 +92,7 @@ doc: ## compile doc as html and launch doc web server
9292

9393
lint: ## lint the code and check coding conventions
9494
@echo "Running linter..."
95-
@yarn -s lint
95+
@yarn -s tslint 'packages/*/src/**/*.*s'
9696

9797
prettier: ## prettify the source code using prettier
9898
@echo "Running prettier..."

Diff for: ‎examples/data-generator/package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
"private": true,
55
"main": "./lib/index.js",
66
"scripts": {
7-
"build": "rimraf ./lib && cross-env NODE_ENV=production BABEL_ENV=cjs babel --quiet ./src -d ./lib --ignore spec.js,test.js",
8-
"build-esm": "rimraf ./esm && cross-env NODE_ENV=production BABEL_ENV=esm babel --quiet ./src -d ./esm --ignore spec.js,test.js",
9-
"watch": "rimraf ./lib && cross-env NODE_ENV=production babel --watch ./src -d ./lib --ignore spec.js,test.js"
7+
"build": "yarn run build-cjs && yarn run build-esm",
8+
"build-cjs": "rimraf ./lib && tsc",
9+
"build-esm": "rimraf ./esm && tsc --outDir esm --module es2015",
10+
"watch": "rimraf ./lib && tsc --watch"
1011
},
1112
"dependencies": {
12-
"babel-core": "~6.26.0",
1313
"date-fns": "~1.29.0",
1414
"faker": "^4.1.0"
1515
},
1616
"devDependencies": {
17-
"babel-cli": "~6.26.0",
1817
"cross-env": "^5.2.0",
1918
"rimraf": "^2.6.2"
2019
}

Diff for: ‎examples/data-generator/tsconfig.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"extends": "../../tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "lib",
5+
"rootDir": "src"
6+
},
7+
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.spec.js"],
8+
"include": ["src"]
9+
}

Diff for: ‎examples/demo/package.json

+38-32
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,40 @@
11
{
2-
"name": "demo",
3-
"version": "0.1.0",
4-
"private": true,
5-
"dependencies": {
6-
"@material-ui/core": "~1.4.0",
7-
"@material-ui/icons": "~1.1.0",
8-
"data-generator": "^2.1.4",
9-
"fakerest": "~2.1.0",
10-
"fetch-mock": "~6.3.0",
11-
"json-graphql-server": "~2.1.1",
12-
"ra-data-fakerest": "^2.0.0",
13-
"ra-data-graphql-simple": "^2.0.0",
14-
"ra-data-simple-rest": "~2.0.0",
15-
"ra-input-rich-text": "^2.0.0",
16-
"ra-language-english": "^2.0.0",
17-
"ra-language-french": "^2.0.0",
18-
"react": "~16.3.1",
19-
"react-admin": "^2.0.0",
20-
"react-dom": "~16.3.1",
21-
"react-redux": "~5.0.7",
22-
"react-router-dom": "~4.2.2",
23-
"react-scripts": "1.1.4",
24-
"recompose": "~0.26.0",
25-
"redux-form": "~7.4.0",
26-
"redux-saga": "~0.16.0"
27-
},
28-
"scripts": {
29-
"start": "react-scripts start",
30-
"build": "react-scripts build",
31-
"eject": "react-scripts eject"
32-
},
33-
"homepage": "https://marmelab.com/react-admin-demo"
2+
"name": "demo",
3+
"version": "0.1.0",
4+
"private": true,
5+
"dependencies": {
6+
"@material-ui/core": "~1.4.0",
7+
"@material-ui/icons": "~1.1.0",
8+
"data-generator": "^2.1.4",
9+
"fakerest": "~2.1.0",
10+
"fetch-mock": "~6.3.0",
11+
"json-graphql-server": "~2.1.1",
12+
"ra-data-fakerest": "^2.0.0",
13+
"ra-data-graphql-simple": "^2.0.0",
14+
"ra-data-simple-rest": "~2.0.0",
15+
"ra-input-rich-text": "^2.0.0",
16+
"ra-language-english": "^2.0.0",
17+
"ra-language-french": "^2.0.0",
18+
"react": "~16.3.1",
19+
"react-admin": "^2.0.0",
20+
"react-dom": "~16.3.1",
21+
"react-redux": "~5.0.7",
22+
"react-router-dom": "~4.2.2",
23+
"react-scripts": "^2.0.5",
24+
"recompose": "~0.26.0",
25+
"redux-form": "~7.4.0",
26+
"redux-saga": "~0.16.0"
27+
},
28+
"scripts": {
29+
"start": "react-scripts start",
30+
"build": "react-scripts build",
31+
"eject": "react-scripts eject"
32+
},
33+
"homepage": "https://marmelab.com/react-admin-demo",
34+
"browserslist": [
35+
">0.2%",
36+
"not dead",
37+
"not ie <= 11",
38+
"not op_mini all"
39+
]
3440
}

Diff for: ‎examples/graphcool-demo/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"react-dom": "~16.3.1",
1515
"react-redux": "~5.0.7",
1616
"react-router-dom": "~4.2.2",
17-
"react-scripts": "1.1.4",
17+
"react-scripts": "^2.0.5",
1818
"recompose": "~0.26.0",
1919
"redux-form": "~7.4.0",
2020
"redux-saga": "~0.16.0"

Diff for: ‎examples/simple/.babelrc

-10
This file was deleted.

Diff for: ‎examples/simple/babel.config.js

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
const presets = [
2+
[
3+
'@babel/env',
4+
{
5+
targets: {
6+
edge: '17',
7+
firefox: '60',
8+
chrome: '67',
9+
safari: '11.1',
10+
},
11+
useBuiltIns: 'usage',
12+
},
13+
],
14+
'@babel/preset-react',
15+
'@babel/preset-typescript',
16+
];
17+
18+
const plugins = [
19+
'@babel/plugin-proposal-class-properties',
20+
'@babel/plugin-proposal-object-rest-spread',
21+
'@babel/plugin-syntax-dynamic-import',
22+
];
23+
24+
module.exports = { presets, plugins };

0 commit comments

Comments
 (0)