Merge pull request #460 from Lemoncode/feature/api-rest-update-packages

Feature/api rest update packages

Author: v-borrego

06-rest-api/01-concepts/00-boilerplate/.babelrc

@@ -3,6 +3,5 @@
     "@babel/preset-env",
     "@babel/preset-typescript",
     "@babel/preset-react"
-  ],
-  "plugins": ["react-hot-loader/babel"]
+  ]
 }

06-rest-api/01-concepts/00-boilerplate/.gitignore

@@ -6,6 +6,5 @@ test-report.*
 junit.xml
 *.log
 *.orig
-package-lock.json
 yarn.lock
 .awcache

06-rest-api/01-concepts/00-boilerplate/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "typescript.tsdk": "node_modules\\typescript\\lib"
+}

06-rest-api/01-concepts/00-boilerplate/config/webpack/base.js

@@ -1,5 +1,5 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const helpers = require('./helpers');
 
 module.exports = merge(

06-rest-api/01-concepts/00-boilerplate/config/webpack/dev.js

@@ -1,32 +1,17 @@
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const Dotenv = require('dotenv-webpack');
+const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 const base = require('./base');
 const helpers = require('./helpers');
 
-const hotReloadingEntries = ['react-hot-loader/patch'];
-
-module.exports = merge.strategy({
-  entry: 'prepend',
-})(base, {
+module.exports = merge(base, {
   mode: 'development',
   devtool: 'inline-source-map',
-  resolve: {
-    alias: {
-      'react-dom': '@hot-loader/react-dom',
-    },
-  },
-  entry: {
-    app: hotReloadingEntries,
-  },
   output: {
     path: helpers.resolveFromRootPath('dist'),
     filename: '[name].js',
   },
   devServer: {
-    inline: true,
-    host: 'localhost',
-    port: 8080,
-    stats: 'minimal',
     hot: true,
     proxy: {
       '/api': 'http://localhost:3000',
@@ -35,12 +20,16 @@ module.exports = merge.strategy({
   module: {
     rules: [
       {
-        test: /\.(png|jpg|gif|svg)$/,
-        loader: 'file-loader',
-        options: {
-          name: 'img/[name].[ext]',
-          esModule: false,
-        },
+        test: /\.[jt]sx?$/,
+        exclude: /node_modules/,
+        use: [
+          {
+            loader: require.resolve('babel-loader'),
+            options: {
+              plugins: [require.resolve('react-refresh/babel')],
+            },
+          },
+        ],
       },
       {
         test: /\.css$/,
@@ -49,6 +38,7 @@ module.exports = merge.strategy({
     ],
   },
   plugins: [
+    new ReactRefreshWebpackPlugin(),
     new Dotenv({
       path: 'dev.env',
     }),

06-rest-api/01-concepts/00-boilerplate/config/webpack/prod.js

@@ -1,4 +1,4 @@
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const base = require('./base');
 const helpers = require('./helpers');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');