@solidjs/vite-plugin 3.0.0-next.33 → 3.0.0-next.35

package/README.md

@@ -693,8 +693,8 @@ your entry files instead. See `examples/start-ssr` for a complete page.
 - Default: `"native"`
 
 Choose the JSX compiler backend. The default `"native"` compiles JSX through
-the native compiler from `@dom-expressions/compiler`. `"babel"` runs
-`babel-preset-solid` instead and only switches the JSX transform — every
+the native compiler from `@solidjs/compiler`. `"babel"` runs
+`@solidjs/babel-plugin` instead and only switches the JSX transform — every
 other pass (the `lazy()` module-URL transform and the solid-refresh HMR
 transform) is native in both modes.
 
@@ -702,7 +702,7 @@ transform) is native in both modes.
 you expect, set `compiler: 'babel'` and file an issue — the behavioral diff
 between the two modes is the bug report. Platforms without a prebuilt native
 binary (for example StackBlitz WebContainers) automatically fall back to the
-`@dom-expressions/compiler-wasm32-wasi` build, so no configuration is needed
+`@solidjs/compiler-wasm32-wasi` build, so no configuration is needed
 there.
 
 ```ts
@@ -723,13 +723,13 @@ Pass any additional [babel transform options](https://babeljs.io/docs/en/options
 
 #### options.solid
 
-- Type: [@dom-expressions/compiler](https://github.com/ryansolid/dom-expressions/tree/main/packages/compiler#options) / [@dom-expressions/babel-plugin-jsx](https://github.com/ryansolid/dom-expressions/tree/main/packages/babel-plugin-jsx#plugin-options)
+- Type: [@solidjs/compiler](https://github.com/solidjs/solid/tree/main/packages/compiler) / [@solidjs/babel-plugin](https://github.com/solidjs/solid/tree/main/packages/babel-plugin)
 - Default: {}
 
-Pass additional DOM Expressions JSX compiler options. They will be merged with
-Solid's defaults (`moduleName: "@solidjs/web"`, Solid built-ins, custom-element
-context, and conditional wrapping) and applied to whichever compiler backend is
-selected.
+Pass additional Solid JSX compiler options. Both backends carry the Solid
+defaults (`moduleName: "@solidjs/web"`, the control-flow built-ins,
+custom-element context, and conditional wrapping) internally; anything set
+here is merged over them and applied to whichever backend is selected.
 
 #### options.typescript
 
@@ -778,7 +778,7 @@ plugin's errors are prefixed `[@solidjs/vite-plugin]`.
 ## Note on HMR
 
 Starting from version `1.1.0`, this plugin handles automatic HMR. The refresh
-transform is compiled natively by `@dom-expressions/compiler` and drives the
+transform is compiled natively by `@solidjs/compiler` and drives the
 dev-only `solid-js/refresh` runtime entry that ships with Solid (the
 standalone [solid-refresh](https://github.com/solidjs/solid-refresh) package
 is no longer used).

package/dist/cjs/index.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var babel = require('@babel/core');
 var remapping = require('@ampproject/remapping');
-var solid = require('babel-preset-solid');
+var solid = require('@solidjs/babel-plugin');
 var fs = require('fs');
 var mergeAnything = require('merge-anything');
 var module$1 = require('module');
@@ -501,6 +501,27 @@ function createDevAssetResolver(server, filter = defaultStyleFilter) {
   };
 }
 
+/**
+ * Cross-instance-safe stand-in for vite's `isRunnableDevEnvironment`.
+ *
+ * Vite's helper is an `instanceof RunnableDevEnvironment` check against the
+ * class of whichever `vite` module the CALLER imported. When this plugin is
+ * consumed through a workspace/`link:` install, its own `vite` import can
+ * resolve to a different physical copy than the one running the dev server —
+ * and then the `instanceof` is false for every environment, silently standing
+ * the SSR/dev middlewares down. The `runner` accessor is the type's defining
+ * member (`RunnableDevEnvironment` is exactly "a DevEnvironment with a
+ * runner"), so presence-check it instead of trusting class identity.
+ */
+function isRunnableEnvironment(environment) {
+  return !!environment && typeof environment === 'object' && 'runner' in environment;
+}
+function getEnvironmentConsumer(environment, options) {
+  const consumer = environment?.config?.consumer;
+  if (consumer === 'client' || consumer === 'server') return consumer;
+  return options?.ssr ? 'server' : 'client';
+}
+
 const VIRTUAL_ID = '\0@solidjs/vite-plugin:boundary-modules';
 
 /**
@@ -535,7 +556,7 @@ function boundaryModules() {
       // scan all the same. Real dev/build module graphs resolve without
       // the flag and stay fully guarded.
       const scan = !!options?.scan;
-      const server = this.environment.config.consumer === 'server';
+      const server = getEnvironmentConsumer(this.environment, options) === 'server';
       if (id === 'server-only') {
         if (!server && !scan) this.error(`[@solidjs/vite-plugin] Attempt to import 'server-only' in a client module: ${importer}. ` + `Code that uses this module must run only on the server — make sure it is only ` + `imported by server code (e.g. a server entry, a "use server" module, or code ` + `reached exclusively from them).`);
       } else if (id === 'client-only') {
@@ -552,31 +573,216 @@ function boundaryModules() {
 }
 
 /**
- * Cross-instance-safe stand-in for vite's `isRunnableDevEnvironment`.
+ * Agent diagnostics surface (`diagnostics: true`, dev serve only).
  *
- * Vite's helper is an `instanceof RunnableDevEnvironment` check against the
- * class of whichever `vite` module the CALLER imported. When this plugin is
- * consumed through a workspace/`link:` install, its own `vite` import can
- * resolve to a different physical copy than the one running the dev server —
- * and then the `instanceof` is false for every environment, silently standing
- * the SSR/dev middlewares down. The `runner` accessor is the type's defining
- * member (`RunnableDevEnvironment` is exactly "a DevEnvironment with a
- * runner"), so presence-check it instead of trusting class identity.
+ * Three pieces:
+ * - an injected client module (virtual, imported by index.html or the
+ *   start-mode client entry) that installs the in-page bridge from the
+ *   app's own `@solidjs/diagnostics` and answers requests over Vite's
+ *   WebSocket custom events;
+ * - a collector that forwards requests to the page and correlates
+ *   responses by id;
+ * - an HTTP endpoint (`/__solid/diagnostics`) fronting that round-trip so
+ *   any out-of-process consumer (agent, MCP tool, curl) can drive capture
+ *   sessions without holding a WebSocket.
+ *
+ * `@solidjs/diagnostics` is deliberately a type-only dependency of this
+ * plugin: the runtime bridge always comes from the app's own installed
+ * copy, so plugin releases and diagnostics releases stay uncoupled. The
+ * wire constants are re-declared here with types imported from the
+ * package, so drift fails the plugin's own compile.
  */
-function isRunnableEnvironment(environment) {
-  return !!environment && typeof environment === 'object' && 'runner' in environment;
+const DIAGNOSTICS_ENDPOINT = '/__solid/diagnostics';
+const REQUEST_EVENT = 'solid:diagnostics:request';
+const RESPONSE_EVENT = 'solid:diagnostics:response';
+const DIAGNOSTICS_PACKAGE = '@solidjs/diagnostics';
+const DIAGNOSTICS_CLIENT_ID = 'virtual:solid-diagnostics/client';
+const METHODS = ['begin', 'end', 'active', 'whyDidRun', 'costs'];
+
+/** How long the endpoint waits for a page to answer before failing the call. */
+const RESPONSE_TIMEOUT_MS = 10_000;
+function diagnosticsClientModuleCode() {
+  // Runtime imports resolve to the APP's diagnostics package (see the
+  // resolveId assist below) — the page speaks its own package's protocol.
+  return [`import { installDiagnosticsBridge } from '${DIAGNOSTICS_PACKAGE}/browser';`, `import {`, `  DIAGNOSTICS_REQUEST_EVENT,`, `  DIAGNOSTICS_RESPONSE_EVENT,`, `} from '${DIAGNOSTICS_PACKAGE}/protocol';`, ``, `const bridge = installDiagnosticsBridge();`, ``, `async function dispatch(request) {`, `  switch (request.method) {`, `    case 'begin': bridge.begin(request.params); return true;`, `    case 'end': return bridge.end();`, `    case 'active': return bridge.active();`, `    case 'whyDidRun': return bridge.whyDidRun(request.params.name);`, `    case 'costs': return bridge.costs();`, `    default: throw new Error('Unknown diagnostics method: ' + request.method);`, `  }`, `}`, ``, `if (import.meta.hot) {`, `  import.meta.hot.on(DIAGNOSTICS_REQUEST_EVENT, async (request) => {`, `    let response;`, `    try {`, `      response = { id: request.id, result: await dispatch(request) };`, `    } catch (error) {`, `      response = {`, `        id: request.id,`, `        error: error instanceof Error ? error.message : String(error),`, `      };`, `    }`, `    import.meta.hot.send(DIAGNOSTICS_RESPONSE_EVENT, response);`, `  });`, `}`].join('\n');
 }
-function getEnvironmentConsumer(environment, options) {
-  const consumer = environment?.config?.consumer;
-  if (consumer === 'client' || consumer === 'server') return consumer;
-  return options?.ssr ? 'server' : 'client';
+function sendJson(res, status, body) {
+  res.statusCode = status;
+  res.setHeader('Content-Type', 'application/json');
+  res.end(JSON.stringify(body));
+}
+function readJsonBody(req) {
+  return new Promise((resolve, reject) => {
+    const chunks = [];
+    req.on('data', chunk => chunks.push(chunk));
+    req.on('end', () => {
+      const text = Buffer.concat(chunks).toString('utf8');
+      if (!text) return resolve({});
+      try {
+        resolve(JSON.parse(text));
+      } catch {
+        reject(new Error('Request body is not valid JSON'));
+      }
+    });
+    req.on('error', reject);
+  });
+}
+function solidDiagnostics() {
+  let root = process.cwd();
+  let base = '/';
+  return {
+    name: 'solid:diagnostics',
+    // Dev-serve only: the channels this fronts exist in dev builds only.
+    apply(_config, env) {
+      return env.command === 'serve' && !env.isPreview;
+    },
+    configResolved(config) {
+      root = config.root;
+      base = config.base;
+    },
+    async resolveId(source, importer) {
+      if (source === DIAGNOSTICS_CLIENT_ID) {
+        return {
+          id: DIAGNOSTICS_CLIENT_ID,
+          moduleSideEffects: true
+        };
+      }
+      // The virtual module has no directory to resolve bare imports from;
+      // resolve the app's diagnostics package from the project root.
+      if (importer === DIAGNOSTICS_CLIENT_ID && source.startsWith(DIAGNOSTICS_PACKAGE)) {
+        const resolved = await this.resolve(source, path.resolve(root, 'index.html'), {
+          skipSelf: true
+        });
+        if (!resolved || resolved.id.startsWith('__vite-optional-peer-dep:')) {
+          this.error(`[@solidjs/vite-plugin] the diagnostics option requires ${DIAGNOSTICS_PACKAGE} ` + 'installed in the app (it provides the in-page bridge). Install it as a ' + 'development dependency or remove `diagnostics: true`.');
+        }
+        return resolved;
+      }
+      return null;
+    },
+    load(id) {
+      if (id === DIAGNOSTICS_CLIENT_ID) return diagnosticsClientModuleCode();
+      return null;
+    },
+    // Plain (index.html) apps get the client module injected here;
+    // start-mode apps import it from the generated client entry instead.
+    transformIndexHtml() {
+      return [{
+        tag: 'script',
+        attrs: {
+          type: 'module',
+          src: joinBase(base, '/@id/' + DIAGNOSTICS_CLIENT_ID)
+        },
+        injectTo: 'head'
+      }];
+    },
+    configureServer(server) {
+      // Announce the surface in the startup block. This is a discovery
+      // channel: agents watching dev-server output learn the endpoint and
+      // the skill documents without any project-level pointer (AGENTS.md).
+      const originalPrintUrls = server.printUrls.bind(server);
+      server.printUrls = () => {
+        originalPrintUrls();
+        const local = server.resolvedUrls?.local[0];
+        const endpoint = local ? new URL(DIAGNOSTICS_ENDPOINT, local).href : DIAGNOSTICS_ENDPOINT;
+        server.config.logger.info(`  ➜  Solid diagnostics: ${endpoint} ` + `(GET status; POST {"method":"begin"|"end"|"whyDidRun"|"costs"})\n` + `  ➜  Agent skills: node_modules/${DIAGNOSTICS_PACKAGE}/skills/agent-loops/SKILL.md, ` + `node_modules/solid-js/skills/reactivity-diagnostics/SKILL.md`);
+      };
+      const pending = new Map();
+      let nextId = 1;
+      server.ws.on(RESPONSE_EVENT, data => {
+        const entry = pending.get(data?.id);
+        if (!entry) return;
+        pending.delete(data.id);
+        clearTimeout(entry.timer);
+        entry.resolve(data);
+      });
+      server.middlewares.use(DIAGNOSTICS_ENDPOINT, async (req, res) => {
+        // The middleware mounts on the exact path; anything deeper is 404.
+        if (req.url && req.url !== '/' && req.url !== '') {
+          sendJson(res, 404, {
+            error: `Unknown diagnostics path ${req.url}`
+          });
+          return;
+        }
+        if (req.method === 'GET') {
+          sendJson(res, 200, {
+            ok: true,
+            methods: METHODS,
+            clients: server.ws.clients.size
+          });
+          return;
+        }
+        if (req.method !== 'POST') {
+          sendJson(res, 405, {
+            error: 'Use GET for status or POST { method, params }'
+          });
+          return;
+        }
+        let body;
+        try {
+          body = await readJsonBody(req);
+        } catch (error) {
+          sendJson(res, 400, {
+            error: error.message
+          });
+          return;
+        }
+        if (!body.method || !METHODS.includes(body.method)) {
+          sendJson(res, 400, {
+            error: `Unknown method ${JSON.stringify(body.method)}; expected one of: ${METHODS.join(', ')}`
+          });
+          return;
+        }
+        if (server.ws.clients.size === 0) {
+          sendJson(res, 503, {
+            error: 'No connected page. Open the app in a browser (dev server) so the ' + 'diagnostics bridge can answer.'
+          });
+          return;
+        }
+        const id = nextId++;
+        // Broadcast; with several open tabs the first responder wins. Good
+        // enough for the agent loop (one page under test); revisit with
+        // client targeting if multi-page capture ever matters.
+        const response = await new Promise(resolve => {
+          const timer = setTimeout(() => {
+            pending.delete(id);
+            resolve({
+              timeout: `No page answered within ${RESPONSE_TIMEOUT_MS}ms. The connected page ` + 'may predate `diagnostics: true` — reload it.'
+            });
+          }, RESPONSE_TIMEOUT_MS);
+          pending.set(id, {
+            resolve,
+            timer
+          });
+          server.ws.send(REQUEST_EVENT, {
+            id,
+            method: body.method,
+            params: body.params
+          });
+        });
+        if ('timeout' in response) {
+          sendJson(res, 504, {
+            error: response.timeout
+          });
+        } else if (response.error !== undefined) {
+          sendJson(res, 400, {
+            error: response.error
+          });
+        } else {
+          sendJson(res, 200, {
+            result: response.result
+          });
+        }
+      });
+    }
+  };
 }
 
 // The `"use server"` directive compiler. This wraps the native
-// `transformDirectives` pass from @dom-expressions/compiler (Rust/Oxc); the
+// `transformDirectives` pass from @solidjs/compiler (Rust/Oxc); the
 // original Babel implementation (hoisted from solid-start) lived in this
 // directory through vite-plugin-solid@c052963e and remains the frozen
-// reference for the native pass's fixture suite in dom-expressions.
+// reference for the native pass's fixture suite.
 
 let compilerPromise;
 
@@ -585,11 +791,11 @@ let compilerPromise;
 // compiler's opt-in loader in index.ts).
 async function loadCompiler() {
   try {
-    return await (compilerPromise ??= import('@dom-expressions/compiler'));
+    return await (compilerPromise ??= import('@solidjs/compiler'));
   } catch (error) {
     compilerPromise = undefined;
     const reason = error instanceof Error ? `\n\nCause: ${error.message}` : '';
-    throw new Error('@solidjs/vite-plugin: failed to load @dom-expressions/compiler (the "use server" ' + 'transform). Your platform should get a prebuilt native binary or the ' + '@dom-expressions/compiler-wasm32-wasi fallback — check that optional ' + 'dependencies were installed.' + reason);
+    throw new Error('@solidjs/vite-plugin: failed to load @solidjs/compiler (the "use server" ' + 'transform). Your platform should get a prebuilt native binary or the ' + '@solidjs/compiler-wasm32-wasi fallback — check that optional ' + 'dependencies were installed.' + reason);
   }
 }
 
@@ -1037,24 +1243,47 @@ function serverFunctions(options = {}, internal = {}) {
         if (internal.externalDevServer || !isRunnableEnvironment(ssrEnvironment)) {
           return;
         }
+        // A call's address is `<endpoint>/<id>` (solidjs/solid#3076) — the
+        // mount plus exactly one path segment. Bare-mount requests still
+        // reach the runtime handler (it answers 404), so misdirected posts
+        // fail through the endpoint rather than falling through to SSR.
+        const underMount = (pathname, mount) => pathname === mount || pathname.startsWith(mount + '/');
         server.middlewares.use((req, res, next) => {
           const url = new URL(req.url || '/', 'http://localhost');
           // Match with and without `base` — middleware-mode hosts may mount
           // vite.middlewares below the base themselves.
-          if (url.pathname !== resolvedEndpoint && url.pathname !== endpoint) {
+          if (!underMount(url.pathname, resolvedEndpoint) && !underMount(url.pathname, endpoint)) {
             return next();
           }
+          const basePrefixed = underMount(url.pathname, resolvedEndpoint);
           // When the stripped form matched, restore the base for dispatch:
           // the generated handler compares the request pathname against the
           // base-prefixed endpoint, and production handlers only ever see
           // base-prefixed URLs.
-          const dispatchUrl = url.pathname === resolvedEndpoint ? undefined : joinBase(base, req.url || '/');
+          const dispatchUrl = basePrefixed ? undefined : joinBase(base, req.url || '/');
           (async () => {
             // Make sure the referenced module has been evaluated in the SSR
             // environment so its registration exists — functions only client
             // code references are never loaded by the SSR render itself.
-            const headerId = req.headers['x-server-function-id'];
-            const functionId = (typeof headerId === 'string' ? headerId.split('#')[0] : undefined) || url.searchParams.get('id');
+            // The id lives in the path segment after the mount.
+            const mount = basePrefixed ? resolvedEndpoint : endpoint;
+            const segment = url.pathname.slice(mount.length + 1);
+            let functionId = null;
+            if (segment && !segment.includes('/')) {
+              try {
+                functionId = decodeURIComponent(segment);
+              } catch {
+                // not an address; the runtime handler answers the 404
+              }
+            }
+            if (!functionId) {
+              // TRANSITIONAL (remove before 3.0 stable): the retired header
+              // and `?id=` addressing, kept only for the RC window where this
+              // plugin meets a @solidjs/web older than the path-addressing
+              // change (solidjs/solid#3076).
+              const headerId = req.headers['x-server-function-id'];
+              functionId = (typeof headerId === 'string' ? headerId.split('#')[0] : undefined) || url.searchParams.get('id');
+            }
             if (functionId) {
               const entry = moduleForFunctionId(functionId);
               if (entry) await ssrEnvironment.runner.import(moduleDevUrl(entry));
@@ -1401,6 +1630,7 @@ function startServe(options, internal = {}) {
   const serverComponents = !!internal.serverComponents;
   const errorBoundary = options.errorBoundary !== false;
   const styleFilter = internal.styleFilter;
+  const diagnostics = !!internal.diagnostics;
   let devtoolsEnabled = false;
   let devtoolsResolutions = {};
   let devtoolsIds = {};
@@ -1565,15 +1795,18 @@ function startServe(options, internal = {}) {
     const {
       app
     } = requireEntries();
+    // Dev-only: the diagnostics bridge fronts dev-mode channels, so builds
+    // never see this import (mirrors the plugin's own serve-only `apply`).
+    const diagnosticsImport = diagnostics && !isBuild ? [`import ${JSON.stringify(DIAGNOSTICS_CLIENT_ID)};`] : [];
     if (clientMode) {
       // render(), not hydrate(): the shell's body is empty, the app mounts
       // fresh. Client code compiles non-hydratable in client mode, so the
       // app cannot claim server DOM anyway. The entry script is injected
       // without `async` (plain module = deferred), so document.body is
       // complete when this runs.
-      return [`import { render } from '@solidjs/web';`, ...errorBoundaryImport(), ...(toolbar ? [`import { DevToolbar } from ${JSON.stringify(DEVTOOLS_PACKAGE)};`] : []), `import App from ${JSON.stringify(app)};`, ``, `render(() => ${isBuild && errorBoundary ? '<DefaultErrorBoundary><App /></DefaultErrorBoundary>' : toolbar ? '<DevToolbar><App /></DevToolbar>' : '<App />'}, document.body);`].join('\n');
+      return [...diagnosticsImport, `import { render } from '@solidjs/web';`, ...errorBoundaryImport(), ...(toolbar ? [`import { DevToolbar } from ${JSON.stringify(DEVTOOLS_PACKAGE)};`] : []), `import App from ${JSON.stringify(app)};`, ``, `render(() => ${isBuild && errorBoundary ? '<DefaultErrorBoundary><App /></DefaultErrorBoundary>' : toolbar ? '<DevToolbar><App /></DevToolbar>' : '<App />'}, document.body);`].join('\n');
     }
-    return [`import { hydrate } from '@solidjs/web';`, ...(toolbar ? [`import { DevToolbar } from ${JSON.stringify(DEVTOOLS_PACKAGE)};`] : []), ...(serverComponents ? [`import { installServerComponents } from '@solidjs/web/frames';`] : []), ...errorBoundaryImport(), `import Document from ${JSON.stringify(documentSpec())};`, `import App from ${JSON.stringify(app)};`, ``, ...(serverComponents ? [
+    return [...diagnosticsImport, `import { hydrate } from '@solidjs/web';`, ...(toolbar ? [`import { DevToolbar } from ${JSON.stringify(DEVTOOLS_PACKAGE)};`] : []), ...(serverComponents ? [`import { installServerComponents } from '@solidjs/web/frames';`] : []), ...errorBoundaryImport(), `import Document from ${JSON.stringify(documentSpec())};`, `import App from ${JSON.stringify(app)};`, ``, ...(serverComponents ? [
     // Installs the t=0 document-adoption registry and the transport
     // policy (component responses morph their boundary instead of
     // decoding as data). Must run before hydrate().
@@ -1688,7 +1921,11 @@ function startServe(options, internal = {}) {
     // through untouched, so the edge applies it unconditionally.
     lines.push(``, `async function dispatchRequest(request, event, options) {`);
     if (composeServerFunctions) {
-      lines.push(`  if (new URL(request.url).pathname === endpoint) {`,
+      lines.push(
+      // A call's address is `<endpoint>/<id>` (solidjs/solid#3076); the
+      // bare mount still routes so a misaddressed request 404s through the
+      // runtime handler instead of rendering a page at it.
+      `  const requestPath = new URL(request.url).pathname;`, `  if (requestPath === endpoint || requestPath.startsWith(endpoint + '/')) {`,
       // The call shares the middleware chain's event (locals decoration,
       // the response stub); an explicit host-provided createEvent wins.
       // No fold here: the runtime's server-function handler runs the
@@ -1985,7 +2222,7 @@ function startServe(options, internal = {}) {
       return null;
     },
     async transform(code, id, opts) {
-      if (isBuild || !devtoolsEnabled) return null;
+      if (isBuild || !devtoolsEnabled && !diagnostics) return null;
       const current = requireEntries();
       if (current.generated || getEnvironmentConsumer(this.environment, opts) !== 'client') {
         return null;
@@ -1995,12 +2232,17 @@ function startServe(options, internal = {}) {
       if (vite.normalizePath(id.split('?')[0]) !== vite.normalizePath(path.resolve(root, current.entryClient))) {
         return null;
       }
-      const toolbar = await resolveDevtools((source, importer) => this.resolve(source, importer, {
-        skipSelf: true
-      }), id, 'client');
-      if (!toolbar) return null;
+      const injected = [];
+      if (diagnostics) injected.push(`import ${JSON.stringify(DIAGNOSTICS_CLIENT_ID)};`);
+      if (devtoolsEnabled) {
+        const toolbar = await resolveDevtools((source, importer) => this.resolve(source, importer, {
+          skipSelf: true
+        }), id, 'client');
+        if (toolbar) injected.push(`import ${JSON.stringify(DEVTOOLS_MOUNT_ID)};`);
+      }
+      if (injected.length === 0) return null;
       return {
-        code: `import ${JSON.stringify(DEVTOOLS_MOUNT_ID)};\n${code}`,
+        code: `${injected.join('\n')}\n${code}`,
         map: null
       };
     },
@@ -2734,7 +2976,7 @@ const require$1 = module$1.createRequire((typeof document === 'undefined' ? requ
  * second string-literal argument of the form
  * `"__SOLID_LAZY_MODULE__:" + spec`, which `resolveLazyModuleUrls` swaps for
  * the project-relative resolved module path. The prefix and shape are FROZEN
- * — the emitting side lives in @dom-expressions/compiler and must match.
+ * — the emitting side lives in @solidjs/compiler and must match.
  */
 const LAZY_PLACEHOLDER_PREFIX = '__SOLID_LAZY_MODULE__:';
 
@@ -2852,18 +3094,17 @@ async function fetchAssets(key) {
 }
 export default (registry && registry[${JSON.stringify(root)}]) ||
   (bridgeUrl ? createBridgeResolver() : { resolve: jsOnly, resolveSync: jsOnly });`;
-const SOLID_BUILT_INS = ['For', 'Show', 'Switch', 'Match', 'Loading', 'Reveal', 'Portal', 'Repeat', 'Dynamic', 'Errored'];
 
 /** Possible options for the extensions property */
 
 let nativeCompilerPromise;
 async function loadNativeCompiler() {
   try {
-    return await (nativeCompilerPromise ??= import('@dom-expressions/compiler'));
+    return await (nativeCompilerPromise ??= import('@solidjs/compiler'));
   } catch (error) {
     nativeCompilerPromise = undefined;
     const reason = error instanceof Error ? `\n\nCause: ${error.message}` : '';
-    throw new Error('@solidjs/vite-plugin: failed to load @dom-expressions/compiler, which is required ' + 'in every mode (it drives the lazy, refresh, and server-function transforms; ' + 'compiler: "babel" only switches the JSX transform). Your platform should get ' + 'a prebuilt native binary or the @dom-expressions/compiler-wasm32-wasi fallback ' + '— check that optional dependencies were installed.' + reason);
+    throw new Error('@solidjs/vite-plugin: failed to load @solidjs/compiler, which is required ' + 'in every mode (it drives the lazy, refresh, and server-function transforms; ' + 'compiler: "babel" only switches the JSX transform). Your platform should get ' + 'a prebuilt native binary or the @solidjs/compiler-wasm32-wasi fallback ' + '— check that optional dependencies were installed.' + reason);
   }
 }
 
@@ -2940,11 +3181,12 @@ function getSolidOptions(options, isSsr, dev, isTestMode = false) {
   // by construction (the dom generate ignores the flag), and apps without
   // the flag compile byte-for-byte as before.
   const serverComponents = typeof options.serverFunctions === 'object' && !!options.serverFunctions.components;
+
+  // Solid-specific defaults (moduleName "@solidjs/web", the control-flow
+  // builtIns, contextToCustomElements, wrapConditionals) are baked into both
+  // backends — @solidjs/compiler and @solidjs/babel-plugin — so only the
+  // posture this plugin actually decides is passed.
   return {
-    moduleName: '@solidjs/web',
-    builtIns: SOLID_BUILT_INS,
-    contextToCustomElements: true,
-    wrapConditionals: true,
     ...solidOptions,
     ...(serverComponents && solidOptions.generate === 'ssr' ? {
       serverComponents: true
@@ -3538,10 +3780,13 @@ function solidPlugin(options = {}) {
       }
 
       // Babel JSX backend: one babel.transformAsync hosting the user's
-      // options plus babel-preset-solid.
+      // options plus @solidjs/babel-plugin. Appended to `plugins` (was the
+      // sole preset pre-rename): user plugins still run before it, user
+      // presets still run after — babel runs plugins before presets and
+      // presets in reverse order, so the pass order is unchanged.
       const babelOptions = mergeAnything.mergeAndConcat(babelUserOptions, {
         ...babelBaseOptions,
-        presets: [[solid, solidOptions]]
+        plugins: [[solid, solidOptions]]
       });
       const result = await babel__namespace.transformAsync(code, babelOptions);
       if (!result) {
@@ -3583,10 +3828,17 @@ function solidPlugin(options = {}) {
       serverFunctions: !!options.serverFunctions,
       serverComponents,
       ssr: !!options.ssr,
-      styleFilter: filterDevStyles
+      styleFilter: filterDevStyles,
+      diagnostics: !!options.diagnostics
     }));
   }
 
+  // Agent diagnostics endpoint + injected bridge (dev serve only — the
+  // plugin no-ops itself for builds and preview via `apply`).
+  if (options.diagnostics) {
+    plugins.push(solidDiagnostics());
+  }
+
   // Builder-mode (environments API) client-before-server build ordering.
   // Server builds read the client manifest — `virtual:solid-manifest` bakes
   // dist/client/.vite/manifest.json in, and the persisted server-function