Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/nitro-v2-vite-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
},
"type": "module",
"types": "dist/esm/index.d.ts",
"main": "dist/cjs/index.cjs",
"module": "dist/esm/index.js",
"exports": {
".": {
Expand All @@ -61,7 +60,8 @@
},
"dependencies": {
"nitropack": "^2.12.6",
"pathe": "^2.0.3"
"pathe": "^2.0.3",
"h3-v1": "npm:h3@^1.15.4"
},
"peerDependencies": {
"vite": ">=7.0.0"
Expand Down
20 changes: 19 additions & 1 deletion packages/nitro-v2-vite-plugin/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createRequire } from 'node:module'
import { build, copyPublicAssets, createNitro, prepare } from 'nitropack'
import { dirname, resolve } from 'pathe'

Expand All @@ -15,6 +16,7 @@ function isFullUrl(str: string): boolean {
return false
}
}
const require = createRequire(import.meta.url)

export function nitroV2Plugin(nitroConfig?: NitroConfig): Array<PluginOption> {
let resolvedConfig: ResolvedConfig
Expand Down Expand Up @@ -92,6 +94,7 @@ export function nitroV2Plugin(nitroConfig?: NitroConfig): Array<PluginOption> {

await builder.build(client)
await builder.build(server)
const h3 = require.resolve('h3-v1')

const virtualEntry = '#tanstack/start/entry'
const baseURL = !isFullUrl(resolvedConfig.base)
Expand All @@ -110,7 +113,22 @@ export function nitroV2Plugin(nitroConfig?: NitroConfig): Array<PluginOption> {
renderer: virtualEntry,
rollupConfig: {
...nitroConfig?.rollupConfig,
plugins: [virtualBundlePlugin(ssrBundle) as any],
plugins: [
virtualBundlePlugin(ssrBundle) as any,
{
name: 'resolve',
resolveId(source, importer) {
if (
(importer?.includes('nitropack') ||
importer === virtualEntry) &&
source === 'h3'
) {
return h3
}
return null
},
},
],
},
virtual: {
...nitroConfig?.virtual,
Expand Down
1 change: 1 addition & 0 deletions packages/nitro-v2-vite-plugin/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ export default mergeConfig(
entry: './src/index.ts',
srcDir: './src',
exclude: ['./src/tests/'],
cjs: false,
}),
)
2 changes: 1 addition & 1 deletion packages/start-server-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@tanstack/router-core": "workspace:*",
"@tanstack/start-client-core": "workspace:*",
"@tanstack/start-storage-context": "workspace:*",
"h3-v2": "npm:h3@2.0.0-beta.4",
"h3": "2.0.0-beta.5",
"seroval": "^1.3.2",
"tiny-invariant": "^1.3.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/start-server-core/src/request-response.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
unsealSession as h3_unsealSession,
updateSession as h3_updateSession,
useSession as h3_useSession,
} from 'h3-v2'
} from 'h3'
import type {
RequestHeaderMap,
RequestHeaderName,
Expand Down
34 changes: 23 additions & 11 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading