Skip to content

Commit 0269c22

Browse files
committed
migration
1 parent c2a4c6b commit 0269c22

16 files changed

Lines changed: 4529 additions & 176 deletions

package.json

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"url": "https://github.com/MacKentoch/react-redux-bootstrap-webpack-starter/issues"
1414
},
1515
"engines": {
16-
"node": ">=8.11.1",
16+
"node": ">=10",
1717
"npm": ">=6.0.0",
1818
"yarn": ">=1.3.0"
1919
},
@@ -23,7 +23,7 @@
2323
"test:coverage": "cross-env NODE_ENV=test jest --coverage",
2424
"clean-docs": "rimraf docs/*",
2525
"prepare:index-html": "node ./scripts/prepareIndexHtml.js",
26-
"build-server": "tsc server/src/index.ts",
26+
"build-server": "tsc server/src/index.ts --outDir server/out",
2727
"predev": "npm run clean-docs",
2828
"dev": "cross-env NODE_ENV=dev webpack --config webpack.dev.config.js",
2929
"postdev": "react-snap",
@@ -72,22 +72,15 @@
7272
"@babel/register": "^7.0.0",
7373
"@testing-library/jest-dom": "^4.0.0",
7474
"@testing-library/react": "^9.1.4",
75-
"@types/body-parser": "^1.17.1",
76-
"@types/chalk": "^2.2.0",
7775
"@types/classnames": "^2.2.9",
7876
"@types/compression": "^1.0.1",
79-
"@types/convict": "^4.2.1",
8077
"@types/enzyme": "^3.10.3",
81-
"@types/express": "^4.17.1",
82-
"@types/express-promise-router": "^2.0.1",
83-
"@types/express-rate-limit": "^3.3.3",
8478
"@types/fetch-mock": "^7.3.1",
8579
"@types/helmet": "^0.0.44",
8680
"@types/history": "^4.7.3",
8781
"@types/jest": "^24.0.18",
8882
"@types/js-base64": "^2.3.1",
8983
"@types/jwt-decode": "^2.2.1",
90-
"@types/node": "^12.7.12",
9184
"@types/react": "^16.9.5",
9285
"@types/react-helmet": "^5.0.11",
9386
"@types/react-motion": "^0.0.29",
@@ -152,9 +145,7 @@
152145
"style-loader": "^1.0.0",
153146
"ts-jest": "^24.0.2",
154147
"ts-loader": "^6.0.4",
155-
"ts-node": "^8.3.0",
156148
"tsconfig-paths-webpack-plugin": "^3.2.0",
157-
"tslib": "^1.10.0",
158149
"tslint-config-prettier": "^1.18.0",
159150
"typescript": "^3.6.2",
160151
"uglifyjs-webpack-plugin": "^1.2.5",
@@ -176,17 +167,11 @@
176167
"@types/styled-components": "^4.1.19",
177168
"axios": "^0.18.1",
178169
"babel-polyfill": "^6.26.0",
179-
"body-parser": "^1.18.3",
180170
"bootstrap": "^4.3.1",
181-
"chalk": "^2.4.1",
182171
"classnames": "^2.2.6",
183-
"compression": "^1.7.2",
184172
"connected-react-router": "^4.4.1",
185173
"core-js": "^3.2.0",
186174
"date-fns": "^1.29.0",
187-
"express": "^4.16.3",
188-
"express-promise-router": "^3.0.3",
189-
"express-rate-limit": "^2.12.1",
190175
"font-awesome": "^4.7.0",
191176
"helmet": "^3.13.0",
192177
"history": "^4.7.2",
@@ -198,7 +183,6 @@
198183
"modernizr": "^3.6.0",
199184
"popper.js": "1.14.3",
200185
"prettier-eslint": "^8.8.1",
201-
"pretty-error": "^2.1.1",
202186
"react": "^16.9.0",
203187
"react-bootstrap": "^0.32.1",
204188
"react-dom": "^16.9.0",
@@ -213,8 +197,6 @@
213197
"redux": "^4.0.4",
214198
"redux-persist": "^5.10.0",
215199
"redux-thunk": "^2.3.0",
216-
"serialize-javascript": "^1.5.0",
217-
"serve-favicon": "^2.5.0",
218200
"smoothscroll-polyfill": "^0.4.3",
219201
"styled-components": "^4.3.2"
220202
}

scripts/prepareIndexHtml.js

Lines changed: 0 additions & 34 deletions
This file was deleted.

server/.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
end_of_line = lf
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
11+
[*.md]
12+
trim_trailing_whitespace = false

server/.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
10

