Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
d74dab7
Pull in changes from experimental render modes branch into Suspense R…
dac09 Jun 7, 2023
66d566c
Merge branch 'main' into feat/kc-dc-server-rendering
dac09 Jun 8, 2023
137f780
Fix bad merge
dac09 Jun 8, 2023
3db95ab
Merge branch 'main' into feat/kc-dc-server-rendering
dac09 Jun 12, 2023
3a9d696
Merge branch 'main' into feat/kc-dc-server-rendering
dac09 Jun 13, 2023
e4bc979
Recursively trigger routeHooks
dac09 Jun 13, 2023
29499b8
Make it build
Tobbe Jun 25, 2023
93603ba
Merge branch 'main' into feat/kc-dc-server-rendering
Tobbe Jun 25, 2023
a177424
extract assetMap
Tobbe Jun 25, 2023
01df1fc
Limit code churn
Tobbe Jun 25, 2023
0268f2f
Limit code churn project.mjs
Tobbe Jun 25, 2023
fbbfdeb
Merge serve.js with latest on main
Tobbe Jun 25, 2023
f29f9dd
babel common.ts: Undo custom plugin names to reduce churn
Tobbe Jun 26, 2023
351e3ba
Merge branch 'main' into feat/kc-dc-server-rendering
Tobbe Jun 26, 2023
12bf302
Resolve getRouteHookBabelPlugins comment
Tobbe Jun 27, 2023
86710c3
Use @TODO for GitHub highlighting to work
Tobbe Jun 27, 2023
94aa4e5
TODO (STREAMING) everywhere
Tobbe Jun 27, 2023
68a50e5
Merge branch 'main' into feat/kc-dc-server-rendering
Tobbe Jun 28, 2023
d48d756
after yarn install
Tobbe Jun 28, 2023
85f1f76
Fix merge conflict
Tobbe Jun 28, 2023
aae431e
Merge branch 'main' into feat/kc-dc-server-rendering
Tobbe Jun 29, 2023
eacfff0
Fix serve.js merge
Tobbe Jun 29, 2023
14a1c63
More serve.js fixes
Tobbe Jun 29, 2023
f2f191d
serve.js keep trying
Tobbe Jun 29, 2023
eac9296
Revert prerender changes to make current CI pass
Tobbe Jun 29, 2023
142cbe6
buildHandler: Wrap in feature flag check
Tobbe Jun 29, 2023
1791dee
serve.js: streamingSsr feature flag
Tobbe Jun 29, 2023
7389399
Work on getting this mergable by getting behavior closer to what's in…
Tobbe Jun 29, 2023
58870fe
Remove serverData
Tobbe Jun 29, 2023
fdf7d64
runFeServer: Add comment about new package
Tobbe Jun 29, 2023
8a3925d
apollo: streamingSsr feature flag
Tobbe Jun 29, 2023
b9a410e
Merge branch 'main' into feat/kc-dc-server-rendering
Tobbe Jun 29, 2023
196132e
Merge branch 'main' into feat/kc-dc-server-rendering
Tobbe Jun 29, 2023
9841fd2
Update paths tests
Tobbe Jun 30, 2023
b606f19
Merge branch 'feat/kc-dc-server-rendering' of https://github.com/redw…
Tobbe Jun 30, 2023
3b56964
No unsupported import assertions
Tobbe Jun 30, 2023
6117d6e
Merge branch 'main' into feat/kc-dc-server-rendering
Tobbe Jun 30, 2023
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
Prev Previous commit
Next Next commit
Fix serve.js merge
  • Loading branch information
Tobbe committed Jun 29, 2023
commit eacfff0f272edbdeb057824d0542c442e78b2e3c
10 changes: 2 additions & 8 deletions packages/cli/src/commands/serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ const streamServerErrorHandler = () => {
}

export async function builder(yargs) {
const redwoodProjectPaths = getPaths()
const redwoodProjectConfig = getConfig()

yargs
.usage('usage: $0 <side>')
.command({
command: '$0',
description: 'Run both api and web servers. Uses the web port and host',
description: 'Run both api and web servers',
handler: (argv) => {
recordTelemetryAttributes({
command: 'serve',
Expand All @@ -57,15 +56,10 @@ export async function builder(yargs) {
builder: (yargs) =>
yargs.options({
port: {
default: redwoodProjectConfig.web.port,
default: getConfig().web?.port || 8910,
type: 'number',
alias: 'p',
},
host: {
default: redwoodProjectConfig.web.host,
type: 'string',
},
socket: { type: 'string' },
}),
})
.command({
Expand Down