Skip to content

Commit e71da32

Browse files
committed
frontend: re-order dependencies and whitespace
Re-order the dependencies since all the npm tools keep re-ordering them and adjusting the whitespace.
1 parent 1a4fa99 commit e71da32

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

{{cookiecutter.project_slug}}/frontend/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6+
"@material-ui/lab": "^4.0.0-alpha.54",
7+
"jwt-decode": "^3.0.0",
68
"ra-data-json-server": "^3.5.2",
79
"ra-data-simple-rest": "^3.3.2",
810
"react": "^16.13.1",
@@ -11,9 +13,7 @@
1113
"react-router-dom": "^5.1.2",
1214
"react-scripts": "3.4.3",
1315
"react-truncate": "^2.4.0",
14-
"standard": "^14.3.3",
15-
"jwt-decode": "^3.0.0",
16-
"@material-ui/lab": "^4.0.0-alpha.54"
16+
"standard": "^14.3.3"
1717
},
1818
"scripts": {
1919
"start": "react-scripts start",
@@ -37,26 +37,26 @@
3737
]
3838
},
3939
"devDependencies": {
40-
"typescript": "^4.0.2",
4140
"@testing-library/jest-dom": "^5.11.1",
4241
"@testing-library/react": "^11.0.4",
43-
"@typescript-eslint/eslint-plugin": "^2.24.0",
44-
"@typescript-eslint/parser": "^2.24.0",
4542
"@testing-library/user-event": "^12.0.11",
4643
"@types/jest": "^26.0.3",
44+
"@types/jwt-decode": "^2.2.1",
4745
"@types/node": "^14.0.1",
4846
"@types/react": "^16.9.19",
4947
"@types/react-dom": "^16.9.5",
5048
"@types/react-router-dom": "^5.1.3",
51-
"@types/jwt-decode": "^2.2.1",
49+
"@typescript-eslint/eslint-plugin": "^2.24.0",
50+
"@typescript-eslint/parser": "^2.24.0",
5251
"eslint-config-airbnb": "^18.1.0",
53-
"eslint-config-react-app": "^5.2.1",
5452
"eslint-plugin-flowtype": "^4.6.0",
5553
"eslint-plugin-import": "^2.20.1",
5654
"eslint-plugin-jsx-a11y": "^6.2.3",
5755
"eslint-plugin-react": "^7.19.0",
56+
"eslint-config-react-app": "^5.2.1",
5857
"eslint-plugin-react-hooks": "^2.5.1",
5958
"prettier": "^2.0.5",
60-
"react-test-renderer": "^16.13.1"
59+
"react-test-renderer": "^16.13.1",
60+
"typescript": "^4.0.2"
6161
}
6262
}

{{cookiecutter.project_slug}}/frontend/tsconfig.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
22
"compilerOptions": {
33
"target": "es5",
4-
"lib": ["dom", "dom.iterable", "esnext"],
4+
"lib": [
5+
"dom",
6+
"dom.iterable",
7+
"esnext"
8+
],
59
"allowJs": true,
610
"skipLibCheck": true,
711
"esModuleInterop": true,
@@ -15,5 +19,8 @@
1519
"noEmit": true,
1620
"jsx": "react"
1721
},
18-
"include": ["src", "decs.d.ts"]
22+
"include": [
23+
"src",
24+
"decs.d.ts"
25+
]
1926
}

0 commit comments

Comments
 (0)