Skip to content

Commit 50d7cab

Browse files
committed
fixed hot reload
1 parent fd2e506 commit 50d7cab

5 files changed

Lines changed: 30 additions & 40 deletions

File tree

front/package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"postprod": "react-snap",
3131
"analyze": "rimraf docs/assets && cross-env NODE_ENV=production webpack -p --config webpack.analyze.config.js",
3232
"prestart": "npm run clean-docs",
33-
"start": "cross-env NODE_ENV=dev webpack-dev-server --hot --config ./webpack.hot.reload.config.js"
33+
"start": "cross-env NODE_ENV=dev webpack-dev-server --config ./webpack.hot.reload.config.js"
3434
},
3535
"reactSnap": {
3636
"source": "docs"
@@ -69,7 +69,6 @@
6969
"@types/jest": "^24.0.18",
7070
"@types/js-base64": "^2.3.1",
7171
"@types/jwt-decode": "^2.2.1",
72-
"@types/styled-components": "^4.1.19",
7372
"@types/react": "^16.9.5",
7473
"@types/react-dom": "^16.9.1",
7574
"@types/react-helmet": "^5.0.11",
@@ -85,6 +84,7 @@
8584
"@types/redux-mock-store": "^1.0.1",
8685
"@types/rimraf": "^2.0.2",
8786
"@types/smoothscroll-polyfill": "^0.3.1",
87+
"@types/styled-components": "^4.1.19",
8888
"@types/webpack": "^4.39.3",
8989
"@typescript-eslint/eslint-plugin": "^1.13.0",
9090
"@typescript-eslint/parser": "1.13.0",
@@ -132,13 +132,12 @@
132132
"typescript": "^3.6.2",
133133
"uglifyjs-webpack-plugin": "^1.2.5",
134134
"url-loader": "^2.1.0",
135-
"webpack": "^4.39.3",
136-
"webpack-bundle-analyzer": "^3.4.1",
137-
"webpack-cli": "^3.3.8",
138-
"webpack-dev-middleware": "^3.7.1",
139-
"webpack-dev-server": "^3.8.0",
135+
"webpack": "^4.41.2",
136+
"webpack-bundle-analyzer": "^3.6.0",
137+
"webpack-cli": "^3.3.9",
138+
"webpack-dev-middleware": "^3.7.2",
139+
"webpack-dev-server": "^3.8.2",
140140
"webpack-hot-middleware": "^2.25.0",
141-
"webpack-node-externals": "^1.7.2",
142141
"webpack-require-from": "^1.8.0",
143142
"workbox-webpack-plugin": "^4.3.1"
144143
},

front/src/Root.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ConnectedRouter } from 'connected-react-router';
44
import { Switch, Route } from 'react-router-dom';
55
import { Provider } from 'react-redux';
66
import { ThemeProvider } from 'styled-components';
7-
import { hot } from 'react-hot-loader';
7+
import { hot } from 'react-hot-loader/root';
88
import configureStore from './redux/store/configureStore';
99
import { history } from './redux/store/configureStore';
1010
import ScrollTop from './components/scrollToTop/ScrollToTop';
@@ -56,4 +56,4 @@ class Root extends Component<Props, State> {
5656
}
5757
}
5858

59-
export default hot(module)(Root);
59+
export default hot(Root);

front/src/redux/modules/userAuth/index.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import { ThunkAction } from 'redux-thunk';
2+
import Axios from 'axios';
23
import appConfig from '../../../config/appConfig';
34
import userInfosMockData from '../../../mock/userInfosMock.json';
45
import { getLocationOrigin } from '../../../services/API/fetchTools';
56
import auth from '../../../services/auth';
67
import { State } from './type';
7-
import Axios from 'axios';
8-
import { response } from 'express';
98

109
// #region CONSTANTS
1110
const REQUEST_USER_INFOS_DATA = 'REQUEST_USER_INFOS_DATA';
@@ -37,13 +36,13 @@ type PartialState = Partial<State>;
3736
type UserInfo = { user: User };
3837

3938
export type Action = {
40-
type: ActionType,
39+
type: ActionType;
4140

42-
isFetching?: boolean,
43-
actionTime?: string,
44-
data?: Array<any> | any,
45-
error?: any,
46-
payload?: any,
41+
isFetching?: boolean;
42+
actionTime?: string;
43+
data?: Array<any> | any;
44+
error?: any;
45+
payload?: any;
4746
} & PartialState &
4847
Partial<UserInfo>;
4948

@@ -302,7 +301,7 @@ function fetchUserInfosData(id: string = ''): RFetchUserDataAction {
302301
...options,
303302
});
304303

305-
return response;
304+
return reponse;
306305
} catch (error) {
307306
dispatch({ type: ERROR_USER_INFOS_DATA, error });
308307
}

