Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: inject instead of auto import server entry #8

Merged
merged 19 commits into from
Aug 23, 2024
Merged

fix: inject instead of auto import server entry #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e8b8e28
link vike
brillout Aug 21, 2024
b812f5d
pin react-streaming
brillout Aug 23, 2024
f9e8aeb
Revert "pin react-streaming"
brillout Aug 23, 2024
6e15bd3
Revert "link vike"
brillout Aug 23, 2024
1f07296
override vite-plugin-server-entry
brillout Aug 23, 2024
97d424f
showcase with examples/express-react
brillout Aug 23, 2024
3340f62
link vite-plugin-server-entry
brillout Aug 23, 2024
4784186
fix: inject instead of auto import server entry
brillout Aug 23, 2024
ac54072
try standalone
brillout Aug 23, 2024
8787cfe
Revert "try standalone"
brillout Aug 23, 2024
02d5147
Revert "showcase with examples/express-react"
brillout Aug 23, 2024
25dbefc
Revert "link vite-plugin-server-entry"
brillout Aug 23, 2024
2ee2b33
Revert "override vite-plugin-server-entry"
brillout Aug 23, 2024
f5e3c0c
update vike
brillout Aug 23, 2024
b5533ef
update @brillout/vite-plugin-server-entry of example
brillout Aug 23, 2024
680af3d
don't assume writeBundle() to be called
brillout Aug 23, 2024
4941edb
link vike
brillout Aug 23, 2024
a2d721f
Revert "link vike"
brillout Aug 23, 2024
3989613
udpate vike
brillout Aug 23, 2024
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
2 changes: 1 addition & 1 deletion examples/express-react-vercel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"express": "^4.19.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vike": "^0.4.184",
"vike": "^0.4.193",
"vike-node": "^0.1.16",
"vike-react": "^0.4.18",
"vite": "^5.4.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/express-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"express": "^4.19.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vike": "^0.4.184",
"vike": "^0.4.193",
"vike-node": "^0.1.16",
"vike-react": "^0.4.18",
"vite": "^5.4.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/hono-react-cf-pages/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"hono": "^4.5.5",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vike": "^0.4.184",
"vike": "^0.4.193",
"vike-node": "^0.1.16",
"vike-react": "^0.4.18",
"vite": "^5.4.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/hono-react-vercel-edge/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"hono": "^4.5.5",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vike": "^0.4.184",
"vike": "^0.4.193",
"vike-node": "^0.1.16",
"vike-react": "^0.4.18",
"vite": "^5.4.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/vike-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"resolve-from": "^5.0.0"
},
"peerDependencies": {
"vike": "^0.4.181",
"vike": "^0.4.193",
"vite": "^5.0.10"
},
"devDependencies": {
Expand All @@ -50,7 +50,7 @@
"h3": "^1.12.0",
"hono": "^4.5.5",
"typescript": "^5.5.4",
"vike": "^0.4.184",
"vike": "^0.4.193",
"vite": "^5.4.0"
},
"typesVersions": {
Expand Down
8 changes: 6 additions & 2 deletions packages/vike-node/src/plugin/plugins/serverEntryPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import pc from '@brillout/picocolors'
import { createRequire } from 'module'
import path from 'path'
import type { Plugin } from 'vite'
import type { Plugin, ResolvedConfig } from 'vite'
import type { EntryResolved } from '../../types.js'
import { assert, assertUsage } from '../../utils/assert.js'
import { getConfigVikeNode } from '../utils/getConfigVikeNode.js'
import { injectRollupInputs } from '../utils/injectRollupInputs.js'
import { viteIsSSR } from '../utils/viteIsSSR.js'
import type { ConfigVitePluginServerEntry } from 'vike/types'

const require_ = createRequire(import.meta.url)

export function serverEntryPlugin(): Plugin {
return {
name: 'vike-node:serverEntry',
async configResolved(config) {
async configResolved(config: ResolvedConfig & ConfigVitePluginServerEntry) {
const resolvedConfig = getConfigVikeNode(config)
const { entry } = resolvedConfig.server
const entries = Object.entries(entry)
Expand Down Expand Up @@ -48,6 +49,9 @@ export function serverEntryPlugin(): Plugin {
config
)
}

config.vitePluginServerEntry ??= {}
config.vitePluginServerEntry.inject = Object.keys(resolvedEntries)
}
}
}
2 changes: 1 addition & 1 deletion packages/vike-node/src/plugin/plugins/standalonePlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function standalonePlugin(): Plugin {
let root = ''
let outDir = ''
let outDirAbs = ''
let rollupEntryFilePaths: string[]
let rollupEntryFilePaths: string[] = []
let rollupResolve: any

return {
Expand Down
63 changes: 35 additions & 28 deletions pnpm-lock.yaml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion test/vike-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"sharp": "^0.33.4",
"telefunc": "^0.1.76",
"typescript": "^5.5.4",
"vike": "^0.4.184",
"vike": "^0.4.193",
"vike-node": "link:../../packages/vike-node",
"vite": "^5.4.0"
},
Expand Down