Skip to content

Commit d51c0d9

Browse files
authored
fix(cli): update getTsconfig opts to support jsconfig.json (#1442)
* fix(cli): update getTsconfig opts to support jsconfig.json * fix(cli): replace `ensureDependencyInstalled` with `addDependency` cause it doesn’t install the dependencies properly.
1 parent 9eadbc8 commit d51c0d9

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

packages/cli/src/utils/get-config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export async function resolveConfigPaths(
6565
)
6666

6767
// Read tsconfig.json.
68-
const tsConfig = await getTsconfig(tsConfigPath)
68+
const tsConfig = await getTsconfig(tsConfigPath, isTypeScript ? undefined : 'jsconfig.json')
6969

7070
if (tsConfig === null) {
7171
throw new Error(

packages/cli/src/utils/updaters/update-dependencies.ts

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { RegistryItem } from '@/src/schema'
22
import type { Config } from '@/src/utils/get-config'
3-
import { ensureDependencyInstalled } from 'nypm'
3+
import { addDependency } from 'nypm'
44
import { spinner } from '@/src/utils/spinner'
55

66
export async function updateDependencies(
@@ -27,26 +27,20 @@ export async function updateDependencies(
2727
dependenciesSpinner?.start()
2828

2929
if (dependencies?.length) {
30-
const ensureDeps = dependencies.map(dep => ensureDependencyInstalled(dep, {
30+
await addDependency(dependencies, {
3131
cwd: config.resolvedPaths.cwd,
32-
// @ts-expect-error type error
3332
silent: true,
3433
dev: false,
35-
}))
36-
37-
await Promise.all(ensureDeps)
34+
})
3835
}
3936

4037
// Install dev dependencies
4138
if (devDependencies?.length) {
42-
const ensureDevDeps = devDependencies.map(dep => ensureDependencyInstalled(dep, {
39+
await addDependency(devDependencies, {
4340
cwd: config.resolvedPaths.cwd,
44-
// @ts-expect-error type error
4541
silent: true,
4642
dev: true,
47-
}))
48-
49-
await Promise.all(ensureDevDeps)
43+
})
5044
}
5145

5246
dependenciesSpinner?.succeed()

0 commit comments

Comments
 (0)