chore(web): change to generate the default dist folder

hongbo-miao · Jan 6, 2025 · d91a972 · d91a972
1 parent 478ff8c
commit d91a972
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 16 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -160,6 +160,7 @@ web-cypress/cypress/fixtures/example.json
 web-cypress/cypress/screenshots
 web/.eslintcache
 web/.lighthouseci
+web/dist
 web/public/sitemap.xml
 web/storybook-static
 web/tmp

diff --git a/.gitignore b/.gitignore
@@ -157,6 +157,7 @@ web-cypress/cypress/fixtures/example.json
 web-cypress/cypress/screenshots/**/*
 web/.eslintcache
 web/.lighthouseci/**/*
+web/dist/**/*
 web/public/sitemap.xml
 web/storybook-static/**/*
 web/tmp/**/*

diff --git a/.markdownlint-cli2.jsonc b/.markdownlint-cli2.jsonc
@@ -168,6 +168,7 @@
     "web-cypress/cypress/screenshots",
     "web/.eslintcache",
     "web/.lighthouseci",
+    "web/dist",
     "web/public/sitemap.xml",
     "web/storybook-static",
     "web/tmp"

diff --git a/.prettierignore b/.prettierignore
@@ -160,6 +160,7 @@ web-cypress/cypress/fixtures/example.json
 web-cypress/cypress/screenshots
 web/.eslintcache
 web/.lighthouseci
+web/dist
 web/public/sitemap.xml
 web/storybook-static
 web/tmp
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -163,7 +163,8 @@ AllCops:
     - 'web-cypress/cypress/fixtures/example.json'
     - 'web-cypress/cypress/screenshots/**/*'
     - 'web/.eslintcache'
-    - 'web/.lighthouseci'
+    - 'web/.lighthouseci/**/*'
+    - 'web/dist/**/*'
     - 'web/public/sitemap.xml'
     - 'web/storybook-static/**/*'
     - 'web/tmp/**/*'
diff --git a/.ruff.toml b/.ruff.toml
@@ -159,6 +159,7 @@ exclude = [
   "web-cypress/cypress/screenshots",
   "web/.eslintcache",
   "web/.lighthouseci",
+  "web/dist",
   "web/public/sitemap.xml",
   "web/storybook-static",
   "web/tmp",

diff --git a/.solhintignore b/.solhintignore
@@ -158,6 +158,7 @@ web-cypress/cypress/fixtures/example.json
 web-cypress/cypress/screenshots
 web/.eslintcache
 web/.lighthouseci
+web/dist
 web/public/sitemap.xml
 web/storybook-static
 web/tmp
diff --git a/.sqlfluffignore b/.sqlfluffignore
@@ -160,6 +160,7 @@ web-cypress/cypress/fixtures/example.json
 web-cypress/cypress/screenshots
 web/.eslintcache
 web/.lighthouseci
+web/dist
 web/public/sitemap.xml
 web/storybook-static
 web/tmp
diff --git a/.stylelintignore b/.stylelintignore
@@ -160,6 +160,7 @@ web-cypress/cypress/fixtures/example.json
 web-cypress/cypress/screenshots
 web/.eslintcache
 web/.lighthouseci
+web/dist
 web/public/sitemap.xml
 web/storybook-static
 web/tmp
diff --git a/.textlintignore b/.textlintignore
@@ -159,6 +159,7 @@ web-cypress/cypress/fixtures/example.json
 web-cypress/cypress/screenshots/**/*
 web/.eslintcache
 web/.lighthouseci
+web/dist
 web/public/sitemap.xml
 web/storybook-static/**/*
 web/tmp/**/*
diff --git a/.yamllint.yaml b/.yamllint.yaml
@@ -165,6 +165,7 @@ ignore: |
   web-cypress/cypress/screenshots
   web/.eslintcache
   web/.lighthouseci
+  web/dist
   web/public/sitemap.xml
   web/storybook-static
   web/tmp

diff --git a/api-node/Dockerfile b/api-node/Dockerfile
@@ -5,9 +5,7 @@ FROM web-base AS web-builder
 COPY ["web/package.json", "web/package-lock.json", "web/.npmrc", "./"]
 RUN npm ci
 COPY web ./
-# Skip lint check during react-scripts build
-RUN rm -f ./.eslintrc.js \
-  && npm run build \
+RUN npm run build \
   && npm prune --production
 
 FROM docker.io/node:22.12.0-alpine AS api-node-base
@@ -17,7 +15,7 @@ FROM api-node-base AS api-node-builder
 COPY ["api-node/package.json", "api-node/package-lock.json", "api-node/.npmrc", "./"]
 RUN npm ci
 COPY api-node ./
-COPY --from=web-builder /usr/src/app/build ./public
+COPY --from=web-builder /usr/src/app/dist ./public
 RUN npm run build \
   && npm prune --production
 

diff --git a/api-node/Dockerfile.development b/api-node/Dockerfile.development
@@ -19,7 +19,7 @@ WORKDIR /usr/src/app
 FROM api-node-base AS api-node-builder
 COPY ["api-node/package.json", "api-node/package-lock.json", "api-node/.npmrc", "./"]
 RUN npm ci
-COPY --from=web-builder /usr/src/app/build ./public
+COPY --from=web-builder /usr/src/app/dist ./public
 COPY api-node ./
 EXPOSE 58136
 CMD ["npm", "run", "dev"]
diff --git a/api-node/bin/build_web.sh b/api-node/bin/build_web.sh
@@ -6,4 +6,4 @@ npm install
 npm run build
 
 cd ..
-cp -R web/build/ api-node/public/
+cp -R web/dist/ api-node/public/
diff --git a/caddy/bin/build_web.sh b/caddy/bin/build_web.sh
@@ -6,4 +6,4 @@ npm install
 npm run build
 
 cd ..
-cp -R web/build/ caddy/public/
+cp -R web/dist/ caddy/public/
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -169,6 +169,7 @@ export default [
       'web-cypress/cypress/screenshots',
       'web/.eslintcache',
       'web/.lighthouseci',
+      'web/dist',
       'web/public/sitemap.xml',
       'web/storybook-static',
       'web/tmp',

diff --git a/web/Dockerfile b/web/Dockerfile
@@ -5,13 +5,11 @@ FROM base AS builder
 COPY ["web/package.json", "web/package-lock.json", "web/.npmrc", "./"]
 RUN npm ci
 COPY web ./
-# Skip lint check during react-scripts build
-RUN rm -f ./.eslintrc.js \
-  && npm run build \
+RUN npm run build \
   && npm prune --production
 
 FROM docker.io/nginx:1.27.3-alpine AS release
-COPY --from=builder /usr/src/app/build /usr/share/nginx/html
+COPY --from=builder /usr/src/app/dist /usr/share/nginx/html
 COPY web/conf/nginx.conf /etc/nginx/conf.d/default.conf
 EXPOSE 80
 CMD [ "nginx", "-g", "daemon off;" ]
diff --git a/web/lighthouserc.cjs b/web/lighthouserc.cjs
@@ -1,7 +1,7 @@
 module.exports = {
   ci: {
     collect: {
-      staticDistDir: './build',
+      staticDistDir: './dist',
     },
     assert: {
       preset: 'lighthouse:recommended',

diff --git a/web/vite.config.ts b/web/vite.config.ts
@@ -4,9 +4,6 @@ import { defineConfig } from 'vite';
 // https://vite.dev/config
 export default defineConfig({
   plugins: [react()],
-  build: {
-    outDir: 'build',
-  },
   server: {
     port: 62470,
   },