@foldkit/vite-plugin 0.26.1-canary.fe2701c2fa4b → 0.27.0-canary.49dc36ef672d

package/README.md

@@ -98,19 +98,20 @@ The standalone build plugin takes `foldkitBuild(serverEntry, { clientEntry, ...o
 Each module graph must load one Foldkit copy. The plugin configures Vite for that:
 
 - `resolve.dedupe` lists `foldkit`, `@foldkit/ui`, and `@foldkit/devtools`, each only when it resolves from the application root.
-- Server builds and the dev server's server render bundle those three packages, plus every installed package whose `dependencies` or `peerDependencies` include `foldkit` or an `@foldkit/*` package, such as `@foldkit/markdown`. In the dev server, these `ssr.noExternal` packages run through Vite's module runner instead of Node's own import. An explicit `ssr.external` entry still keeps a package external.
+- In server builds and in every server environment of the dev server, the plugin bundles those three packages, plus every installed package whose `dependencies` or `peerDependencies` include `foldkit` or an `@foldkit/*` package, such as `@foldkit/markdown`. The plugin lists them in `resolve.noExternal`, which Vite applies to every environment, and in `ssr.noExternal`. In a Node server environment of the dev server, these packages run through Vite's module runner instead of Node's own import. An explicit `ssr.external` or `resolve.external` entry still keeps a package external.
 - The plugin finds these packages by crawling from the application's `package.json`. It follows the application's `dependencies` and `devDependencies`, then the `dependencies` of each package it bundles, plus the `devDependencies` of a bundled package that is a private workspace package.
+- The plugin excludes `foldkit` from dependency pre-bundling in every environment, so the build id transform runs on it. It also pre-bundles the Effect entries Foldkit imports in every environment whose optimizer is enabled, for example a Cloudflare Worker environment, so Foldkit and the application share one Effect instance. Applications need no `optimizeDeps` settings for Foldkit.
 
-A package the crawl does not reach stays external. For example: a peer the application does not declare, or a package reached only through a package that does not depend on Foldkit. Such a package loads a second Foldkit copy from `node_modules` at runtime. Declare it in the application's `package.json`, or add it to `ssr.noExternal`:
+A package the crawl does not reach stays external. For example: a peer the application does not declare, or a package reached only through a package that does not depend on Foldkit. Such a package loads a second Foldkit copy from `node_modules` at runtime. Declare it in the application's `package.json`, or add it to `resolve.noExternal`, which Vite applies to every environment:
 
 ```typescript
 export default defineConfig({
   plugins: [foldkit()],
-  ssr: { noExternal: ['foldkit-component-library'] },
+  resolve: { noExternal: ['foldkit-component-library'] },
 })
 ```
 
-Vitest copies SSR `noExternal` into `server.deps.inline`. A Vitest config that includes `foldkit()` therefore also inlines the crawled packages in tests.
+Vitest copies each environment's `resolve.noExternal` into `server.deps.inline`. A Vitest config that includes `foldkit()` therefore also inlines the crawled packages in tests.
 
 ## Completed build metadata
 

package/dist/foldkitPackages.d.ts

@@ -12,6 +12,6 @@ export declare const isFoldkitSingletonPackageSpecifier: (specifier: string) =>
  */
 export declare const crawlFoldkitPackages: (root: string, isBuild: boolean, viteUserConfig: UserConfig) => Promise<Readonly<{
     dedupe: Array<string>;
-    ssrNoExternal: Array<string>;
+    noExternal: Array<string>;
 }>>;
 //# sourceMappingURL=foldkitPackages.d.ts.map

package/dist/foldkitPackages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"foldkitPackages.d.ts","sourceRoot":"","sources":["../src/foldkitPackages.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,UAAU,EAA0B,MAAM,MAAM,CAAA;AAS9D;;;;GAIG;AACH,eAAO,MAAM,kCAAkC,cAClC,MAAM,KAChB,OAKA,CAAA;AA8CH;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,SACzB,MAAM,WACH,OAAO,kBACA,UAAU,KACzB,OAAO,CACR,QAAQ,CAAC;IAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAAC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC,CAqClE,CAAA"}
+{"version":3,"file":"foldkitPackages.d.ts","sourceRoot":"","sources":["../src/foldkitPackages.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,UAAU,EAA0B,MAAM,MAAM,CAAA;AAS9D;;;;GAIG;AACH,eAAO,MAAM,kCAAkC,cAClC,MAAM,KAChB,OAKA,CAAA;AA8CH;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,SACzB,MAAM,WACH,OAAO,kBACA,UAAU,KACzB,OAAO,CAAC,QAAQ,CAAC;IAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC,CAoCxE,CAAA"}

package/dist/foldkitPackages.js

@@ -58,11 +58,11 @@ export const crawlFoldkitPackages = async (root, isBuild, viteUserConfig) => {
         viteUserConfig,
         isSemiFrameworkPkgByJson: dependsOnFoldkit,
     });
