eddev 2.0.0-beta.215 → 2.0.0-beta.217

package/dist/node/cli/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.0.0-beta.215";
+export declare const VERSION = "2.0.0-beta.217";
 //# sourceMappingURL=version.d.ts.map

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.215";
+export const VERSION = "2.0.0-beta.217";

package/dist/node/compiler/get-vite-config.d.ts

@@ -10,6 +10,7 @@ export type Args = {
     console: StatefulLog<any>;
     client: boolean;
 };
+export declare function skewProtectionPlugin(): PluginOption;
 export declare function envPlugin(args: Args): PluginOption;
 type ReactPluginArgs = {
     retainBlockMeta?: boolean;

package/dist/node/compiler/get-vite-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-vite-config.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/get-vite-config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgB,YAAY,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,UAAU,GAAG,KAAK,CAAA;IAC1B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACzB,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAkDlD;AAED,KAAK,eAAe,GAAG;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,wBAAgB,WAAW,CAAC,IAAI,GAAE,eAAoB,kBA4FrD;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,YAAY,CA4CxC;AAwBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAStD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAE/D;AAED,wBAAgB,wBAAwB,IAAI,YAAY,CA8BvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,YAAY,CA4B9E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CA+DtD"}
+{"version":3,"file":"get-vite-config.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/get-vite-config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgB,YAAY,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,UAAU,GAAG,KAAK,CAAA;IAC1B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACzB,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,wBAAgB,oBAAoB,IAAI,YAAY,CAkDnD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAkDlD;AAED,KAAK,eAAe,GAAG;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,wBAAgB,WAAW,CAAC,IAAI,GAAE,eAAoB,kBA4FrD;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,YAAY,CA4CxC;AAwBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAStD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAE/D;AAED,wBAAgB,wBAAwB,IAAI,YAAY,CA8BvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,YAAY,CA4B9E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CA+DtD"}

package/dist/node/compiler/get-vite-config.js

@@ -6,6 +6,53 @@ import { withoutTrailingSlash } from "ufo";
 import { createLogger } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
 import { cliMode } from "../cli/cli-mode.js";
+export function skewProtectionPlugin() {
+    const deploymentId = process.env.VERCEL_DEPLOYMENT_ID;
+    const queryKey = "dpl";
+    const addQueryParam = (name) => `${name}?${queryKey}=${deploymentId}`;
+    const hasQueryParam = (name) => name.includes(`?${queryKey}=${deploymentId}`);
+    const removeQueryParam = (name) => name.replace(new RegExp(`\\?${queryKey}=${deploymentId}$`), "");
+    if (process.env.VERCEL_SKEW_PROTECTION_ENABLED !== "1" || !deploymentId)
+        return null;
+    return {
+        name: "vite:vite-plugin-vercel-skew-protection",
+        configResolved(config) {
+            const rollupOptions = config.build.rollupOptions || {};
+            const output = rollupOptions.output || {};
+            // rollupOptions.output = {
+            //   ...output,
+            //   entryFileNames: addQueryParam(
+            //     output.entryFileNames || "assets/[name].[hash].js"
+            //   ),
+            //   chunkFileNames: addQueryParam(
+            //     output.chunkFileNames || "assets/[name].[hash].js"
+            //   ),
+            //   assetFileNames: addQueryParam(
+            //     output.assetFileNames || "assets/[name].[hash].[ext]"
+            //   ),
+            // };
+            config.build.rollupOptions = rollupOptions;
+        },
+        generateBundle(_options, bundle) {
+            for (const [fileName, fileInfo] of Object.entries(bundle)) {
+                if (!hasQueryParam(fileName)) {
+                    continue;
+                }
+                const newFileName = removeQueryParam(fileName);
+                bundle[newFileName] = { ...fileInfo, fileName: newFileName };
+                delete bundle[fileName];
+            }
+        },
+        transformIndexHtml(html) {
+            return html.replace(/(<script|<link).+?(src|href)="(.+?)"/g, (match, _tag, _attr, value) => {
+                if (value.startsWith("/assets/") && !hasQueryParam(value)) {
+                    return match.replace(value, addQueryParam(value));
+                }
+                return match;
+            });
+        },
+    };
+}
 export function envPlugin(args) {
     const envDefines = {
         client: args.client ? "true" : "false",

package/dist/node/compiler/vinxi-app.d.ts.map

@@ -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"}
+{"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,uBAmO3C"}

package/dist/node/compiler/vinxi-app.js

@@ -2,7 +2,7 @@ import { joinURL } from "ufo";
 import { createApp } from "vinxi";
 import tsconfigPaths from "vite-tsconfig-paths";
 import { StatefulLog } from "../utils/stateful-log.js";
-import { corePlugins, envPlugin } from "./get-vite-config.js";
+import { corePlugins, envPlugin, skewProtectionPlugin } from "./get-vite-config.js";
 import { getVinxiFolder } from "./vinxi-codegen.js";
 export function createVinxiApp(args) {
     const log = args.log ?? new StatefulLog({ label: "Build" });
@@ -64,10 +64,10 @@ export function createVinxiApp(args) {
                 "/wp-content/**": { proxy: joinURL(args.origin, "wp-content/**") },
                 "/wp-includes/**": { proxy: joinURL(args.origin, "wp-includes/**") },
                 "/_data/route/**": {
-                    isr: 300,
+                    isr: 1800,
                     swr: true,
                     cache: {
-                        maxAge: 300,
+                        maxAge: 1800,
                         swr: true,
                         varies: ["Authorization", "woocommerce-session"],
                     },
@@ -91,10 +91,10 @@ export function createVinxiApp(args) {
                     };
                 }, {}),
                 "/**/*": {
-                    isr: 300,
+                    isr: 1800,
                     swr: true,
                     cache: {
-                        maxAge: 300,
+                        maxAge: 1800,
                         swr: true,
                         staleMaxAge: 3600,
                     },
@@ -161,6 +161,7 @@ export function createVinxiApp(args) {
                 handler: `${folder}/entry.client.tsx`,
                 target: "browser",
                 plugins: () => [
+                    skewProtectionPlugin(),
                     ...corePlugins({
                         rootDir: args.rootDir,
                         console: log,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.215",
+  "version": "2.0.0-beta.217",
   "description": "",
   "main": "index.js",
   "type": "module",