admin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: revert classic/mt to Tailwind v3, exclude default workspace in Docker build
Docker Build / Build and Push Docker Image (push) Failing after 2m29s
Details

Browse Source
This commit is contained in:
admin
2026-06-14 10:25:47 +08:00
parent 9bbd99ad56
commit 87d0b42c2e
9 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+2 -4
View File
@@ -14,10 +14,9 @@ FROM oven/bun:1@sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2
WORKDIR /build/web
COPY web/package.json web/bun.lock ./
COPY web/default/package.json ./default/package.json
COPY web/classic/package.json ./classic/package.json
COPY web/mt/package.json ./mt/package.json
RUN bun install
RUN sed -i '/"default",/d' package.json && bun install
COPY ./web/classic ./classic
COPY ./VERSION /build/VERSION
RUN cd classic && VITE_REACT_APP_VERSION=$(cat /build/VERSION) bun run build
@@ -26,10 +25,9 @@ FROM oven/bun:1@sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2
WORKDIR /build/web
COPY web/package.json web/bun.lock ./
COPY web/default/package.json ./default/package.json
COPY web/classic/package.json ./classic/package.json
COPY web/mt/package.json ./mt/package.json
RUN bun install
RUN sed -i '/"default",/d' package.json && bun install
COPY ./web/mt ./mt
COPY ./VERSION /build/VERSION
RUN cd mt && VITE_REACT_APP_VERSION=$(cat /build/VERSION) bun run build
web/bun.lock
Vendored
+6 -4
View File
@@ -52,14 +52,15 @@
"@rsbuild/core": "^2.0.7",
"@rsbuild/plugin-react": "^2.0.0",
"@so1ve/prettier-config": "^3.1.0",
"@tailwindcss/postcss": "^4.3.0",
"autoprefixer": "^10.4.21",
"eslint": "8.57.0",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-react-hooks": "^5.2.0",
"i18next-cli": "^1.10.3",
"postcss": "^8.5.3",
"prettier": "catalog:",
"prop-types": "^15.8.1",
"tailwindcss": "^4.3.0",
"tailwindcss": "^3",
"typescript": "4.4.2",
},
},
@@ -110,14 +111,15 @@
"@rsbuild/core": "^2.0.7",
"@rsbuild/plugin-react": "^2.0.0",
"@so1ve/prettier-config": "^3.1.0",
"@tailwindcss/postcss": "^4.3.0",
"autoprefixer": "^10.4.21",
"eslint": "8.57.0",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-react-hooks": "^5.2.0",
"i18next-cli": "^1.10.3",
"postcss": "^8.5.3",
"prettier": "catalog:",
"prop-types": "^15.8.1",
"tailwindcss": "^4.3.0",
"tailwindcss": "^3",
"typescript": "4.4.2",
},
},
web/classic/package.json
Vendored
+3 -2
View File
@@ -78,14 +78,15 @@
"@rsbuild/core": "^2.0.7",
"@rsbuild/plugin-react": "^2.0.0",
"@so1ve/prettier-config": "^3.1.0",
"@tailwindcss/postcss": "^4.3.0",
"autoprefixer": "^10.4.21",
"eslint": "8.57.0",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-react-hooks": "^5.2.0",
"i18next-cli": "^1.10.3",
"postcss": "^8.5.3",
"prettier": "catalog:",
"prop-types": "^15.8.1",
"tailwindcss": "^4.3.0",
"tailwindcss": "^3",
"typescript": "4.4.2"
},
"prettier": {
web/classic/postcss.config.js
Vendored
+2 -1
View File
@@ -19,6 +19,7 @@ For commercial licensing, please contact support@quantumnous.com
export default {
plugins: {
'@tailwindcss/postcss': {},
tailwindcss: {},
autoprefixer: {},
},
};
web/classic/src/index.css
Vendored
+13 -2
View File
@@ -1,6 +1,17 @@
/* ==================== Tailwind CSS 配置 ==================== */
@import "tailwindcss";
@config "./tailwind.config.js";
@layer tailwind-base, semi, tailwind-components, tailwind-utils;
@layer tailwind-base {
@tailwind base;
}
@layer tailwind-components {
@tailwind components;
}
@layer tailwind-utils {
@tailwind utilities;
}
/* ==================== 全局基础样式 ==================== */
:root {
web/mt/package.json
Vendored
+3 -2
View File
@@ -78,14 +78,15 @@
"@rsbuild/core": "^2.0.7",
"@rsbuild/plugin-react": "^2.0.0",
"@so1ve/prettier-config": "^3.1.0",
"@tailwindcss/postcss": "^4.3.0",
"autoprefixer": "^10.4.21",
"eslint": "8.57.0",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-react-hooks": "^5.2.0",
"i18next-cli": "^1.10.3",
"postcss": "^8.5.3",
"prettier": "catalog:",
"prop-types": "^15.8.1",
"tailwindcss": "^4.3.0",
"tailwindcss": "^3",
"typescript": "4.4.2"
},
"prettier": {
web/mt/postcss.config.js
Vendored
+2 -1
View File
@@ -19,6 +19,7 @@ For commercial licensing, please contact support@quantumnous.com
export default {
plugins: {
'@tailwindcss/postcss': {},
tailwindcss: {},
autoprefixer: {},
},
};
web/mt/src/index.css
Vendored
+13 -2
View File
@@ -1,6 +1,17 @@
/* ==================== Tailwind CSS 配置 ==================== */
@import "tailwindcss";
@config "./tailwind.config.js";
@layer tailwind-base, semi, tailwind-components, tailwind-utils;
@layer tailwind-base {
@tailwind base;
}
@layer tailwind-components {
@tailwind components;
}
@layer tailwind-utils {
@tailwind utilities;
}
/* ==================== 全局基础样式 ==================== */
:root {
web/pnpm-lock.yaml
Generated Vendored
+9
View File
@@ -0,0 +1,9 @@
lockfileVersion: '9.0'
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
importers:
.: {}