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

Jump to bottom

Remove tree-kill from test devDependencies #9232

Merged
merged 5 commits into from
Jul 25, 2024
Merged

Remove tree-kill from test devDependencies #9232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2d6e95
move devDependencies to devDependencies for tests
dcousens Apr 29, 2024
da234ed
drop treekill
dcousens Apr 30, 2024
fa44d6b
fix live-reloading tests
dcousens Jul 25, 2024
e97338f
fix build waiting for non-existent message
dcousens Jul 25, 2024
a881116
fix start before build is ready
dcousens Jul 25, 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
4 changes: 2 additions & 2 deletions packages/core/src/scripts/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ export async function build (
if (prisma) {
if (frozen) {
await validateArtifacts(cwd, system)
console.log('✨ GraphQL and Prisma schemas are up to date')
console.log('✨ GraphQL and Prisma schemas are up to date') // TODO: validating?
} else {
await generateArtifacts(cwd, system)
console.log('✨ Generated GraphQL and Prisma schemas')
console.log('✨ Generated GraphQL and Prisma schemas') // TODO: generating?
}

await generateTypes(cwd, system)
Expand Down
12 changes: 5 additions & 7 deletions packages/core/src/scripts/dev.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,22 +263,20 @@ export async function dev (

let nextApp
if (!system.config.ui?.isDisabled && ui) {
const paths = system.getPaths(cwd)
await fsp.rm(paths.admin, { recursive: true, force: true })
if (!expressServer || !context) throw new TypeError('Error trying to prepare the Admin UI')

console.log('✨ Generating Admin UI code')
const paths = system.getPaths(cwd)
await fsp.rm(paths.admin, { recursive: true, force: true })
await generateAdminUI(system.config, system.graphQLSchema, system.adminMeta, paths.admin, false)

console.log('✨ Preparing Admin UI app')
console.log('✨ Preparing Admin UI')
nextApp = next({ dev: true, dir: paths.admin })
await nextApp.prepare()

expressServer.use(createAdminUIMiddlewareWithNextApp(system.config, context, nextApp))
console.log(`✅ Admin UI ready`)
}

if (nextApp && expressServer && context) {
expressServer.use(createAdminUIMiddlewareWithNextApp(system.config, context, nextApp))
}
hasAddedAdminUIMiddleware = true
initKeystonePromiseResolve()

Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/scripts/start.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@ export async function start (

console.log(`✅ GraphQL API ready`)
if (!system.config.ui?.isDisabled && ui) {
console.log('✨ Preparing Admin UI Next.js app')
console.log('✨ Preparing Admin UI')
const nextApp = next({ dev: false, dir: paths.admin })
await nextApp.prepare()

expressServer.use(await createAdminUIMiddlewareWithNextApp(system.config, keystone.context, nextApp))
console.log(`✅ Admin UI ready`)
}
Expand Down
Loading
Loading