@foldkit/vite-plugin 0.28.0-canary.90746b32d2ca → 0.28.0-canary.af4b0bc7b683
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/dist/brandDist.d.ts.map +1 -1
- package/dist/build.d.ts +0 -4
- package/dist/build.d.ts.map +1 -1
- package/dist/build.js +3 -15
- package/dist/buildToken.d.ts.map +1 -1
- package/dist/devToolsOverlay.d.ts.map +1 -1
- package/dist/foldkitPackages.d.ts.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -23
- package/dist/relayRegistry.d.ts.map +1 -1
- package/dist/relayRegistryTrust.d.ts.map +1 -1
- package/dist/ssr.d.ts +6 -10
- package/dist/ssr.d.ts.map +1 -1
- package/dist/ssr.js +19 -159
- package/dist/viewIdentity.d.ts.map +1 -1
- package/package.json +11 -11
- package/dist/crypto.d.ts +0 -9
- package/dist/crypto.d.ts.map +0 -1
- package/dist/crypto.js +0 -9
- package/dist/preview.d.ts +0 -4
- package/dist/preview.d.ts.map +0 -1
- package/dist/preview.js +0 -67
package/README.md
CHANGED
|
@@ -61,7 +61,7 @@ Pass `ssr` with the path to your server entry to render page requests through it
|
|
|
61
61
|
plugins: [foldkit({ ssr: { serverEntry: '/src/entry.server.ts' } })]
|
|
62
62
|
```
|
|
63
63
|
|
|
64
|
-
With this set, the dev server converts HTML page requests to Web `Request` values, passes them to the entry's `renderPage`, and serves the returned `Response`. The request URL retains Vite's configured `base` prefix and the browser's query string. Vite continues to serve the client entry, HMR, and assets, and the server entry runs through
|
|
64
|
+
With this set, the dev server converts HTML page requests to Web `Request` values, passes them to the entry's `renderPage`, and serves the returned `Response`. The request URL retains Vite's configured `base` prefix and the browser's query string. Vite continues to serve the client entry, HMR, and assets, and the server entry runs through Vite's module graph, so edits to it apply without a restart. The client side of the handoff needs no plugin configuration: a server-rendered application's client entry calls `Runtime.hydrate` instead of `Runtime.run`. Hydration adopts matching DOM, rebuilds mismatched subtrees, and refuses an invalid or cross-deployment handoff. The option shapes only the dev server; production hosts import the built server entry themselves. See the [Server Rendering documentation](https://foldkit.dev/core/server-rendering) for the full contract.
|
|
65
65
|
|
|
66
66
|
Vite retains ownership of configured proxy routes before Foldkit handles application requests. Vite's `server.cors` option applies to Vite-owned source modules, assets, and HMR. It does not add headers to application responses or answer their preflights. Preflight ownership follows `Access-Control-Request-Method`, so a preflight for an application `POST` reaches `renderPage` even when its path looks like an asset. An `OPTIONS` request without both `Origin` and `Access-Control-Request-Method` is not a preflight and also reaches `renderPage`. Define application CORS in `renderPage`, where development and the deployed host share one policy. Vite's `allowedHosts` check runs before proxy and application handling, including `OPTIONS` and methods the Web `Request` API cannot represent.
|
|
67
67
|
|
|
@@ -171,10 +171,10 @@ When one Vite app build produces the client and server artifacts, the plugin gen
|
|
|
171
171
|
|
|
172
172
|
```typescript
|
|
173
173
|
// src/entry.server.ts
|
|
174
|
-
Server.renderToString(
|
|
174
|
+
Server.renderToString(config, { flags })
|
|
175
175
|
|
|
176
176
|
// src/entry.ts
|
|
177
|
-
Runtime.hydrate(
|
|
177
|
+
Runtime.hydrate(application)
|
|
178
178
|
```
|
|
179
179
|
|
|
180
180
|
Use the `buildId` option or `FOLDKIT_BUILD_ID` as an explicit override when client and server build in separate jobs, or when the id should name a deployment in another system:
|
package/dist/brandDist.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"brandDist.d.ts","sources":["../src/brandDist.ts"],"names":[],"mappings":"AAQA,sEAAsE;AACtE,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACrC,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAC,CAAA;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,kBAAkB,gBAChB,MAAM,eACN,MAAM,KAClB,eAyBF,CAAA"}
|
|
1
|
+
{"version":3,"file":"brandDist.d.ts","sourceRoot":"","sources":["../src/brandDist.ts"],"names":[],"mappings":"AAQA,sEAAsE;AACtE,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACrC,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAC,CAAA;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,kBAAkB,gBAChB,MAAM,eACN,MAAM,KAClB,eAyBF,CAAA"}
|
package/dist/build.d.ts
CHANGED
|
@@ -127,10 +127,6 @@ export declare const renderTargetFor: (clientDirectory: string, path: string, or
|
|
|
127
127
|
* use the server entry's `renderDocument` export with the emitted browser assets.
|
|
128
128
|
* The browser build has a script input and emits no HTML until prerendering.
|
|
129
129
|
* The server bundle's default export is `{ fetch }`.
|
|
130
|
-
*
|
|
131
|
-
* With prerendering enabled, `vite preview` resolves generated directory-index
|
|
132
|
-
* pages at their declared paths. Vite serves the existing files without running
|
|
133
|
-
* the server entry. Custom application hosts retain their own routing.
|
|
134
130
|
*/
|
|
135
131
|
export declare const foldkitBuild: (serverEntry: string, options: FoldkitBuildOptions) => Plugin<FoldkitBuildApi>;
|
|
136
132
|
//# sourceMappingURL=build.d.ts.map
|
package/dist/build.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sources":["../src/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,MAAM,EAAE,MAAM,QAAQ,CAAA;AAS1C,OAAO,QAA8B,MAAM,WAAW,CAAA;AAEtD,OAAO,KAAK,EAGV,MAAM,EAGP,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,MAAM,EAAE,MAAM,QAAQ,CAAA;AAS1C,OAAO,QAA8B,MAAM,WAAW,CAAA;AAEtD,OAAO,KAAK,EAGV,MAAM,EAGP,MAAM,MAAM,CAAA;AAEb,mEAAmE;AACnE,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC;IAC7C;;;OAGG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAC7B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAC,CAAA;AAEF,4EAA4E;AAC5E,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC;IACzC,2HAA2H;IAC3H,WAAW,EAAE,MAAM,CAAA;IACnB,0CAA0C;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,yCAAyC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,GAAG,uBAAuB,CAAA;CAC9C,CAAC,CAAA;AAEF,6EAA6E;AAC7E,eAAO,MAAM,uBAAuB,0BAA0B,CAAA;AAE9D;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB;IAC/B;;;;OAIG;;IAEH;;;;OAIG;;IAEH,+EAA+E;;IAE/E,2DAA2D;;IAE3D,6EAA6E;;EAE7E,CAAA;AAEF;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,oBAAoB,CAAC,IAAI,CAAA;AAEnE,iFAAiF;AACjF,eAAO,MAAM,oBAAoB;IAC/B,+CAA+C;;IAE/C,kDAAkD;;IAElD,iDAAiD;;IAEjD,kDAAkD;;IAElD,0DAA0D;;QAtC1D;;;;WAIG;;QAEH;;;;WAIG;;QAEH,+EAA+E;;QAE/E,2DAA2D;;QAE3D,6EAA6E;;;EAwB7E,CAAA;AAEF,sEAAsE;AACtE,MAAM,MAAM,oBAAoB,GAAG,OAAO,oBAAoB,CAAC,IAAI,CAAA;AAEnE,2DAA2D;AAC3D,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACrC,2CAA2C;IAC3C,WAAW,EAAE,MAAM,CAAA;IACnB,uDAAuD;IACvD,aAAa,EAAE,OAAO,uBAAuB,CAAA;IAC7C;;;;OAIG;IACH,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;CAC7C,CAAC,CAAA;AAcF,eAAO,MAAM,YAAY,SACjB,MAAM,aACD,MAAM,YACR,OAAO,QAAQ,KACvB,MAQF,CAAA;AA6FD,eAAO,MAAM,eAAe,oBACT,MAAM,QACjB,MAAM,UACJ,MAAM,YACL,OAAO,QAAQ,KACvB,QAAQ,CAAC;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CA0CrC,CAAA;AAqLD;;;;;;;;;GASG;AACH,eAAO,MAAM,YAAY,gBACV,MAAM,WACV,mBAAmB,KAC3B,MAAM,CAAC,eAAe,CAwSxB,CAAA"}
|
package/dist/build.js
CHANGED
|
@@ -4,7 +4,6 @@ import { existsSync } from 'node:fs';
|
|
|
4
4
|
import { mkdir, readFile, writeFile } from 'node:fs/promises';
|
|
5
5
|
import nodePath, { dirname, resolve } from 'node:path';
|
|
6
6
|
import { pathToFileURL } from 'node:url';
|
|
7
|
-
import { installPrerenderPreview } from './preview.js';
|
|
8
7
|
/** Vite module id of the fetch handler Foldkit emits as the server entry. */
|
|
9
8
|
export const FOLDKIT_FETCH_MODULE_ID = 'virtual:foldkit/fetch';
|
|
10
9
|
/**
|
|
@@ -281,10 +280,6 @@ const assetsForFetchModule = (assets) => {
|
|
|
281
280
|
* use the server entry's `renderDocument` export with the emitted browser assets.
|
|
282
281
|
* The browser build has a script input and emits no HTML until prerendering.
|
|
283
282
|
* The server bundle's default export is `{ fetch }`.
|
|
284
|
-
*
|
|
285
|
-
* With prerendering enabled, `vite preview` resolves generated directory-index
|
|
286
|
-
* pages at their declared paths. Vite serves the existing files without running
|
|
287
|
-
* the server entry. Custom application hosts retain their own routing.
|
|
288
283
|
*/
|
|
289
284
|
export const foldkitBuild = (serverEntry, options) => {
|
|
290
285
|
const state = {};
|
|
@@ -374,10 +369,7 @@ export const foldkitBuild = (serverEntry, options) => {
|
|
|
374
369
|
};
|
|
375
370
|
return {
|
|
376
371
|
name: 'foldkit:build',
|
|
377
|
-
apply:
|
|
378
|
-
...(prerender === undefined
|
|
379
|
-
? {}
|
|
380
|
-
: { configurePreviewServer: installPrerenderPreview }),
|
|
372
|
+
apply: 'build',
|
|
381
373
|
sharedDuringBuild: true,
|
|
382
374
|
api: {
|
|
383
375
|
serverEntry,
|
|
@@ -446,14 +438,10 @@ export const foldkitBuild = (serverEntry, options) => {
|
|
|
446
438
|
state.assets = collectDocumentAssets(Object.values(bundle), this.environment.config);
|
|
447
439
|
},
|
|
448
440
|
},
|
|
449
|
-
config:
|
|
441
|
+
config: userConfig => {
|
|
450
442
|
const client = {
|
|
451
443
|
build: {
|
|
452
|
-
outDir:
|
|
453
|
-
? (userConfig.environments?.['client']?.build?.outDir ??
|
|
454
|
-
userConfig.build?.outDir ??
|
|
455
|
-
clientOutDir)
|
|
456
|
-
: clientOutDir,
|
|
444
|
+
outDir: clientOutDir,
|
|
457
445
|
rolldownOptions: { input: { [CLIENT_CHUNK_NAME]: CLIENT_MODULE_ID } },
|
|
458
446
|
},
|
|
459
447
|
};
|
package/dist/buildToken.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildToken.d.ts","sources":["../src/buildToken.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAA+B,MAAM,MAAM,CAAA;AAoC/D;;;;GAIG;AACH,eAAO,MAAM,cAAc,gBAAiB,MAAM,KAAG,MAAM,GAAG,SAQ7D,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,YACnB,OAAO,GAAG,OAAO,eACb,MAAM,KAClB,MAAM,GAAG,SAMX,CAAA;AA0ID;;;GAGG;AACH,eAAO,MAAM,iBAAiB,aAClB,MAAM,wCAEf,KAAK,CAAC,MAAM,CA+Dd,CAAA"}
|
|
1
|
+
{"version":3,"file":"buildToken.d.ts","sourceRoot":"","sources":["../src/buildToken.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAA+B,MAAM,MAAM,CAAA;AAoC/D;;;;GAIG;AACH,eAAO,MAAM,cAAc,gBAAiB,MAAM,KAAG,MAAM,GAAG,SAQ7D,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,YACnB,OAAO,GAAG,OAAO,eACb,MAAM,KAClB,MAAM,GAAG,SAMX,CAAA;AA0ID;;;GAGG;AACH,eAAO,MAAM,iBAAiB,aAClB,MAAM,wCAEf,KAAK,CAAC,MAAM,CA+Dd,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devToolsOverlay.d.ts","sources":["../src/devToolsOverlay.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"devToolsOverlay.d.ts","sourceRoot":"","sources":["../src/devToolsOverlay.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAoIlC;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,YAC7B,OAAO,GAAG,OAAO,QACpB,MAAM,KACX,OAQF,CAAA;AAED,+EAA+E;AAC/E,eAAO,MAAM,qBAAqB,QAAO,MAmExC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"foldkitPackages.d.ts","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"}
|
|
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,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/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sources":["../src/index.ts"],"names":[],"mappings":"AAgDA,OAAO,KAAK,EAEV,MAAM,EAIP,MAAM,MAAM,CAAA;AAQb,OAAO,EAAE,KAAK,mBAAmB,EAAgB,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgDA,OAAO,KAAK,EAEV,MAAM,EAIP,MAAM,MAAM,CAAA;AAQb,OAAO,EAAE,KAAK,mBAAmB,EAAgB,MAAM,YAAY,CAAA;AAMnE,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;;;;;;;;;OASG;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;AAggCF,eAAO,MAAM,OAAO,aAAa,oBAAoB,KAAQ,KAAK,CAAC,MAAM,CA+IxE,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Array, Clock, ConfigProvider, Console,
|
|
1
|
+
import { Array, Clock, ConfigProvider, Console, Data, Duration, Effect, Exit, Fiber, HashMap, Layer, Match, Number, Option, Order, Predicate, Queue, Ref, Schedule, Schema, Stream, pipe, } from 'effect';
|
|
2
|
+
import { SecureRandom } from 'effect/crypto';
|
|
2
3
|
import { Event as DevToolsEvent, EventFrame, RELAY_RECORD_VERSION, RequestFrame, Response, ResponseFrame, } from 'foldkit/devtools-protocol';
|
|
3
4
|
import { PreserveModelMessage, RequestModelMessage, RestoreModelMessage, } from 'foldkit/model-preservation';
|
|
4
5
|
import { createHmac, timingSafeEqual } from 'node:crypto';
|
|
@@ -10,7 +11,6 @@ import * as NodeFileSystem from '@effect/platform-node/NodeFileSystem';
|
|
|
10
11
|
import * as NodePath from '@effect/platform-node/NodePath';
|
|
11
12
|
import { foldkitBuild } from './build.js';
|
|
12
13
|
import { foldkitBuildToken } from './buildToken.js';
|
|
13
|
-
import { randomUUIDv4Effect } from './crypto.js';
|
|
14
14
|
import { devToolsOverlayPlugin } from './devToolsOverlay.js';
|
|
15
15
|
import { crawlFoldkitPackages } from './foldkitPackages.js';
|
|
16
16
|
import { publishRelayRecord, retireRelayRecord } from './relayRegistry.js';
|
|
@@ -71,7 +71,6 @@ const FORCE_INCLUDED_EFFECT_ENTRIES = [
|
|
|
71
71
|
'effect/String',
|
|
72
72
|
'effect/Struct',
|
|
73
73
|
'effect/SubscriptionRef',
|
|
74
|
-
'effect/Tuple',
|
|
75
74
|
'effect/Types',
|
|
76
75
|
];
|
|
77
76
|
// NOTE: Adding includes to an environment whose optimizer is otherwise disabled
|
|
@@ -106,9 +105,6 @@ const byConnectionOrder = Order.mapInput(Order.Number, ({ sequence }) => sequenc
|
|
|
106
105
|
const handlePreserveModelReceived = (state, payload) => Exit.match(Schema.decodeUnknownExit(PreserveModelMessage)(payload), {
|
|
107
106
|
onFailure: error => Console.warn('[foldkit:preserve] failed to decode preserve-model payload', error),
|
|
108
107
|
onSuccess: ({ id, model, isReloadFlush }) => Ref.update(state.preservedModels, current => {
|
|
109
|
-
if (model === undefined) {
|
|
110
|
-
return HashMap.remove(current, id);
|
|
111
|
-
}
|
|
112
108
|
const existingFlag = Option.exists(HashMap.get(current, id), ({ isReloadFlush }) => isReloadFlush);
|
|
113
109
|
const entry = {
|
|
114
110
|
model,
|
|
@@ -292,8 +288,8 @@ class RelayBindFailed extends Data.TaggedError('RelayBindFailed') {
|
|
|
292
288
|
}
|
|
293
289
|
const isPortInUse = (error) => Predicate.hasProperty(error, 'code') && error.code === 'EADDRINUSE';
|
|
294
290
|
const relayId = Effect.gen(function* () {
|
|
295
|
-
const
|
|
296
|
-
return yield*
|
|
291
|
+
const secureRandom = yield* SecureRandom.SecureRandom;
|
|
292
|
+
return yield* secureRandom.uuidV4();
|
|
297
293
|
});
|
|
298
294
|
const attachRelayHandlers = (wss, enqueue) => {
|
|
299
295
|
wss.on('connection', client => {
|
|
@@ -311,8 +307,8 @@ const boundPort = (address) => address === null || Predicate.isString(address)
|
|
|
311
307
|
: Option.some(address.port);
|
|
312
308
|
const relayHasNoBoundPort = () => new Error('[foldkit:devTools] the MCP relay listener has no bound port');
|
|
313
309
|
const relayToken = Effect.gen(function* () {
|
|
314
|
-
const
|
|
315
|
-
const bytes = yield*
|
|
310
|
+
const secureRandom = yield* SecureRandom.SecureRandom;
|
|
311
|
+
const bytes = yield* secureRandom.randomBytes(RELAY_TOKEN_BYTES);
|
|
316
312
|
return Buffer.from(bytes).toString('hex');
|
|
317
313
|
});
|
|
318
314
|
const relayUrlForLog = (url) => {
|
|
@@ -538,7 +534,7 @@ const main = (server, events, options) => Effect.gen(function* () {
|
|
|
538
534
|
* an array; Vite flattens nested plugin arrays, so `plugins: [foldkit()]`
|
|
539
535
|
* keeps working.
|
|
540
536
|
*/
|
|
541
|
-
const relayRegistryLayer = Layer.provideMerge(NodeChildProcessSpawner.layer, Layer.mergeAll(NodeFileSystem.layer, NodePath.layer, NodeCrypto.
|
|
537
|
+
const relayRegistryLayer = Layer.provideMerge(NodeChildProcessSpawner.layer, Layer.mergeAll(NodeFileSystem.layer, NodePath.layer, NodeCrypto.layerSecureRandom));
|
|
542
538
|
export const foldkit = (options = {}) => {
|
|
543
539
|
// NOTE: During a Vite restart, old and new servers overlap. Separate queues
|
|
544
540
|
// and fibers keep their events and shutdowns attached to the right server.
|
|
@@ -577,18 +573,9 @@ export const foldkit = (options = {}) => {
|
|
|
577
573
|
closeBundle() {
|
|
578
574
|
return Effect.runPromise(stopMain(this.environment.getTopLevelConfig()));
|
|
579
575
|
},
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
// run the server entry's `import.meta.hot.dispose` callback.
|
|
584
|
-
hotUpdate({ type, file, modules, server }) {
|
|
585
|
-
if (type !== 'update' || this.environment.name !== 'client') {
|
|
586
|
-
return undefined;
|
|
587
|
-
}
|
|
588
|
-
const serverModules = server.environments.ssr?.moduleGraph.getModulesByFile(file);
|
|
589
|
-
if (Array.isArrayEmpty(modules) &&
|
|
590
|
-
(serverModules === undefined || serverModules.size === 0)) {
|
|
591
|
-
return undefined;
|
|
576
|
+
handleHotUpdate: ({ server, modules, }) => {
|
|
577
|
+
if (modules.length === 0) {
|
|
578
|
+
return;
|
|
592
579
|
}
|
|
593
580
|
server.ws.send({ type: 'full-reload' });
|
|
594
581
|
const run = mainRuns.get(server.config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relayRegistry.d.ts","sources":["../src/relayRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EACN,UAAU,EAEV,IAAI,EACJ,KAAK,aAAa,EAGnB,MAAM,QAAQ,CAAA;AACf,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACzD,OAAO,EAGL,WAAW,EACZ,MAAM,2BAA2B,CAAA;AAGlC,OAAO,EACL,KAAK,kBAAkB,EAExB,MAAM,yBAAyB,CAAA;AAUhC,KAAK,qBAAqB,GAAG,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAA;AAE9D,MAAM,MAAM,sBAAsB,GAC9B,qBAAqB,GACrB,mBAAmB,CAAC,mBAAmB,CAAA;;;;AAE3C,qBAAa,6BAA8B,SAAQ,mCAEjD;IACA,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB,CAAC;CAAG;AAkIL,eAAO,MAAM,kBAAkB,WACrB,WAAW,SACZ,kBAAkB,KACxB,MAAM,CAAC,MAAM,CACd,MAAM,EACN,aAAa,CAAC,aAAa,GAAG,6BAA6B,EAC3D,sBAAsB,CA+CpB,CAAA;AAEJ,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAC1C,aAAa,CAAC,WAAW,CAAC,EAC1B,KAAK,EACL,qBAAqB,CAOrB,CAAA;AAEF,eAAO,MAAM,iBAAiB,OACxB,MAAM,aACC,MAAM,KAChB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,aAAa,EAAE,qBAAqB,CAKrE,CAAA"}
|
|
1
|
+
{"version":3,"file":"relayRegistry.d.ts","sourceRoot":"","sources":["../src/relayRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EACN,UAAU,EAEV,IAAI,EACJ,KAAK,aAAa,EAGnB,MAAM,QAAQ,CAAA;AACf,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACzD,OAAO,EAGL,WAAW,EACZ,MAAM,2BAA2B,CAAA;AAGlC,OAAO,EACL,KAAK,kBAAkB,EAExB,MAAM,yBAAyB,CAAA;AAUhC,KAAK,qBAAqB,GAAG,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAA;AAE9D,MAAM,MAAM,sBAAsB,GAC9B,qBAAqB,GACrB,mBAAmB,CAAC,mBAAmB,CAAA;;;;AAE3C,qBAAa,6BAA8B,SAAQ,mCAEjD;IACA,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB,CAAC;CAAG;AAkIL,eAAO,MAAM,kBAAkB,WACrB,WAAW,SACZ,kBAAkB,KACxB,MAAM,CAAC,MAAM,CACd,MAAM,EACN,aAAa,CAAC,aAAa,GAAG,6BAA6B,EAC3D,sBAAsB,CA+CpB,CAAA;AAEJ,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAC1C,aAAa,CAAC,WAAW,CAAC,EAC1B,KAAK,EACL,qBAAqB,CAOrB,CAAA;AAEF,eAAO,MAAM,iBAAiB,OACxB,MAAM,aACC,MAAM,KAChB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,aAAa,EAAE,qBAAqB,CAKrE,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relayRegistryTrust.d.ts","sources":["../src/relayRegistryTrust.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EACN,UAAU,EACV,MAAM,EAIP,MAAM,QAAQ,CAAA;AACf,OAAO,EAAgB,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAyElE,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACxC,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,KACd,MAAM,CAAC,MAAM,CAChB,uBAAuB,EACvB,KAAK,EACL,mBAAmB,CAAC,mBAAmB,CACxC,CAAA;CACF,CAAC,CAAA;AAEF,KAAK,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,CAAA;AAE/D,eAAO,MAAM,6BAA6B,SAClC,aAAa,mBACF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KACrC,MAAM,CAAC,MAAM,CAAC,MAAM,CAkBnB,CAAA;AA2OJ,eAAO,MAAM,uBAAuB,SAC5B,MAAM,kBACI,MAAM,KACrB,MAAM,CAAC,MAAM,CAAC,MAAM,CAwCtB,CAAA;AAuFD,eAAO,MAAM,4BAA4B,gBAC1B,aAAa,CAAC,MAAM,CAAC,kBAClB,MAAM,KACrB,MAAM,CAAC,MAAM,CAAC,MAAM,CAwEtB,CAAA;AAED,eAAO,MAAM,cAAc,eAAgB,MAAM,KAAG,MAOjD,CAAA;AAEH,eAAO,MAAM,sBAAsB,cACtB,MAAM,YACP,MAAM,KACf,MAAM,CAAC,MAAM,CAAC,MAAM,CAGgB,CAAA;AAuHvC,eAAO,MAAM,qBAAqB,oBACf,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAC3B,MAAM,KAChB,MAAM,CAAC,MAAM,CACd,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EACrB,KAAK,EACL,mBAAmB,CAAC,mBAAmB,CAQrC,CAAA;AA+BJ,eAAO,MAAM,kBAAkB,EAAE,kBAgFhC,CAAA"}
|
|
1
|
+
{"version":3,"file":"relayRegistryTrust.d.ts","sourceRoot":"","sources":["../src/relayRegistryTrust.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EACN,UAAU,EACV,MAAM,EAIP,MAAM,QAAQ,CAAA;AACf,OAAO,EAAgB,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAyElE,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACxC,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,KACd,MAAM,CAAC,MAAM,CAChB,uBAAuB,EACvB,KAAK,EACL,mBAAmB,CAAC,mBAAmB,CACxC,CAAA;CACF,CAAC,CAAA;AAEF,KAAK,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,CAAA;AAE/D,eAAO,MAAM,6BAA6B,SAClC,aAAa,mBACF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KACrC,MAAM,CAAC,MAAM,CAAC,MAAM,CAkBnB,CAAA;AA2OJ,eAAO,MAAM,uBAAuB,SAC5B,MAAM,kBACI,MAAM,KACrB,MAAM,CAAC,MAAM,CAAC,MAAM,CAwCtB,CAAA;AAuFD,eAAO,MAAM,4BAA4B,gBAC1B,aAAa,CAAC,MAAM,CAAC,kBAClB,MAAM,KACrB,MAAM,CAAC,MAAM,CAAC,MAAM,CAwEtB,CAAA;AAED,eAAO,MAAM,cAAc,eAAgB,MAAM,KAAG,MAOjD,CAAA;AAEH,eAAO,MAAM,sBAAsB,cACtB,MAAM,YACP,MAAM,KACf,MAAM,CAAC,MAAM,CAAC,MAAM,CAGgB,CAAA;AAuHvC,eAAO,MAAM,qBAAqB,oBACf,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAC3B,MAAM,KAChB,MAAM,CAAC,MAAM,CACd,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EACrB,KAAK,EACL,mBAAmB,CAAC,mBAAmB,CAQrC,CAAA;AA+BJ,eAAO,MAAM,kBAAkB,EAAE,kBAgFhC,CAAA"}
|
package/dist/ssr.d.ts
CHANGED
|
@@ -53,17 +53,13 @@ export type FoldkitSsrOptions = Readonly<{
|
|
|
53
53
|
* Serves server-rendered pages from the Vite dev server.
|
|
54
54
|
*
|
|
55
55
|
* Vite retains ownership of configured proxies, source modules, HMR, and
|
|
56
|
-
* assets. Requests that fall through load the server entry through
|
|
57
|
-
*
|
|
58
|
-
*
|
|
59
|
-
*
|
|
60
|
-
*
|
|
56
|
+
* assets. Requests that fall through load the server entry through Vite's SSR
|
|
57
|
+
* module loader, call its `renderPage` with a Web `Request`, and send the
|
|
58
|
+
* resulting Web `Response`. Vite's host validation applies before either
|
|
59
|
+
* owner. Foldkit then validates and normalizes the request target before Vite
|
|
60
|
+
* or the server entry can resolve it. Vite's CORS option applies only to
|
|
61
61
|
* Vite-owned responses, while the server entry owns CORS for application
|
|
62
|
-
* responses. Server entry edits take effect without a restart.
|
|
63
|
-
* entry accepts its own updates, and the server graph is reevaluated so Block
|
|
64
|
-
* Definitions and their declarations are created together. Unless
|
|
65
|
-
* `server.hmr` is `false`, an `import.meta.hot.dispose` callback in the entry
|
|
66
|
-
* runs before a hot update replaces it.
|
|
62
|
+
* responses. Server entry edits take effect without a restart.
|
|
67
63
|
*/
|
|
68
64
|
export declare const foldkitSsr: (options: FoldkitSsrOptions) => Plugin;
|
|
69
65
|
//# sourceMappingURL=ssr.d.ts.map
|
package/dist/ssr.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssr.d.ts","sources":["../src/ssr.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ssr.d.ts","sourceRoot":"","sources":["../src/ssr.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAGV,MAAM,EAGP,MAAM,MAAM,CAAA;AAIb,0EAA0E;AAC1E,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC;;;;;OAKG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAC,CAAA;AA6tBF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,UAAU,YAAa,iBAAiB,KAAG,MAyGvD,CAAA"}
|
package/dist/ssr.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { Array, Effect,
|
|
1
|
+
import { Array, Effect, Predicate } from 'effect';
|
|
2
2
|
import * as Server from 'foldkit/experimental/server';
|
|
3
|
-
import MagicString from 'magic-string';
|
|
4
3
|
import { readFile } from 'node:fs/promises';
|
|
5
4
|
import { resolve } from 'node:path';
|
|
6
5
|
import { Readable } from 'node:stream';
|
|
@@ -11,70 +10,6 @@ import { buildIdForCommand } from './buildToken.js';
|
|
|
11
10
|
// getter is the shape every copy shares, and `in` reads its descriptor without
|
|
12
11
|
// invoking it.
|
|
13
12
|
const isRunnable = (environment) => 'runner' in environment;
|
|
14
|
-
const isHotServerEnvironment = (environment) => environment.name === 'ssr' &&
|
|
15
|
-
environment.config.server.hmr !== false &&
|
|
16
|
-
isRunnable(environment);
|
|
17
|
-
// NOTE: Vite reruns an edited declaration module and its importers, but keeps
|
|
18
|
-
// imported Block Definitions. Invalidate the full server graph so the next
|
|
19
|
-
// entry evaluation creates each Definition before registering its declarations.
|
|
20
|
-
const invalidateServerModulesForReevaluation = (environment) => {
|
|
21
|
-
const { moduleGraph } = environment;
|
|
22
|
-
const invalidatedModules = new Set();
|
|
23
|
-
for (const module of moduleGraph.idToModuleMap.values()) {
|
|
24
|
-
moduleGraph.invalidateModule(module, invalidatedModules, undefined, false, true);
|
|
25
|
-
}
|
|
26
|
-
};
|
|
27
|
-
const SERVER_UPDATE_SETTLED_EVENT = 'foldkit:server-update-settled';
|
|
28
|
-
const SERVER_UPDATE_SETTLE_TIMEOUT_MS = 1_000;
|
|
29
|
-
// NOTE: The entry accepts updates so Vite runs its `import.meta.hot.dispose`
|
|
30
|
-
// callback before evaluating the replacement. The server graph is invalidated
|
|
31
|
-
// separately so every Block Definition is recreated with its declarations.
|
|
32
|
-
// The entry also reports each update payload the runner finishes handling, so
|
|
33
|
-
// the dev server can hold requests until then.
|
|
34
|
-
const SERVER_ENTRY_HOT_SOURCE = `if (import.meta.hot) {
|
|
35
|
-
import.meta.hot.accept()
|
|
36
|
-
const reportSettledUpdate = () => {
|
|
37
|
-
import.meta.hot.send(${JSON.stringify(SERVER_UPDATE_SETTLED_EVENT)})
|
|
38
|
-
}
|
|
39
|
-
import.meta.hot.on('vite:afterUpdate', reportSettledUpdate)
|
|
40
|
-
import.meta.hot.on('vite:beforeFullReload', reportSettledUpdate)
|
|
41
|
-
import.meta.hot.on('vite:error', reportSettledUpdate)
|
|
42
|
-
}
|
|
43
|
-
`;
|
|
44
|
-
// NOTE: Vite invalidates the edited modules before it sends the update to the
|
|
45
|
-
// module runner. A request that imports the server entry in between evaluates
|
|
46
|
-
// a new copy, whose `dispose` callback replaces the old copy's, so the old copy
|
|
47
|
-
// is never released. The gate counts the edits to modules in the `ssr` module
|
|
48
|
-
// graph and holds requests until the entry reports each one settled. The
|
|
49
|
-
// timeout releases them when an edit never reaches the runner.
|
|
50
|
-
const makeServerUpdateGate = () => {
|
|
51
|
-
const settled = Latch.makeUnsafe(true);
|
|
52
|
-
let pendingUpdateCount = 0;
|
|
53
|
-
let settleTimeout;
|
|
54
|
-
const release = () => {
|
|
55
|
-
pendingUpdateCount = 0;
|
|
56
|
-
clearTimeout(settleTimeout);
|
|
57
|
-
settled.openUnsafe();
|
|
58
|
-
};
|
|
59
|
-
const beginUpdate = () => {
|
|
60
|
-
pendingUpdateCount += 1;
|
|
61
|
-
settled.closeUnsafe();
|
|
62
|
-
clearTimeout(settleTimeout);
|
|
63
|
-
settleTimeout = setTimeout(release, SERVER_UPDATE_SETTLE_TIMEOUT_MS).unref();
|
|
64
|
-
};
|
|
65
|
-
const settleUpdate = () => {
|
|
66
|
-
pendingUpdateCount = Math.max(0, pendingUpdateCount - 1);
|
|
67
|
-
if (pendingUpdateCount === 0) {
|
|
68
|
-
release();
|
|
69
|
-
}
|
|
70
|
-
};
|
|
71
|
-
return {
|
|
72
|
-
beginUpdate,
|
|
73
|
-
settleUpdate,
|
|
74
|
-
awaitSettledUpdates: settled.await,
|
|
75
|
-
close: release,
|
|
76
|
-
};
|
|
77
|
-
};
|
|
78
13
|
const isEntryModule = (loadedModule) => Predicate.isObject(loadedModule) &&
|
|
79
14
|
Predicate.hasProperty(loadedModule, 'renderPage') &&
|
|
80
15
|
Predicate.isFunction(loadedModule.renderPage);
|
|
@@ -194,11 +129,10 @@ const renderDecision = (nodeRequest, requestUrl) => {
|
|
|
194
129
|
}
|
|
195
130
|
return 'Render';
|
|
196
131
|
};
|
|
197
|
-
const renderRequest = (server,
|
|
132
|
+
const renderRequest = (server, options, nodeRequest, requestUrl) => Effect.gen(function* () {
|
|
198
133
|
const { pathname, search } = new URL(requestUrl);
|
|
199
134
|
const route = `${pathname}${search}`;
|
|
200
|
-
yield*
|
|
201
|
-
const loadedModule = yield* Effect.promise(() => ssrEnvironment.runner.import(options.serverEntry));
|
|
135
|
+
const loadedModule = yield* Effect.promise(() => server.ssrLoadModule(options.serverEntry));
|
|
202
136
|
if (!isEntryModule(loadedModule)) {
|
|
203
137
|
return yield* Effect.die(new Error(`[foldkit] '${options.serverEntry}' does not export a renderPage function, so the dev server cannot render pages.`));
|
|
204
138
|
}
|
|
@@ -474,7 +408,7 @@ const sendWebResponse = async (webResponse, nodeRequest, nodeResponse, isNegotia
|
|
|
474
408
|
// The handler that turns an application-owned request into a response. OPTIONS
|
|
475
409
|
// reaches it at the host boundary. Other methods reach it after Vite's modules
|
|
476
410
|
// and assets have had an opportunity to answer.
|
|
477
|
-
const renderMiddleware = (server,
|
|
411
|
+
const renderMiddleware = (server, options, requestUrls, stateByRequest) => (nodeRequest, nodeResponse, next) => {
|
|
478
412
|
const corsState = stateByRequest.get(nodeRequest);
|
|
479
413
|
stateByRequest.delete(nodeRequest);
|
|
480
414
|
corsState?.tracking.stop();
|
|
@@ -518,33 +452,29 @@ const renderMiddleware = (server, ssrEnvironment, serverUpdates, options, reques
|
|
|
518
452
|
return;
|
|
519
453
|
}
|
|
520
454
|
const isNegotiated = decision === 'RenderNegotiated';
|
|
521
|
-
void Effect.runPromise(renderRequest(server,
|
|
455
|
+
void Effect.runPromise(renderRequest(server, options, nodeRequest, requestUrl))
|
|
522
456
|
.then(response => sendWebResponse(response, nodeRequest, nodeResponse, isNegotiated))
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
457
|
+
.catch((error) => {
|
|
458
|
+
if (error instanceof Error) {
|
|
459
|
+
server.ssrFixStacktrace(error);
|
|
460
|
+
}
|
|
461
|
+
next(error);
|
|
462
|
+
});
|
|
527
463
|
};
|
|
528
464
|
/**
|
|
529
465
|
* Serves server-rendered pages from the Vite dev server.
|
|
530
466
|
*
|
|
531
467
|
* Vite retains ownership of configured proxies, source modules, HMR, and
|
|
532
|
-
* assets. Requests that fall through load the server entry through
|
|
533
|
-
*
|
|
534
|
-
*
|
|
535
|
-
*
|
|
536
|
-
*
|
|
468
|
+
* assets. Requests that fall through load the server entry through Vite's SSR
|
|
469
|
+
* module loader, call its `renderPage` with a Web `Request`, and send the
|
|
470
|
+
* resulting Web `Response`. Vite's host validation applies before either
|
|
471
|
+
* owner. Foldkit then validates and normalizes the request target before Vite
|
|
472
|
+
* or the server entry can resolve it. Vite's CORS option applies only to
|
|
537
473
|
* Vite-owned responses, while the server entry owns CORS for application
|
|
538
|
-
* responses. Server entry edits take effect without a restart.
|
|
539
|
-
* entry accepts its own updates, and the server graph is reevaluated so Block
|
|
540
|
-
* Definitions and their declarations are created together. Unless
|
|
541
|
-
* `server.hmr` is `false`, an `import.meta.hot.dispose` callback in the entry
|
|
542
|
-
* runs before a hot update replaces it.
|
|
474
|
+
* responses. Server entry edits take effect without a restart.
|
|
543
475
|
*/
|
|
544
476
|
export const foldkitSsr = (options) => {
|
|
545
477
|
let isDevelopmentHost = false;
|
|
546
|
-
const entryIds = new WeakMap();
|
|
547
|
-
const serverUpdates = makeServerUpdateGate();
|
|
548
478
|
return {
|
|
549
479
|
name: 'foldkit-ssr',
|
|
550
480
|
configResolved(config) {
|
|
@@ -588,65 +518,6 @@ export const foldkitSsr = (options) => {
|
|
|
588
518
|
}),
|
|
589
519
|
};
|
|
590
520
|
},
|
|
591
|
-
perEnvironmentWatchChangeDuringDev: true,
|
|
592
|
-
watchChange(id, change) {
|
|
593
|
-
if (!isDevelopmentHost ||
|
|
594
|
-
change.event !== 'update' ||
|
|
595
|
-
this.environment.name !== 'ssr' ||
|
|
596
|
-
!isRunnable(this.environment)) {
|
|
597
|
-
return;
|
|
598
|
-
}
|
|
599
|
-
const serverModules = this.environment.moduleGraph.getModulesByFile(id);
|
|
600
|
-
if (serverModules !== undefined && serverModules.size > 0) {
|
|
601
|
-
if (isHotServerEnvironment(this.environment)) {
|
|
602
|
-
serverUpdates.beginUpdate();
|
|
603
|
-
}
|
|
604
|
-
invalidateServerModulesForReevaluation(this.environment);
|
|
605
|
-
}
|
|
606
|
-
},
|
|
607
|
-
// NOTE: Vite invalidates the server entry when a module it imports
|
|
608
|
-
// dynamically changes, even when the runner has not loaded that module,
|
|
609
|
-
// but sends the runner no update for it. The next request would then
|
|
610
|
-
// evaluate a new copy without disposing the old one, so the update goes to
|
|
611
|
-
// the entry instead.
|
|
612
|
-
hotUpdate({ type, file, modules }) {
|
|
613
|
-
if (!isDevelopmentHost ||
|
|
614
|
-
type !== 'update' ||
|
|
615
|
-
!isHotServerEnvironment(this.environment) ||
|
|
616
|
-
Array.isArrayEmpty(modules)) {
|
|
617
|
-
return undefined;
|
|
618
|
-
}
|
|
619
|
-
const entryId = entryIds.get(this.environment);
|
|
620
|
-
const evaluatedModules = this.environment.runner.evaluatedModules.getModulesByFile(file);
|
|
621
|
-
if (entryId === undefined ||
|
|
622
|
-
(evaluatedModules !== undefined && evaluatedModules.size > 0)) {
|
|
623
|
-
return undefined;
|
|
624
|
-
}
|
|
625
|
-
const entryModule = this.environment.moduleGraph.getModuleById(entryId);
|
|
626
|
-
return entryModule === undefined ? undefined : [entryModule];
|
|
627
|
-
},
|
|
628
|
-
async transform(code, id) {
|
|
629
|
-
if (!isDevelopmentHost ||
|
|
630
|
-
this.environment.name !== 'ssr' ||
|
|
631
|
-
!isRunnable(this.environment)) {
|
|
632
|
-
return undefined;
|
|
633
|
-
}
|
|
634
|
-
const entryId = entryIds.get(this.environment) ??
|
|
635
|
-
(await this.resolve(options.serverEntry).catch(() => undefined))?.id;
|
|
636
|
-
if (entryId === undefined) {
|
|
637
|
-
return undefined;
|
|
638
|
-
}
|
|
639
|
-
entryIds.set(this.environment, entryId);
|
|
640
|
-
if (entryId !== id) {
|
|
641
|
-
return undefined;
|
|
642
|
-
}
|
|
643
|
-
const transformed = new MagicString(code);
|
|
644
|
-
transformed.prepend(SERVER_ENTRY_HOT_SOURCE);
|
|
645
|
-
return {
|
|
646
|
-
code: transformed.toString(),
|
|
647
|
-
map: transformed.generateMap({ hires: 'boundary', source: id }),
|
|
648
|
-
};
|
|
649
|
-
},
|
|
650
521
|
configureServer: server => {
|
|
651
522
|
// Rendering here loads the server entry through the `ssr` environment's
|
|
652
523
|
// module runner, which only a runnable environment has. A host plugin
|
|
@@ -657,8 +528,7 @@ export const foldkitSsr = (options) => {
|
|
|
657
528
|
// them here instead would run the application in Node, without the
|
|
658
529
|
// bindings the deployed entry holds, while the deployment it is standing
|
|
659
530
|
// in for renders in workerd.
|
|
660
|
-
|
|
661
|
-
if (!isRunnable(ssrEnvironment)) {
|
|
531
|
+
if (!isRunnable(server.environments.ssr)) {
|
|
662
532
|
if (options.quietStandDown !== true) {
|
|
663
533
|
server.config.logger.warn('[foldkit] the "ssr" environment is not runnable, so another plugin owns' +
|
|
664
534
|
" server-side execution. Dev-time rendering through Foldkit's Vite" +
|
|
@@ -668,22 +538,12 @@ export const foldkitSsr = (options) => {
|
|
|
668
538
|
}
|
|
669
539
|
const requestUrls = new WeakMap();
|
|
670
540
|
const stateByRequest = new WeakMap();
|
|
671
|
-
|
|
672
|
-
const render = renderMiddleware(server, ssrEnvironment, serverUpdates, options, requestUrls, stateByRequest);
|
|
541
|
+
const render = renderMiddleware(server, options, requestUrls, stateByRequest);
|
|
673
542
|
server.middlewares.use(requestTargetMiddleware(server, options, requestUrls, render));
|
|
674
543
|
wrapViteCors(server, options, requestUrls, stateByRequest);
|
|
675
544
|
return () => {
|
|
676
545
|
server.middlewares.use(render);
|
|
677
546
|
};
|
|
678
547
|
},
|
|
679
|
-
closeBundle() {
|
|
680
|
-
if (!isDevelopmentHost ||
|
|
681
|
-
this.environment.name !== 'ssr' ||
|
|
682
|
-
!isRunnable(this.environment)) {
|
|
683
|
-
return;
|
|
684
|
-
}
|
|
685
|
-
this.environment.hot.off(SERVER_UPDATE_SETTLED_EVENT, serverUpdates.settleUpdate);
|
|
686
|
-
serverUpdates.close();
|
|
687
|
-
},
|
|
688
548
|
};
|
|
689
549
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewIdentity.d.ts","sources":["../src/viewIdentity.ts"],"names":[],"mappings":"AAAA,OAAoB,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAA;AAI1D,OAAO,EAAE,KAAK,MAAM,EAAY,MAAM,MAAM,CAAA;AA6a5C,iFAAiF;AACjF,MAAM,MAAM,2BAA2B,GAAG,QAAQ,CAAC;IACjD,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,SAAS,CAAA;CACf,CAAC,CAAA;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,eAAO,MAAM,qBAAqB,SAC1B,MAAM,MACR,MAAM,QACJ,MAAM,YACF,QAAQ,CAAC;IACjB,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAC,KACD,2BAA2B,GAAG,IAyChC,CAAA;AA8DD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,mBAAmB,QAAO,MA0CtC,CAAA"}
|
|
1
|
+
{"version":3,"file":"viewIdentity.d.ts","sourceRoot":"","sources":["../src/viewIdentity.ts"],"names":[],"mappings":"AAAA,OAAoB,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAA;AAI1D,OAAO,EAAE,KAAK,MAAM,EAAY,MAAM,MAAM,CAAA;AA6a5C,iFAAiF;AACjF,MAAM,MAAM,2BAA2B,GAAG,QAAQ,CAAC;IACjD,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,SAAS,CAAA;CACf,CAAC,CAAA;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,eAAO,MAAM,qBAAqB,SAC1B,MAAM,MACR,MAAM,QACJ,MAAM,YACF,QAAQ,CAAC;IACjB,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAC,KACD,2BAA2B,GAAG,IAyChC,CAAA;AA8DD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,mBAAmB,QAAO,MA0CtC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@foldkit/vite-plugin",
|
|
3
|
-
"version": "0.28.0-canary.
|
|
3
|
+
"version": "0.28.0-canary.af4b0bc7b683",
|
|
4
4
|
"description": "Vite plugin for Foldkit with state-preserving live reload",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -16,13 +16,13 @@
|
|
|
16
16
|
"dist"
|
|
17
17
|
],
|
|
18
18
|
"peerDependencies": {
|
|
19
|
-
"effect": "4.
|
|
20
|
-
"foldkit": "0.169.0-canary.
|
|
19
|
+
"effect": "~4.1.0",
|
|
20
|
+
"foldkit": "0.169.0-canary.af4b0bc7b683",
|
|
21
21
|
"vite": "^8.0.0"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@effect/platform-node": "4.
|
|
25
|
-
"@effect/platform-node-shared": "4.
|
|
24
|
+
"@effect/platform-node": "~4.1.0",
|
|
25
|
+
"@effect/platform-node-shared": "~4.1.0",
|
|
26
26
|
"magic-string": "^1.4.2",
|
|
27
27
|
"vitefu": "^1.1.3",
|
|
28
28
|
"ws": "^8.21.3"
|
|
@@ -31,13 +31,13 @@
|
|
|
31
31
|
"@types/node": "26.4.0",
|
|
32
32
|
"@types/ws": "^8.18.1",
|
|
33
33
|
"@vitejs/plugin-basic-ssl": "^2.3.0",
|
|
34
|
-
"effect": "4.
|
|
35
|
-
"foldkit": "0.169.0-canary.
|
|
34
|
+
"effect": "4.1.0",
|
|
35
|
+
"foldkit": "0.169.0-canary.af4b0bc7b683",
|
|
36
36
|
"happy-dom": "^20.14.5",
|
|
37
37
|
"rimraf": "^6.1.3",
|
|
38
|
-
"typescript": "7.
|
|
39
|
-
"vite": "^8.3.
|
|
40
|
-
"vite-host": "npm:vite@8.2.
|
|
38
|
+
"typescript": "^7.0.2",
|
|
39
|
+
"vite": "^8.3.1",
|
|
40
|
+
"vite-host": "npm:vite@8.2.1",
|
|
41
41
|
"vitest": "^4.1.11"
|
|
42
42
|
},
|
|
43
43
|
"keywords": [
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"access": "public"
|
|
59
59
|
},
|
|
60
60
|
"engines": {
|
|
61
|
-
"node": ">=
|
|
61
|
+
"node": ">=22.19.0"
|
|
62
62
|
},
|
|
63
63
|
"scripts": {
|
|
64
64
|
"clean": "rimraf dist *.tsbuildinfo",
|
package/dist/crypto.d.ts
DELETED
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import { Effect } from 'effect';
|
|
2
|
-
import type * as PlatformError from 'effect/PlatformError';
|
|
3
|
-
type RandomUUIDv4Crypto = Readonly<{
|
|
4
|
-
randomUUIDv4: Effect.Effect<string, PlatformError.PlatformError> | (() => Effect.Effect<string, PlatformError.PlatformError>);
|
|
5
|
-
}>;
|
|
6
|
-
/** Normalizes Effect Crypto's property and method forms of randomUUIDv4. */
|
|
7
|
-
export declare const randomUUIDv4Effect: (crypto: RandomUUIDv4Crypto) => Effect.Effect<string, PlatformError.PlatformError>;
|
|
8
|
-
export {};
|
|
9
|
-
//# sourceMappingURL=crypto.d.ts.map
|
package/dist/crypto.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.d.ts","sources":["../src/crypto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAA;AAC1C,OAAO,KAAK,KAAK,aAAa,MAAM,sBAAsB,CAAA;AAE1D,KAAK,kBAAkB,GAAG,QAAQ,CAAC;IACjC,YAAY,EACR,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,CAAC,GAClD,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC,CAAA;CAC/D,CAAC,CAAA;AAEF,4EAA4E;AAC5E,eAAO,MAAM,kBAAkB,WACrB,kBAAkB,KACzB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,CAShD,CAAA"}
|
package/dist/crypto.js
DELETED
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import { Effect, Predicate } from 'effect';
|
|
2
|
-
/** Normalizes Effect Crypto's property and method forms of randomUUIDv4. */
|
|
3
|
-
export const randomUUIDv4Effect = (crypto) => Effect.suspend(() => {
|
|
4
|
-
const operation = crypto.randomUUIDv4;
|
|
5
|
-
if (Predicate.isFunction(operation)) {
|
|
6
|
-
return operation.call(crypto);
|
|
7
|
-
}
|
|
8
|
-
return operation;
|
|
9
|
-
});
|
package/dist/preview.d.ts
DELETED
package/dist/preview.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"preview.d.ts","sources":["../src/preview.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAW,aAAa,EAAE,MAAM,MAAM,CAAA;AAgElD,qFAAqF;AACrF,eAAO,MAAM,uBAAuB,WAAY,aAAa,KAAG,IA6B/D,CAAA"}
|
package/dist/preview.js
DELETED
|
@@ -1,67 +0,0 @@
|
|
|
1
|
-
import { existsSync, realpathSync, statSync } from 'node:fs';
|
|
2
|
-
import { resolve, sep } from 'node:path';
|
|
3
|
-
const isContained = (root, file) => file.startsWith(root.endsWith(sep) ? root : `${root}${sep}`);
|
|
4
|
-
const rewriteDirectoryIndex = (request, root, base, isProxied) => {
|
|
5
|
-
const { method, headers, url } = request;
|
|
6
|
-
if ((method !== 'GET' && method !== 'HEAD') ||
|
|
7
|
-
url === undefined ||
|
|
8
|
-
isProxied(url) ||
|
|
9
|
-
isProxied(url.replace(/(\?|$)/, '/index.html$1')) ||
|
|
10
|
-
(headers.accept &&
|
|
11
|
-
!headers.accept.includes('text/html') &&
|
|
12
|
-
!headers.accept.includes('*/*'))) {
|
|
13
|
-
return;
|
|
14
|
-
}
|
|
15
|
-
const [pathname = ''] = url.split('?');
|
|
16
|
-
if (!pathname.startsWith('/') ||
|
|
17
|
-
pathname.startsWith('//') ||
|
|
18
|
-
pathname.includes('#') ||
|
|
19
|
-
!pathname.startsWith(base)) {
|
|
20
|
-
return;
|
|
21
|
-
}
|
|
22
|
-
const route = pathname.slice(base.length);
|
|
23
|
-
if (route === '' || route.endsWith('/')) {
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
26
|
-
const segments = route.split('/').map(segment => decodeURIComponent(segment));
|
|
27
|
-
if (segments.join('/') !== decodeURI(route) ||
|
|
28
|
-
segments.some(segment => /^\.{1,2}$|[/\\\u0000:]/.test(segment))) {
|
|
29
|
-
return;
|
|
30
|
-
}
|
|
31
|
-
const file = resolve(root, ...segments);
|
|
32
|
-
if (!isContained(root, file) ||
|
|
33
|
-
file.endsWith('.html') ||
|
|
34
|
-
statSync(file, { throwIfNoEntry: false })?.isFile() ||
|
|
35
|
-
statSync(resolve(file, 'index'), { throwIfNoEntry: false })?.isFile() ||
|
|
36
|
-
existsSync(`${file}.html`)) {
|
|
37
|
-
return;
|
|
38
|
-
}
|
|
39
|
-
const index = realpathSync(resolve(file, 'index.html'));
|
|
40
|
-
if (isContained(realpathSync(root), index) && statSync(index).isFile()) {
|
|
41
|
-
request.url = `${pathname}/index.html${url.slice(pathname.length)}`;
|
|
42
|
-
}
|
|
43
|
-
};
|
|
44
|
-
/** @internal Resolve generated directory indexes through Vite's preview pipeline. */
|
|
45
|
-
export const installPrerenderPreview = (server) => {
|
|
46
|
-
if (server.config.appType === 'custom') {
|
|
47
|
-
return;
|
|
48
|
-
}
|
|
49
|
-
const client = server.config.environments['client'];
|
|
50
|
-
if (client === undefined) {
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
|
-
const root = resolve(server.config.root, client.build.outDir);
|
|
54
|
-
const isProxied = (url) => Object.entries(server.config.preview.proxy ?? {}).some(([context, options]) => Boolean(options) &&
|
|
55
|
-
(context.startsWith('^')
|
|
56
|
-
? new RegExp(context).test(url)
|
|
57
|
-
: url.startsWith(context)));
|
|
58
|
-
server.middlewares.use((request, _response, next) => {
|
|
59
|
-
try {
|
|
60
|
-
rewriteDirectoryIndex(request, root, server.config.base, isProxied);
|
|
61
|
-
}
|
|
62
|
-
catch {
|
|
63
|
-
return next();
|
|
64
|
-
}
|
|
65
|
-
next();
|
|
66
|
-
});
|
|
67
|
-
};
|