Skip to content

Commit 0addfb8

Browse files
committed
migration
1 parent 0269c22 commit 0addfb8

104 files changed

Lines changed: 94 additions & 1131 deletions

File tree

Some content is hidden

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

front/.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
10
File renamed without changes.

.prettierrc renamed to front/.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"printWidth": 80,
99
"useTabs": false,
1010
"tabWidth": 2,
11-
"parser": "babel"
11+
"parser": "typescript"
1212
}
File renamed without changes.
File renamed without changes.

jest.config.js renamed to front/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = {
77
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
88
globals: {
99
'ts-jest': {
10-
tsConfig: './src/tsconfig.json',
10+
tsConfig: './tsconfig.json',
1111
babelConfig: false,
1212
},
1313
},

package.json renamed to front/package.json

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "react-redux-bootstrap-webpack-starter",
2+
"name": "react-redux-bootstrap-webpack-starter-front",
33
"version": "7.0.0",
44
"author": "Erwan DATIN (MacKentoch)",
55
"license": "MIT",
@@ -22,8 +22,6 @@
2222
"test": "cross-env NODE_ENV=test jest",
2323
"test:coverage": "cross-env NODE_ENV=test jest --coverage",
2424
"clean-docs": "rimraf docs/*",
25-
"prepare:index-html": "node ./scripts/prepareIndexHtml.js",
26-
"build-server": "tsc server/src/index.ts --outDir server/out",
2725
"predev": "npm run clean-docs",
2826
"dev": "cross-env NODE_ENV=dev webpack --config webpack.dev.config.js",
2927
"postdev": "react-snap",
@@ -32,9 +30,7 @@
3230
"postprod": "react-snap",
3331
"analyze": "rimraf docs/assets && cross-env NODE_ENV=production webpack -p --config webpack.analyze.config.js",
3432
"prestart": "npm run clean-docs",
35-
"start": "cross-env NODE_ENV=dev webpack-dev-server --hot --config ./webpack.hot.reload.config.js --mode development",
36-
"serve-dev": "npm run dev && ts-node server/index.ts",
37-
"serve-prod": "npm run prod && ts-node server/index.ts"
33+
"start": "cross-env NODE_ENV=dev webpack-dev-server --hot --config ./webpack.hot.reload.config.js --mode development"
3834
},
3935
"reactSnap": {
4036
"source": "docs"
@@ -48,6 +44,10 @@
4844
"ES7",
4945
"ES2015",
5046
"ES2016",
47+
"ES2017",
48+
"ES2018",
49+
"ES2019",
50+
"typescript",
5151
"bootstrap",
5252
"react-router4",
5353
"react-router",
@@ -59,29 +59,19 @@
5959
"webpack4"
6060
],
6161
"devDependencies": {
62-
"@babel/cli": "^7.6.0",
63-
"@babel/core": "^7.6.0",
64-
"@babel/plugin-proposal-class-properties": "^7.1.0",
65-
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
66-
"@babel/plugin-transform-async-to-generator": "^7.0.0",
67-
"@babel/plugin-transform-modules-commonjs": "^7.0.0",
68-
"@babel/plugin-transform-regenerator": "^7.0.0",
69-
"@babel/preset-env": "^7.0.0",
70-
"@babel/preset-react": "^7.0.0",
71-
"@babel/preset-typescript": "^7.6.0",
72-
"@babel/register": "^7.0.0",
7362
"@testing-library/jest-dom": "^4.0.0",
7463
"@testing-library/react": "^9.1.4",
7564
"@types/classnames": "^2.2.9",
76-
"@types/compression": "^1.0.1",
7765
"@types/enzyme": "^3.10.3",
7866
"@types/fetch-mock": "^7.3.1",
7967
"@types/helmet": "^0.0.44",
8068
"@types/history": "^4.7.3",
8169
"@types/jest": "^24.0.18",
8270
"@types/js-base64": "^2.3.1",
8371
"@types/jwt-decode": "^2.2.1",
72+
"@types/styled-components": "^4.1.19",
8473
"@types/react": "^16.9.5",
74+
"@types/react-dom": "^16.9.1",
8575
"@types/react-helmet": "^5.0.11",
8676
"@types/react-motion": "^0.0.29",
8777
"@types/react-redux": "^5.0.19",
@@ -93,19 +83,12 @@
9383
"@types/redux-devtools-extension": "^2.13.2",
9484
"@types/redux-logger": "^3.0.7",
9585
"@types/redux-mock-store": "^1.0.1",
96-
"@types/rename": "^1.0.1",
9786
"@types/rimraf": "^2.0.2",
9887
"@types/smoothscroll-polyfill": "^0.3.1",
9988
"@types/webpack": "^4.39.3",
10089
"@typescript-eslint/eslint-plugin": "^1.13.0",
10190
"@typescript-eslint/parser": "1.13.0",
10291
"awesome-typescript-loader": "^5.2.1",
103-
"babel-core": "^7.0.0-0",
104-
"babel-eslint": "^8.2.3",
105-
"babel-jest": "^24.8.0",
106-
"babel-loader": "^8.0.0",
107-
"babel-plugin-dynamic-import-node": "^2.2.0",
108-
"babel-plugin-transform-remove-console": "^6.9.4",
10992
"clean-webpack-plugin": "^3.0.0",
11093
"compression-webpack-plugin": "^3.0.0",
11194
"copy-webpack-plugin": "^5.0.4",
@@ -144,7 +127,6 @@
144127
"sass-loader": "^8.0.0",
145128
"style-loader": "^1.0.0",
146129
"ts-jest": "^24.0.2",
147-
"ts-loader": "^6.0.4",
148130
"tsconfig-paths-webpack-plugin": "^3.2.0",
149131
"tslint-config-prettier": "^1.18.0",
150132
"typescript": "^3.6.2",
@@ -163,8 +145,6 @@
163145
"dependencies": {
164146
"@babel/polyfill": "^7.4.4",
165147
"@hot-loader/react-dom": "^16.9.0",
166-
"@types/react-dom": "^16.9.1",
167-
"@types/styled-components": "^4.1.19",
168148
"axios": "^0.18.1",
169149
"babel-polyfill": "^6.26.0",
170150
"bootstrap": "^4.3.1",
@@ -182,7 +162,6 @@
182162
"lodash.throttle": "^4.1.1",
183163
"modernizr": "^3.6.0",
184164
"popper.js": "1.14.3",
185-
"prettier-eslint": "^8.8.1",
186165
"react": "^16.9.0",
187166
"react-bootstrap": "^0.32.1",
188167
"react-dom": "^16.9.0",

0 commit comments

Comments
 (0)