diff --git a/packages/vinxi/lib/dev-server.js b/packages/vinxi/lib/dev-server.js index 4037320a..e8070507 100644 --- a/packages/vinxi/lib/dev-server.js +++ b/packages/vinxi/lib/dev-server.js @@ -183,9 +183,13 @@ async function createViteHandler(app, router, serveConfig) { configFile: false, base: router.base, plugins: [ - ...(targetDevPlugin[router.build.target]?.(router).filter(Boolean) ?? []), - ...(routerModeDevPlugin[router.mode]?.(router).filter(Boolean) ?? []), - ...((await router.build?.plugins?.(router)).filter(Boolean) || []), + ...((targetDevPlugin[router.build.target]?.(router) ?? []).filter( + Boolean, + ) ?? []), + ...((routerModeDevPlugin[router.mode]?.(router) ?? []).filter(Boolean) ?? + []), + ...(((await router.build?.plugins?.(router)) ?? []).filter(Boolean) || + []), ], router, app, diff --git a/packages/vinxi/package.json b/packages/vinxi/package.json index 78f9a9c1..a1346441 100644 --- a/packages/vinxi/package.json +++ b/packages/vinxi/package.json @@ -58,7 +58,7 @@ "listhen": "^1.0.4", "micromatch": "^4.0.5", "mri": "^1.2.0", - "nitropack": "npm:nitropack-edge@2.6.0-28206057.d584781", + "nitropack": "2.6.1", "node-fetch-native": "^1.2.0", "path-to-regexp": "^6.2.1", "pathe": "^1.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 88bd0696..438995ea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -728,8 +728,8 @@ importers: specifier: ^1.2.0 version: 1.2.0 nitropack: - specifier: npm:nitropack-edge@2.6.0-28206057.d584781 - version: /nitropack-edge@2.6.0-28206057.d584781 + specifier: 2.6.1 + version: 2.6.1 node-fetch-native: specifier: ^1.2.0 version: 1.2.0 @@ -744,7 +744,7 @@ importers: version: 1.0.0 rollup-plugin-visualizer: specifier: ^5.9.2 - version: 5.9.2(rollup@3.28.0) + version: 5.9.2(rollup@3.28.1) serve-placeholder: specifier: ^2.0.1 version: 2.0.1 @@ -2629,13 +2629,27 @@ packages: - utf-8-validate dev: false - /@netlify/functions@1.6.0: - resolution: {integrity: sha512-6G92AlcpFrQG72XU8YH8pg94eDnq7+Q0YJhb8x4qNpdGsvuzvrfHWBmqFGp/Yshmv4wex9lpsTRZOocdrA2erQ==} + /@netlify/functions@2.0.2: + resolution: {integrity: sha512-goWRtaIPUK/q47qLYtfGGj7HgJIRaT0snw7zZ0yeoNTfQfCRwQwvRrMAsXkCsCtq2N2Oo81L26SpkMxEQMk9hg==} engines: {node: '>=14.0.0'} dependencies: + '@netlify/serverless-functions-api': 1.7.3 is-promise: 4.0.0 dev: false + /@netlify/node-cookies@0.1.0: + resolution: {integrity: sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==} + engines: {node: ^14.16.0 || >=16.0.0} + dev: false + + /@netlify/serverless-functions-api@1.7.3: + resolution: {integrity: sha512-n6/7cJlSWvvbBlUOEAbkGyEld80S6KbG/ldQI9OhLfe1lTatgKmrTNIgqVNpaWpUdTgP2OHWFjmFBzkxxBWs5w==} + engines: {node: ^14.18.0 || >=16.0.0} + dependencies: + '@netlify/node-cookies': 0.1.0 + urlpattern-polyfill: 8.0.2 + dev: false + /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -2735,6 +2749,16 @@ packages: napi-wasm: 1.1.0 dev: false + /@parcel/watcher-wasm@2.3.0-alpha.3: + resolution: {integrity: sha512-kTkqlYhGhCM9EaoZMyjNzqKRSdTyp/vN+/uoJ2fzN+UCiWUI+jMKacwnBgu13T1F0mrcNqEWtYEXTRaZmnml1w==} + engines: {node: '>= 10.0.0'} + dependencies: + is-glob: 4.0.3 + micromatch: 4.0.5 + dev: false + bundledDependencies: + - napi-wasm + /@parcel/watcher-win32-arm64@2.2.0: resolution: {integrity: sha512-z225cPn3aygJsyVUOWwfyW+fY0Tvk7N3XCOl66qUPFxpbuXeZuiuuJemmtm8vxyqa3Ur7peU/qJxrpC64aeI7Q==} engines: {node: '>= 10.0.0'} @@ -2793,7 +2817,7 @@ packages: playwright-core: 1.27.0 dev: false - /@rollup/plugin-alias@5.0.0(rollup@3.28.0): + /@rollup/plugin-alias@5.0.0(rollup@3.28.1): resolution: {integrity: sha512-l9hY5chSCjuFRPsnRm16twWBiSApl2uYFLsepQYwtBuAxNMQ/1dJqADld40P0Jkqm65GRTLy/AC6hnpVebtLsA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2802,11 +2826,11 @@ packages: rollup: optional: true dependencies: - rollup: 3.28.0 + rollup: 3.28.1 slash: 4.0.0 dev: false - /@rollup/plugin-commonjs@25.0.4(rollup@3.28.0): + /@rollup/plugin-commonjs@25.0.4(rollup@3.28.1): resolution: {integrity: sha512-L92Vz9WUZXDnlQQl3EwbypJR4+DM2EbsO+/KOcEkP4Mc6Ct453EeDB2uH9lgRwj4w5yflgNpq9pHOiY8aoUXBQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2815,16 +2839,16 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.0) + '@rollup/pluginutils': 5.0.3(rollup@3.28.1) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.27.0 - rollup: 3.28.0 + rollup: 3.28.1 dev: false - /@rollup/plugin-inject@5.0.3(rollup@3.28.0): + /@rollup/plugin-inject@5.0.3(rollup@3.28.1): resolution: {integrity: sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2833,13 +2857,13 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.0) + '@rollup/pluginutils': 5.0.3(rollup@3.28.1) estree-walker: 2.0.2 magic-string: 0.27.0 - rollup: 3.28.0 + rollup: 3.28.1 dev: false - /@rollup/plugin-json@6.0.0(rollup@3.28.0): + /@rollup/plugin-json@6.0.0(rollup@3.28.1): resolution: {integrity: sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2848,12 +2872,12 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.0) - rollup: 3.28.0 + '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + rollup: 3.28.1 dev: false - /@rollup/plugin-node-resolve@15.1.0(rollup@3.28.0): - resolution: {integrity: sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==} + /@rollup/plugin-node-resolve@15.2.1(rollup@3.28.1): + resolution: {integrity: sha512-nsbUg588+GDSu8/NS8T4UAshO6xeaOfINNuXeVHcKV02LJtoRaM1SiOacClw4kws1SFiNhdLGxlbMY9ga/zs/w==} engines: {node: '>=14.0.0'} peerDependencies: rollup: ^2.78.0||^3.0.0 @@ -2861,16 +2885,16 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.0) + '@rollup/pluginutils': 5.0.3(rollup@3.28.1) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-builtin-module: 3.2.1 is-module: 1.0.0 resolve: 1.22.2 - rollup: 3.28.0 + rollup: 3.28.1 dev: false - /@rollup/plugin-replace@5.0.2(rollup@3.28.0): + /@rollup/plugin-replace@5.0.2(rollup@3.28.1): resolution: {integrity: sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2879,12 +2903,12 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.0) + '@rollup/pluginutils': 5.0.3(rollup@3.28.1) magic-string: 0.27.0 - rollup: 3.28.0 + rollup: 3.28.1 dev: false - /@rollup/plugin-terser@0.4.3(rollup@3.28.0): + /@rollup/plugin-terser@0.4.3(rollup@3.28.1): resolution: {integrity: sha512-EF0oejTMtkyhrkwCdg0HJ0IpkcaVg1MMSf2olHb2Jp+1mnLM04OhjpJWGma4HobiDTF0WCyViWuvadyE9ch2XA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2893,13 +2917,13 @@ packages: rollup: optional: true dependencies: - rollup: 3.28.0 + rollup: 3.28.1 serialize-javascript: 6.0.1 smob: 1.4.0 terser: 5.19.2 dev: false - /@rollup/plugin-wasm@6.1.3(rollup@3.28.0): + /@rollup/plugin-wasm@6.1.3(rollup@3.28.1): resolution: {integrity: sha512-7ItTTeyauE6lwdDtQWceEHZ9+txbi4RRy0mYPFn9BW7rD7YdgBDu7HTHsLtHrRzJc313RM/1m6GKgV3np/aEaw==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2908,7 +2932,7 @@ packages: rollup: optional: true dependencies: - rollup: 3.28.0 + rollup: 3.28.1 dev: false /@rollup/pluginutils@4.2.1: @@ -2934,7 +2958,7 @@ packages: rollup: 3.28.0 dev: false - /@rollup/pluginutils@5.0.3(rollup@3.28.0): + /@rollup/pluginutils@5.0.3(rollup@3.28.1): resolution: {integrity: sha512-hfllNN4a80rwNQ9QCxhxuHCGHMAvabXqxNdaChUSSadMre7t4iEUI6fFAhBOn/eIYTgYVhBv7vCLsAJ4u3lf3g==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2946,7 +2970,7 @@ packages: '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 3.28.0 + rollup: 3.28.1 dev: false /@sideway/address@4.1.4: @@ -3793,8 +3817,8 @@ packages: defu: 6.1.2 dotenv: 16.3.1 giget: 1.1.2 - jiti: 1.19.1 - mlly: 1.4.0 + jiti: 1.19.3 + mlly: 1.4.1 ohash: 1.1.3 pathe: 1.1.1 perfect-debounce: 1.0.0 @@ -3938,6 +3962,12 @@ packages: consola: 3.2.3 dev: false + /citty@0.1.3: + resolution: {integrity: sha512-tb6zTEb2BDSrzFedqFYFUKUuKNaxVJWCm7o02K4kADGkBDyyiz7D40rDMpguczdZyAN3aetd5fhpB01HkreNyg==} + dependencies: + consola: 3.2.3 + dev: false + /cli-truncate@3.1.0: resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -4901,19 +4931,6 @@ packages: duplexer: 0.1.2 dev: false - /h3-nightly@1.8.1-1692554209.a3ad8c2: - resolution: {integrity: sha512-OmbTmQEjtsoTo5nhS0EqohRdm8sqScjpAdO4R4SCo5827Uf8mSF6OqhDmlxcmOKH6pqzbqsOWr7sXWTs7gRc1Q==} - dependencies: - cookie-es: 1.0.0 - defu: 6.1.2 - destr: 2.0.1 - iron-webcrypto: 0.8.0 - radix3: 1.0.1 - ufo: 1.2.0 - uncrypto: 0.1.3 - unenv: 1.7.1 - dev: false - /h3@1.8.0: resolution: {integrity: sha512-057VY83X7Tg5n4XU2GV9M3dsCWUU4jtw2Lc/r4GjAcf9Jb6GI1mD5F8TCQHUcvLMEgtx6lbfobOFu7Vdmejihg==} dependencies: @@ -5055,6 +5072,10 @@ packages: - supports-color dev: false + /httpxy@0.1.2: + resolution: {integrity: sha512-8IldwriN7eS7Pe1pPRE6L7S1LW551lBJ3N9oI4HLYGZTXl2JBkdINEi+mDZwhwykw1OBVI2li3zhPSi7r1N8lQ==} + dev: false + /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} @@ -5353,6 +5374,11 @@ packages: resolution: {integrity: sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==} hasBin: true + /jiti@1.19.3: + resolution: {integrity: sha512-5eEbBDQT/jF1xg6l36P+mWGGoH9Spuy0PCdSr2dtWRDGC6ph/w9ZCL4lmESW8f8F7MwT3XKescfP0wnZWAKL9w==} + hasBin: true + dev: false + /joi@17.9.2: resolution: {integrity: sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==} dependencies: @@ -5463,6 +5489,28 @@ packages: uqr: 0.1.2 dev: false + /listhen@1.4.0: + resolution: {integrity: sha512-gEOMJKTak+WLjPITBVbv2kR0WKVUSnl5XPwvoFYheyaQPzh/jdA+pRZeUujJkjabNMDsBxwuaYH7HYLpzzGEJA==} + hasBin: true + dependencies: + '@parcel/watcher': 2.2.0 + '@parcel/watcher-wasm': 2.3.0-alpha.3 + citty: 0.1.3 + clipboardy: 3.0.0 + consola: 3.2.3 + defu: 6.1.2 + get-port-please: 3.0.1 + h3: 1.8.0 + http-shutdown: 1.2.2 + jiti: 1.19.3 + mlly: 1.4.1 + node-forge: 1.3.1 + pathe: 1.1.1 + ufo: 1.3.0 + untun: 0.1.1 + uqr: 0.1.2 + dev: false + /local-pkg@0.4.3: resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==} engines: {node: '>=14'} @@ -5540,8 +5588,8 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: false - /magic-string@0.30.2: - resolution: {integrity: sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==} + /magic-string@0.30.3: + resolution: {integrity: sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 @@ -6073,6 +6121,15 @@ packages: ufo: 1.2.0 dev: false + /mlly@1.4.1: + resolution: {integrity: sha512-SCDs78Q2o09jiZiE2WziwVBEqXQ02XkGdUy45cbJf+BpYRIjArXRJ1Wbowxkb+NaM9DWvS3UC9GiO/6eqvQ/pg==} + dependencies: + acorn: 8.10.0 + pathe: 1.1.1 + pkg-types: 1.0.3 + ufo: 1.3.0 + dev: false + /mri@1.2.0: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} engines: {node: '>=4'} @@ -6114,29 +6171,29 @@ packages: engines: {node: '>= 0.6'} dev: false - /nitropack-edge@2.6.0-28206057.d584781: - resolution: {integrity: sha512-+38eIN7JN9mLW+0pBozFi5/bl71SfBLr/4qDk+mN0HY5WJVJqe6VSkDdkIU/EDg+ygGNnwVrfGEExLpd+/AFqA==} + /nitropack@2.6.1: + resolution: {integrity: sha512-BoVM7nWx/S5S7TUU3z0DqiY/VVIHu6zng3vJyGMjESIW/FDhc3ecPDJRkNzdUXG5zZ3Ex7ZNll2AsdNHZImcpA==} engines: {node: ^16.11.0 || >=17.0.0} hasBin: true dependencies: '@cloudflare/kv-asset-handler': 0.3.0 - '@netlify/functions': 1.6.0 - '@rollup/plugin-alias': 5.0.0(rollup@3.28.0) - '@rollup/plugin-commonjs': 25.0.4(rollup@3.28.0) - '@rollup/plugin-inject': 5.0.3(rollup@3.28.0) - '@rollup/plugin-json': 6.0.0(rollup@3.28.0) - '@rollup/plugin-node-resolve': 15.1.0(rollup@3.28.0) - '@rollup/plugin-replace': 5.0.2(rollup@3.28.0) - '@rollup/plugin-terser': 0.4.3(rollup@3.28.0) - '@rollup/plugin-wasm': 6.1.3(rollup@3.28.0) - '@rollup/pluginutils': 5.0.3(rollup@3.28.0) + '@netlify/functions': 2.0.2 + '@rollup/plugin-alias': 5.0.0(rollup@3.28.1) + '@rollup/plugin-commonjs': 25.0.4(rollup@3.28.1) + '@rollup/plugin-inject': 5.0.3(rollup@3.28.1) + '@rollup/plugin-json': 6.0.0(rollup@3.28.1) + '@rollup/plugin-node-resolve': 15.2.1(rollup@3.28.1) + '@rollup/plugin-replace': 5.0.2(rollup@3.28.1) + '@rollup/plugin-terser': 0.4.3(rollup@3.28.1) + '@rollup/plugin-wasm': 6.1.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.3(rollup@3.28.1) '@types/http-proxy': 1.17.11 '@vercel/nft': 0.23.1 archiver: 6.0.0 c12: 1.4.2 chalk: 5.3.0 chokidar: 3.5.3 - citty: 0.1.2 + citty: 0.1.3 consola: 3.2.3 cookie-es: 1.0.0 defu: 6.1.2 @@ -6148,39 +6205,39 @@ packages: fs-extra: 11.1.1 globby: 13.2.2 gzip-size: 7.0.0 - h3: /h3-nightly@1.8.1-1692554209.a3ad8c2 + h3: 1.8.0 hookable: 5.5.3 - http-proxy: 1.18.1 + httpxy: 0.1.2 is-primitive: 3.0.1 - jiti: 1.19.1 + jiti: 1.19.3 klona: 2.0.6 knitwork: 1.0.0 - listhen: 1.3.0 - magic-string: 0.30.2 + listhen: 1.4.0 + magic-string: 0.30.3 mime: 3.0.0 - mlly: 1.4.0 + mlly: 1.4.1 mri: 1.2.0 - node-fetch-native: 1.2.0 - ofetch: 1.1.1 + node-fetch-native: 1.4.0 + ofetch: 1.3.3 ohash: 1.1.3 - openapi-typescript: 6.5.0 + openapi-typescript: 6.5.3 pathe: 1.1.1 perfect-debounce: 1.0.0 pkg-types: 1.0.3 pretty-bytes: 6.1.1 - radix3: 1.0.1 - rollup: 3.28.0 - rollup-plugin-visualizer: 5.9.2(rollup@3.28.0) + radix3: 1.1.0 + rollup: 3.28.1 + rollup-plugin-visualizer: 5.9.2(rollup@3.28.1) scule: 1.0.0 semver: 7.5.4 serve-placeholder: 2.0.1 serve-static: 1.15.0 - std-env: 3.3.3 - ufo: 1.2.0 + std-env: 3.4.3 + ufo: 1.3.0 uncrypto: 0.1.3 unctx: 2.3.1 - unenv: 1.7.1 - unimport: 3.1.3(rollup@3.28.0) + unenv: 1.7.4 + unimport: 3.2.0(rollup@3.28.1) unstorage: 1.9.0 transitivePeerDependencies: - '@azure/app-configuration' @@ -6193,7 +6250,6 @@ packages: - '@planetscale/database' - '@upstash/redis' - '@vercel/kv' - - debug - encoding - idb-keyval - supports-color @@ -6207,6 +6263,10 @@ packages: resolution: {integrity: sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ==} dev: false + /node-fetch-native@1.4.0: + resolution: {integrity: sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==} + dev: false + /node-fetch@2.6.12: resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==} engines: {node: 4.x || >=6.0.0} @@ -6315,6 +6375,14 @@ packages: ufo: 1.2.0 dev: false + /ofetch@1.3.3: + resolution: {integrity: sha512-s1ZCMmQWXy4b5K/TW9i/DtiN8Ku+xCiHcjQ6/J/nDdssirrQNOoB165Zu8EqLMA2lln1JUth9a0aW9Ap2ctrUg==} + dependencies: + destr: 2.0.1 + node-fetch-native: 1.4.0 + ufo: 1.3.0 + dev: false + /ohash@1.1.3: resolution: {integrity: sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==} dev: false @@ -6359,8 +6427,8 @@ packages: is-wsl: 2.2.0 dev: false - /openapi-typescript@6.5.0: - resolution: {integrity: sha512-FHrCCZdwNP47OcEPrjHcw7IhRcky3SpTA8lI8q+mvI27ow5UQEvWjGJk7pK0XzmiXjgYKtIoL6+vmL7x3tzvCg==} + /openapi-typescript@6.5.3: + resolution: {integrity: sha512-iVOgf1wf/6R73Cg9wcxMAD/P3+/TJ8HQruLyv3WRDu29Pwnmp7ZUJ897Kb401jW7Ao/L4JjisropHQJW62BXtA==} hasBin: true dependencies: ansi-colors: 4.1.3 @@ -6600,6 +6668,10 @@ packages: resolution: {integrity: sha512-y+AcwZ3HcUIGc9zGsNVf5+BY/LxL+z+4h4J3/pp8jxSmy1STaCocPS3qrj4tA5ehUSzqtqK+0Aygvz/r/8vy4g==} dev: false + /radix3@1.1.0: + resolution: {integrity: sha512-pNsHDxbGORSvuSScqNJ+3Km6QAVqk8CfsCBIEoDgpqLrkD2f3QM4I7d1ozJJ172OmIcoUcerZaNWqtLkRXTV3A==} + dev: false + /randombytes@2.1.0: resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==} dependencies: @@ -6802,7 +6874,7 @@ packages: dependencies: glob: 10.3.3 - /rollup-plugin-visualizer@5.9.2(rollup@3.28.0): + /rollup-plugin-visualizer@5.9.2(rollup@3.28.1): resolution: {integrity: sha512-waHktD5mlWrYFrhOLbti4YgQCn1uR24nYsNuXxg7LkPH8KdTXVWR9DNY1WU0QqokyMixVXJS4J04HNrVTMP01A==} engines: {node: '>=14'} hasBin: true @@ -6814,7 +6886,7 @@ packages: dependencies: open: 8.4.2 picomatch: 2.3.1 - rollup: 3.28.0 + rollup: 3.28.1 source-map: 0.7.4 yargs: 17.7.2 dev: false @@ -6841,6 +6913,14 @@ packages: fsevents: 2.3.2 dev: false + /rollup@3.28.1: + resolution: {integrity: sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + dev: false + /run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: @@ -7084,6 +7164,10 @@ packages: resolution: {integrity: sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==} dev: false + /std-env@3.4.3: + resolution: {integrity: sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==} + dev: false + /streamsearch@1.1.0: resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==} engines: {node: '>=10.0.0'} @@ -7369,6 +7453,10 @@ packages: resolution: {integrity: sha512-RsPyTbqORDNDxqAdQPQBpgqhWle1VcTSou/FraClYlHf6TZnQcGslpLcAphNR+sQW4q5lLWLbOsRlh9j24baQg==} dev: false + /ufo@1.3.0: + resolution: {integrity: sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==} + dev: false + /uncrypto@0.1.3: resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==} dev: false @@ -7378,7 +7466,7 @@ packages: dependencies: acorn: 8.10.0 estree-walker: 3.0.3 - magic-string: 0.30.2 + magic-string: 0.30.3 unplugin: 1.4.0 dev: false @@ -7433,6 +7521,16 @@ packages: pathe: 1.1.1 dev: false + /unenv@1.7.4: + resolution: {integrity: sha512-fjYsXYi30It0YCQYqLOcT6fHfMXsBr2hw9XC7ycf8rTG7Xxpe3ZssiqUnD0khrjiZEmkBXWLwm42yCSCH46fMw==} + dependencies: + consola: 3.2.3 + defu: 6.1.2 + mime: 3.0.0 + node-fetch-native: 1.4.0 + pathe: 1.1.1 + dev: false + /unified@10.1.2: resolution: {integrity: sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==} dependencies: @@ -7474,15 +7572,15 @@ packages: - rollup dev: false - /unimport@3.1.3(rollup@3.28.0): - resolution: {integrity: sha512-up4TE2yA+nMyyErGTjbYGVw95MriGa2hVRXQ3/JRp7984cwwqULcnBjHaovVpsO8tZc2j0fvgGu9yiBKOyxvYw==} + /unimport@3.2.0(rollup@3.28.1): + resolution: {integrity: sha512-9buxPxkNwxwxAlH/RfOFHxtQTUrlmBGi9Ai9HezY2yYbkoOhgJTYPI6+WqxI1EZphoM9cw1SHoCFRkXSb8/fjQ==} dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.0) + '@rollup/pluginutils': 5.0.3(rollup@3.28.1) escape-string-regexp: 5.0.0 fast-glob: 3.3.1 local-pkg: 0.4.3 - magic-string: 0.30.2 - mlly: 1.4.0 + magic-string: 0.30.3 + mlly: 1.4.1 pathe: 1.1.1 pkg-types: 1.0.3 scule: 1.0.0 @@ -7634,6 +7732,10 @@ packages: resolution: {integrity: sha512-DOE84vZT2fEcl9gqCUTcnAw5ZY5Id55ikUcziSUntuEFL3pRvavg5kwDmTEUJkeCHInTlV/HexFomgYnzO5kdQ==} dev: false + /urlpattern-polyfill@8.0.2: + resolution: {integrity: sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==} + dev: false + /use-sync-external-store@1.2.0(react@0.0.0-experimental-035a41c4e-20230704): resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} peerDependencies: diff --git a/test/templates/react/app/api.ts b/test/templates/react/app/api.ts index 0e5a79db..02c8ab09 100644 --- a/test/templates/react/app/api.ts +++ b/test/templates/react/app/api.ts @@ -1,6 +1,6 @@ import { pathToRegexp } from "path-to-regexp"; import fileRoutes from "vinxi/routes"; -import { H3Event, eventHandler } from "vinxi/runtime/server"; +import { H3Event, eventHandler, toWebRequest } from "vinxi/runtime/server"; const routes = [ ...fileRoutes.map((route) => ({ @@ -28,7 +28,7 @@ function createRouter(routes) { return { async handle(event) { for (const route of builtRoutes) { - const url = new URL(event.request.url); + const url = new URL(toWebRequest(event).url); const path = url.pathname.replace(import.meta.env.BASE_URL, ""); const match = route.regexp.exec(path);