mirror of
https://github.com/labring/FastGPT.git
synced 2026-05-08 01:08:43 +08:00
chore: bump and clean deps (#6878)
* chore: bump and clean deps * fix: action workflow
This commit is contained in:
@@ -20,7 +20,9 @@ concurrency:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
if: ${{ github.event_name != 'pull_request_target' || contains(fromJSON('["COLLABORATOR", "OWNER"]'), github.event.pull_request.author_association) }}
|
||||
if: ${{ github.event_name != 'pull_request_target' ||
|
||||
contains(fromJSON('["COLLABORATOR", "OWNER"]'),
|
||||
github.event.pull_request.author_association) }}
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
permissions:
|
||||
@@ -53,9 +55,9 @@ jobs:
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
with:
|
||||
version: 10.33.2
|
||||
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: "24"
|
||||
|
||||
@@ -25,8 +25,6 @@ jobs:
|
||||
github.repository }}
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
with:
|
||||
version: 10.33.2
|
||||
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
@@ -48,7 +46,8 @@ jobs:
|
||||
- name: "Report Coverage (Global)"
|
||||
# Set if: always() to also generate the report if tests are failing
|
||||
# Only works if you set `reportOnFailure: true` in your vite config as specified above
|
||||
if: always() && hashFiles('packages/global/coverage/coverage-summary.json') != ''
|
||||
if: always() && hashFiles('packages/global/coverage/coverage-summary.json') !=
|
||||
''
|
||||
uses: davelosert/vitest-coverage-report-action@v2
|
||||
with:
|
||||
name: global
|
||||
@@ -56,7 +55,8 @@ jobs:
|
||||
json-summary-path: packages/global/coverage/coverage-summary.json
|
||||
|
||||
- name: "Report Coverage (Service)"
|
||||
if: always() && hashFiles('packages/service/coverage/coverage-summary.json') != ''
|
||||
if: always() && hashFiles('packages/service/coverage/coverage-summary.json') !=
|
||||
''
|
||||
uses: davelosert/vitest-coverage-report-action@v2
|
||||
with:
|
||||
name: service
|
||||
|
||||
Vendored
+1
-1
@@ -35,5 +35,5 @@
|
||||
"files.associations": {
|
||||
"*.mdx": "markdown"
|
||||
},
|
||||
"typescript.tsdk": "node_modules/typescript/lib"
|
||||
"js/ts.tsdk.path": "node_modules/typescript/lib"
|
||||
}
|
||||
|
||||
+3
-3
@@ -23,7 +23,7 @@
|
||||
"test:service": "turbo run test --filter=@fastgpt/service",
|
||||
"test:service:integration": "turbo run test:integration --filter=@fastgpt/service",
|
||||
"test:vector": "turbo run test:integration --filter=@fastgpt/service",
|
||||
"build:sdks": "pnpm -r --filter @fastgpt-sdk/storage --filter @fastgpt-sdk/logger --filter @fastgpt-sdk/otel build"
|
||||
"build:sdks": "pnpm -r --filter @fastgpt-sdk/storage --filter @fastgpt-sdk/otel build"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@chakra-ui/cli": "^2.4.1",
|
||||
@@ -40,7 +40,7 @@
|
||||
"next-i18next": "catalog:",
|
||||
"prettier": "3.2.4",
|
||||
"react-i18next": "catalog:",
|
||||
"turbo": "2.9.6",
|
||||
"turbo": "2.9.9",
|
||||
"typescript": "catalog:",
|
||||
"vitest": "catalog:"
|
||||
},
|
||||
@@ -65,5 +65,5 @@
|
||||
"node": ">=20",
|
||||
"pnpm": "10.x"
|
||||
},
|
||||
"packageManager": "pnpm@10.33.2"
|
||||
"packageManager": "pnpm@10.33.4"
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
"baseUrl": "..",
|
||||
"paths": {
|
||||
"@/*": ["../../packages/*"],
|
||||
"@fastgpt-sdk/logger": ["../../sdk/logger/src/index.ts"],
|
||||
"@fastgpt-sdk/storage": ["../../sdk/storage/src/index.ts"],
|
||||
"@fastgpt-sdk/otel": ["../../sdk/otel/src/index.ts"],
|
||||
"@fastgpt-sdk/otel/logger": ["../../sdk/otel/src/logger-entry.ts"],
|
||||
|
||||
@@ -5,7 +5,6 @@ export default defineConfig({
|
||||
resolve: {
|
||||
alias: {
|
||||
'@': resolve('..'),
|
||||
'@fastgpt-sdk/logger': resolve('../../sdk/logger/src/index.ts'),
|
||||
'@fastgpt-sdk/storage': resolve('../../sdk/storage/src/index.ts'),
|
||||
'@fastgpt-sdk/otel/logger': resolve('../../sdk/otel/src/logger-entry.ts'),
|
||||
'@fastgpt-sdk/otel/metrics': resolve('../../sdk/otel/src/metrics-entry.ts'),
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
"baseUrl": "..",
|
||||
"paths": {
|
||||
"@/*": ["../../projects/app/src/*"],
|
||||
"@fastgpt-sdk/logger": ["../../sdk/logger/src/index.ts"],
|
||||
"@fastgpt-sdk/storage": ["../../sdk/storage/src/index.ts"],
|
||||
"@fastgpt-sdk/otel": ["../../sdk/otel/src/index.ts"],
|
||||
"@fastgpt-sdk/otel/logger": ["../../sdk/otel/src/logger-entry.ts"],
|
||||
|
||||
@@ -5,7 +5,6 @@ export default defineConfig({
|
||||
resolve: {
|
||||
alias: {
|
||||
'@': resolve('../../projects/app/src'),
|
||||
'@fastgpt-sdk/logger': resolve('../../sdk/logger/src/index.ts'),
|
||||
'@fastgpt-sdk/storage': resolve('../../sdk/storage/src/index.ts'),
|
||||
'@fastgpt-sdk/otel/logger': resolve('../../sdk/otel/src/logger-entry.ts'),
|
||||
'@fastgpt-sdk/otel/metrics': resolve('../../sdk/otel/src/metrics-entry.ts'),
|
||||
|
||||
Generated
+458
-58
File diff suppressed because it is too large
Load Diff
+29
-32
@@ -13,35 +13,32 @@ packages:
|
||||
- sdk/*
|
||||
|
||||
catalog:
|
||||
'@fastgpt-sdk/logger': 0.1.2
|
||||
'@fastgpt-sdk/otel': 0.1.2
|
||||
'@fastgpt-sdk/storage': 0.6.15
|
||||
'@modelcontextprotocol/sdk': ^1
|
||||
'@node-rs/jieba': 2.0.1
|
||||
'@svgr/webpack': ^6.5.1
|
||||
'@t3-oss/env-core': 0.13.10
|
||||
'@tanstack/react-query': ^4.24.10
|
||||
'@types/js-yaml': ^4.0.9
|
||||
'@types/jsonwebtoken': ^9.0.3
|
||||
'@types/lodash': ^4
|
||||
'@types/mime-types': ^3.0.1
|
||||
'@types/node': ^20
|
||||
'@types/react': ^18
|
||||
'@types/react-dom': ^18
|
||||
'@types/request-ip': ^0.0.38
|
||||
'@types/proxy-addr': 2.0.3
|
||||
'@typescript-eslint/eslint-plugin': ^6.21.0
|
||||
'@typescript-eslint/parser': ^6.21.0
|
||||
'@vitest/coverage-v8': ^4.1.5
|
||||
"@modelcontextprotocol/sdk": ^1
|
||||
"@node-rs/jieba": 2.0.1
|
||||
"@svgr/webpack": ^6.5.1
|
||||
"@t3-oss/env-core": 0.13.10
|
||||
"@tanstack/react-query": ^4.24.10
|
||||
"@types/js-yaml": ^4.0.9
|
||||
"@types/jsonwebtoken": ^9.0.3
|
||||
"@types/lodash": ^4
|
||||
"@types/mime-types": ^3.0.1
|
||||
"@types/node": ^20
|
||||
"@types/react": ^18
|
||||
"@types/react-dom": ^18
|
||||
"@types/request-ip": ^0.0.38
|
||||
"@types/proxy-addr": 2.0.3
|
||||
"@typescript-eslint/eslint-plugin": ^6.21.0
|
||||
"@typescript-eslint/parser": ^6.21.0
|
||||
"@vitest/coverage-v8": ^4.1.5
|
||||
"@chakra-ui/anatomy": ^2
|
||||
"@chakra-ui/icons": ^2
|
||||
"@chakra-ui/next-js": ^2
|
||||
"@chakra-ui/react": ^2
|
||||
"@chakra-ui/styled-system": ^2
|
||||
"@chakra-ui/system": ^2
|
||||
"@emotion/react": ^11
|
||||
"@emotion/styled": ^11
|
||||
ahooks: ^3.9.5
|
||||
'@chakra-ui/anatomy': ^2
|
||||
'@chakra-ui/icons': ^2
|
||||
'@chakra-ui/next-js': ^2
|
||||
'@chakra-ui/react': ^2
|
||||
'@chakra-ui/styled-system': ^2
|
||||
'@chakra-ui/system': ^2
|
||||
'@emotion/react': ^11
|
||||
'@emotion/styled': ^11
|
||||
axios: ^1.16.0
|
||||
ipaddr.js: ^2.4.0
|
||||
chalk: ^5.6.2
|
||||
@@ -74,14 +71,14 @@ catalog:
|
||||
recharts: ^2.15.0
|
||||
remark-gfm: ^4.0.1
|
||||
request-ip: ^3.3.0
|
||||
tsdown: 0.21.4
|
||||
tsdown: 0.21.10
|
||||
tsx: ^4.20.6
|
||||
typescript: ^5.9.3
|
||||
vitest: ^4.1.5
|
||||
zod: ^4
|
||||
|
||||
onlyBuiltDependencies:
|
||||
- '@parcel/watcher'
|
||||
- "@parcel/watcher"
|
||||
- bufferutil
|
||||
- canvas
|
||||
- core-js
|
||||
@@ -95,7 +92,7 @@ onlyBuiltDependencies:
|
||||
- vue-demi
|
||||
|
||||
overrides:
|
||||
'@types/react': ^18
|
||||
'@types/react-dom': ^18
|
||||
"@types/react": ^18
|
||||
"@types/react-dom": ^18
|
||||
react: ^18
|
||||
react-dom: ^18
|
||||
|
||||
+1
-1
Submodule pro updated: a10974c0a7...1fb505fba6
@@ -4,8 +4,6 @@ import path from 'path';
|
||||
import { webEnv } from '@fastgpt/web/env';
|
||||
import { appEnv } from './src/env';
|
||||
|
||||
const basePath = webEnv.NEXT_PUBLIC_BASE_URL || undefined;
|
||||
|
||||
const securityHeaders = [
|
||||
{
|
||||
key: 'X-Frame-Options',
|
||||
@@ -39,7 +37,7 @@ const optimizedPackageImports = [
|
||||
];
|
||||
|
||||
const nextConfig: NextConfig = {
|
||||
basePath,
|
||||
basePath: webEnv.NEXT_PUBLIC_BASE_URL || undefined,
|
||||
env: {
|
||||
SYSTEM_NAME: appEnv.SYSTEM_NAME,
|
||||
SYSTEM_DESCRIPTION: appEnv.SYSTEM_DESCRIPTION,
|
||||
@@ -95,10 +93,6 @@ const nextConfig: NextConfig = {
|
||||
// Exclude build-time-only packages from standalone output file tracing
|
||||
outputFileTracingExcludes: {
|
||||
'*': [
|
||||
// Rspack bindings - only used in dev, not needed at runtime
|
||||
'node_modules/@next/rspack-binding-*/**',
|
||||
'node_modules/@rspack/binding-*/**',
|
||||
'node_modules/next-rspack/**',
|
||||
// GNU platform binaries - Alpine uses musl only
|
||||
'node_modules/**/*-linux-x64-gnu*/**',
|
||||
// typescript - build-time only
|
||||
|
||||
@@ -17,15 +17,15 @@
|
||||
"baseUrl": ".",
|
||||
"paths": {
|
||||
"@/*": ["../src/*"],
|
||||
"@fastgpt-sdk/logger": ["../../../sdk/logger/src/index.ts"],
|
||||
"@fastgpt-sdk/storage": ["../../../sdk/storage/src/index.ts"],
|
||||
"@fastgpt-sdk/otel": ["../../../sdk/otel/src/index.ts"],
|
||||
"@fastgpt-sdk/otel/logger": ["../../../sdk/otel/src/logger-entry.ts"],
|
||||
"@fastgpt-sdk/otel/metrics": ["../../../sdk/otel/src/metrics-entry.ts"],
|
||||
"@fastgpt-sdk/otel/tracing": ["../../../sdk/otel/src/tracing-entry.ts"],
|
||||
"@fastgpt/*": ["../../../packages/*"],
|
||||
"@test/*": ["../../../test/*"],
|
||||
|
||||
"#fastgpt/app/test/*": ["./*"],
|
||||
"@test/*": ["../../../test/*"]
|
||||
}
|
||||
},
|
||||
"include": ["**/*.test.ts"],
|
||||
|
||||
@@ -5,7 +5,6 @@ export default defineConfig({
|
||||
resolve: {
|
||||
alias: {
|
||||
'@': resolve('src'),
|
||||
'@fastgpt-sdk/logger': resolve('../../sdk/logger/src/index.ts'),
|
||||
'@fastgpt-sdk/storage': resolve('../../sdk/storage/src/index.ts'),
|
||||
'@fastgpt-sdk/otel/logger': resolve('../../sdk/otel/src/logger-entry.ts'),
|
||||
'@fastgpt-sdk/otel/metrics': resolve('../../sdk/otel/src/metrics-entry.ts'),
|
||||
|
||||
@@ -25,7 +25,7 @@ RUN if [ -z "$proxy" ]; then \
|
||||
fi
|
||||
|
||||
# 先构建 SDK workspace 包,确保 dist 入口可被打包工具解析
|
||||
RUN pnpm --filter @fastgpt-sdk/logger --filter @fastgpt-sdk/otel --filter @fastgpt-sdk/storage build
|
||||
RUN pnpm --filter @fastgpt-sdk/otel --filter @fastgpt-sdk/storage build
|
||||
|
||||
# 编译主入口文件
|
||||
RUN cd /app/projects/code-sandbox && pnpm build
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
"pnpm": "10.x"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fastgpt-sdk/logger": "^0.1.2",
|
||||
"@fastgpt-sdk/otel": "workspace:*",
|
||||
"@hono/node-server": "^1.13.7",
|
||||
"@fastgpt/global": "workspace:*",
|
||||
"@t3-oss/env-core": "catalog:",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { configureLoggerFromEnv, getLogger } from '@fastgpt-sdk/logger';
|
||||
import { configureLoggerFromEnv, getLogger } from '@fastgpt-sdk/otel/logger';
|
||||
|
||||
export const LogCategories = {
|
||||
MODULE: {
|
||||
|
||||
@@ -43,7 +43,7 @@ RUN apk add --no-cache libc6-compat && npm install -g pnpm@10.33.2
|
||||
|
||||
ENV NODE_OPTIONS="--max-old-space-size=4096"
|
||||
ENV NEXT_PUBLIC_BASE_URL=$base_url
|
||||
RUN pnpm --filter @fastgpt-sdk/logger --filter @fastgpt-sdk/otel --filter @fastgpt-sdk/storage build
|
||||
RUN pnpm --filter @fastgpt-sdk/otel --filter @fastgpt-sdk/storage build
|
||||
RUN pnpm --filter=marketplace build
|
||||
|
||||
# --------- runner -----------
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
"@chakra-ui/styled-system": "catalog:",
|
||||
"@chakra-ui/system": "catalog:",
|
||||
"@fastgpt/global": "workspace:*",
|
||||
"@fastgpt-sdk/logger": "workspace:*",
|
||||
"@fastgpt-sdk/otel": "workspace:*",
|
||||
"@fastgpt/service": "workspace:*",
|
||||
"@fastgpt/web": "workspace:*",
|
||||
"@t3-oss/env-core": "catalog:",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { configureLoggerFromEnv, getLogger } from '@fastgpt-sdk/logger';
|
||||
import { configureLoggerFromEnv, getLogger } from '@fastgpt-sdk/otel/logger';
|
||||
|
||||
export const LogCategories = {
|
||||
SYSTEM: ['system'] as const,
|
||||
|
||||
@@ -4,7 +4,7 @@ const originalSyncIndex = process.env.SYNC_INDEX;
|
||||
|
||||
const importEnv = async () => {
|
||||
vi.resetModules();
|
||||
return import('../../projects/marketplace/src/env');
|
||||
return import('../src/env');
|
||||
};
|
||||
|
||||
describe('marketplace env', () => {
|
||||
@@ -17,15 +17,15 @@
|
||||
"baseUrl": ".",
|
||||
"paths": {
|
||||
"@/*": ["../src/*"],
|
||||
"@fastgpt-sdk/logger": ["../../../sdk/logger/src/index.ts"],
|
||||
"@fastgpt-sdk/storage": ["../../../sdk/storage/src/index.ts"],
|
||||
"@fastgpt-sdk/otel": ["../../../sdk/otel/src/index.ts"],
|
||||
"@fastgpt-sdk/otel/logger": ["../../../sdk/otel/src/logger-entry.ts"],
|
||||
"@fastgpt-sdk/otel/metrics": ["../../../sdk/otel/src/metrics-entry.ts"],
|
||||
"@fastgpt-sdk/otel/tracing": ["../../../sdk/otel/src/tracing-entry.ts"],
|
||||
"@fastgpt/*": ["../../../packages/*"],
|
||||
"@test/*": ["../../../test/*"],
|
||||
|
||||
"#fastgpt/marketplace/test/*": ["./*"],
|
||||
"@test/*": ["../../../test/*"]
|
||||
}
|
||||
},
|
||||
"include": ["**/*.test.ts"],
|
||||
|
||||
@@ -48,7 +48,7 @@ RUN apk add --no-cache libc6-compat curl bash && npm install -g pnpm@10.33.2
|
||||
RUN curl -fsSL https://bun.sh/install | bash
|
||||
ENV PATH="/root/.bun/bin:$PATH"
|
||||
|
||||
RUN pnpm --filter @fastgpt-sdk/logger build
|
||||
RUN pnpm --filter @fastgpt-sdk/otel build
|
||||
RUN pnpm --filter=@fastgpt/mcp_server build
|
||||
|
||||
# runner
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@fastgpt/global": "workspace:*",
|
||||
"@fastgpt-sdk/logger": "workspace:*",
|
||||
"@fastgpt-sdk/otel": "workspace:*",
|
||||
"@modelcontextprotocol/sdk": "catalog:",
|
||||
"@t3-oss/env-core": "catalog:",
|
||||
"chalk": "catalog:",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { configureLoggerFromEnv, getLogger } from '@fastgpt-sdk/logger';
|
||||
import { configureLoggerFromEnv, getLogger } from '@fastgpt-sdk/otel/logger';
|
||||
|
||||
export const LogCategories = {
|
||||
MODULE: {
|
||||
|
||||
+1
-2
@@ -3,7 +3,6 @@
|
||||
"compilerOptions": {
|
||||
"baseUrl": "..",
|
||||
"paths": {
|
||||
"@fastgpt-sdk/logger": ["sdk/logger/src/index.ts"],
|
||||
"@fastgpt-sdk/storage": ["sdk/storage/src/index.ts"],
|
||||
"@fastgpt-sdk/otel": ["sdk/otel/src/index.ts"],
|
||||
"@fastgpt-sdk/otel/logger": ["sdk/otel/src/logger-entry.ts"],
|
||||
@@ -29,7 +28,7 @@
|
||||
"../packages/**/*.tsx",
|
||||
"../packages/**/*.d.ts",
|
||||
"../projects/app/src/**/*.ts",
|
||||
"../projects/app/src/**/*.tsx"
|
||||
"../projects/app/src/**/*"
|
||||
],
|
||||
"exclude": ["node_modules", "../node_modules", "dist", "../dist"]
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@ export default defineConfig({
|
||||
resolve: {
|
||||
alias: {
|
||||
'@': resolve('projects/app/src'),
|
||||
'@fastgpt-sdk/logger': resolve('sdk/logger/src/index.ts'),
|
||||
'@fastgpt-sdk/storage': resolve('sdk/storage/src/index.ts'),
|
||||
'@fastgpt-sdk/otel/logger': resolve('sdk/otel/src/logger-entry.ts'),
|
||||
'@fastgpt-sdk/otel/metrics': resolve('sdk/otel/src/metrics-entry.ts'),
|
||||
|
||||
Reference in New Issue
Block a user