server/.prettierrc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"semi": true,
3+
"trailingComma": "all",
4+
"bracketSpacing": true,
5+
"jsxBracketSameLine": false,
6+
"singleQuote": true,
7+
"overrides": [],
8+
"printWidth": 80,
9+
"useTabs": false,
10+
"tabWidth": 2,
11+
"parser": "typescript"
12+
}

server/jest.config.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
const { jsWithBabel: tsjPreset } = require('ts-jest/presets');
2+
3+
module.exports = {
4+
preset: 'ts-jest',
5+
transform: { ...tsjPreset.transform },
6+
testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
7+
moduleFileExtensions: ['ts', 'tsx', 'json', 'node'],
8+
globals: {
9+
'ts-jest': {
10+
babelConfig: false,
11+
},
12+
},
13+
testEnvironment: 'node',
14+
verbose: true,
15+
// roots: ['<rootDir>/src/', '<rootDir>/src/test'],
16+
// setupFiles: [],
17+
// setupFilesAfterEnv: ['<rootDir>/src/test/setupTests.js'],
18+
// moduleNameMapper: {
19+
// '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
20+
// '<rootDir>/src/test/__mocks__/fileMock.js',
21+
// '\\.(css|less|sass|scss)$': 'identity-obj-proxy',
22+
// },
23+
coverageDirectory: './coverage/',
24+
collectCoverage: true,
25+
};
File renamed without changes.

server/package.json

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{
2+
"name": "react-redux-bootstrap-webpack-starter-server",
3+
"version": "1.0.0",
4+
"author": "Erwan DATIN <[email protected]> (MacKentoch)",
5+
"license": "MIT",
6+
"description": "server side of react js + redux + react router + hot reload + devTools + bootstrap + webpack starter",
7+
"main": "out/index.js",
8+
"repository": {
9+
"type": "git",
10+
"url": "git+https://github.com/MacKentoch/react-redux-bootstrap-webpack-starter.git"
11+
},
12+
"bugs": {
13+
"url": "https://github.com/MacKentoch/react-redux-bootstrap-webpack-starter/issues"
14+
},
15+
"engines": {
16+
"node": ">=10",
17+
"npm": ">=6.0.0",
18+
"yarn": ">=1.3.0"
19+
},
20+
"directories": {
21+
"test": "test"
22+
},
23+
"scripts": {
24+
"test": "cross-env NODE_ENV=test jest",
25+
"build-server": "tsc src/index.ts --outDir out"
26+
},
27+
"keywords": [
28+
"node",
29+
"TS",
30+
"express",
31+
"react",
32+
"react 16",
33+
"redux",
34+
"react-redux",
35+
"ES6",
36+
"ES7",
37+
"ES2015",
38+
"ES2016",
39+
"ES2017",
40+
"ES2018",
41+
"ES2019",
42+
"typescript",
43+
"bootstrap",
44+
"react-router4",
45+
"react-router",
46+
"starter",
47+
"webpack",
48+
"hot-reload",
49+
"redux-devtools-extension",
50+
"devtools",
51+
"webpack4"
52+
],
53+
"dependencies": {
54+
"body-parser": "^1.19.0",
55+
"chalk": "^2.4.2",
56+
"compression": "^1.7.4",
57+
"convict": "^5.1.0",
58+
"date-fns": "^2.4.1",
59+
"express": "^4.17.1",
60+
"express-promise-router": "^3.0.3",
61+
"express-rate-limit": "^5.0.0",
62+
"pretty-error": "^2.1.1",
63+
"serialize-javascript": "^2.1.0",
64+
"serve-favicon": "^2.5.0"
65+
},
66+
"devDependencies": {
67+
"@types/body-parser": "^1.17.1",
68+
"@types/chalk": "^2.2.0",
69+
"@types/convict": "^4.2.1",
70+
"@types/express": "^4.17.1",
71+
"@types/express-promise-router": "^2.0.1",
72+
"@types/express-rate-limit": "^3.3.3",
73+
"@types/fetch-mock": "^7.3.1",
74+
"@types/jest": "^24.0.18",
75+
"@types/node": "^12.7.12",
76+
"fetch-mock": "^7.5.1",
77+
"jest": "^24.9.0",
78+
"jest-localstorage-mock": "^2.4.0",
79+
"prettier": "^1.18.2",
80+
"rimraf": "^3.0.0",
81+
"ts-jest": "^24.1.0",
82+
"ts-node": "^8.4.1",
83+
"tslib": "^1.10.0",
84+
"tslint-config-prettier": "^1.18.0",
85+
"typescript": "^3.6.4"
86+
}
87+
}

0 commit comments

Comments
 (0)