eddev 2.0.0-beta.216 → 2.0.0-beta.217
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/dist/node/cli/version.d.ts +1 -1
- package/dist/node/cli/version.js +1 -1
- package/dist/node/compiler/get-vite-config.d.ts +1 -0
- package/dist/node/compiler/get-vite-config.d.ts.map +1 -1
- package/dist/node/compiler/get-vite-config.js +47 -0
- package/dist/node/compiler/vinxi-app.d.ts.map +1 -1
- package/dist/node/compiler/vinxi-app.js +2 -1
- package/package.json +1 -1
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "2.0.0-beta.
|
|
1
|
+
export declare const VERSION = "2.0.0-beta.217";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/node/cli/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const VERSION = "2.0.0-beta.
|
|
1
|
+
export const VERSION = "2.0.0-beta.217";
|
|
@@ -10,6 +10,7 @@ export type Args = {
|
|
|
10
10
|
console: StatefulLog<any>;
|
|
11
11
|
client: boolean;
|
|
12
12
|
};
|
|
13
|
+
export declare function skewProtectionPlugin(): PluginOption;
|
|
13
14
|
export declare function envPlugin(args: Args): PluginOption;
|
|
14
15
|
type ReactPluginArgs = {
|
|
15
16
|
retainBlockMeta?: boolean;
|
|
@@ -1 +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"}
|
|
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,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"}
|
|
@@ -6,6 +6,53 @@ import { withoutTrailingSlash } from "ufo";
|
|
|
6
6
|
import { createLogger } from "vite";
|
|
7
7
|
import tsconfigPaths from "vite-tsconfig-paths";
|
|
8
8
|
import { cliMode } from "../cli/cli-mode.js";
|
|
9
|
+
export function skewProtectionPlugin() {
|
|
10
|
+
const deploymentId = process.env.VERCEL_DEPLOYMENT_ID;
|
|
11
|
+
const queryKey = "dpl";
|
|
12
|
+
const addQueryParam = (name) => `${name}?${queryKey}=${deploymentId}`;
|
|
13
|
+
const hasQueryParam = (name) => name.includes(`?${queryKey}=${deploymentId}`);
|
|
14
|
+
const removeQueryParam = (name) => name.replace(new RegExp(`\\?${queryKey}=${deploymentId}$`), "");
|
|
15
|
+
if (process.env.VERCEL_SKEW_PROTECTION_ENABLED !== "1" || !deploymentId)
|
|
16
|
+
return null;
|
|
17
|
+
return {
|
|
18
|
+
name: "vite:vite-plugin-vercel-skew-protection",
|
|
19
|
+
configResolved(config) {
|
|
20
|
+
const rollupOptions = config.build.rollupOptions || {};
|
|
21
|
+
const output = rollupOptions.output || {};
|
|
22
|
+
// rollupOptions.output = {
|
|
23
|
+
// ...output,
|
|
24
|
+
// entryFileNames: addQueryParam(
|
|
25
|
+
// output.entryFileNames || "assets/[name].[hash].js"
|
|
26
|
+
// ),
|
|
27
|
+
// chunkFileNames: addQueryParam(
|
|
28
|
+
// output.chunkFileNames || "assets/[name].[hash].js"
|
|
29
|
+
// ),
|
|
30
|
+
// assetFileNames: addQueryParam(
|
|
31
|
+
// output.assetFileNames || "assets/[name].[hash].[ext]"
|
|
32
|
+
// ),
|
|
33
|
+
// };
|
|
34
|
+
config.build.rollupOptions = rollupOptions;
|
|
35
|
+
},
|
|
36
|
+
generateBundle(_options, bundle) {
|
|
37
|
+
for (const [fileName, fileInfo] of Object.entries(bundle)) {
|
|
38
|
+
if (!hasQueryParam(fileName)) {
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
const newFileName = removeQueryParam(fileName);
|
|
42
|
+
bundle[newFileName] = { ...fileInfo, fileName: newFileName };
|
|
43
|
+
delete bundle[fileName];
|
|
44
|
+
}
|
|
45
|
+
},
|
|
46
|
+
transformIndexHtml(html) {
|
|
47
|
+
return html.replace(/(<script|<link).+?(src|href)="(.+?)"/g, (match, _tag, _attr, value) => {
|
|
48
|
+
if (value.startsWith("/assets/") && !hasQueryParam(value)) {
|
|
49
|
+
return match.replace(value, addQueryParam(value));
|
|
50
|
+
}
|
|
51
|
+
return match;
|
|
52
|
+
});
|
|
53
|
+
},
|
|
54
|
+
};
|
|
55
|
+
}
|
|
9
56
|
export function envPlugin(args) {
|
|
10
57
|
const envDefines = {
|
|
11
58
|
client: args.client ? "true" : "false",
|
|
@@ -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,
|
|
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,uBAmO3C"}
|
|
@@ -2,7 +2,7 @@ import { joinURL } from "ufo";
|
|
|
2
2
|
import { createApp } from "vinxi";
|
|
3
3
|
import tsconfigPaths from "vite-tsconfig-paths";
|
|
4
4
|
import { StatefulLog } from "../utils/stateful-log.js";
|
|
5
|
-
import { corePlugins, envPlugin } from "./get-vite-config.js";
|
|
5
|
+
import { corePlugins, envPlugin, skewProtectionPlugin } from "./get-vite-config.js";
|
|
6
6
|
import { getVinxiFolder } from "./vinxi-codegen.js";
|
|
7
7
|
export function createVinxiApp(args) {
|
|
8
8
|
const log = args.log ?? new StatefulLog({ label: "Build" });
|
|
@@ -161,6 +161,7 @@ export function createVinxiApp(args) {
|
|
|
161
161
|
handler: `${folder}/entry.client.tsx`,
|
|
162
162
|
target: "browser",
|
|
163
163
|
plugins: () => [
|
|
164
|
+
skewProtectionPlugin(),
|
|
164
165
|
...corePlugins({
|
|
165
166
|
rootDir: args.rootDir,
|
|
166
167
|
console: log,
|