diff --git a/apps/shared/OpenClawKit/Tools/CanvasA2UI/rolldown.config.mjs b/apps/shared/OpenClawKit/Tools/CanvasA2UI/rolldown.config.mjs index bd8677d5f0c..98256ced706 100644 --- a/apps/shared/OpenClawKit/Tools/CanvasA2UI/rolldown.config.mjs +++ b/apps/shared/OpenClawKit/Tools/CanvasA2UI/rolldown.config.mjs @@ -1,10 +1,10 @@ import path from "node:path"; -import { existsSync } from "node:fs"; import { fileURLToPath } from "node:url"; import { defineConfig } from "rolldown"; const here = path.dirname(fileURLToPath(import.meta.url)); const repoRoot = path.resolve(here, "../../../../.."); +const uiRoot = path.resolve(repoRoot, "ui"); const fromHere = (p) => path.resolve(here, p); const outputFile = path.resolve( here, @@ -17,17 +17,6 @@ const outputFile = path.resolve( const a2uiLitDist = path.resolve(repoRoot, "vendor/a2ui/renderers/lit/dist/src"); const a2uiThemeContext = path.resolve(a2uiLitDist, "0.8/ui/context/theme.js"); -const a2uiNodeModules = path.resolve(repoRoot, "ui/node_modules"); -const rootNodeModules = path.resolve(repoRoot, "node_modules"); - -const resolveA2uiDep = (pkg, rel = "") => { - const uiPath = path.resolve(a2uiNodeModules, pkg, rel); - if (existsSync(uiPath)) { - return uiPath; - } - - return path.resolve(rootNodeModules, pkg, rel); -}; export default defineConfig({ input: fromHere("bootstrap.js"), @@ -40,13 +29,12 @@ export default defineConfig({ "@a2ui/lit": path.resolve(a2uiLitDist, "index.js"), "@a2ui/lit/ui": path.resolve(a2uiLitDist, "0.8/ui/ui.js"), "@openclaw/a2ui-theme-context": a2uiThemeContext, - "@lit/context": resolveA2uiDep("@lit/context", "index.js"), - "@lit/context/": resolveA2uiDep("@lit/context"), - "@lit-labs/signals": resolveA2uiDep("@lit-labs/signals", "index.js"), - "@lit-labs/signals/": resolveA2uiDep("@lit-labs/signals"), - lit: resolveA2uiDep("lit", "index.js"), - "lit/": resolveA2uiDep("lit"), - "signal-utils/": resolveA2uiDep("signal-utils"), + "@lit/context": path.resolve(uiRoot, "node_modules/@lit/context/index.js"), + "@lit/context/": path.resolve(uiRoot, "node_modules/@lit/context/"), + "@lit-labs/signals": path.resolve(uiRoot, "node_modules/@lit-labs/signals/index.js"), + "@lit-labs/signals/": path.resolve(uiRoot, "node_modules/@lit-labs/signals/"), + lit: path.resolve(uiRoot, "node_modules/lit/index.js"), + "lit/": path.resolve(uiRoot, "node_modules/lit/"), }, }, output: { diff --git a/extensions/msteams/package.json b/extensions/msteams/package.json index b39c6bdb459..ebd598988bb 100644 --- a/extensions/msteams/package.json +++ b/extensions/msteams/package.json @@ -5,8 +5,6 @@ "type": "module", "dependencies": { "@microsoft/agents-hosting": "^1.2.3", - "@microsoft/agents-hosting-express": "^1.2.3", - "@microsoft/agents-hosting-extensions-teams": "^1.2.3", "express": "^5.2.1" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 83ef0ba64b9..d3802bcae26 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -405,12 +405,6 @@ importers: '@microsoft/agents-hosting': specifier: ^1.2.3 version: 1.2.3 - '@microsoft/agents-hosting-express': - specifier: ^1.2.3 - version: 1.2.3 - '@microsoft/agents-hosting-extensions-teams': - specifier: ^1.2.3 - version: 1.2.3 express: specifier: ^5.2.1 version: 5.2.1 @@ -1561,14 +1555,6 @@ packages: resolution: {integrity: sha512-XRQF+AVn6f9sGDUsfDQFiwLtmqqWNhM9JIwZRzK9XQLPTQmoWwjoWz8KMKc5fuvj5Ybly3974VrqYUbDOeMyTg==} engines: {node: '>=20.0.0'} - '@microsoft/agents-hosting-express@1.2.3': - resolution: {integrity: sha512-aBgvyDJ+3ifeUKy/56qQuLJPAizN9UfGV3/1GVrhmyAqUKvphusK3LMxiRTpHDhAaUvuzFOr1AJ8XiRhOl9l3w==} - engines: {node: '>=20.0.0'} - - '@microsoft/agents-hosting-extensions-teams@1.2.3': - resolution: {integrity: sha512-fZcn8JcU50VfjBgz6jTlCRiQReAZzj2f2Atudwa+ymxJQhfBb7NToJcY7OdLqM8hlnQhzAg71HJtGhPR/L2p1g==} - engines: {node: '>=20.0.0'} - '@microsoft/agents-hosting@1.2.3': resolution: {integrity: sha512-8paXuxdbRc9X6tccYoR3lk0DSglt1SxpJG+6qDa8TVTuGiTvIuhnN4st9JZhIiazxPiFPTJAkhK5JSsOk+wLVQ==} engines: {node: '>=20.0.0'} @@ -7402,21 +7388,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@microsoft/agents-hosting-express@1.2.3': - dependencies: - '@microsoft/agents-hosting': 1.2.3 - express: 5.2.1 - transitivePeerDependencies: - - debug - - supports-color - - '@microsoft/agents-hosting-extensions-teams@1.2.3': - dependencies: - '@microsoft/agents-hosting': 1.2.3 - transitivePeerDependencies: - - debug - - supports-color - '@microsoft/agents-hosting@1.2.3': dependencies: '@azure/core-auth': 1.10.1 diff --git a/scripts/bundle-a2ui.sh b/scripts/bundle-a2ui.sh index ff85dd044f8..3278e1d35a3 100755 --- a/scripts/bundle-a2ui.sh +++ b/scripts/bundle-a2ui.sh @@ -89,7 +89,7 @@ pnpm -s exec tsc -p "$A2UI_RENDERER_DIR/tsconfig.json" if command -v rolldown >/dev/null 2>&1; then rolldown -c "$A2UI_APP_DIR/rolldown.config.mjs" else - pnpm dlx "rolldown@1.0.0-rc.5" -c "$A2UI_APP_DIR/rolldown.config.mjs" + pnpm -s dlx rolldown -c "$A2UI_APP_DIR/rolldown.config.mjs" fi echo "$current_hash" > "$HASH_FILE"