@multiplatform.one/vite-plugin-vscode 6.4.3 → 6.6.0

package/lib/index.cjs

@@ -66,9 +66,11 @@ async function createVscodeConfig(options) {
 	const workspaceRoot = options.workspaceRoot ?? (0, _multiplatform_one_utils_dev.lookupProjectRoot)();
 	const isDev = options.isDev ?? process.env.NODE_ENV !== "production";
 	const { tamaguiPlugin } = await import("@tamagui/vite-plugin");
+	const outputCSS = node_path.default.join(options.targetDir, "tamagui.css");
+	if (!node_fs.default.existsSync(outputCSS)) node_fs.default.writeFileSync(outputCSS, "/* generated by @tamagui/vite-plugin during build */\n");
 	return {
 		root: options.targetDir,
-		base: isDev ? "/" : "./",
+		base: "/",
 		build: {
 			outDir: options.outDir,
 			emptyOutDir: true,
@@ -177,10 +179,41 @@ async function createVscodeConfig(options) {
 		}
 	};
 }
+/** Correct the webview dist path baked into the extension-host bundle.
+*
+*  @tomjs/vite-plugin-vscode computes `VITE_WEBVIEW_DIST` (the segment its
+*  runtime joins onto `context.extensionUri` to form the webview base URI)
+*  by stripping `process.cwd()` off the resolved outDir. That model assumes
+*  the extension is packaged from the vite project root; with an
+*  out-of-tree staging dir (ours: apps/<name>/dist-vscode + generated
+*  manifest) the strip misses and the BUILD MACHINE'S ABSOLUTE PATH gets
+*  baked into the bundle — at runtime the webview base URI doubles into
+*  `…/dist-vscode/Users/…/dist-vscode/webview` and every asset 404s.
+*
+*  In the staging layout the correct value is always the literal
+*  `"webview"` (the assets dir next to the generated package.json), so the
+*  staging step rewrites the joinPath call site — anchored on the
+*  `.extensionUri` property read, which survives minification. */
+async function fixWebviewDistPath(stagingDir) {
+	const bundles = ["extension/index.js", "extension/index.cjs"].map((file) => node_path.default.join(stagingDir, file));
+	let fixed = false;
+	for (const bundle of bundles) {
+		if (!node_fs.default.existsSync(bundle)) continue;
+		const source = await node_fs.default.promises.readFile(bundle, "utf-8");
+		const rewritten = source.replace(/joinPath\(([A-Za-z_$][\w$]*\.extensionUri),\s*("[^"\n]*"|'[^'\n]*'|`[^`\n]*`)\)/g, "joinPath($1, \"webview\")");
+		if (rewritten !== source) {
+			await node_fs.default.promises.writeFile(bundle, rewritten, "utf-8");
+			fixed = true;
+		}
+	}
+	return fixed;
+}
 /** Write the extension-manifest package.json into the staging dir. A VS
 *  Code extension's package.json IS its manifest — the product app's own
 *  package.json (an Expo/One app manifest) can't double as it, so `vsce
-*  package` runs against the staging dir instead. */
+*  package` runs against the staging dir instead. Also applies
+*  `fixWebviewDistPath` — staging is the earliest race-free point after
+*  the plugin's detached extension-host build has finished. */
 async function writeVsceManifest(stagingDir, manifest) {
 	const { engines, main, ...rest } = manifest;
 	const packageJson = {
@@ -193,10 +226,12 @@ async function writeVsceManifest(stagingDir, manifest) {
 	};
 	await node_fs.default.promises.mkdir(stagingDir, { recursive: true });
 	await node_fs.default.promises.writeFile(node_path.default.join(stagingDir, "package.json"), `${JSON.stringify(packageJson, null, 2)}\n`, "utf-8");
+	await fixWebviewDistPath(stagingDir);
 }
 
 //#endregion
 exports.DEFAULT_WEBVIEW_CSP = DEFAULT_WEBVIEW_CSP;
 exports.createVscodeConfig = createVscodeConfig;
+exports.fixWebviewDistPath = fixWebviewDistPath;
 exports.resolveSeamOneAdapter = resolveSeamOneAdapter;
 exports.writeVsceManifest = writeVsceManifest;

package/lib/index.mjs

@@ -34,9 +34,11 @@ async function createVscodeConfig(options) {
 	const workspaceRoot = options.workspaceRoot ?? lookupProjectRoot();
 	const isDev = options.isDev ?? process.env.NODE_ENV !== "production";
 	const { tamaguiPlugin } = await import("@tamagui/vite-plugin");
+	const outputCSS = path.join(options.targetDir, "tamagui.css");
+	if (!fs.existsSync(outputCSS)) fs.writeFileSync(outputCSS, "/* generated by @tamagui/vite-plugin during build */\n");
 	return {
 		root: options.targetDir,
-		base: isDev ? "/" : "./",
+		base: "/",
 		build: {
 			outDir: options.outDir,
 			emptyOutDir: true,
@@ -145,10 +147,41 @@ async function createVscodeConfig(options) {
 		}
 	};
 }
+/** Correct the webview dist path baked into the extension-host bundle.
+*
+*  @tomjs/vite-plugin-vscode computes `VITE_WEBVIEW_DIST` (the segment its
+*  runtime joins onto `context.extensionUri` to form the webview base URI)
+*  by stripping `process.cwd()` off the resolved outDir. That model assumes
+*  the extension is packaged from the vite project root; with an
+*  out-of-tree staging dir (ours: apps/<name>/dist-vscode + generated
+*  manifest) the strip misses and the BUILD MACHINE'S ABSOLUTE PATH gets
+*  baked into the bundle — at runtime the webview base URI doubles into
+*  `…/dist-vscode/Users/…/dist-vscode/webview` and every asset 404s.
+*
+*  In the staging layout the correct value is always the literal
+*  `"webview"` (the assets dir next to the generated package.json), so the
+*  staging step rewrites the joinPath call site — anchored on the
+*  `.extensionUri` property read, which survives minification. */
+async function fixWebviewDistPath(stagingDir) {
+	const bundles = ["extension/index.js", "extension/index.cjs"].map((file) => path.join(stagingDir, file));
+	let fixed = false;
+	for (const bundle of bundles) {
+		if (!fs.existsSync(bundle)) continue;
+		const source = await fs.promises.readFile(bundle, "utf-8");
+		const rewritten = source.replace(/joinPath\(([A-Za-z_$][\w$]*\.extensionUri),\s*("[^"\n]*"|'[^'\n]*'|`[^`\n]*`)\)/g, "joinPath($1, \"webview\")");
+		if (rewritten !== source) {
+			await fs.promises.writeFile(bundle, rewritten, "utf-8");
+			fixed = true;
+		}
+	}
+	return fixed;
+}
 /** Write the extension-manifest package.json into the staging dir. A VS
 *  Code extension's package.json IS its manifest — the product app's own
 *  package.json (an Expo/One app manifest) can't double as it, so `vsce
-*  package` runs against the staging dir instead. */
+*  package` runs against the staging dir instead. Also applies
+*  `fixWebviewDistPath` — staging is the earliest race-free point after
+*  the plugin's detached extension-host build has finished. */
 async function writeVsceManifest(stagingDir, manifest) {
 	const { engines, main, ...rest } = manifest;
 	const packageJson = {
@@ -161,7 +194,8 @@ async function writeVsceManifest(stagingDir, manifest) {
 	};
 	await fs.promises.mkdir(stagingDir, { recursive: true });
 	await fs.promises.writeFile(path.join(stagingDir, "package.json"), `${JSON.stringify(packageJson, null, 2)}\n`, "utf-8");
+	await fixWebviewDistPath(stagingDir);
 }
 
 //#endregion
-export { DEFAULT_WEBVIEW_CSP, createVscodeConfig, resolveSeamOneAdapter, writeVsceManifest };
+export { DEFAULT_WEBVIEW_CSP, createVscodeConfig, fixWebviewDistPath, resolveSeamOneAdapter, writeVsceManifest };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/vite-plugin-vscode",
-  "version": "6.4.3",
+  "version": "6.6.0",
   "description": "Vite config factory for building a VS Code extension (extension host + Tamagui webview) as a target of a multiplatform.one One app — wraps @tomjs/vite-plugin-vscode with the workspace source aliases, the one-router seam alias, React dedupe against one's vendored copy, and a vsce staging-manifest writer.",
   "keywords": [
     "multiplatform.one",
@@ -46,7 +46,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@multiplatform.one/utils": "6.4.3"
+    "@multiplatform.one/utils": "6.6.0"
   },
   "devDependencies": {
     "@tamagui/vite-plugin": "2.0.0-rc.41",

package/src/index.ts

@@ -85,9 +85,20 @@ export async function createVscodeConfig(options: VscodeTargetOptions): Promise<
   const workspaceRoot = options.workspaceRoot ?? lookupProjectRoot();
   const isDev = options.isDev ?? process.env.NODE_ENV !== "production";
   const { tamaguiPlugin } = await import("@tamagui/vite-plugin");
+  // The webview entry imports tamagui.css, but the tamagui plugin only
+  // writes outputCSS DURING the build — seed it so a fresh clone's first
+  // build doesn't die on an unresolvable import.
+  const outputCSS = path.join(options.targetDir, "tamagui.css");
+  if (!fs.existsSync(outputCSS)) {
+    fs.writeFileSync(outputCSS, "/* generated by @tamagui/vite-plugin during build */\n");
+  }
   return {
     root: options.targetDir,
-    base: isDev ? "/" : "./",
+    // Always root-absolute: the vscode plugin rewrites built asset URLs as
+    // `{{baseUri}}${attr}` (string concatenation), so a "./"-relative base
+    // would produce `<baseUri>./assets/…` — a literal `webview./assets`
+    // path segment the webview resource host 404s.
+    base: "/",
     build: {
       outDir: options.outDir,
       emptyOutDir: true,
@@ -213,10 +224,49 @@ export interface VsceManifest {
   license?: string;
 }
 
+/** Correct the webview dist path baked into the extension-host bundle.
+ *
+ *  @tomjs/vite-plugin-vscode computes `VITE_WEBVIEW_DIST` (the segment its
+ *  runtime joins onto `context.extensionUri` to form the webview base URI)
+ *  by stripping `process.cwd()` off the resolved outDir. That model assumes
+ *  the extension is packaged from the vite project root; with an
+ *  out-of-tree staging dir (ours: apps/<name>/dist-vscode + generated
+ *  manifest) the strip misses and the BUILD MACHINE'S ABSOLUTE PATH gets
+ *  baked into the bundle — at runtime the webview base URI doubles into
+ *  `…/dist-vscode/Users/…/dist-vscode/webview` and every asset 404s.
+ *
+ *  In the staging layout the correct value is always the literal
+ *  `"webview"` (the assets dir next to the generated package.json), so the
+ *  staging step rewrites the joinPath call site — anchored on the
+ *  `.extensionUri` property read, which survives minification. */
+export async function fixWebviewDistPath(stagingDir: string): Promise<boolean> {
+  const bundles = ["extension/index.js", "extension/index.cjs"].map((file) =>
+    path.join(stagingDir, file),
+  );
+  let fixed = false;
+  for (const bundle of bundles) {
+    if (!fs.existsSync(bundle)) continue;
+    const source = await fs.promises.readFile(bundle, "utf-8");
+    const rewritten = source.replace(
+      // The dist segment may be emitted as a quoted string OR a template
+      // literal (tsdown's env define does both depending on content).
+      /joinPath\(([A-Za-z_$][\w$]*\.extensionUri),\s*("[^"\n]*"|'[^'\n]*'|`[^`\n]*`)\)/g,
+      'joinPath($1, "webview")',
+    );
+    if (rewritten !== source) {
+      await fs.promises.writeFile(bundle, rewritten, "utf-8");
+      fixed = true;
+    }
+  }
+  return fixed;
+}
+
 /** Write the extension-manifest package.json into the staging dir. A VS
  *  Code extension's package.json IS its manifest — the product app's own
  *  package.json (an Expo/One app manifest) can't double as it, so `vsce
- *  package` runs against the staging dir instead. */
+ *  package` runs against the staging dir instead. Also applies
+ *  `fixWebviewDistPath` — staging is the earliest race-free point after
+ *  the plugin's detached extension-host build has finished. */
 export async function writeVsceManifest(stagingDir: string, manifest: VsceManifest): Promise<void> {
   const { engines, main, ...rest } = manifest;
   const packageJson = {
@@ -230,4 +280,5 @@ export async function writeVsceManifest(stagingDir: string, manifest: VsceManife
     `${JSON.stringify(packageJson, null, 2)}\n`,
     "utf-8",
   );
+  await fixWebviewDistPath(stagingDir);
 }

package/types/index.d.ts

@@ -49,9 +49,27 @@ export interface VsceManifest {
     repository?: unknown;
     license?: string;
 }
+/** Correct the webview dist path baked into the extension-host bundle.
+ *
+ *  @tomjs/vite-plugin-vscode computes `VITE_WEBVIEW_DIST` (the segment its
+ *  runtime joins onto `context.extensionUri` to form the webview base URI)
+ *  by stripping `process.cwd()` off the resolved outDir. That model assumes
+ *  the extension is packaged from the vite project root; with an
+ *  out-of-tree staging dir (ours: apps/<name>/dist-vscode + generated
+ *  manifest) the strip misses and the BUILD MACHINE'S ABSOLUTE PATH gets
+ *  baked into the bundle — at runtime the webview base URI doubles into
+ *  `…/dist-vscode/Users/…/dist-vscode/webview` and every asset 404s.
+ *
+ *  In the staging layout the correct value is always the literal
+ *  `"webview"` (the assets dir next to the generated package.json), so the
+ *  staging step rewrites the joinPath call site — anchored on the
+ *  `.extensionUri` property read, which survives minification. */
+export declare function fixWebviewDistPath(stagingDir: string): Promise<boolean>;
 /** Write the extension-manifest package.json into the staging dir. A VS
  *  Code extension's package.json IS its manifest — the product app's own
  *  package.json (an Expo/One app manifest) can't double as it, so `vsce
