Skip to content

Commit 7d2a6b8

Browse files
committed
update front deps
1 parent 7795a1d commit 7d2a6b8

33 files changed

Lines changed: 17010 additions & 25542 deletions

front/.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"@babel/preset-typescript",
55
"@babel/preset-react"
66
],
7-
"plugins": ["react-hot-loader/babel", "emotion"]
7+
"plugins": ["@emotion"]
88
}

front/config/webpack/base.js

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const HtmlWebpackPlugin = require('html-webpack-plugin');
2-
const merge = require('webpack-merge');
2+
const {merge} = require('webpack-merge');
33
const helpers = require('./helpers');
44
const CopyPlugin = require('copy-webpack-plugin');
55

@@ -22,31 +22,22 @@ module.exports = merge(
2222
entry: {
2323
app: ['regenerator-runtime/runtime', './index.tsx'],
2424
},
25+
output: {
26+
path: helpers.resolveFromRootPath('dist'),
27+
publicPath: '/',
28+
},
2529
module: {
2630
rules: [
27-
{
28-
test: /\.tsx?$/,
29-
exclude: /node_modules/,
30-
loader: 'babel-loader',
31-
},
3231
{
3332
test: /\.svg$/,
3433
use: ['@svgr/webpack'],
3534
},
36-
],
37-
},
38-
optimization: {
39-
runtimeChunk: 'single',
40-
splitChunks: {
41-
cacheGroups: {
42-
vendor: {
43-
chunks: 'all',
44-
name: 'vendor',
45-
test: /[\\/]node_modules[\\/]/,
46-
enforce: true,
47-
},
35+
{
36+
test: /\.(png|jpg|gif)$/,
37+
exclude: /node_modules/,
38+
type: 'asset/resource',
4839
},
49-
},
40+
],
5041
},
5142
plugins: [
5243
new HtmlWebpackPlugin({

front/config/webpack/dev.js

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,36 @@
1-
const merge = require('webpack-merge');
1+
const { merge } = require('webpack-merge');
22
const Dotenv = require('dotenv-webpack');
3+
const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
34
const base = require('./base');
4-
const helpers = require('./helpers');
55

6-
const hotReloadingEntries = ['react-hot-loader/patch'];
7-
8-
module.exports = merge.strategy({
9-
entry: 'prepend',
10-
})(base, {
6+
module.exports = merge(base, {
117
mode: 'development',
12-
devtool: 'inline-source-map',
13-
resolve: {
14-
alias: {
15-
'react-dom': '@hot-loader/react-dom',
16-
},
17-
},
18-
entry: {
19-
app: hotReloadingEntries,
20-
},
8+
devtool: 'eval-source-map',
219
output: {
22-
path: helpers.resolveFromRootPath('dist'),
2310
filename: '[name].js',
2411
},
2512
devServer: {
26-
inline: true,
2713
host: 'localhost',
2814
port: 8080,
29-
stats: 'minimal',
3015
hot: true,
16+
historyApiFallback: true,
17+
proxy: {
18+
'/api': 'http://localhost:3001',
19+
},
20+
devMiddleware: {
21+
stats: 'errors-warnings',
22+
},
3123
},
32-
plugins: [
33-
new Dotenv({
34-
path: 'dev.env',
35-
}),
36-
],
3724
module: {
3825
rules: [
3926
{
40-
test: /\.(png|jpg|gif|svg)$/,
41-
loader: 'file-loader',
42-
options: {
43-
name: 'img/[name].[ext]',
27+
test: /\.tsx?$/,
28+
exclude: /node_modules/,
29+
use: {
30+
loader: 'babel-loader',
31+
options: {
32+
plugins: [require.resolve('react-refresh/babel')],
33+
},
4434
},
4535
},
4636
{
@@ -49,4 +39,10 @@ module.exports = merge.strategy({
4939
},
5040
],
5141
},
42+
plugins: [
43+
new ReactRefreshWebpackPlugin(),
44+
new Dotenv({
45+
path: 'dev.env',
46+
}),
47+
],
5248
});

front/config/webpack/prod.js

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
11
const merge = require('webpack-merge');
22
const Dotenv = require('dotenv-webpack');
33
const base = require('./base');
4-
const helpers = require('./helpers');
54
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
65

76
module.exports = merge(base, {
87
mode: 'production',
98
output: {
10-
path: helpers.resolveFromRootPath('dist'),
11-
filename: './js/[name].[chunkhash].js',
9+
filename: 'js/[name].[chunkhash].js',
10+
assetModuleFilename: 'images/[hash][ext][query]',
11+
},
12+
optimization: {
13+
runtimeChunk: 'single',
14+
splitChunks: {
15+
cacheGroups: {
16+
vendor: {
17+
chunks: 'all',
18+
name: 'vendor',
19+
test: /[\\/]node_modules[\\/]/,
20+
enforce: true,
21+
},
22+
},
23+
},
1224
},
1325
module: {
1426
rules: [
1527
{
16-
test: /\.(png|jpg|gif|svg)$/,
17-
loader: 'file-loader',
18-
options: {
19-
name: './images/[name].[ext]?[hash]',
20-
},
28+
test: /\.tsx?$/,
29+
exclude: /node_modules/,
30+
loader: 'babel-loader',
2131
},
2232
{
2333
test: /\.css$/,

0 commit comments

Comments
 (0)