Skip to content

Commit

Permalink
Merge branch 'main' into fix/jiti
Browse files Browse the repository at this point in the history
  • Loading branch information
danielroe authored Jan 6, 2025
2 parents 4de3336 + 7ded939 commit e7402f7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"version": "1.0.0",
"packageManager": "[email protected]",
"dependencies": {
"nuxi": "latest",
"nuxt": "^3.15.1"
}
}
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion src/commands/info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ async function getNuxtConfig(rootDir: string) {
},
})
;(globalThis as any).defineNuxtConfig = (c: any) => c
const result = await jiti.import('./nuxt.config') as NuxtConfig
const result = await jiti.import('./nuxt.config', { default: true }) as NuxtConfig
delete (globalThis as any).defineNuxtConfig
return result
}
Expand Down

0 comments on commit e7402f7

Please sign in to comment.