From 9afbf2d8b541dadc3c007fe110d4241edf3a59fb Mon Sep 17 00:00:00 2001 From: Ryo Date: Thu, 7 May 2026 16:39:40 +0800 Subject: [PATCH] chore: bump and clean deps (#6878) * chore: bump and clean deps * fix: action workflow --- .github/workflows/test-fastgpt-pro.yaml | 8 +- .github/workflows/test-fastgpt.yaml | 8 +- .vscode/settings.json | 2 +- package.json | 6 +- packages/global/test/tsconfig.json | 1 - packages/global/vitest.config.ts | 1 - .../opengauss/index.integration.test.ts | 0 packages/service/test/tsconfig.json | 1 - packages/service/vitest.config.ts | 1 - pnpm-lock.yaml | 516 ++++++++++++++++-- pnpm-workspace.yaml | 61 +-- pro | 2 +- projects/app/next.config.ts | 8 +- projects/app/test/tsconfig.json | 4 +- projects/app/vitest.config.ts | 1 - projects/code-sandbox/Dockerfile | 2 +- projects/code-sandbox/package.json | 2 +- projects/code-sandbox/src/utils/logger.ts | 2 +- projects/marketplace/Dockerfile | 2 +- projects/marketplace/package.json | 2 +- projects/marketplace/src/service/logger.ts | 2 +- .../marketplace/test}/env.test.ts | 2 +- projects/marketplace/test/tsconfig.json | 4 +- projects/mcp_server/Dockerfile | 2 +- projects/mcp_server/package.json | 2 +- projects/mcp_server/src/logger.ts | 2 +- test/tsconfig.json | 3 +- vitest.config.mts | 1 - 28 files changed, 517 insertions(+), 131 deletions(-) rename {test/integrationTest => packages/service/test/integrations}/vectorDB/opengauss/index.integration.test.ts (100%) rename {test/marketplace => projects/marketplace/test}/env.test.ts (94%) diff --git a/.github/workflows/test-fastgpt-pro.yaml b/.github/workflows/test-fastgpt-pro.yaml index caaef24f94..316303d1d0 100644 --- a/.github/workflows/test-fastgpt-pro.yaml +++ b/.github/workflows/test-fastgpt-pro.yaml @@ -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" diff --git a/.github/workflows/test-fastgpt.yaml b/.github/workflows/test-fastgpt.yaml index 8ed6c20f77..89507e945e 100644 --- a/.github/workflows/test-fastgpt.yaml +++ b/.github/workflows/test-fastgpt.yaml @@ -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 diff --git a/.vscode/settings.json b/.vscode/settings.json index afbf3f380e..7c8139743f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -35,5 +35,5 @@ "files.associations": { "*.mdx": "markdown" }, - "typescript.tsdk": "node_modules/typescript/lib" + "js/ts.tsdk.path": "node_modules/typescript/lib" } diff --git a/package.json b/package.json index 3512e83355..0a34e3b20a 100644 --- a/package.json +++ b/package.json @@ -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" } diff --git a/packages/global/test/tsconfig.json b/packages/global/test/tsconfig.json index d207a72505..bc2f48de3a 100644 --- a/packages/global/test/tsconfig.json +++ b/packages/global/test/tsconfig.json @@ -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"], diff --git a/packages/global/vitest.config.ts b/packages/global/vitest.config.ts index 1da4b56199..e691f4551f 100644 --- a/packages/global/vitest.config.ts +++ b/packages/global/vitest.config.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'), diff --git a/test/integrationTest/vectorDB/opengauss/index.integration.test.ts b/packages/service/test/integrations/vectorDB/opengauss/index.integration.test.ts similarity index 100% rename from test/integrationTest/vectorDB/opengauss/index.integration.test.ts rename to packages/service/test/integrations/vectorDB/opengauss/index.integration.test.ts diff --git a/packages/service/test/tsconfig.json b/packages/service/test/tsconfig.json index d397f9a8e1..d7b8858b13 100644 --- a/packages/service/test/tsconfig.json +++ b/packages/service/test/tsconfig.json @@ -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"], diff --git a/packages/service/vitest.config.ts b/packages/service/vitest.config.ts index b9c984fb46..05ed9685b1 100644 --- a/packages/service/vitest.config.ts +++ b/packages/service/vitest.config.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'), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0b3e164785..dfde549136 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -169,8 +169,8 @@ catalogs: specifier: ^3.3.0 version: 3.3.0 tsdown: - specifier: 0.21.4 - version: 0.21.4 + specifier: 0.21.10 + version: 0.21.10 tsx: specifier: ^4.20.6 version: 4.20.6 @@ -237,8 +237,8 @@ importers: specifier: 'catalog:' version: 14.1.2(i18next@23.16.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) turbo: - specifier: 2.9.6 - version: 2.9.6 + specifier: 2.9.9 + version: 2.9.9 typescript: specifier: 'catalog:' version: 5.9.3 @@ -1084,9 +1084,9 @@ importers: pro/sso: dependencies: - '@fastgpt-sdk/logger': + '@fastgpt-sdk/otel': specifier: workspace:* - version: link:../../sdk/logger + version: link:../../sdk/otel '@node-saml/node-saml': specifier: ^5.1.0 version: 5.1.0 @@ -1404,9 +1404,9 @@ importers: projects/code-sandbox: dependencies: - '@fastgpt-sdk/logger': - specifier: ^0.1.2 - version: 0.1.2 + '@fastgpt-sdk/otel': + specifier: workspace:* + version: link:../../sdk/otel '@fastgpt/global': specifier: workspace:* version: link:../../packages/global @@ -1464,7 +1464,7 @@ importers: version: 4.1.5(vitest@4.1.5) tsdown: specifier: 'catalog:' - version: 0.21.4(typescript@5.9.3) + version: 0.21.10(typescript@5.9.3) tsx: specifier: 'catalog:' version: 4.20.6 @@ -1495,9 +1495,9 @@ importers: '@chakra-ui/system': specifier: 'catalog:' version: 2.6.1(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.0(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(react@18.3.1) - '@fastgpt-sdk/logger': + '@fastgpt-sdk/otel': specifier: workspace:* - version: link:../../sdk/logger + version: link:../../sdk/otel '@fastgpt/global': specifier: workspace:* version: link:../../packages/global @@ -1568,9 +1568,9 @@ importers: projects/mcp_server: dependencies: - '@fastgpt-sdk/logger': + '@fastgpt-sdk/otel': specifier: workspace:* - version: link:../../sdk/logger + version: link:../../sdk/otel '@fastgpt/global': specifier: workspace:* version: link:../../packages/global @@ -1638,7 +1638,7 @@ importers: version: 20.17.24 tsdown: specifier: 'catalog:' - version: 0.21.4(typescript@5.9.3) + version: 0.21.10(typescript@5.9.3) typescript: specifier: 'catalog:' version: 5.9.3 @@ -1690,7 +1690,7 @@ importers: version: 20.17.24 tsdown: specifier: 'catalog:' - version: 0.21.4(typescript@5.9.3) + version: 0.21.10(typescript@5.9.3) typescript: specifier: 'catalog:' version: 5.9.3 @@ -2135,6 +2135,10 @@ packages: resolution: {integrity: sha512-oCQ1IKPwkzCeJzAPb7Fv8rQ9k5+1sG8mf2uoHiMInPYvkRfrDJxbTIbH51U+jstlkghus0vAi3EBvkfvEsYNLQ==} engines: {node: ^20.19.0 || >=22.12.0} + '@babel/generator@8.0.0-rc.3': + resolution: {integrity: sha512-em37/13/nR320G4jab/nIIHZgc2Wz2y/D39lxnTyxB4/D/omPQncl/lSdlnJY1OhQcRGugTSIF2l/69o31C9dA==} + engines: {node: ^20.19.0 || >=22.12.0} + '@babel/helper-annotate-as-pure@7.25.9': resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==} engines: {node: '>=6.9.0'} @@ -2206,6 +2210,10 @@ packages: resolution: {integrity: sha512-noLx87RwlBEMrTzncWd/FvTxoJ9+ycHNg0n8yyYydIoDsLZuxknKgWRJUqcrVkNrJ74uGyhWQzQaS3q8xfGAhQ==} engines: {node: ^20.19.0 || >=22.12.0} + '@babel/helper-string-parser@8.0.0-rc.4': + resolution: {integrity: sha512-dluR3v287dp6YPF57kyKKrHPKffUeuxH1zQcF1WD30TeFzWXhDiVi1U6PkqaDB0++H1PeCwRhmYl4DvoerlPIw==} + engines: {node: ^20.19.0 || >=22.12.0} + '@babel/helper-validator-identifier@7.28.5': resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==} engines: {node: '>=6.9.0'} @@ -2214,6 +2222,10 @@ packages: resolution: {integrity: sha512-xExUBkuXWJjVuIbO7z6q7/BA9bgfJDEhVL0ggrggLMbg0IzCUWGT1hZGE8qUH7Il7/RD/a6cZ3AAFrrlp1LF/A==} engines: {node: ^20.19.0 || >=22.12.0} + '@babel/helper-validator-identifier@8.0.0-rc.3': + resolution: {integrity: sha512-8AWCJ2VJJyDFlGBep5GpaaQ9AAaE/FjAcrqI7jyssYhtL7WGV0DOKpJsQqM037xDbpRLHXsY8TwU7zDma7coOw==} + engines: {node: ^20.19.0 || >=22.12.0} + '@babel/helper-validator-option@7.25.9': resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==} engines: {node: '>=6.9.0'} @@ -2236,6 +2248,11 @@ packages: engines: {node: ^20.19.0 || >=22.12.0} hasBin: true + '@babel/parser@8.0.0-rc.3': + resolution: {integrity: sha512-B20dvP3MfNc/XS5KKCHy/oyWl5IA6Cn9YjXRdDlCjNmUFrjvLXMNUfQq/QUy9fnG2gYkKKcrto2YaF9B32ToOQ==} + engines: {node: ^20.19.0 || >=22.12.0} + hasBin: true + '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9': resolution: {integrity: sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==} engines: {node: '>=6.9.0'} @@ -2681,6 +2698,10 @@ packages: resolution: {integrity: sha512-91gAaWRznDwSX4E2tZ1YjBuIfnQVOFDCQ2r0Toby0gu4XEbyF623kXLMA8d4ZbCu+fINcrudkmEcwSUHgDDkNw==} engines: {node: ^20.19.0 || >=22.12.0} + '@babel/types@8.0.0-rc.3': + resolution: {integrity: sha512-mOm5ZrYmphGfqVWoH5YYMTITb3cDXsFgmvFlvkvWDMsR9X8RFnt7a0Wb6yNIdoFsiMO9WjYLq+U/FMtqIYAF8Q==} + engines: {node: ^20.19.0 || >=22.12.0} + '@bany/curl-to-json@1.2.8': resolution: {integrity: sha512-hPt9KUM2sGZ5Ojx3O9utjzUgjRZI3CZPAlLf+cRY9EUzVs7tWt1OpA0bhEUTX2PEEkOeyZ6sC0tAQMOHh9ld+Q==} @@ -3024,15 +3045,24 @@ packages: resolution: {integrity: sha512-6yLi0I2/FBhB6beqtuiFMTajB3PHQw+5+apuI3QdEv1Rx8e2Xp0h37SL0Y6tuVJQ2Frp7P3wWT77Wvy6l6OHPA==} engines: {node: '>=20'} + '@emnapi/core@1.10.0': + resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==} + '@emnapi/core@1.7.1': resolution: {integrity: sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==} + '@emnapi/runtime@1.10.0': + resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==} + '@emnapi/runtime@1.8.1': resolution: {integrity: sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==} '@emnapi/wasi-threads@1.1.0': resolution: {integrity: sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==} + '@emnapi/wasi-threads@1.2.1': + resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} + '@emotion/babel-plugin@11.13.5': resolution: {integrity: sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==} @@ -3274,10 +3304,6 @@ packages: resolution: {integrity: sha512-OEl393iCOoo/z8bMezRlJu+GlRGlsKbUAN7jKB6LhnKoqKve5DXRpalbItIIcwnCjs1k/FOPjFzcA6Qn+H+YbA==} engines: {node: '>=18.0.0', npm: '>=9.0.0'} - '@fastgpt-sdk/logger@0.1.2': - resolution: {integrity: sha512-nt1qCq7frcRiR+406vEERWC1vEPVIKPUGH/ZRP/mlBxvNJp1RycWQT8RhK7/tHmW6xPNZoRL/q2WfhM4Q+L7eg==} - engines: {node: '>=20', pnpm: '>=9'} - '@fastgpt-sdk/plugin@0.6.1': resolution: {integrity: sha512-2sut2mgiZmrgJl8A5XPas5mYYyDs9Sdl2E5xF9CmBJuwblSrsdibbxe1lv2saLX5z6vHQ+C/aGb/JjwOGBIocA==} @@ -3940,6 +3966,12 @@ packages: '@napi-rs/wasm-runtime@1.1.1': resolution: {integrity: sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==} + '@napi-rs/wasm-runtime@1.1.4': + resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==} + peerDependencies: + '@emnapi/core': ^1.7.1 + '@emnapi/runtime': ^1.7.1 + '@next/bundle-analyzer@16.1.6': resolution: {integrity: sha512-ee2kagdTaeEWPlotgdTOqFHYcD3e2m2bbE3I9Rq2i6ABYi5OgopmtEUe8NM23viaYxLV2tDH/2nd5+qKoEr6cw==} @@ -4338,6 +4370,9 @@ packages: '@oxc-project/types@0.115.0': resolution: {integrity: sha512-4n91DKnebUS4yjUHl2g3/b2T+IUdCfmoZGhmwsovZCDaJSs+QkVAM+0AqqTxHSsHfeiMuueT75cZaZcT/m0pSw==} + '@oxc-project/types@0.127.0': + resolution: {integrity: sha512-aIYXQBo4lCbO4z0R3FHeucQHpF46l2LbMdxRvqvuRuW2OxdnSkcng5B8+K12spgLDj93rtN3+J2Vac/TIO+ciQ==} + '@oxc-resolver/binding-darwin-arm64@5.0.0': resolution: {integrity: sha512-zwHAf+owoxSWTDD4dFuwW+FkpaDzbaL30H5Ltocb+RmLyg4WKuteusRLKh5Y8b/cyu7UzhxM0haIqQjyqA1iuA==} cpu: [arm64] @@ -4996,36 +5031,73 @@ packages: '@codemirror/state': ^6.0.0 '@codemirror/view': ^6.0.0 + '@rolldown/binding-android-arm64@1.0.0-rc.17': + resolution: {integrity: sha512-s70pVGhw4zqGeFnXWvAzJDlvxhlRollagdCCKRgOsgUOH3N1l0LIxf83AtGzmb5SiVM4Hjl5HyarMRfdfj3DaQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [android] + '@rolldown/binding-android-arm64@1.0.0-rc.9': resolution: {integrity: sha512-lcJL0bN5hpgJfSIz/8PIf02irmyL43P+j1pTCfbD1DbLkmGRuFIA4DD3B3ZOvGqG0XiVvRznbKtN0COQVaKUTg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] + '@rolldown/binding-darwin-arm64@1.0.0-rc.17': + resolution: {integrity: sha512-4ksWc9n0mhlZpZ9PMZgTGjeOPRu8MB1Z3Tz0Mo02eWfWCHMW1zN82Qz/pL/rC+yQa+8ZnutMF0JjJe7PjwasYw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [darwin] + '@rolldown/binding-darwin-arm64@1.0.0-rc.9': resolution: {integrity: sha512-J7Zk3kLYFsLtuH6U+F4pS2sYVzac0qkjcO5QxHS7OS7yZu2LRs+IXo+uvJ/mvpyUljDJ3LROZPoQfgBIpCMhdQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] + '@rolldown/binding-darwin-x64@1.0.0-rc.17': + resolution: {integrity: sha512-SUSDOI6WwUVNcWxd02QEBjLdY1VPHvlEkw6T/8nYG322iYWCTxRb1vzk4E+mWWYehTp7ERibq54LSJGjmouOsw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [darwin] + '@rolldown/binding-darwin-x64@1.0.0-rc.9': resolution: {integrity: sha512-iwtmmghy8nhfRGeNAIltcNXzD0QMNaaA5U/NyZc1Ia4bxrzFByNMDoppoC+hl7cDiUq5/1CnFthpT9n+UtfFyg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] + '@rolldown/binding-freebsd-x64@1.0.0-rc.17': + resolution: {integrity: sha512-hwnz3nw9dbJ05EDO/PvcjaaewqqDy7Y1rn1UO81l8iIK1GjenME75dl16ajbvSSMfv66WXSRCYKIqfgq2KCfxw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [freebsd] + '@rolldown/binding-freebsd-x64@1.0.0-rc.9': resolution: {integrity: sha512-DLFYI78SCiZr5VvdEplsVC2Vx53lnA4/Ga5C65iyldMVaErr86aiqCoNBLl92PXPfDtUYjUh+xFFor40ueNs4Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] + '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.17': + resolution: {integrity: sha512-IS+W7epTcwANmFSQFrS1SivEXHtl1JtuQA9wlxrZTcNi6mx+FDOYrakGevvvTwgj2JvWiK8B29/qD9BELZPyXQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [linux] + '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.9': resolution: {integrity: sha512-CsjTmTwd0Hri6iTw/DRMK7kOZ7FwAkrO4h8YWKoX/kcj833e4coqo2wzIFywtch/8Eb5enQ/lwLM7w6JX1W5RQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] + '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.17': + resolution: {integrity: sha512-e6usGaHKW5BMNZOymS1UcEYGowQMWcgZ71Z17Sl/h2+ZziNJ1a9n3Zvcz6LdRyIW5572wBCTH/Z+bKuZouGk9Q==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + libc: [glibc] + '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.9': resolution: {integrity: sha512-2x9O2JbSPxpxMDhP9Z74mahAStibTlrBMW0520+epJH5sac7/LwZW5Bmg/E6CXuEF53JJFW509uP+lSedaUNxg==} engines: {node: ^20.19.0 || >=22.12.0} @@ -5033,6 +5105,13 @@ packages: os: [linux] libc: [glibc] + '@rolldown/binding-linux-arm64-musl@1.0.0-rc.17': + resolution: {integrity: sha512-b/CgbwAJpmrRLp02RPfhbudf5tZnN9nsPWK82znefso832etkem8H7FSZwxrOI9djcdTP7U6YfNhbRnh7djErg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + libc: [musl] + '@rolldown/binding-linux-arm64-musl@1.0.0-rc.9': resolution: {integrity: sha512-JA1QRW31ogheAIRhIg9tjMfsYbglXXYGNPLdPEYrwFxdbkQCAzvpSCSHCDWNl4hTtrol8WeboCSEpjdZK8qrCg==} engines: {node: ^20.19.0 || >=22.12.0} @@ -5040,6 +5119,13 @@ packages: os: [linux] libc: [musl] + '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.17': + resolution: {integrity: sha512-4EII1iNGRUN5WwGbF/kOh/EIkoDN9HsupgLQoXfY+D1oyJm7/F4t5PYU5n8SWZgG0FEwakyM8pGgwcBYruGTlA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ppc64] + os: [linux] + libc: [glibc] + '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.9': resolution: {integrity: sha512-aOKU9dJheda8Kj8Y3w9gnt9QFOO+qKPAl8SWd7JPHP+Cu0EuDAE5wokQubLzIDQWg2myXq2XhTpOVS07qqvT+w==} engines: {node: ^20.19.0 || >=22.12.0} @@ -5047,6 +5133,13 @@ packages: os: [linux] libc: [glibc] + '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.17': + resolution: {integrity: sha512-AH8oq3XqQo4IibpVXvPeLDI5pzkpYn0WiZAfT05kFzoJ6tQNzwRdDYQ45M8I/gslbodRZwW8uxLhbSBbkv96rA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [s390x] + os: [linux] + libc: [glibc] + '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.9': resolution: {integrity: sha512-OalO94fqj7IWRn3VdXWty75jC5dk4C197AWEuMhIpvVv2lw9fiPhud0+bW2ctCxb3YoBZor71QHbY+9/WToadA==} engines: {node: ^20.19.0 || >=22.12.0} @@ -5054,6 +5147,13 @@ packages: os: [linux] libc: [glibc] + '@rolldown/binding-linux-x64-gnu@1.0.0-rc.17': + resolution: {integrity: sha512-cLnjV3xfo7KslbU41Z7z8BH/E1y5mzUYzAqih1d1MDaIGZRCMqTijqLv76/P7fyHuvUcfGsIpqCdddbxLLK9rA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + libc: [glibc] + '@rolldown/binding-linux-x64-gnu@1.0.0-rc.9': resolution: {integrity: sha512-cVEl1vZtBsBZna3YMjGXNvnYYrOJ7RzuWvZU0ffvJUexWkukMaDuGhUXn0rjnV0ptzGVkvc+vW9Yqy6h8YX4pg==} engines: {node: ^20.19.0 || >=22.12.0} @@ -5061,6 +5161,13 @@ packages: os: [linux] libc: [glibc] + '@rolldown/binding-linux-x64-musl@1.0.0-rc.17': + resolution: {integrity: sha512-0phclDw1spsL7dUB37sIARuis2tAgomCJXAHZlpt8PXZ4Ba0dRP1e+66lsRqrfhISeN9bEGNjQs+T/Fbd7oYGw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + libc: [musl] + '@rolldown/binding-linux-x64-musl@1.0.0-rc.9': resolution: {integrity: sha512-UzYnKCIIc4heAKgI4PZ3dfBGUZefGCJ1TPDuLHoCzgrMYPb5Rv6TLFuYtyM4rWyHM7hymNdsg5ik2C+UD9VDbA==} engines: {node: ^20.19.0 || >=22.12.0} @@ -5068,29 +5175,55 @@ packages: os: [linux] libc: [musl] + '@rolldown/binding-openharmony-arm64@1.0.0-rc.17': + resolution: {integrity: sha512-0ag/hEgXOwgw4t8QyQvUCxvEg+V0KBcA6YuOx9g0r02MprutRF5dyljgm3EmR02O292UX7UeS6HzWHAl6KgyhA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [openharmony] + '@rolldown/binding-openharmony-arm64@1.0.0-rc.9': resolution: {integrity: sha512-+6zoiF+RRyf5cdlFQP7nm58mq7+/2PFaY2DNQeD4B87N36JzfF/l9mdBkkmTvSYcYPE8tMh/o3cRlsx1ldLfog==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] + '@rolldown/binding-wasm32-wasi@1.0.0-rc.17': + resolution: {integrity: sha512-LEXei6vo0E5wTGwpkJ4KoT3OZJRnglwldt5ziLzOlc6qqb55z4tWNq2A+PFqCJuvWWdP53CVhG1Z9NtToDPJrA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [wasm32] + '@rolldown/binding-wasm32-wasi@1.0.0-rc.9': resolution: {integrity: sha512-rgFN6sA/dyebil3YTlL2evvi/M+ivhfnyxec7AccTpRPccno/rPoNlqybEZQBkcbZu8Hy+eqNJCqfBR8P7Pg8g==} engines: {node: '>=14.0.0'} cpu: [wasm32] + '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.17': + resolution: {integrity: sha512-gUmyzBl3SPMa6hrqFUth9sVfcLBlYsbMzBx5PlexMroZStgzGqlZ26pYG89rBb45Mnia+oil6YAIFeEWGWhoZA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [win32] + '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.9': resolution: {integrity: sha512-lHVNUG/8nlF1IQk1C0Ci574qKYyty2goMiPlRqkC5R+3LkXDkL5Dhx8ytbxq35m+pkHVIvIxviD+TWLdfeuadA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] + '@rolldown/binding-win32-x64-msvc@1.0.0-rc.17': + resolution: {integrity: sha512-3hkiolcUAvPB9FLb3UZdfjVVNWherN1f/skkGWJP/fgSQhYUZpSIRr0/I8ZK9TkF3F7kxvJAk0+IcKvPHk9qQg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [win32] + '@rolldown/binding-win32-x64-msvc@1.0.0-rc.9': resolution: {integrity: sha512-G0oA4+w1iY5AGi5HcDTxWsoxF509hrFIPB2rduV5aDqS9FtDg1CAfa7V34qImbjfhIcA8C+RekocJZA96EarwQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] + '@rolldown/pluginutils@1.0.0-rc.17': + resolution: {integrity: sha512-n8iosDOt6Ig1UhJ2AYqoIhHWh/isz0xpicHTzpKBeotdVsTEcxsSA/i3EVM7gQAj0rU27OLAxCjzlj15IWY7bg==} + '@rolldown/pluginutils@1.0.0-rc.9': resolution: {integrity: sha512-w6oiRWgEBl04QkFZgmW+jnU1EC9b57Oihi2ot3HNWIQRqgHp5PnYDia5iZ5FF7rpa4EQdiqMDXjlqKGXBhsoXw==} @@ -6008,33 +6141,33 @@ packages: resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==} engines: {node: '>=10.13.0'} - '@turbo/darwin-64@2.9.6': - resolution: {integrity: sha512-X/56SnVXIQZBLKwniGTwEQTGmtE5brSACnKMBWpY3YafuxVYefrC2acamfjgxP7BG5w3I+6jf0UrLoSzgPcSJg==} + '@turbo/darwin-64@2.9.9': + resolution: {integrity: sha512-hTEiNu2ABZZOO1qbjnKASI8eF3BdOOzU6iKv5w5uGOK65DDMc10cS40N1kqM99YT0uSAGUwNu6GdFctRPeEeVA==} cpu: [x64] os: [darwin] - '@turbo/darwin-arm64@2.9.6': - resolution: {integrity: sha512-aalBeSl4agT/QtYGDyf/XLajedWzUC9Vg/pm/YO6QQ93vkQ91Vz5uK1ta5RbVRDozQSz4njxUNqRNmOXDzW+qw==} + '@turbo/darwin-arm64@2.9.9': + resolution: {integrity: sha512-MinO40EEcP5mJiTVpfjtEulsEBhVeryfq21QhYtJZ8hQJLHGgy459rcmDVAY8/JERe4dkVU4KW+zoLF22o01EA==} cpu: [arm64] os: [darwin] - '@turbo/linux-64@2.9.6': - resolution: {integrity: sha512-YKi05jnNHaD7vevgYwahpzGwbsNNTwzU2c7VZdmdFm7+cGDP4oREUWSsainiMfRqjRuolQxBwRn8wf1jmu+YZA==} + '@turbo/linux-64@2.9.9': + resolution: {integrity: sha512-7JNLw88Isk+gMlbsC8pulLDkrqe2B827ZsKFEHilb17AC6Xn/62pzH7afjY7fEU6Ayp4XP/vGhlRWOzqBvBvIQ==} cpu: [x64] os: [linux] - '@turbo/linux-arm64@2.9.6': - resolution: {integrity: sha512-02o/ZS69cOYEDczXvOB2xmyrtzjQ2hVFtWZK1iqxXUfzMmTjZK4UumrfNnjckSg+gqeBfnPRHa0NstA173Ik3g==} + '@turbo/linux-arm64@2.9.9': + resolution: {integrity: sha512-0pnXDwPw1rHii98JZPRg7SvsjIzy7jrhkwGU9Jy5fVYoMdYd3P2vbtLfII+OJ0Mm4Ar5yykdHDTz3RWiRI1o9g==} cpu: [arm64] os: [linux] - '@turbo/windows-64@2.9.6': - resolution: {integrity: sha512-wVdQjvnBI15wB6JrA+43CtUtagjIMmX6XYO758oZHAsCNSxqRlJtdyujih0D8OCnwCRWiGWGI63zAxR0hO6s9g==} + '@turbo/windows-64@2.9.9': + resolution: {integrity: sha512-vjDQycz4gQVvIq4n2rPtiiIESwJlAc406qtkiZlqyL+fHZEd9SxYNlBIFYtc5cuMuwrk+sIKrhN7XvwjmvS9YQ==} cpu: [x64] os: [win32] - '@turbo/windows-arm64@2.9.6': - resolution: {integrity: sha512-1XUUyWW0W6FTSqGEhU8RHVqb2wP1SPkr7hIvBlMEwH9jr+sJQK5kqeosLJ/QaUv4ecSAd1ZhIrLoW7qslAzT4A==} + '@turbo/windows-arm64@2.9.9': + resolution: {integrity: sha512-V6NiH43oCctepbOdQFp7UjqLyK8p6Tt824QA+G4TE+B1BBHu80A0W8OCL+H7uBJ3XZjAj/hvPDw3k3l65DoDGw==} cpu: [arm64] os: [win32] @@ -8072,6 +8205,9 @@ packages: defu@6.1.4: resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==} + defu@6.1.7: + resolution: {integrity: sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==} + degenerator@3.0.4: resolution: {integrity: sha512-Z66uPeBfHZAHVmue3HPfyKu2Q0rC2cRxbTOsvmU/po5fvvcx27W4mIu9n0PUlQih4oUYvcG1BsbtVv8x7KDOSw==} engines: {node: '>= 6'} @@ -9071,6 +9207,9 @@ packages: get-tsconfig@4.13.6: resolution: {integrity: sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw==} + get-tsconfig@4.14.0: + resolution: {integrity: sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==} + get-uri@3.0.2: resolution: {integrity: sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==} engines: {node: '>= 6'} @@ -9322,6 +9461,9 @@ packages: hookable@6.1.0: resolution: {integrity: sha512-ZoKZSJgu8voGK2geJS+6YtYjvIzu9AOM/KZXsBxr83uhLL++e9pEv/dlgwgy3dvHg06kTz6JOh1hk3C8Ceiymw==} + hookable@6.1.1: + resolution: {integrity: sha512-U9LYDy1CwhMCnprUfeAZWZGByVbhd54hwepegYTK7Pi5NvqEj63ifz5z+xukznehT7i6NIZRu89Ay1AZmRsLEQ==} + hpagent@1.2.0: resolution: {integrity: sha512-A91dYTeIB6NoXG+PxTQpCCDDnfHsW9kc06Lvpu1TEe9gnd6ZFeiBoRO9JvzEv6xK7EX97/dUE8g/vBMTqTS3CA==} engines: {node: '>=14'} @@ -9480,6 +9622,10 @@ packages: resolution: {integrity: sha512-B6Lc2s6yApwnD2/pMzFh/d5AVjdsDXjgkeJ766FmFuJELIGHNycKRj+l3A39yZPM4CchqNCB4RITEAYB1KUM6A==} engines: {node: '>=20.19.0'} + import-without-cache@0.3.3: + resolution: {integrity: sha512-bDxwDdF04gm550DfZHgffvlX+9kUlcz32UD0AeBTmVPFiWkrexF2XVmiuFFbDhiFuP8fQkrkvI2KdSNPYWAXkQ==} + engines: {node: '>=20.19.0'} + imurmurhash@0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} @@ -11589,6 +11735,10 @@ packages: resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} engines: {node: '>=12'} + picomatch@4.0.4: + resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==} + engines: {node: '>=12'} + pidtree@0.6.0: resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==} engines: {node: '>=0.10'} @@ -12430,6 +12580,30 @@ packages: vue-tsc: optional: true + rolldown-plugin-dts@0.23.2: + resolution: {integrity: sha512-PbSqLawLgZBGcOGT3yqWBGn4cX+wh2nt5FuBGdcMHyOhoukmjbhYAl8NT9sE4U38Cm9tqLOIQeOrvzeayM0DLQ==} + engines: {node: '>=20.19.0'} + peerDependencies: + '@ts-macro/tsc': ^0.3.6 + '@typescript/native-preview': '>=7.0.0-dev.20260325.1' + rolldown: ^1.0.0-rc.12 + typescript: ^5.0.0 || ^6.0.0 + vue-tsc: ~3.2.0 + peerDependenciesMeta: + '@ts-macro/tsc': + optional: true + '@typescript/native-preview': + optional: true + typescript: + optional: true + vue-tsc: + optional: true + + rolldown@1.0.0-rc.17: + resolution: {integrity: sha512-ZrT53oAKrtA4+YtBWPQbtPOxIbVDbxT0orcYERKd63VJTF13zPcgXTvD4843L8pcsI7M6MErt8QtON6lrB9tyA==} + engines: {node: ^20.19.0 || >=22.12.0} + hasBin: true + rolldown@1.0.0-rc.9: resolution: {integrity: sha512-9EbgWge7ZH+yqb4d2EnELAntgPTWbfL8ajiTW+SyhJEC4qhBbkCKbqFV4Ge4zmu5ziQuVbWxb/XwLZ+RIO7E8Q==} engines: {node: ^20.19.0 || >=22.12.0} @@ -13102,10 +13276,18 @@ packages: resolution: {integrity: sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw==} engines: {node: '>=18'} + tinyexec@1.1.2: + resolution: {integrity: sha512-dAqSqE/RabpBKI8+h26GfLq6Vb3JVXs30XYQjdMjaj/c2tS8IYYMbIzP599KtRj7c57/wYApb3QjgRgXmrCukA==} + engines: {node: '>=18'} + tinyglobby@0.2.15: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} + tinyglobby@0.2.16: + resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==} + engines: {node: '>=12.0.0'} + tinyrainbow@3.1.0: resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} engines: {node: '>=14.0.0'} @@ -13211,6 +13393,34 @@ packages: tsconfig-paths@3.15.0: resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==} + tsdown@0.21.10: + resolution: {integrity: sha512-3wk73yBhZe/wX7REqSdivNQ84TDs1mJ+IlnzrrEREP70xlJ/AEIzqaI04l/TzMKVIdkTdC3CPaADn2Lk/0SkdA==} + engines: {node: '>=20.19.0'} + hasBin: true + peerDependencies: + '@arethetypeswrong/core': ^0.18.1 + '@tsdown/css': 0.21.10 + '@tsdown/exe': 0.21.10 + '@vitejs/devtools': '*' + publint: ^0.3.0 + typescript: ^5.0.0 || ^6.0.0 + unplugin-unused: ^0.5.0 + peerDependenciesMeta: + '@arethetypeswrong/core': + optional: true + '@tsdown/css': + optional: true + '@tsdown/exe': + optional: true + '@vitejs/devtools': + optional: true + publint: + optional: true + typescript: + optional: true + unplugin-unused: + optional: true + tsdown@0.21.4: resolution: {integrity: sha512-Q/kBi8SXkr4X6JI/NAZKZY1UuiEcbuXtIskL4tZCsgpDiEPM/2W6lC+OonNA31S+V3KsWedFvbFDBs23hvt+Aw==} engines: {node: '>=20.19.0'} @@ -13263,8 +13473,8 @@ packages: tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} - turbo@2.9.6: - resolution: {integrity: sha512-+v2QJey7ZUeUiuigkU+uFfklvNUyPI2VO2vBpMYJA+a1hKFLFiKtUYlRHdb3P9CrAvMzi0upbjI4WT+zKtqkBg==} + turbo@2.9.9: + resolution: {integrity: sha512-3xfzXE/yTjhh0S5dIWlE+3E+J9A09REpLI1ZqVh2+HrNZoVzZn0pkvjiRgVK/Ev3PF9XnaTwCntTx+CADWXcyA==} hasBin: true turndown@7.2.0: @@ -13480,6 +13690,16 @@ packages: synckit: optional: true + unrun@0.2.37: + resolution: {integrity: sha512-AA7vDuYsgeSYVzJMm16UKA+aXFKhy7nFqW9z5l7q44K4ppFWZAMqYS58ePRZbugMLPH0fwwMzD5A8nP0avxwZQ==} + engines: {node: '>=20.19.0'} + hasBin: true + peerDependencies: + synckit: ^0.11.11 + peerDependenciesMeta: + synckit: + optional: true + update-browserslist-db@1.2.3: resolution: {integrity: sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==} hasBin: true @@ -15180,6 +15400,15 @@ snapshots: '@types/jsesc': 2.5.1 jsesc: 3.1.0 + '@babel/generator@8.0.0-rc.3': + dependencies: + '@babel/parser': 8.0.0-rc.3 + '@babel/types': 8.0.0-rc.3 + '@jridgewell/gen-mapping': 0.3.13 + '@jridgewell/trace-mapping': 0.3.31 + '@types/jsesc': 2.5.1 + jsesc: 3.1.0 + '@babel/helper-annotate-as-pure@7.25.9': dependencies: '@babel/types': 7.29.0 @@ -15281,10 +15510,14 @@ snapshots: '@babel/helper-string-parser@8.0.0-rc.2': {} + '@babel/helper-string-parser@8.0.0-rc.4': {} + '@babel/helper-validator-identifier@7.28.5': {} '@babel/helper-validator-identifier@8.0.0-rc.2': {} + '@babel/helper-validator-identifier@8.0.0-rc.3': {} + '@babel/helper-validator-option@7.25.9': {} '@babel/helper-wrap-function@7.25.9': @@ -15308,6 +15541,10 @@ snapshots: dependencies: '@babel/types': 8.0.0-rc.2 + '@babel/parser@8.0.0-rc.3': + dependencies: + '@babel/types': 8.0.0-rc.3 + '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -15874,6 +16111,11 @@ snapshots: '@babel/helper-string-parser': 8.0.0-rc.2 '@babel/helper-validator-identifier': 8.0.0-rc.2 + '@babel/types@8.0.0-rc.3': + dependencies: + '@babel/helper-string-parser': 8.0.0-rc.4 + '@babel/helper-validator-identifier': 8.0.0-rc.3 + '@bany/curl-to-json@1.2.8': dependencies: minimist: 1.2.8 @@ -16476,12 +16718,23 @@ snapshots: dependencies: e2b: 2.18.0 + '@emnapi/core@1.10.0': + dependencies: + '@emnapi/wasi-threads': 1.2.1 + tslib: 2.8.1 + optional: true + '@emnapi/core@1.7.1': dependencies: '@emnapi/wasi-threads': 1.1.0 tslib: 2.8.1 optional: true + '@emnapi/runtime@1.10.0': + dependencies: + tslib: 2.8.1 + optional: true + '@emnapi/runtime@1.8.1': dependencies: tslib: 2.8.1 @@ -16492,6 +16745,11 @@ snapshots: tslib: 2.8.1 optional: true + '@emnapi/wasi-threads@1.2.1': + dependencies: + tslib: 2.8.1 + optional: true + '@emotion/babel-plugin@11.13.5': dependencies: '@babel/helper-module-imports': 7.25.9 @@ -16688,17 +16946,6 @@ snapshots: '@faker-js/faker@9.9.0': {} - '@fastgpt-sdk/logger@0.1.2': - dependencies: - '@logtape/logtape': 2.0.2 - '@logtape/pretty': 2.0.2(@logtape/logtape@2.0.2) - '@opentelemetry/api': 1.9.0 - '@opentelemetry/api-logs': 0.203.0 - '@opentelemetry/exporter-logs-otlp-http': 0.203.0(@opentelemetry/api@1.9.0) - '@opentelemetry/resources': 2.6.0(@opentelemetry/api@1.9.0) - '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0) - '@opentelemetry/semantic-conventions': 1.39.0 - '@fastgpt-sdk/plugin@0.6.1': dependencies: '@fortaine/fetch-event-source': 3.0.6 @@ -17445,6 +17692,13 @@ snapshots: '@tybys/wasm-util': 0.10.1 optional: true + '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': + dependencies: + '@emnapi/core': 1.10.0 + '@emnapi/runtime': 1.10.0 + '@tybys/wasm-util': 0.10.1 + optional: true + '@next/bundle-analyzer@16.1.6(bufferutil@4.1.0)(utf-8-validate@5.0.10)': dependencies: webpack-bundle-analyzer: 4.10.1(bufferutil@4.1.0)(utf-8-validate@5.0.10) @@ -17797,6 +18051,8 @@ snapshots: '@oxc-project/types@0.115.0': {} + '@oxc-project/types@0.127.0': {} + '@oxc-resolver/binding-darwin-arm64@5.0.0': optional: true @@ -18492,53 +18748,104 @@ snapshots: '@codemirror/state': 6.5.2 '@codemirror/view': 6.38.6 + '@rolldown/binding-android-arm64@1.0.0-rc.17': + optional: true + '@rolldown/binding-android-arm64@1.0.0-rc.9': optional: true + '@rolldown/binding-darwin-arm64@1.0.0-rc.17': + optional: true + '@rolldown/binding-darwin-arm64@1.0.0-rc.9': optional: true + '@rolldown/binding-darwin-x64@1.0.0-rc.17': + optional: true + '@rolldown/binding-darwin-x64@1.0.0-rc.9': optional: true + '@rolldown/binding-freebsd-x64@1.0.0-rc.17': + optional: true + '@rolldown/binding-freebsd-x64@1.0.0-rc.9': optional: true + '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.17': + optional: true + '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.9': optional: true + '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.17': + optional: true + '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.9': optional: true + '@rolldown/binding-linux-arm64-musl@1.0.0-rc.17': + optional: true + '@rolldown/binding-linux-arm64-musl@1.0.0-rc.9': optional: true + '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.17': + optional: true + '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.9': optional: true + '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.17': + optional: true + '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.9': optional: true + '@rolldown/binding-linux-x64-gnu@1.0.0-rc.17': + optional: true + '@rolldown/binding-linux-x64-gnu@1.0.0-rc.9': optional: true + '@rolldown/binding-linux-x64-musl@1.0.0-rc.17': + optional: true + '@rolldown/binding-linux-x64-musl@1.0.0-rc.9': optional: true + '@rolldown/binding-openharmony-arm64@1.0.0-rc.17': + optional: true + '@rolldown/binding-openharmony-arm64@1.0.0-rc.9': optional: true + '@rolldown/binding-wasm32-wasi@1.0.0-rc.17': + dependencies: + '@emnapi/core': 1.10.0 + '@emnapi/runtime': 1.10.0 + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) + optional: true + '@rolldown/binding-wasm32-wasi@1.0.0-rc.9': dependencies: '@napi-rs/wasm-runtime': 1.1.1 optional: true + '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.17': + optional: true + '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.9': optional: true + '@rolldown/binding-win32-x64-msvc@1.0.0-rc.17': + optional: true + '@rolldown/binding-win32-x64-msvc@1.0.0-rc.9': optional: true + '@rolldown/pluginutils@1.0.0-rc.17': {} + '@rolldown/pluginutils@1.0.0-rc.9': {} '@rollup/rollup-android-arm-eabi@4.35.0': @@ -19856,22 +20163,22 @@ snapshots: '@trysound/sax@0.2.0': {} - '@turbo/darwin-64@2.9.6': + '@turbo/darwin-64@2.9.9': optional: true - '@turbo/darwin-arm64@2.9.6': + '@turbo/darwin-arm64@2.9.9': optional: true - '@turbo/linux-64@2.9.6': + '@turbo/linux-64@2.9.9': optional: true - '@turbo/linux-arm64@2.9.6': + '@turbo/linux-arm64@2.9.9': optional: true - '@turbo/windows-64@2.9.6': + '@turbo/windows-64@2.9.9': optional: true - '@turbo/windows-arm64@2.9.6': + '@turbo/windows-arm64@2.9.9': optional: true '@tybys/wasm-util@0.10.1': @@ -22225,6 +22532,8 @@ snapshots: defu@6.1.4: {} + defu@6.1.7: {} + degenerator@3.0.4: dependencies: ast-types: 0.13.4 @@ -23090,6 +23399,10 @@ snapshots: optionalDependencies: picomatch: 4.0.3 + fdir@6.5.0(picomatch@4.0.4): + optionalDependencies: + picomatch: 4.0.4 + fecha@4.2.3: {} fetch-blob@3.2.0: @@ -23525,6 +23838,10 @@ snapshots: dependencies: resolve-pkg-maps: 1.0.0 + get-tsconfig@4.14.0: + dependencies: + resolve-pkg-maps: 1.0.0 + get-uri@3.0.2: dependencies: '@tootallnate/once': 1.1.2 @@ -23945,6 +24262,8 @@ snapshots: hookable@6.1.0: {} + hookable@6.1.1: {} + hpagent@1.2.0: {} html-encoding-sniffer@4.0.0: @@ -24120,6 +24439,8 @@ snapshots: import-without-cache@0.2.5: {} + import-without-cache@0.3.3: {} + imurmurhash@0.1.4: {} inflight@1.0.6: @@ -26716,6 +27037,8 @@ snapshots: picomatch@4.0.3: {} + picomatch@4.0.4: {} + pidtree@0.6.0: {} pify@2.3.0: {} @@ -27783,6 +28106,45 @@ snapshots: transitivePeerDependencies: - oxc-resolver + rolldown-plugin-dts@0.23.2(rolldown@1.0.0-rc.17)(typescript@5.9.3): + dependencies: + '@babel/generator': 8.0.0-rc.3 + '@babel/helper-validator-identifier': 8.0.0-rc.3 + '@babel/parser': 8.0.0-rc.3 + '@babel/types': 8.0.0-rc.3 + ast-kit: 3.0.0-beta.1 + birpc: 4.0.0 + dts-resolver: 2.1.3 + get-tsconfig: 4.14.0 + obug: 2.1.1 + picomatch: 4.0.4 + rolldown: 1.0.0-rc.17 + optionalDependencies: + typescript: 5.9.3 + transitivePeerDependencies: + - oxc-resolver + + rolldown@1.0.0-rc.17: + dependencies: + '@oxc-project/types': 0.127.0 + '@rolldown/pluginutils': 1.0.0-rc.17 + optionalDependencies: + '@rolldown/binding-android-arm64': 1.0.0-rc.17 + '@rolldown/binding-darwin-arm64': 1.0.0-rc.17 + '@rolldown/binding-darwin-x64': 1.0.0-rc.17 + '@rolldown/binding-freebsd-x64': 1.0.0-rc.17 + '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-rc.17 + '@rolldown/binding-linux-arm64-gnu': 1.0.0-rc.17 + '@rolldown/binding-linux-arm64-musl': 1.0.0-rc.17 + '@rolldown/binding-linux-ppc64-gnu': 1.0.0-rc.17 + '@rolldown/binding-linux-s390x-gnu': 1.0.0-rc.17 + '@rolldown/binding-linux-x64-gnu': 1.0.0-rc.17 + '@rolldown/binding-linux-x64-musl': 1.0.0-rc.17 + '@rolldown/binding-openharmony-arm64': 1.0.0-rc.17 + '@rolldown/binding-wasm32-wasi': 1.0.0-rc.17 + '@rolldown/binding-win32-arm64-msvc': 1.0.0-rc.17 + '@rolldown/binding-win32-x64-msvc': 1.0.0-rc.17 + rolldown@1.0.0-rc.9: dependencies: '@oxc-project/types': 0.115.0 @@ -28634,11 +28996,18 @@ snapshots: tinyexec@1.0.4: {} + tinyexec@1.1.2: {} + tinyglobby@0.2.15: dependencies: fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 + tinyglobby@0.2.16: + dependencies: + fdir: 6.5.0(picomatch@4.0.4) + picomatch: 4.0.4 + tinyrainbow@3.1.0: {} tldts-core@6.1.86: {} @@ -28723,6 +29092,33 @@ snapshots: minimist: 1.2.8 strip-bom: 3.0.0 + tsdown@0.21.10(typescript@5.9.3): + dependencies: + ansis: 4.2.0 + cac: 7.0.0 + defu: 6.1.7 + empathic: 2.0.0 + hookable: 6.1.1 + import-without-cache: 0.3.3 + obug: 2.1.1 + picomatch: 4.0.4 + rolldown: 1.0.0-rc.17 + rolldown-plugin-dts: 0.23.2(rolldown@1.0.0-rc.17)(typescript@5.9.3) + semver: 7.7.4 + tinyexec: 1.1.2 + tinyglobby: 0.2.16 + tree-kill: 1.2.2 + unconfig-core: 7.5.0 + unrun: 0.2.37 + optionalDependencies: + typescript: 5.9.3 + transitivePeerDependencies: + - '@ts-macro/tsc' + - '@typescript/native-preview' + - oxc-resolver + - synckit + - vue-tsc + tsdown@0.21.4(typescript@5.9.3): dependencies: ansis: 4.2.0 @@ -28773,14 +29169,14 @@ snapshots: dependencies: safe-buffer: 5.2.1 - turbo@2.9.6: + turbo@2.9.9: optionalDependencies: - '@turbo/darwin-64': 2.9.6 - '@turbo/darwin-arm64': 2.9.6 - '@turbo/linux-64': 2.9.6 - '@turbo/linux-arm64': 2.9.6 - '@turbo/windows-64': 2.9.6 - '@turbo/windows-arm64': 2.9.6 + '@turbo/darwin-64': 2.9.9 + '@turbo/darwin-arm64': 2.9.9 + '@turbo/linux-64': 2.9.9 + '@turbo/linux-arm64': 2.9.9 + '@turbo/windows-64': 2.9.9 + '@turbo/windows-arm64': 2.9.9 turndown@7.2.0: dependencies: @@ -29021,6 +29417,10 @@ snapshots: dependencies: rolldown: 1.0.0-rc.9 + unrun@0.2.37: + dependencies: + rolldown: 1.0.0-rc.17 + update-browserslist-db@1.2.3(browserslist@4.28.2): dependencies: browserslist: 4.28.2 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index c685da3beb..1bea94d312 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -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 diff --git a/pro b/pro index a10974c0a7..1fb505fba6 160000 --- a/pro +++ b/pro @@ -1 +1 @@ -Subproject commit a10974c0a73ca45f4e041738e5adb227923e289c +Subproject commit 1fb505fba68f8a4a34b5840281500d540b381450 diff --git a/projects/app/next.config.ts b/projects/app/next.config.ts index 0c5aef52db..3820313570 100644 --- a/projects/app/next.config.ts +++ b/projects/app/next.config.ts @@ -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 diff --git a/projects/app/test/tsconfig.json b/projects/app/test/tsconfig.json index 11e0d5ca2e..a999045ddc 100644 --- a/projects/app/test/tsconfig.json +++ b/projects/app/test/tsconfig.json @@ -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"], diff --git a/projects/app/vitest.config.ts b/projects/app/vitest.config.ts index 95b16cd501..87a241bf3e 100644 --- a/projects/app/vitest.config.ts +++ b/projects/app/vitest.config.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'), diff --git a/projects/code-sandbox/Dockerfile b/projects/code-sandbox/Dockerfile index d03a0d1121..f20c8b5302 100644 --- a/projects/code-sandbox/Dockerfile +++ b/projects/code-sandbox/Dockerfile @@ -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 diff --git a/projects/code-sandbox/package.json b/projects/code-sandbox/package.json index 30dd4b4584..2833c4129d 100644 --- a/projects/code-sandbox/package.json +++ b/projects/code-sandbox/package.json @@ -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:", diff --git a/projects/code-sandbox/src/utils/logger.ts b/projects/code-sandbox/src/utils/logger.ts index e278358829..44f58b0cfc 100644 --- a/projects/code-sandbox/src/utils/logger.ts +++ b/projects/code-sandbox/src/utils/logger.ts @@ -1,4 +1,4 @@ -import { configureLoggerFromEnv, getLogger } from '@fastgpt-sdk/logger'; +import { configureLoggerFromEnv, getLogger } from '@fastgpt-sdk/otel/logger'; export const LogCategories = { MODULE: { diff --git a/projects/marketplace/Dockerfile b/projects/marketplace/Dockerfile index a133ed308e..d83c555174 100644 --- a/projects/marketplace/Dockerfile +++ b/projects/marketplace/Dockerfile @@ -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 ----------- diff --git a/projects/marketplace/package.json b/projects/marketplace/package.json index 78e6e2df27..98faa78756 100644 --- a/projects/marketplace/package.json +++ b/projects/marketplace/package.json @@ -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:", diff --git a/projects/marketplace/src/service/logger.ts b/projects/marketplace/src/service/logger.ts index 8590ac5f4d..9341fbb8c8 100644 --- a/projects/marketplace/src/service/logger.ts +++ b/projects/marketplace/src/service/logger.ts @@ -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, diff --git a/test/marketplace/env.test.ts b/projects/marketplace/test/env.test.ts similarity index 94% rename from test/marketplace/env.test.ts rename to projects/marketplace/test/env.test.ts index 670839481c..4fa974e8c8 100644 --- a/test/marketplace/env.test.ts +++ b/projects/marketplace/test/env.test.ts @@ -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', () => { diff --git a/projects/marketplace/test/tsconfig.json b/projects/marketplace/test/tsconfig.json index ecd10d4d22..3cc93b43e5 100644 --- a/projects/marketplace/test/tsconfig.json +++ b/projects/marketplace/test/tsconfig.json @@ -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"], diff --git a/projects/mcp_server/Dockerfile b/projects/mcp_server/Dockerfile index 15a9133d2a..9cfb5cc090 100644 --- a/projects/mcp_server/Dockerfile +++ b/projects/mcp_server/Dockerfile @@ -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 diff --git a/projects/mcp_server/package.json b/projects/mcp_server/package.json index 3857387596..b8aa14ba63 100644 --- a/projects/mcp_server/package.json +++ b/projects/mcp_server/package.json @@ -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:", diff --git a/projects/mcp_server/src/logger.ts b/projects/mcp_server/src/logger.ts index 343ae67f9b..100cf7c765 100644 --- a/projects/mcp_server/src/logger.ts +++ b/projects/mcp_server/src/logger.ts @@ -1,4 +1,4 @@ -import { configureLoggerFromEnv, getLogger } from '@fastgpt-sdk/logger'; +import { configureLoggerFromEnv, getLogger } from '@fastgpt-sdk/otel/logger'; export const LogCategories = { MODULE: { diff --git a/test/tsconfig.json b/test/tsconfig.json index 7c2d9aead3..9e3b3cb441 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -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"] } diff --git a/vitest.config.mts b/vitest.config.mts index d7f995d362..8e4788db12 100644 --- a/vitest.config.mts +++ b/vitest.config.mts @@ -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'),