front/webpack.hot.reload.config.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,12 @@ const config = {
167167
},
168168
extensions: ['.ts', '.tsx', '.js', '.jsx'],
169169
},
170-
node: {
171-
fs: 'empty',
172-
net: 'empty',
173-
},
174170
module: {
175171
rules: [
176172
{
177173
test: /\.ts(x)?$/,
178-
exclude: [nodeModulesDir],
179174
use: ['awesome-typescript-loader'],
175+
exclude: [nodeModulesDir],
180176
},
181177
{
182178
test: /\.css$/,
@@ -222,6 +218,7 @@ const config = {
222218
headers: { 'Access-Control-Allow-Origin': '*' },
223219
},
224220
plugins: [
221+
new webpack.HotModuleReplacementPlugin(),
225222
new HtmlWebpackPlugin({
226223
template: 'index.html',
227224
}),

front/yarn.lock

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10326,10 +10326,10 @@ webidl-conversions@^4.0.2:
1032610326
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
1032710327
integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
1032810328

10329-
webpack-bundle-analyzer@^3.4.1:
10330-
version "3.5.2"
10331-
resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.2.tgz#ac02834f4b31de8e27d71e6c7a612301ebddb79f"
10332-
integrity sha512-g9spCNe25QYUVqHRDkwG414GTok2m7pTTP0wr6l0J50Z3YLS04+BGodTqqoVBL7QfU/U/9p/oiI5XFOyfZ7S/A==
10329+
webpack-bundle-analyzer@^3.6.0:
10330+
version "3.6.0"
10331+
resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz#39b3a8f829ca044682bc6f9e011c95deb554aefd"
10332+
integrity sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g==
1033310333
dependencies:
1033410334
acorn "^6.0.7"
1033510335
acorn-walk "^6.1.1"
@@ -10345,7 +10345,7 @@ webpack-bundle-analyzer@^3.4.1:
1034510345
opener "^1.5.1"
1034610346
ws "^6.0.0"
1034710347

10348-
webpack-cli@^3.3.8:
10348+
webpack-cli@^3.3.9:
1034910349
version "3.3.9"
1035010350
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.9.tgz#79c27e71f94b7fe324d594ab64a8e396b9daa91a"
1035110351
integrity sha512-xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==
@@ -10370,7 +10370,7 @@ webpack-core@^0.6.7:
1037010370
source-list-map "~0.1.7"
1037110371
source-map "~0.4.1"
1037210372

10373-
webpack-dev-middleware@^3.7.1, webpack-dev-middleware@^3.7.2:
10373+
webpack-dev-middleware@^3.7.2:
1037410374
version "3.7.2"
1037510375
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
1037610376
integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
@@ -10381,7 +10381,7 @@ webpack-dev-middleware@^3.7.1, webpack-dev-middleware@^3.7.2:
1038110381
range-parser "^1.2.1"
1038210382
webpack-log "^2.0.0"
1038310383

10384-
webpack-dev-server@^3.8.0:
10384+
webpack-dev-server@^3.8.2:
1038510385
version "3.8.2"
1038610386
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.8.2.tgz#3292427bf6510da9a3ac2d500b924a4197667ff9"
1038710387
integrity sha512-0xxogS7n5jHDQWy0WST0q6Ykp7UGj4YvWh+HVN71JoE7BwPxMZrwgraBvmdEMbDVMBzF0u+mEzn8TQzBm5NYJQ==
@@ -10448,11 +10448,6 @@ webpack-log@^2.0.0:
1044810448
ansi-colors "^3.0.0"
1044910449
uuid "^3.3.2"
1045010450

10451-
webpack-node-externals@^1.7.2:
10452-
version "1.7.2"
10453-
resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz#6e1ee79ac67c070402ba700ef033a9b8d52ac4e3"
10454-
integrity sha512-ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg==
10455-
1045610451
webpack-require-from@^1.8.0:
1045710452
version "1.8.0"
1045810453
resolved "https://registry.yarnpkg.com/webpack-require-from/-/webpack-require-from-1.8.0.tgz#d3b53927346d65accd3c180aaff607328bad3b60"
@@ -10466,10 +10461,10 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-
1046610461
source-list-map "^2.0.0"
1046710462
source-map "~0.6.1"
1046810463

10469-
webpack@^4.39.3:
10470-
version "4.41.1"
10471-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.1.tgz#5388dd3047d680d5d382a84249fd4750e87372fd"
10472-
integrity sha512-ak7u4tUu/U63sCVxA571IuPZO/Q0pZ9cEXKg+R/woxkDzVovq57uB6L2Hlg/pC8LCU+TWpvtcYwsstivQwMJmw==
10464+
webpack@^4.41.2:
10465+
version "4.41.2"
10466+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"
10467+
integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==
1047310468
dependencies:
1047410469
"@webassemblyjs/ast" "1.8.5"
1047510470
"@webassemblyjs/helper-module-context" "1.8.5"

0 commit comments

Comments
 (0)