mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-06 05:40:44 +00:00
fix(release): resolve staged runtime deps in boundary loaders
This commit is contained in:
@@ -3,6 +3,10 @@ import path from "node:path";
|
||||
import { bundledDistPluginFile } from "openclaw/plugin-sdk/test-fixtures";
|
||||
import { afterEach, describe, expect, it } from "vitest";
|
||||
import { stageBundledPluginRuntime } from "../../scripts/stage-bundled-plugin-runtime.mjs";
|
||||
import {
|
||||
clearBundledRuntimeDependencyJitiAliases,
|
||||
registerBundledRuntimeDependencyJitiAliases,
|
||||
} from "./bundled-runtime-deps-jiti-aliases.js";
|
||||
import type { PluginJitiLoaderCache } from "./jiti-loader-cache.js";
|
||||
import { loadPluginBoundaryModuleWithJiti } from "./runtime/runtime-plugin-boundary.js";
|
||||
import { cleanupTrackedTempDirs, makeTrackedTempDir } from "./test-helpers/fs-fixtures.js";
|
||||
@@ -119,6 +123,7 @@ function expectSharedWhatsAppListenerState(runtimePluginDir: string, accountId:
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
clearBundledRuntimeDependencyJitiAliases();
|
||||
cleanupTrackedTempDirs(tempDirs);
|
||||
});
|
||||
|
||||
@@ -126,4 +131,77 @@ describe("runtime plugin boundary whatsapp seam", () => {
|
||||
it("shares listener state between staged light and heavy runtime modules", () => {
|
||||
expectSharedWhatsAppListenerState(createBundledWhatsAppRuntimeFixture(), "work");
|
||||
});
|
||||
|
||||
it("resolves staged root runtime dependency aliases while loading boundary modules", () => {
|
||||
const packageRoot = makeTrackedTempDir("openclaw-runtime-boundary-alias", tempDirs);
|
||||
const stageRoot = makeTrackedTempDir("openclaw-runtime-boundary-deps", tempDirs);
|
||||
writeRuntimeFixtureText(
|
||||
packageRoot,
|
||||
"package.json",
|
||||
JSON.stringify(
|
||||
{
|
||||
name: "openclaw",
|
||||
type: "module",
|
||||
bin: {
|
||||
openclaw: "openclaw.mjs",
|
||||
},
|
||||
exports: {
|
||||
"./plugin-sdk": {
|
||||
default: "./dist/plugin-sdk/index.js",
|
||||
},
|
||||
},
|
||||
},
|
||||
null,
|
||||
2,
|
||||
),
|
||||
);
|
||||
writeRuntimeFixtureText(packageRoot, "openclaw.mjs", "export {};\n");
|
||||
writeRuntimeFixtureText(
|
||||
packageRoot,
|
||||
bundledDistPluginFile("acpx", "runtime-api.js"),
|
||||
'export { marker } from "../../root-runtime-chunk.js";\n',
|
||||
);
|
||||
writeRuntimeFixtureText(
|
||||
packageRoot,
|
||||
"dist/root-runtime-chunk.js",
|
||||
'import { marker as depMarker } from "package-only-runtime-dep";\nexport const marker = depMarker;\n',
|
||||
);
|
||||
stageBundledPluginRuntime({ repoRoot: packageRoot });
|
||||
|
||||
writeRuntimeFixtureText(
|
||||
stageRoot,
|
||||
"package.json",
|
||||
JSON.stringify({
|
||||
dependencies: {
|
||||
"package-only-runtime-dep": "1.0.0",
|
||||
},
|
||||
}),
|
||||
);
|
||||
writeRuntimeFixtureText(
|
||||
stageRoot,
|
||||
"node_modules/package-only-runtime-dep/package.json",
|
||||
JSON.stringify({
|
||||
name: "package-only-runtime-dep",
|
||||
version: "1.0.0",
|
||||
exports: {
|
||||
".": "./index.js",
|
||||
},
|
||||
type: "module",
|
||||
}),
|
||||
);
|
||||
writeRuntimeFixtureText(
|
||||
stageRoot,
|
||||
"node_modules/package-only-runtime-dep/index.js",
|
||||
'export const marker = "staged-runtime-dep";\n',
|
||||
);
|
||||
registerBundledRuntimeDependencyJitiAliases(stageRoot);
|
||||
|
||||
const loaders: PluginJitiLoaderCache = new Map();
|
||||
const loaded = loadPluginBoundaryModuleWithJiti<{ marker: string }>(
|
||||
path.join(packageRoot, "dist-runtime", "extensions", "acpx", "runtime-api.js"),
|
||||
loaders,
|
||||
);
|
||||
|
||||
expect(loaded.marker).toBe("staged-runtime-dep");
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import fs from "node:fs";
|
||||
import path from "node:path";
|
||||
import { getRuntimeConfig } from "../../config/config.js";
|
||||
import { resolveBundledRuntimeDependencyJitiAliasMap } from "../bundled-runtime-deps-jiti-aliases.js";
|
||||
import { getCachedPluginJitiLoader, type PluginJitiLoaderCache } from "../jiti-loader-cache.js";
|
||||
import { loadPluginManifestRegistry } from "../manifest-registry.js";
|
||||
import { shouldPreferNativeJiti } from "../sdk-alias.js";
|
||||
import { buildPluginLoaderAliasMap, shouldPreferNativeJiti } from "../sdk-alias.js";
|
||||
|
||||
type PluginRuntimeRecord = {
|
||||
origin?: string;
|
||||
@@ -107,11 +108,20 @@ export function resolvePluginRuntimeModulePath(
|
||||
|
||||
export function getPluginBoundaryJiti(modulePath: string, loaders: PluginJitiLoaderCache) {
|
||||
const tryNative = shouldPreferNativeJiti(modulePath);
|
||||
const runtimeAliasMap = resolveBundledRuntimeDependencyJitiAliasMap();
|
||||
return getCachedPluginJitiLoader({
|
||||
cache: loaders,
|
||||
modulePath,
|
||||
importerUrl: import.meta.url,
|
||||
jitiFilename: import.meta.url,
|
||||
...(runtimeAliasMap
|
||||
? {
|
||||
aliasMap: {
|
||||
...buildPluginLoaderAliasMap(modulePath, process.argv[1], import.meta.url),
|
||||
...runtimeAliasMap,
|
||||
},
|
||||
}
|
||||
: {}),
|
||||
tryNative,
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user