- *  package` runs against the staging dir instead. */
+ *  package` runs against the staging dir instead. Also applies
+ *  `fixWebviewDistPath` — staging is the earliest race-free point after
+ *  the plugin's detached extension-host build has finished. */
 export declare function writeVsceManifest(stagingDir: string, manifest: VsceManifest): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,KAAK,EAAU,UAAU,EAAE,MAAM,MAAM,CAAC;AAEtD;;;0CAG0C;AAC1C,eAAO,MAAM,mBAAmB,yRAAqR,CAAC;AAEtT,MAAM,WAAW,mBAAmB;IAClC;kCAC8B;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB;kEAC8D;IAC9D,MAAM,EAAE,MAAM,CAAC;IACf,qEAAqE;IACrE,aAAa,EAAE,MAAM,CAAC;IACtB,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0DAA0D;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,sDAAsD;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,0DAA0D;IAC1D,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC;CACnB;AAgBD;kEACkE;AAClE,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAInE;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC,CA4G1F;AAID,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sEAAsE;IACtE,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC7B,2CAA2C;IAC3C,OAAO,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACpD,6DAA6D;IAC7D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;qDAGqD;AACrD,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAajG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,KAAK,EAAU,UAAU,EAAE,MAAM,MAAM,CAAC;AAEtD;;;0CAG0C;AAC1C,eAAO,MAAM,mBAAmB,yRAAqR,CAAC;AAEtT,MAAM,WAAW,mBAAmB;IAClC;kCAC8B;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB;kEAC8D;IAC9D,MAAM,EAAE,MAAM,CAAC;IACf,qEAAqE;IACrE,aAAa,EAAE,MAAM,CAAC;IACtB,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0DAA0D;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,sDAAsD;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,0DAA0D;IAC1D,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC;CACnB;AAgBD;kEACkE;AAClE,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAInE;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC,CAuH1F;AAID,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sEAAsE;IACtE,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC7B,2CAA2C;IAC3C,OAAO,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACpD,6DAA6D;IAC7D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;kEAckE;AAClE,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAoB7E;AAED;;;;;+DAK+D;AAC/D,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAcjG"}