@fluid-app/fluid-cli-widget 0.1.37 → 0.1.38

package/dist/{index-DW3icMxz.d.mts → index-o4ZcD2C9.d.mts}

@@ -190,10 +190,15 @@ declare function createWidgetDevServerConfig(): UserConfig;
 *    imports to the request origin keeps the entire dev module graph on the
 *    widget server.
 *
+* Callers obtain `workerSdkUrl` from `resolveWorkerSdkUrl`, which owns the
+* `/@id/` fallback. The parameter is deliberately required: defaulting to the
+* alias here would let a caller silently reintroduce the two-module-record
+* split of MIST-PW-01.
+*
 * Dev-only: this only ever serves from `configureServer` (the
 * plugin's `apply: "serve"` gate), never a built/published package.
 */
-declare function buildRuntimeEntryBootstrapScript(entryPath: string, origin: string): string;
+declare function buildRuntimeEntryBootstrapScript(entryPath: string, origin: string, workerSdkUrl: string): string;
 /**
 * The shared development descriptor workflow appends Vite's `?direct` query
 * to CSS URLs so preview hosts receive real CSS instead of JS style modules.
@@ -202,4 +207,4 @@ declare function buildRuntimeEntryBootstrapScript(entryPath: string, origin: str
 declare function createDevWidgetPackageDescriptors(configModule: Readonly<Record<string, unknown>>, origin: string, owner?: WidgetPackageOwnerKind): readonly RemoteDomWidgetPackageDescriptor[];
 //#endregion
 export { fluidWidgetDevPlugin as a, createWidgetDevServerConfig as i, buildRuntimeEntryBootstrapScript as n, ValidatedWidgetPackageBuild as o, createDevWidgetPackageDescriptors as r, WidgetPackageValidationError as s, FluidWidgetDevPluginOptions as t };
-//# sourceMappingURL=index-DW3icMxz.d.mts.map
+//# sourceMappingURL=index-o4ZcD2C9.d.mts.map

package/dist/{index-DW3icMxz.d.mts.map → index-o4ZcD2C9.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"index-DW3icMxz.d.mts","names":[],"sources":["../../../portal/core/src/remote-dom-widget-package.ts","../../widget-tooling/src/internal/widget-package-validation.ts","../../widget-tooling/src/dev-routes.ts"],"mappings":";;;cAMa,kCAAA;AAAA,cACA,yBAAA;AAAA,KAED,aAAA;AAAA,KAEA,SAAA,GAAY,aAAA,YAAyB,SAAA,KAAc,UAAA;AAAA,UAE9C,UAAA;EAAA,UACS,GAAA,WAAA,SAAA;AAAA;AAAA,UA4DT,oCAAA;EAAA,SACN,IAAA;EAAA,SACA,OAAA;AAAA;AAAA,UAGM,yBAAA;EAAA,SACN,IAAA;EAAA,SACA,WAAA;EAAA,SACA,WAAA;EAAA,SACA,IAAA;EAAA,SACA,QAAA;EAAA,SACA,cAAA,EAAgB,UAAA;EAAA,SAChB,YAAA,EAAc,UAAA;EAAA,SACd,SAAA;EAAA,SACA,SAAA;EAAA,SACA,aAAA;EAAA,SACA,YAAA,WAAuB,oCAAA;AAAA;;;;;;UAQjB,gCAAA;EAAA,SACN,eAAA,SAAwB,kCAAA;EAAA,SACxB,OAAA,SAAgB,yBAAA;EAAA,SAChB,SAAA;EAAA,SACA,MAAA;EAAA,SACA,OAAA;EAAA,SACA,cAAA;EAAA,SACA,OAAA;EAAA,SACA,SAAA;EAAA,SACA,OAAA,WAAkB,yBAAA;AAAA;;;KCnFjB,sBAAA;AAAA,UAKK,wBAAA;EAAA,SACN,IAAA;EAAA,SACA,OAAA;AAAA;AAAA,UAGM,oBAAA;EAAA,SACN,IAAA;EAAA,SACA,WAAA;EAAA,SACA,WAAA;EAAA,SACA,IAAA;EAAA,SACA,QAAA;EAAA,SACA,cAAA,GAAiB,UAAA;EAAA,SACjB,YAAA,GAAe,UAAA;EAAA,SACf,SAAA;EAAA,SACA,aAAA;EAAA,SACA,SAAA;EAAA,SACA,YAAA,YAAwB,wBAAA;AAAA;AAAA,UAGlB,2BAAA;EAAA,SACN,eAAA;EAAA,SACA,KAAA;EAAA,SACA,eAAA;EAAA,SACA,SAAA;EAAA,SACA,WAAA;EAAA,SACA,OAAA;EAAA,SACA,OAAA,WAAkB,oBAAA;EAAA,SAClB,OAAA;AAAA;AAAA,UAGM,wBAAA,SAAiC,yBAAA;EAAA,SACvC,IAAA;AAAA;AAAA,UA4BM,2BAAA;EAAA,SACN,aAAA,EAAe,2BAAA;EAAA,SACf,UAAA;EAAA,SACA,SAAA;EAAA,SACA,KAAA,EAAO,sBAAA;EAAA,SACP,OAAA;EAAA,SACA,OAAA,WAAkB,wBAAA;AAAA;AAAA,KAGjB,gCAAA;AAAA,UAaK,4BAAA;EAAA,SACN,IAAA,EAAM,gCAAA;EAAA,SACN,OAAA;EAAA,SACA,IAAA;AAAA;;;AD3GX;;;;;AACA;;;;AADA,UEUiB,2BAAA;EFPjB;EAAA,SESW,eAAA;;WAEA,gBAAA;EFXC;EAAA,SEaD,KAAA,GAAQ,sBAAA;EFXP;;;;;;;EAAA,SEmBD,eAAA;AAAA;;;;AFjBX;;;iBE0BgB,oBAAA,CACd,OAAA,GAAS,2BAAA,GACR,MAAA;;AFiCH;;;;;AAKA;;;;;;iBEqBgB,2BAAA,CAAA,GAA+B,UAAA;;;;;;;;;;;;;;;;;;AFF/C;;;;;;;;;;;;;;;;;;;;;;;;;AC1EA;;;;;AAKA;;;;;AAKA;;;;;;iBCgKgB,gCAAA,CACd,SAAA,UACA,MAAA;;;;;;iBA4Cc,iCAAA,CACd,YAAA,EAAc,QAAA,CAAS,MAAA,oBACvB,MAAA,UACA,KAAA,GAAO,sBAAA,YACG,gCAAA"}
+{"version":3,"file":"index-o4ZcD2C9.d.mts","names":[],"sources":["../../../portal/core/src/remote-dom-widget-package.ts","../../widget-tooling/src/internal/widget-package-validation.ts","../../widget-tooling/src/dev-routes.ts"],"mappings":";;;cAMa,kCAAA;AAAA,cACA,yBAAA;AAAA,KAED,aAAA;AAAA,KAEA,SAAA,GAAY,aAAA,YAAyB,SAAA,KAAc,UAAA;AAAA,UAE9C,UAAA;EAAA,UACS,GAAA,WAAA,SAAA;AAAA;AAAA,UA4DT,oCAAA;EAAA,SACN,IAAA;EAAA,SACA,OAAA;AAAA;AAAA,UAGM,yBAAA;EAAA,SACN,IAAA;EAAA,SACA,WAAA;EAAA,SACA,WAAA;EAAA,SACA,IAAA;EAAA,SACA,QAAA;EAAA,SACA,cAAA,EAAgB,UAAA;EAAA,SAChB,YAAA,EAAc,UAAA;EAAA,SACd,SAAA;EAAA,SACA,SAAA;EAAA,SACA,aAAA;EAAA,SACA,YAAA,WAAuB,oCAAA;AAAA;;;;;;UAQjB,gCAAA;EAAA,SACN,eAAA,SAAwB,kCAAA;EAAA,SACxB,OAAA,SAAgB,yBAAA;EAAA,SAChB,SAAA;EAAA,SACA,MAAA;EAAA,SACA,OAAA;EAAA,SACA,cAAA;EAAA,SACA,OAAA;EAAA,SACA,SAAA;EAAA,SACA,OAAA,WAAkB,yBAAA;AAAA;;;KCnFjB,sBAAA;AAAA,UAKK,wBAAA;EAAA,SACN,IAAA;EAAA,SACA,OAAA;AAAA;AAAA,UAGM,oBAAA;EAAA,SACN,IAAA;EAAA,SACA,WAAA;EAAA,SACA,WAAA;EAAA,SACA,IAAA;EAAA,SACA,QAAA;EAAA,SACA,cAAA,GAAiB,UAAA;EAAA,SACjB,YAAA,GAAe,UAAA;EAAA,SACf,SAAA;EAAA,SACA,aAAA;EAAA,SACA,SAAA;EAAA,SACA,YAAA,YAAwB,wBAAA;AAAA;AAAA,UAGlB,2BAAA;EAAA,SACN,eAAA;EAAA,SACA,KAAA;EAAA,SACA,eAAA;EAAA,SACA,SAAA;EAAA,SACA,WAAA;EAAA,SACA,OAAA;EAAA,SACA,OAAA,WAAkB,oBAAA;EAAA,SAClB,OAAA;AAAA;AAAA,UAGM,wBAAA,SAAiC,yBAAA;EAAA,SACvC,IAAA;AAAA;AAAA,UA4BM,2BAAA;EAAA,SACN,aAAA,EAAe,2BAAA;EAAA,SACf,UAAA;EAAA,SACA,SAAA;EAAA,SACA,KAAA,EAAO,sBAAA;EAAA,SACP,OAAA;EAAA,SACA,OAAA,WAAkB,wBAAA;AAAA;AAAA,KAGjB,gCAAA;AAAA,UAaK,4BAAA;EAAA,SACN,IAAA,EAAM,gCAAA;EAAA,SACN,OAAA;EAAA,SACA,IAAA;AAAA;;;AD3GX;;;;;AACA;;;;AADA,UEUiB,2BAAA;EFPjB;EAAA,SESW,eAAA;;WAEA,gBAAA;EFXC;EAAA,SEaD,KAAA,GAAQ,sBAAA;EFXP;;;;;;;EAAA,SEmBD,eAAA;AAAA;;;;AFjBX;;;iBE0BgB,oBAAA,CACd,OAAA,GAAS,2BAAA,GACR,MAAA;;AFiCH;;;;;AAKA;;;;;;iBEwBgB,2BAAA,CAAA,GAA+B,UAAA;;;;;;;;;;;;;;;;;;;;;;;;;AD/E/C;;;;;AAKA;;;;;AAKA;;;;;;;;;;;;;;;;;;;;;;;;AAcA;;;;;iBCyOgB,gCAAA,CACd,SAAA,UACA,MAAA,UACA,YAAA;;;;;;iBAwCc,iCAAA,CACd,YAAA,EAAc,QAAA,CAAS,MAAA,oBACvB,MAAA,UACA,KAAA,GAAO,sBAAA,YACG,gCAAA"}

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { o as ValidatedWidgetPackageBuild, s as WidgetPackageValidationError } from "./index-DW3icMxz.mjs";
+import { o as ValidatedWidgetPackageBuild, s as WidgetPackageValidationError } from "./index-o4ZcD2C9.mjs";
 import { Command } from "commander";
 import { FluidPlugin } from "@fluid-app/fluid-cli";
 

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as fluidOsV0WidgetPackageGitCredentialCreate, l as WidgetToolingError, n as loadAndValidateWidgetPackage, r as publishWidgetPackage$1, t as buildWidgetPackage$1 } from "./src-CzqGGQnf.mjs";
+import { i as fluidOsV0WidgetPackageGitCredentialCreate, l as WidgetToolingError, n as loadAndValidateWidgetPackage, r as publishWidgetPackage$1, t as buildWidgetPackage$1 } from "./src-CTSiuhqb.mjs";
 import { Command } from "commander";
 import path from "node:path";
 import { randomUUID } from "node:crypto";
@@ -574,9 +574,9 @@ function isRecord$3(value) {
 }
 //#endregion
 //#region src/utils/template.ts
-const EMBEDDED_PORTAL_SDK_VERSION = "0.1.477";
+const EMBEDDED_PORTAL_SDK_VERSION = "0.1.481";
 const EMBEDDED_CLI_CORE_VERSION = "0.1.17";
-const EMBEDDED_CLI_WIDGET_VERSION = "0.1.37";
+const EMBEDDED_CLI_WIDGET_VERSION = "0.1.38";
 function getDefaultTemplatePath() {
 	return path.join(findPackageRoot(), "templates", "default");
 }

package/dist/{src-CzqGGQnf.mjs → src-CTSiuhqb.mjs}

@@ -605,7 +605,9 @@ function fluidWidgetDevPlugin(options = {}) {
 			server.middlewares.use(async (request, response, next) => {
 				const pathname = (request.url ?? "").split("?")[0] ?? "";
 				if (pathname === "/__runtime-entry__" || pathname === "/__runtime-entry__/") {
-					sendJavaScript(request, response, buildRuntimeEntryBootstrapScript(entryModulePath, getRequestOrigin(request)));
+					if (handleOptions(request, response)) return;
+					const origin = getRequestOrigin(request);
+					sendJavaScript(request, response, buildRuntimeEntryBootstrapScript(entryModulePath, origin, await resolveWorkerSdkUrl(server, origin)));
 					return;
 				}
 				if (pathname === "/__widget-packages__" || pathname === "/__widget-packages__/") {
@@ -636,6 +638,11 @@ function fluidWidgetDevPlugin(options = {}) {
 function createWidgetDevServerConfig() {
 	return {
 		optimizeDeps: { include: ["@fluid-app/portal-sdk/widgets/worker"] },
+		resolve: { dedupe: [
+			"@fluid-app/portal-sdk",
+			"react",
+			"react-dom"
+		] },
 		ssr: { noExternal: ["@fluid-app/portal-sdk"] }
 	};
 }
@@ -646,6 +653,48 @@ function createWidgetDevServerConfig() {
 const WIDGET_ENTRY_MODULE_PATH = "/src/index.ts";
 /** Source-relative path of a standalone widget project's package source. */
 const WIDGET_CONFIG_MODULE_PATH = "/fluid.widget.config.ts";
+/** Bare specifier of the SDK worker module the bootstrap prepares. */
+const WORKER_SDK_SPECIFIER = "@fluid-app/portal-sdk/widgets/worker";
+/**
+* Resolves the bootstrap's SDK worker import to the same module URL the
+* widget entry's rewritten bare import uses.
+*
+* The bootstrap used to import the hardcoded alias
+* `/@id/@fluid-app/portal-sdk/widgets/worker`. Vite serves the optimized
+* module body inline at that URL while the entry's rewritten import uses the
+* canonical `/node_modules/.vite/deps/...?v=<hash>` URL — same bytes, two
+* resolved URLs, two records in the worker's ES module map. The network
+* guard's re-entry check is module-instance-local, so the second evaluation
+* threw on every dev preview load (MIST-PW-01). Resolving server-side at
+* request time keeps both imports on one module record.
+*
+* Falls back to the `/@id/` alias when resolution fails — no worse than the
+* previous behavior, and the widget-runtime duplicate-install tripwire names
+* the condition if the split ever regresses.
+*/
+async function resolveWorkerSdkUrl(server, origin) {
+	const fallback = new URL(`/@id/${WORKER_SDK_SPECIFIER}`, origin).toString();
+	try {
+		const resolved = await server.pluginContainer.resolveId(WORKER_SDK_SPECIFIER, void 0, { ssr: false });
+		if (!resolved?.id) return fallback;
+		const url = moduleIdToUrl(resolved.id, server.config.root);
+		return url ? new URL(url, origin).toString() : fallback;
+	} catch {
+		return fallback;
+	}
+}
+/**
+* Mirrors Vite import-analysis URL normalization for the id shapes the
+* resolver produces here: a file under the served root (the optimized-deps
+* dir lives at `<root>/node_modules/.vite`) becomes a root-relative URL; any
+* other absolute file path is served through `/@fs/`. Ids and root arrive
+* posix-normalized from Vite, Windows drive letters included.
+*/
+function moduleIdToUrl(id, root) {
+	const rootPrefix = root.endsWith("/") ? root : `${root}/`;
+	if (id.startsWith(rootPrefix)) return `/${id.slice(rootPrefix.length)}`;
+	if (id.startsWith("/") || /^[A-Za-z]:\//.test(id)) return `/@fs/${id.replace(/^\//, "")}`;
+}
 /**
 * Builds the `/__runtime-entry__` worker bootstrap. Runtime-verified
 * against a real widget dev server + `@fluid-app/widget-runtime` host
@@ -701,12 +750,16 @@ const WIDGET_CONFIG_MODULE_PATH = "/fluid.widget.config.ts";
 *    imports to the request origin keeps the entire dev module graph on the
 *    widget server.
 *
+* Callers obtain `workerSdkUrl` from `resolveWorkerSdkUrl`, which owns the
+* `/@id/` fallback. The parameter is deliberately required: defaulting to the
+* alias here would let a caller silently reintroduce the two-module-record
+* split of MIST-PW-01.
+*
 * Dev-only: this only ever serves from `configureServer` (the
 * plugin's `apply: "serve"` gate), never a built/published package.
 */
-function buildRuntimeEntryBootstrapScript(entryPath, origin) {
+function buildRuntimeEntryBootstrapScript(entryPath, origin, workerSdkUrl) {
 	const refreshRuntimeUrl = new URL("/@react-refresh", origin).toString();
-	const workerSdkUrl = new URL("/@id/@fluid-app/portal-sdk/widgets/worker", origin).toString();
 	const entryUrl = new URL(entryPath, origin).toString();
 	return [
 		"// Dev-only worker bootstrap — see buildRuntimeEntryBootstrapScript",
@@ -2004,4 +2057,4 @@ function toPublicUploadErrorCode(code) {
 //#endregion
 export { buildRuntimeEntryBootstrapScript as a, fluidWidgetDevPlugin as c, fluidOsV0WidgetPackageGitCredentialCreate as i, WidgetToolingError as l, loadAndValidateWidgetPackage as n, createDevWidgetPackageDescriptors as o, publishWidgetPackage as r, createWidgetDevServerConfig as s, buildWidgetPackage as t };
 
-//# sourceMappingURL=src-CzqGGQnf.mjs.map
+//# sourceMappingURL=src-CTSiuhqb.mjs.map