-    const ssrNoExternal = Array.dedupe([
+    const noExternal = Array.dedupe([
         ...FOLDKIT_SINGLETON_PACKAGES,
         ...crawl.ssr.noExternal,
     ]);
     const maybeResolvableSingletons = await Promise.all(Array.map(FOLDKIT_SINGLETON_PACKAGES, async (packageName) => pipe(await findDepPkgJsonPath(packageName, crawlRoot), Option.fromUndefinedOr, Option.as(packageName))));
     const dedupe = Array.getSomes(maybeResolvableSingletons);
-    return { dedupe, ssrNoExternal };
+    return { dedupe, noExternal };
 };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA6CA,OAAO,KAAK,EAEV,MAAM,EAIP,MAAM,MAAM,CAAA;AAOb,OAAO,EAAE,KAAK,mBAAmB,EAAgB,MAAM,YAAY,CAAA;AAKnE,OAAO,EAAE,KAAK,iBAAiB,EAAc,MAAM,UAAU,CAAA;AAG7D,OAAO,EAAE,KAAK,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACzE,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EACpB,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,YAAY,GACb,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,KAAK,iBAAiB,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAC7D,OAAO,EACL,KAAK,2BAA2B,EAChC,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,mBAAmB,CAAA;AAE1B,6CAA6C;AAC7C,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC;IAC1C;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,MAAM,GAAG,KAAK,CAAA;IAChC;;;;;;;OAOG;IACH,GAAG,CAAC,EAAE,IAAI,CACR,iBAAiB,EACjB,SAAS,GAAG,gBAAgB,GAAG,aAAa,GAAG,aAAa,CAC7D,GACC,CACI,QAAQ,CAAC;QACP,kFAAkF;QAClF,WAAW,EAAE,MAAM,CAAA;QACnB,WAAW,CAAC,EAAE,KAAK,CAAA;QACnB;;;;;;;;WAQG;QACH,KAAK,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAA;KAC3D,CAAC,GACF,QAAQ,CAAC;QACP,kEAAkE;QAClE,WAAW,CAAC,EAAE,KAAK,CAAA;QACnB,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,KAAK,CAAC,EAAE,KAAK,CAAA;KACd,CAAC,CACL,CAAA;IACH;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAC,CAAA;AA64BF,eAAO,MAAM,OAAO,aAAa,oBAAoB,KAAQ,KAAK,CAAC,MAAM,CAuIxE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA6CA,OAAO,KAAK,EAGV,MAAM,EAIP,MAAM,MAAM,CAAA;AAOb,OAAO,EAAE,KAAK,mBAAmB,EAAgB,MAAM,YAAY,CAAA;AAKnE,OAAO,EAAE,KAAK,iBAAiB,EAAc,MAAM,UAAU,CAAA;AAG7D,OAAO,EAAE,KAAK,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACzE,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EACpB,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,YAAY,GACb,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,KAAK,iBAAiB,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAC7D,OAAO,EACL,KAAK,2BAA2B,EAChC,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,mBAAmB,CAAA;AAE1B,6CAA6C;AAC7C,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC;IAC1C;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,MAAM,GAAG,KAAK,CAAA;IAChC;;;;;;;OAOG;IACH,GAAG,CAAC,EAAE,IAAI,CACR,iBAAiB,EACjB,SAAS,GAAG,gBAAgB,GAAG,aAAa,GAAG,aAAa,CAC7D,GACC,CACI,QAAQ,CAAC;QACP,kFAAkF;QAClF,WAAW,EAAE,MAAM,CAAA;QACnB,WAAW,CAAC,EAAE,KAAK,CAAA;QACnB;;;;;;;;WAQG;QACH,KAAK,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAA;KAC3D,CAAC,GACF,QAAQ,CAAC;QACP,kEAAkE;QAClE,WAAW,CAAC,EAAE,KAAK,CAAA;QACnB,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,KAAK,CAAC,EAAE,KAAK,CAAA;KACd,CAAC,CACL,CAAA;IACH;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAC,CAAA;AA86BF,eAAO,MAAM,OAAO,aAAa,oBAAoB,KAAQ,KAAK,CAAC,MAAM,CA+IxE,CAAA"}

package/dist/index.js

@@ -19,12 +19,12 @@ export { FOLDKIT_FETCH_MODULE_ID, FoldkitBuildManifest, FoldkitBuildMetadata, fo
 export { foldkitSsr } from './ssr.js';
 export { foldkitViewIdentity, transformViewIdentity, } from './viewIdentity.js';
 // NOTE: Vite does not scan imports through `foldkit` because the plugin
-// excludes the package from optimization. A consumer can import only Effect
-// subpaths while Foldkit's compiled distribution imports the bare barrel, so
-// include both the barrel and every top-level namespace Foldkit imports. This
-// keeps them in one optimized dependency graph. Over-inclusion is harmless;
-// under-inclusion is the bug. `scripts/check-effect-prebundle.ts` keeps the
-// entries in sync with Foldkit's source and runs in `pnpm check`.
+// excludes the package from optimization in every environment. A consumer can
+// import only Effect subpaths while Foldkit's compiled distribution imports the
+// bare barrel, so include both the barrel and every top-level namespace Foldkit
+// imports. This keeps them in one optimized dependency graph. Over-inclusion is
+// harmless; under-inclusion is the bug. `scripts/check-effect-prebundle.ts`
+// keeps the entries in sync with Foldkit's source and runs in `pnpm check`.
 const FORCE_INCLUDED_EFFECT_ENTRIES = [
     'effect',
     'effect/Array',
@@ -70,6 +70,16 @@ const FORCE_INCLUDED_EFFECT_ENTRIES = [
     'effect/SubscriptionRef',
     'effect/Types',
 ];
+// NOTE: Adding includes to an environment whose optimizer is otherwise disabled
+// turns on Vite's explicit optimizer, which would pre-bundle Effect in Vite's
+// default Node `ssr` environment.
+const shouldForceEffectEntries = (name, config) => {
+    const consumer = config.consumer ?? (name === 'client' ? 'client' : 'server');
+    const isClientEnvironment = consumer === 'client';
+    const isDiscoveryEnabled = config.optimizeDeps?.noDiscovery === false;
+    const isExplicitOptimizationEnabled = Array.isArrayNonEmpty(config.optimizeDeps?.include ?? []);
+    return (isClientEnvironment || isDiscoveryEnabled || isExplicitOptimizationEnabled);
+};
 const Event = Data.taggedEnum();
 const makeState = Effect.gen(function* () {
     const preservedModels = yield* Ref.make(HashMap.empty());
@@ -87,6 +97,8 @@ const makeState = Effect.gen(function* () {
     return state;
 });
 const encodeResponseFrameJson = Schema.encodeUnknownSync(Schema.fromJsonString(ResponseFrame));
+class WebSocketSendFailed extends Data.TaggedError('WebSocketSendFailed') {
+}
 // HANDLERS
 const handlePreserveModelReceived = (state, payload) => Exit.match(Schema.decodeUnknownExit(PreserveModelMessage)(payload), {
     onFailure: error => Console.warn('[foldkit:preserve] failed to decode preserve-model payload', error),
@@ -103,7 +115,14 @@ const handleRequestModelReceived = (server, state, payload) => Exit.match(Schema
     onFailure: error => Console.warn('[foldkit:preserve] failed to decode request-model payload', error),
     onSuccess: ({ id }) => Effect.gen(function* () {
         const current = yield* Ref.get(state.preservedModels);
-        const sendRestore = (model) => Effect.sync(() => server.ws.send('foldkit:restore-model', Schema.encodeUnknownSync(RestoreModelMessage)(RestoreModelMessage.make({ id, model }))));
+        const sendRestore = (model) => Effect.gen(function* () {
+            const frame = RestoreModelMessage.make({ id, model });
+            const encoded = yield* Schema.encodeEffect(RestoreModelMessage)(frame);
+            yield* Effect.try({
+                try: () => server.ws.send('foldkit:restore-model', encoded),
+                catch: cause => new WebSocketSendFailed({ cause }),
+            });
+        }).pipe(Effect.catch(error => Console.warn('[foldkit:preserve] failed to send restore-model payload', error)));
         yield* Option.match(HashMap.get(current, id), {
             onNone: () => sendRestore(undefined),
             onSome: entry => {
@@ -175,7 +194,7 @@ const handleMcpClientDisconnected = (state, client) => Effect.gen(function* () {
     const remaining = HashSet.size(yield* Ref.get(state.mcpClients));
     yield* Console.log(`[foldkit:devTools] MCP client disconnected (${remaining} remaining)`);
 });
-const handleMcpRequestReceived = (server, state, client, raw) => Exit.match(Schema.decodeUnknownExit(Schema.fromJsonString(RequestFrame))(raw), {
+const handleMcpRequestReceived = (server, state, client, raw) => Exit.match(Schema.decodeExit(Schema.fromJsonString(RequestFrame))(raw), {
     onFailure: error => Console.warn('[foldkit:devTools] failed to decode MCP request frame', error),
     onSuccess: frame => Match.value(frame.request).pipe(Match.tag('RequestListRuntimes', () => replyListRuntimes(state, client, frame.id)), Match.orElse(() => forwardRequestToBrowsers(server, frame))),
 });
@@ -191,7 +210,13 @@ const replyListRuntimes = (state, client, requestId) => Effect.gen(function* ()
         }
     });
 });
-const forwardRequestToBrowsers = (server, frame) => Effect.sync(() => server.ws.send('foldkit:devTools:request', Schema.encodeUnknownSync(RequestFrame)(frame)));
+const forwardRequestToBrowsers = (server, frame) => Effect.gen(function* () {
+    const encoded = yield* Schema.encodeEffect(RequestFrame)(frame);
+    yield* Effect.try({
+        try: () => server.ws.send('foldkit:devTools:request', encoded),
+        catch: cause => new WebSocketSendFailed({ cause }),
+    });
+}).pipe(Effect.catch(error => Console.warn('[foldkit:devTools] failed to send request frame', error)));
 // EVENT DISPATCH
 const dispatchEvent = (server, state, event) => Match.value(event).pipe(Match.tagsExhaustive({
     PreserveModelReceived: ({ payload }) => handlePreserveModelReceived(state, payload),
@@ -492,11 +517,15 @@ export const foldkit = (options = {}) => {
     const reloadPlugin = {
         name: 'foldkit',
         apply: 'serve',
-        config: () => ({
-            optimizeDeps: {
-                include: [...FORCE_INCLUDED_EFFECT_ENTRIES],
-            },
-        }),
+        // NOTE: The `post` order runs this hook after every default-order
+        // `configEnvironment` hook, so the predicate sees discovery or includes
+        // that another plugin turns on there.
+        configEnvironment: {
+            order: 'post',
+            handler: (name, config) => shouldForceEffectEntries(name, config)
+                ? { optimizeDeps: { include: [...FORCE_INCLUDED_EFFECT_ENTRIES] } }
+                : undefined,
+        },
         configureServer: server => {
             const events = Effect.runSync(Queue.unbounded());
             // NOTE: The default ConfigProvider snapshots the environment. Create a
@@ -526,24 +555,27 @@ export const foldkit = (options = {}) => {
         config: async (userConfig, { command }) => {
             const foldkitPackages = await crawlFoldkitPackages(userConfig.root ?? process.cwd(), command === 'build', userConfig);
             return {
-                optimizeDeps: {
-                    exclude: ['foldkit'],
-                },
                 resolve: {
                     dedupe: foldkitPackages.dedupe,
+                    noExternal: foldkitPackages.noExternal,
                 },
                 ssr: {
-                    noExternal: foldkitPackages.ssrNoExternal,
+                    noExternal: foldkitPackages.noExternal,
                 },
                 environments: {
                     ssr: {
                         resolve: {
-                            noExternal: foldkitPackages.ssrNoExternal,
+                            noExternal: foldkitPackages.noExternal,
                         },
                     },
                 },
             };
         },
+        configEnvironment: () => ({
+            optimizeDeps: {
+                exclude: ['foldkit'],
+            },
+        }),
     };
     const shared = [
         resolutionPlugin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foldkit/vite-plugin",
-  "version": "0.26.1-canary.fe2701c2fa4b",
+  "version": "0.27.0-canary.49dc36ef672d",
   "description": "Vite plugin for Foldkit with state-preserving live reload",
   "type": "module",
   "main": "./dist/index.js",
@@ -17,7 +17,7 @@
   ],
   "peerDependencies": {
     "effect": "4.0.0",
-    "foldkit": "0.166.0-canary.fe2701c2fa4b",
+    "foldkit": "0.167.0-canary.49dc36ef672d",
     "vite": "^8.0.0"
   },
   "dependencies": {
@@ -32,13 +32,13 @@
     "@types/ws": "^8.18.1",
     "@vitejs/plugin-basic-ssl": "^2.3.0",
     "effect": "4.0.0",
+    "foldkit": "0.167.0-canary.49dc36ef672d",
     "happy-dom": "^20.14.5",
     "rimraf": "^6.1.3",
     "typescript": "^7.0.2",
     "vite": "^8.3.1",
     "vite-host": "npm:vite@8.2.1",
-    "vitest": "^4.1.11",
-    "foldkit": "0.166.0-canary.fe2701c2fa4b"
+    "vitest": "^4.1.11"
   },
   "keywords": [
     "vite",