eddev 2.0.0-beta.218 → 2.0.0-beta.219

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.
Files changed (8) hide show
  1. package/dist/app/server/render-ssr-page.d.ts.map +1 -1
  2. package/dist/app/server/render-ssr-page.js +2 -1
  3. package/dist/app/server/server-context.js +4 -4
  4. package/dist/node/cli/version.d.ts +1 -1
  5. package/dist/node/cli/version.js +1 -1
  6. package/dist/node/compiler/vinxi-app.d.ts.map +1 -1
  7. package/dist/node/compiler/vinxi-app.js +38 -15
  8. package/package.json +1 -1
package/dist/app/server/render-ssr-page.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"render-ssr-page.d.ts","sourceRoot":"","sources":["../../../src/app/server/render-ssr-page.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAKrF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,qBAAqB,CAAA;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,OAAO,wDAyH/C;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC/B,CAAA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuGpE;AAED,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,GAAG,CAAA;CAChB,GAAG,eAAe,CAAA;AAEnB,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiBlF;AAED,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,KAAK,UA6B1D"}
1
+ {"version":3,"file":"render-ssr-page.d.ts","sourceRoot":"","sources":["../../../src/app/server/render-ssr-page.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAKrF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,qBAAqB,CAAA;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,OAAO,wDAyH/C;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC/B,CAAA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAwGpE;AAED,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,GAAG,CAAA;CAChB,GAAG,eAAe,CAAA;AAEnB,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiBlF;AAED,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,KAAK,UA6B1D"}
package/dist/app/server/render-ssr-page.js CHANGED
@@ -134,7 +134,7 @@ export async function renderPage(args) {
134
134
  data.meta.footer = cspHeaders.addMetaTags(data.meta.footer);
135
135
  responseInit.status = response.status;
136
136
  response.headers.forEach((value, key) => {
137
- if (key !== "Set-Cookie") {
137
+ if (key.toLowerCase().startsWith("x-ed-")) {
138
138
  responseHeaders.set(key, value);
139
139
  }
140
140
  });
@@ -166,6 +166,7 @@ export async function renderPage(args) {
166
166
  });
167
167
  responseHeaders.set("Content-Type", "text/html; charset=utf-8");
168
168
  responseHeaders.set("X-Ed-Rendered-At", new Date().toUTCString());
169
+ responseHeaders.set("X-Ed-Cache-Control", responseHeaders.get("Cache-Control") || "none");
169
170
  responseHeaders.set("X-Ed-Deployment-Id", process.env.VERCEL_DEPLOYMENT_ID || "");
170
171
  // `__vdpl=${process.env.VERCEL_DEPLOYMENT_ID}; HttpOnly`,
171
172
  const stream = await getSsrStream({
package/dist/app/server/server-context.js CHANGED
@@ -246,10 +246,10 @@ export class ServerContext {
246
246
  if (resultData.queryMonitor) {
247
247
  this.debugLogQueryMonitor("props", req.pathname, resultData.queryMonitor);
248
248
  }
249
- if (isFinite(preferredCacheDuration)) {
250
- const maxAge = isFinite(preferredCacheDuration) ? preferredCacheDuration * 1000 : undefined;
251
- resultHeaders.set("Cache-Control", `max-age=0, s-maxage=${maxAge}, stale-while-revalidate`);
252
- }
249
+ // if (isFinite(preferredCacheDuration)) {
250
+ // const maxAge = isFinite(preferredCacheDuration) ? preferredCacheDuration * 1000 : undefined
251
+ // resultHeaders.set("Cache-Control", `max-age=0, s-maxage=${maxAge}, stale-while-revalidate`)
252
+ // }
253
253
  resultHeaders.set("X-Ed-Fetched-At", new Date().toUTCString());
254
254
  return {
255
255
  status: resultStatus,
package/dist/node/cli/version.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export declare const VERSION = "2.0.0-beta.218";
1
+ export declare const VERSION = "2.0.0-beta.219";
2
2
  //# sourceMappingURL=version.d.ts.map
package/dist/node/cli/version.js CHANGED
@@ -1 +1 @@
1
- export const VERSION = "2.0.0-beta.218";
1
+ export const VERSION = "2.0.0-beta.219";
package/dist/node/compiler/vinxi-app.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vinxi-app.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-app.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAGtD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,KAAK,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,CAAA;AAC7D,KAAK,mBAAmB,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAA;AACrD,KAAK,iBAAiB,GAAG,MAAM,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;AAEhE,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAC1C,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,uBAkO3C"}
1
+ {"version":3,"file":"vinxi-app.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-app.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAGtD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,KAAK,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,CAAA;AAC7D,KAAK,mBAAmB,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAA;AACrD,KAAK,iBAAiB,GAAG,MAAM,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;AAEhE,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAC1C,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,uBA2P3C"}
package/dist/node/compiler/vinxi-app.js CHANGED
@@ -11,6 +11,22 @@ export function createVinxiApp(args) {
11
11
  mode: args.mode,
12
12
  serverless: true,
13
13
  });
14
+ const originDomain = new URL(args.origin).host;
15
+ let cacheConfig = args.config.cache[originDomain] ??
16
+ args.config.cache["*"] ?? {
17
+ appDataTTL: 0,
18
+ pageDataTTL: 0,
19
+ queryHooksTTL: 0,
20
+ serverless: {
21
+ isr: true,
22
+ dataCache: "in-memory",
23
+ },
24
+ };
25
+ // for (let key in args.config.cache) {
26
+ // if (key === "*") continue
27
+ // const domain = key.replace(/(^\*|\/$)/g, "")
28
+ // args.origin
29
+ // if (domain.includes("*")) {
14
30
  return createApp({
15
31
  server: {
16
32
  // experimental: {
@@ -31,7 +47,7 @@ export function createVinxiApp(args) {
31
47
  proxy: joinURL(args.origin, "favicon.ico"),
32
48
  static: true,
33
49
  cache: {
34
- maxAge: 3600,
50
+ maxAge: 86400,
35
51
  varies: [],
36
52
  },
37
53
  },
@@ -64,13 +80,16 @@ export function createVinxiApp(args) {
64
80
  "/wp-content/**": { proxy: joinURL(args.origin, "wp-content/**") },
65
81
  "/wp-includes/**": { proxy: joinURL(args.origin, "wp-includes/**") },
66
82
  "/_data/route/**": {
67
- // isr: 1800,
68
- // swr: true,
69
- // cache: {
70
- // maxAge: 1800,
71
- // swr: true,
72
- // varies: ["Authorization", "woocommerce-session"],
73
- // },
83
+ isr: {
84
+ expiration: cacheConfig.pageDataTTL ?? 0,
85
+ allowQuery: [],
86
+ passQuery: false,
87
+ },
88
+ cache: {
89
+ maxAge: cacheConfig.pageDataTTL ?? 0,
90
+ swr: true,
91
+ varies: ["Authorization", "woocommerce-session"],
92
+ },
74
93
  },
75
94
  "/_data/query/**": {
76
95
  isr: false,
@@ -91,13 +110,17 @@ export function createVinxiApp(args) {
91
110
  };
92
111
  }, {}),
93
112
  "/**/*": {
94
- // isr: 1800,
95
- // swr: true,
96
- // cache: {
97
- // maxAge: 1800,
98
- // swr: true,
99
- // staleMaxAge: 3600,
100
- // },
113
+ isr: {
114
+ expiration: cacheConfig.pageDataTTL ?? 0,
115
+ allowQuery: [],
116
+ passQuery: false,
117
+ },
118
+ swr: true,
119
+ cache: {
120
+ maxAge: cacheConfig.pageDataTTL ?? 0,
121
+ swr: true,
122
+ staleMaxAge: 3600,
123
+ },
101
124
  },
102
125
  },
103
126
  vercel: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eddev",
3
- "version": "2.0.0-beta.218",
3
+ "version": "2.0.0-beta.219",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "type": "module",