@salesforce/vite-plugin-webapp-experimental 1.68.1 → 1.70.0

package/dist/index.d.ts

@@ -17,5 +17,5 @@ export interface PluginOptions {
      */
     designMode?: boolean;
 }
-export default function webappsPlugin(options?: PluginOptions): Plugin;
+export default function webappsPlugin(options?: PluginOptions): Plugin[];
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAWlD,MAAM,WAAW,aAAa;IAC7B,2BAA2B;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6BAA6B;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB;AAID,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,OAAO,GAAE,aAAkB,GAAG,MAAM,CAiNzE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAWlD,MAAM,WAAW,aAAa;IAC7B,2BAA2B;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6BAA6B;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB;AAID,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,OAAO,GAAE,aAAkB,GAAG,MAAM,EAAE,CAoN3E"}

package/dist/index.js

@@ -18,18 +18,14 @@ export default function webappsPlugin(options = {}) {
     let proxyHandler;
     // Allow tests or callers to force design mode without needing to run the `config` hook.
     let designModeEnabled = options.designMode ?? false;
-    return {
-        name: "@salesforce/vite-plugin-webapp-experimental",
+    const corePlugin = {
+        name: "@salesforce/vite-plugin-webapp-experimental:core",
         enforce: "pre",
         async config(config, env) {
             const rootPath = config.root ?? process.cwd();
-            // If caller explicitly set it, keep that value. Otherwise derive from Vite mode.
-            designModeEnabled = options.designMode ?? env.mode === "design";
             // Note: At this stage we may not have the correct manifest path yet,
             // so we only load the org info to get the API version
-            // Development server configuration
-            let version;
-            version = DEFAULT_API_VERSION;
+            let version = DEFAULT_API_VERSION;
             try {
                 orgInfo = await getOrgInfo(options.orgAlias);
                 version = orgInfo?.apiVersion || DEFAULT_API_VERSION;
@@ -56,9 +52,8 @@ export default function webappsPlugin(options = {}) {
                     port: getPort(),
                     // Code Builder specific configuration
                     ...(isCodeBuilder && {
-                        // Allow any host to connect to the dev server
                         allowedHosts: true,
-                        strictPort: true, // Fail if port is already occupied
+                        strictPort: true,
                     }),
                 },
             };
@@ -76,16 +71,62 @@ export default function webappsPlugin(options = {}) {
             }
         },
         configureServer(server) {
-            // Add middleware to handle all requests (API, rewrites, redirects, and dev server forwarding)
             // Must run BEFORE Vite's internal middlewares (hence not returning a post-hook function)
             server.middlewares.use(async (req, res, next) => {
-                // Serve design mode interactions script
-                // NOTE: Live Preview and other proxies may host the dev server behind a path prefix,
-                // so we intentionally match by suffix rather than strict equality.
+                if (proxyHandler) {
+                    try {
+                        await proxyHandler(req, res, next);
+                    }
+                    catch (error) {
+                        console.error("[webapps-plugin] Proxy handler error:", error);
+                        next();
+                    }
+                }
+                else {
+                    if (req.url?.startsWith("/services")) {
+                        res.writeHead(503, { "Content-Type": "application/json" });
+                        res.end(JSON.stringify({
+                            error: "SERVICE_UNAVAILABLE",
+                            message: "Proxy not initialized.",
+                        }));
+                        return;
+                    }
+                    next();
+                }
+            });
+        },
+        async handleHotUpdate({ file, server }) {
+            if (file.endsWith("webapplication.json")) {
+                const updatedManifest = await loadManifest(file);
+                if (updatedManifest) {
+                    manifest = updatedManifest;
+                    const rootPath = server.config.root ?? process.cwd();
+                    const target = getDevServerTarget(codeBuilderProxyUrl, server.config.server.port ?? DEFAULT_PORT);
+                    const basePath = getBasePath(server.config.mode, codeBuilderProxyUrl, getPort(), rootPath);
+                    proxyHandler = createProxyHandler(manifest, orgInfo, target, basePath, proxyOptions);
+                    server.ws.send({
+                        type: "full-reload",
+                        path: "*",
+                    });
+                }
+            }
+        },
+    };
+    const designPlugin = {
+        name: "@salesforce/vite-plugin-webapp-experimental:design",
+        enforce: "pre",
+        config(_config, env) {
+            designModeEnabled = options.designMode ?? env.mode === "design";
+        },
+        configureServer(server) {
+            // Intercepts design-mode script requests before the core proxy middleware.
+            server.middlewares.use(async (req, res, next) => {
+                if (!designModeEnabled) {
+                    next();
+                    return;
+                }
                 const urlPath = stripUrlQuery(req.url);
-                if (designModeEnabled &&
-                    (urlPath === "/design-mode-interactions.js" ||
-                        urlPath.endsWith("/design-mode-interactions.js"))) {
+                if (urlPath === "/_sfdc/design-mode-interactions.js") {
                     try {
                         const script = getDesignModeScriptContent();
                         if (script !== null) {
@@ -106,32 +147,10 @@ export default function webappsPlugin(options = {}) {
                         return;
                     }
                 }
-                // Let proxy handler handle all requests
-                if (proxyHandler) {
-                    try {
-                        await proxyHandler(req, res, next);
-                    }
-                    catch (error) {
-                        console.error("[webapps-plugin] Proxy handler error:", error);
-                        next();
-                    }
-                }
-                else {
-                    // Only return 503 for Salesforce API requests when handler not initialized
-                    if (req.url?.startsWith("/services")) {
-                        res.writeHead(503, { "Content-Type": "application/json" });
-                        res.end(JSON.stringify({
-                            error: "SERVICE_UNAVAILABLE",
-                            message: "Proxy not initialized.",
-                        }));
-                        return;
-                    }
-                    next();
-                }
+                next();
             });
         },
         async transform(code, id) {
-            // Only inject design-time locator attributes when design mode is enabled
             if (!designModeEnabled)
                 return null;
             // Strip Vite query string (e.g. ?import, ?v=hash)
@@ -159,36 +178,17 @@ export default function webappsPlugin(options = {}) {
                 return null;
             return { code: result.code, map: result.map };
         },
-        async handleHotUpdate({ file, server }) {
-            // Watch for manifest changes and reload
-            if (file.endsWith("webapplication.json")) {
-                const updatedManifest = await loadManifest(file);
-                if (updatedManifest) {
-                    // Update context with new manifest
-                    manifest = updatedManifest;
-                    // Recreate proxy handler with updated appContext
-                    const rootPath = server.config.root ?? process.cwd();
-                    const target = getDevServerTarget(codeBuilderProxyUrl, server.config.server.port ?? DEFAULT_PORT);
-                    const basePath = getBasePath(server.config.mode, codeBuilderProxyUrl, getPort(), rootPath);
-                    proxyHandler = createProxyHandler(manifest, orgInfo, target, basePath, proxyOptions);
-                    server.ws.send({
-                        type: "full-reload",
-                        path: "*",
-                    });
-                }
-            }
-        },
         transformIndexHtml(html) {
-            // Only inject design mode interactions script when design mode is enabled in dev
             if (designModeEnabled) {
-                // Use a relative URL so it works when the app is hosted under a path prefix
-                // (e.g. VS Code Live Preview or Code Builder reverse proxies).
-                const designScriptTag = '<script src="design-mode-interactions.js"></script>';
+                const designScriptTag = '<script src="/_sfdc/design-mode-interactions.js"></script>';
                 return html.replace("</body>", `${designScriptTag}\n</body>`);
             }
             return html;
         },
     };
+    // Design plugin is listed first so its middleware intercepts design-mode
+    // script requests before the core proxy middleware.
+    return [designPlugin, corePlugin];
 }
 function stripUrlQuery(url) {
     if (!url)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/vite-plugin-webapp-experimental",
   "description": "[experimental] Vite plugin for Salesforce Web Applications",
-  "version": "1.68.1",
+  "version": "1.70.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "type": "module",
   "main": "./dist/index.js",
@@ -28,7 +28,7 @@
   "dependencies": {
     "@babel/core": "^7.28.4",
     "@babel/helper-plugin-utils": "^7.28.3",
-    "@salesforce/webapp-experimental": "^1.68.1"
+    "@salesforce/webapp-experimental": "^1.70.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",