Skip to content

fix: avoid breakage if user has jiti 1.x installed [sc-24059] #1060

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.

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

Merged
merged 1 commit into from
Apr 28, 2025
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
11 changes: 9 additions & 2 deletions packages/cli/src/services/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,17 @@ type Jiti = ReturnType<(typeof import('jiti', {

// To avoid a dependency on typescript for users with no TS checks, we need to dynamically import jiti
let jiti: Jiti
let haveJiti = false
async function getJiti (): Promise<Jiti | undefined> {
if (jiti) return jiti
if (haveJiti) return jiti
try {
jiti = (await import('jiti')).createJiti(__filename)
const maybeJiti = await import('jiti')
// Jiti 1x does not have createJiti().
if (typeof maybeJiti.createJiti !== 'function') {
return
}
jiti = maybeJiti.createJiti(__filename)
haveJiti = true
} catch (err: any) {
if (err.code === 'ERR_MODULE_NOT_FOUND' || err.code === 'MODULE_NOT_FOUND') {
return undefined
Expand Down
11 changes: 9 additions & 2 deletions packages/create-cli/src/utils/fileloader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,17 @@ type Jiti = ReturnType<(typeof import('jiti', {

// To avoid a dependency on typescript for users with no TS checks, we need to dynamically import jiti
let jiti: Jiti
let haveJiti = false
async function getJiti (): Promise<Jiti | undefined> {
if (jiti) return jiti
if (haveJiti) return jiti
try {
jiti = (await import('jiti')).createJiti(__filename)
const maybeJiti = await import('jiti')
// Jiti 1x does not have createJiti().
if (typeof maybeJiti.createJiti !== 'function') {
return
}
jiti = maybeJiti.createJiti(__filename)
haveJiti = true
} catch (err: any) {
if (err.code === 'ERR_MODULE_NOT_FOUND' || err.code === 'MODULE_NOT_FOUND') {
return undefined
Expand Down
Loading