Merge remote-tracking branch 'origin/develop'

Author: thaind97git

README.md

@@ -26,7 +26,7 @@ React-Typescript-Webpack was config with React, Typescript and Webpack without C
 
 # Documentation
 
-[https://thaind97git.github.io/react-typescript-webpack/](https://thaind97git.github.io/react-typescript-webpack/)
+Full documentation [here](https://thaind97git.github.io/react-typescript-webpack/)
 
 ## License
 

config/env.js

@@ -30,7 +30,7 @@ const dotenvFiles = [
   // since normally you expect tests to produce the same
   // results for everyone
   // NODE_ENV !== 'test' && `${paths.dotenv}.local`,
-  `${paths.dotenv}.${NODE_ENV}`,
+  `${paths.dotenv}`,
   // paths.dotenv,
 ].filter(Boolean);
 

config/jest/routeMock.js

@@ -0,0 +1,33 @@
+const fs = require('fs');
+const path = require('../paths');
+
+const { appSrc } = path;
+const featuresDir = `${appSrc}/features`;
+
+const routeFileName = 'route.ts';
+
+const RouteModules = [];
+function readFolder(dir) {
+  const files = fs.readdirSync(dir);
+  files.forEach(file => {
+    const filePath = `${dir}/${file}`;
+    const stat = fs.statSync(filePath);
+    if (stat.isDirectory()) {
+      readFolder(filePath);
+    } else {
+      if (file === routeFileName) {
+        const route = require(filePath);
+        RouteModules.push(route);
+      }
+    }
+  });
+}
+
+readFolder(featuresDir);
+
+const appRoutes = RouteModules.reduce((prev, module) => {
+  prev.push(...module.default);
+  return prev;
+}, []);
+
+module.exports = appRoutes;

docs/README.md

@@ -51,7 +51,7 @@
    [ yarn or npm run ] build
    ```
 
-2. Setup env for production mode by create new file `.env.production`
+2. Setup env for production mode by create new file `.env`
 
 3. Run project at build directory
    - Using pm2: `[ yarn or npm run ] start-pm2`
@@ -121,7 +121,9 @@
 
   _- You don't need do anything else after create and modify `route.ts` because i'm using [import-glob](https://www.npmjs.com/package/import-glob) to auto import (check at `webpack/webpack.common.js` for plugin, `src/router/index.ts` and `src/layouts/main/index.tsx` for using)._
 
-  _- If you don't want to use auto import or <b>using project with jest</b>, just using the code that i'm commented. Because i'm not yet support auto import for jest._
+  _- ~~If you don't want to use auto import or <b>using project with jest</b>, just using the code that i'm commented. Because i'm not yet support auto import for jest.~~_
+
+  _- Now, I'm supported auto import route for jest (check at `config/jest/routeMock.js)`_
 
 ## Write new component
 

package.json

@@ -41,7 +41,7 @@
     "@babel/plugin-transform-runtime": "^7.13.10",
     "@babel/preset-env": "^7.13.9",
     "@babel/preset-react": "^7.12.13",
-    "@svgr/webpack": "^5.5.0",
+    "@svgr/webpack": "^6.2.1",
     "@testing-library/jest-dom": "^5.11.10",
     "@testing-library/react": "^12.0.0",
     "@types/enzyme": "^3.10.9",

src/constants/env.ts

@@ -0,0 +1,7 @@
+const { NODE_ENV, API_SERVER_URL, PORT } = process.env;
+
+export default {
+  NodeEnv: NODE_ENV,
+  ApiServerUrl: API_SERVER_URL,
+  Port: PORT,
+};

src/jest.config.js

@@ -17,6 +17,7 @@ const config = {
     '^.+\\.(css|less|scss)$': '<rootDir>/config/jest/cssMock.js',
     '^@/static/(.*)$': '<rootDir>/public/static/$1',
     '^@/(.*)$': '<rootDir>/src/$1',
+    '^.+\\/features/\\*\\*/route.ts$': '<rootDir>/config/jest/routeMock.js',
   },
 };
 

src/locales/i18n.ts

@@ -1,8 +1,9 @@
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
+import env from '@/constants/env';
 
 import resources, { langs } from './resources';
-const isProduction = process.env.NODE_ENV === 'production';
+const isProduction = env.NodeEnv === 'production';
 
 i18n.use(initReactI18next).init({
   resources,

src/services/axios-base.ts

@@ -1,10 +1,11 @@
+import env from '@/constants/env';
 import { getHeaders } from '@/utils';
 
 import axios from 'axios';
 // Make an 'instance' of axios
 const instance = axios.create({
   // .. where we make our configurations
-  baseURL: process.env.API_SERVER_URL,
+  baseURL: env.ApiServerUrl,
 });
 
 // Where you would set stuff like your 'Authorization' header, etc ...

webpack/webpack.common.js

@@ -52,6 +52,7 @@ module.exports = {
       },
       {
         test: /\.svg$/,
+        issuer: /\.[jt]sx?$/,
         use: ['@svgr/webpack'],
       },
       {
@@ -69,10 +70,23 @@ module.exports = {
       {
         test: /\.(woff|woff2|eot|ttf|otf)$/i,
         type: 'asset/resource',
+        generator: {
+          filename: 'static/fonts/[hash][ext][query]',
+        },
+      },
+      {
+        test: /\.(png|jpg|jpeg)$/i,
+        type: 'asset/resource',
+        generator: {
+          filename: 'static/images/[hash][ext][query]',
+        },
       },
       {
-        test: /\.(png|jpg|jpeg|gif)$/i,
+        test: /\.(gif)$/i,
         type: 'asset/resource',
+        generator: {
+          filename: 'static/gifs/[hash][ext][query]',
+        },
       },
     ],
   },