eddev 2.0.0-beta.220 → 2.0.0-beta.221
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.
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Manifest } from "vinxi/dist/types/types/manifest";
|
|
2
|
-
import { RequestHeaders } from "vinxi/http";
|
|
2
|
+
import { H3Event, RequestHeaders } from "vinxi/http";
|
|
3
3
|
import type { EDConfig } from "../../node/project/config.js";
|
|
4
4
|
import { TrackerTags } from "../lib/routing/types.js";
|
|
5
5
|
import { UrlReplacerConf } from "./utils/replace-host.js";
|
|
@@ -60,6 +60,7 @@ export declare class ServerContext {
|
|
|
60
60
|
headers: RequestHeaders;
|
|
61
61
|
}): Promise<Response>;
|
|
62
62
|
get allowedCorsOrigins(): string[];
|
|
63
|
+
shouldBypass(event: H3Event): boolean;
|
|
63
64
|
getCorsOrigin(originHeader: string): string | undefined;
|
|
64
65
|
getCorsHeaders(origin: string): {
|
|
65
66
|
"Access-Control-Allow-Methods"?: undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-context.d.ts","sourceRoot":"","sources":["../../../src/app/server/server-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAC1D,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"server-context.d.ts","sourceRoot":"","sources":["../../../src/app/server/server-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,cAAc,EAAoC,MAAM,YAAY,CAAA;AACtF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAE5D,OAAO,EAAiC,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEpF,OAAO,EAAqB,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAE5E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKxD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,eAAe,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAA;CACxC,CAAA;AAkBD;;GAEG;AACH,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,qBAAa,aAAa;IACxB,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,MAAM,EAAE,QAAQ,CAAA;IAEhB,MAAM,CAAC,IAAI,EAAE,aAAa,CAAA;gBAEd,IAAI,EAAE,iBAAiB;IAWnC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAOzC,IAAI,OAAO,yBAEV;IAED,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,oBAAoB;IAI1C,YAAY,CAAC,GAAG,EAAE,MAAM;IAQlB,WAAW,CACf,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,WAAW,GAAG;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GACjE,OAAO,CAAC,QAAQ,CAAC;IAgCpB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE;IAmFvG,cAAc,CAAC,GAAG,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,cAAc,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;IA8GxG,YAAY,CAAC,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAgCtE,qBAAqB,CAAC,GAAG,CAAC,EAAE,cAAc;IAYpC,eAAe,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IA4D/F,aAAa,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IAehF,IAAI,kBAAkB,aAcrB;IAED,YAAY,CAAC,KAAK,EAAE,OAAO;IAc3B,aAAa,CAAC,YAAY,EAAE,MAAM;IAUlC,cAAc,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;;CAiD9B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { parseURL, stringifyParsedURL, withQuery, withTrailingSlash } from "ufo";
|
|
2
|
+
import { getCookie, getHeader } from "vinxi/http";
|
|
2
3
|
import { fetchWP } from "../../node/utils/fetch-wp.js";
|
|
3
4
|
import { filterHeader } from "./utils/headers.js";
|
|
4
5
|
import { createUrlReplacer } from "./utils/replace-host.js";
|
|
@@ -378,6 +379,19 @@ export class ServerContext {
|
|
|
378
379
|
}
|
|
379
380
|
return result;
|
|
380
381
|
}
|
|
382
|
+
shouldBypass(event) {
|
|
383
|
+
const bypassToken = process.env.VERCEL_BYPASS_TOKEN;
|
|
384
|
+
if (!bypassToken)
|
|
385
|
+
return false;
|
|
386
|
+
const cookieName = "__prerender_bypass";
|
|
387
|
+
if (getCookie(event, cookieName) === bypassToken) {
|
|
388
|
+
return true;
|
|
389
|
+
}
|
|
390
|
+
if (getHeader(event, "x-prerender-revalidate") === bypassToken) {
|
|
391
|
+
return true;
|
|
392
|
+
}
|
|
393
|
+
return false;
|
|
394
|
+
}
|
|
381
395
|
getCorsOrigin(originHeader) {
|
|
382
396
|
const parsed = parseURL(originHeader);
|
|
383
397
|
if (this.allowedCorsOrigins.includes(parsed.host)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vinxi-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-codegen.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC,UAExE;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,iBAIlD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"vinxi-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-codegen.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC,UAExE;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,iBAIlD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,aAgrB/C"}
|
|
@@ -257,20 +257,6 @@ export function createVinxiCodegen(opts) {
|
|
|
257
257
|
import { withTrailingSlash } from 'ufo'
|
|
258
258
|
import { viewManifestReader, blockManifestReader } from 'eddev/_internal'
|
|
259
259
|
|
|
260
|
-
const shouldBypass = (event: H3Event) => {
|
|
261
|
-
const bypassToken = process.env.VERCEL_BYPASS_TOKEN;
|
|
262
|
-
if (!bypassToken) return false
|
|
263
|
-
const cookieName = "__prerender_bypass";
|
|
264
|
-
|
|
265
|
-
if (getCookie(event, cookieName) === BYPASS_TOKEN) {
|
|
266
|
-
return true;
|
|
267
|
-
}
|
|
268
|
-
if (getHeader(event, "x-prerender-revalidate") === bypassToken) {
|
|
269
|
-
return true
|
|
270
|
-
}
|
|
271
|
-
return false
|
|
272
|
-
}
|
|
273
|
-
|
|
274
260
|
const router = createRouter()
|
|
275
261
|
.get(
|
|
276
262
|
"/_data/route/",
|
|
@@ -278,7 +264,7 @@ export function createVinxiCodegen(opts) {
|
|
|
278
264
|
const id = "/"
|
|
279
265
|
const url = getRequestURL(event)
|
|
280
266
|
|
|
281
|
-
return await serverContext.fetchRouteData({ pathname: id, newOrigin: url.origin, bypass: shouldBypass(event) })
|
|
267
|
+
return await serverContext.fetchRouteData({ pathname: id, newOrigin: url.origin, bypass: serverContext.shouldBypass(event) })
|
|
282
268
|
}),
|
|
283
269
|
)
|
|
284
270
|
.get(
|
|
@@ -287,7 +273,7 @@ export function createVinxiCodegen(opts) {
|
|
|
287
273
|
const id = "/" + getRouterParam(event, "name")
|
|
288
274
|
const url = getRequestURL(event)
|
|
289
275
|
|
|
290
|
-
return await serverContext.fetchRouteData({ pathname: id, newOrigin: url.origin, bypass: shouldBypass(event) })
|
|
276
|
+
return await serverContext.fetchRouteData({ pathname: id, newOrigin: url.origin, bypass: serverContext.shouldBypass(event) })
|
|
291
277
|
}),
|
|
292
278
|
)
|
|
293
279
|
.get(
|
|
@@ -306,7 +292,7 @@ export function createVinxiCodegen(opts) {
|
|
|
306
292
|
throw new Error("Invalid query parameters")
|
|
307
293
|
}
|
|
308
294
|
|
|
309
|
-
return await serverContext.fetchNamedQuery({ name: id, params: params, headers: getRequestHeaders(event), bypass: shouldBypass(event) })
|
|
295
|
+
return await serverContext.fetchNamedQuery({ name: id, params: params, headers: getRequestHeaders(event), bypass: serverContext.shouldBypass(event) })
|
|
310
296
|
}),
|
|
311
297
|
)
|
|
312
298
|
.get(
|