From b5e37bfa61c65c2005d200bdaf7b1d4000fd09bd Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Fri, 22 Sep 2023 09:59:59 -0700 Subject: [PATCH] Fix for getPathAlias typecheck failure --- packages/cli/src/utils/pathAlias.test.ts | 14 ++++++-------- packages/cli/src/utils/pathAlias.ts | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/cli/src/utils/pathAlias.test.ts b/packages/cli/src/utils/pathAlias.test.ts index f28e06e88..25f11ba34 100644 --- a/packages/cli/src/utils/pathAlias.test.ts +++ b/packages/cli/src/utils/pathAlias.test.ts @@ -10,7 +10,7 @@ describe("javascript config", () => { const alias = await getPathAlias({ projectPath: "", isTypescriptProject: false, - usesSrcDir: true, + extraDirectories: ["src"], }); expect(alias).toBeUndefined(); @@ -25,7 +25,7 @@ describe("javascript config", () => { const alias = await getPathAlias({ projectPath: "", isTypescriptProject: false, - usesSrcDir: true, + extraDirectories: ["src"], }); expect(alias).toBeUndefined(); @@ -40,7 +40,7 @@ describe("javascript config", () => { const alias = await getPathAlias({ projectPath: "", isTypescriptProject: false, - usesSrcDir: true, + extraDirectories: ["src"], }); expect(alias).toBeUndefined(); @@ -57,7 +57,7 @@ describe("javascript config", () => { const alias = await getPathAlias({ projectPath: "", isTypescriptProject: false, - usesSrcDir: true, + extraDirectories: ["src"], }); expect(alias).toBeUndefined(); @@ -74,7 +74,7 @@ describe("javascript config", () => { const alias = await getPathAlias({ projectPath: "", isTypescriptProject: false, - usesSrcDir: true, + extraDirectories: ["src"], }); expect(alias).toEqual("~"); @@ -91,7 +91,6 @@ describe("javascript config", () => { const alias = await getPathAlias({ projectPath: "", isTypescriptProject: false, - usesSrcDir: false, }); expect(alias).toEqual("~"); @@ -108,7 +107,7 @@ describe("javascript config", () => { const alias = await getPathAlias({ projectPath: "", isTypescriptProject: true, - usesSrcDir: true, + extraDirectories: ["src"], }); expect(alias).toEqual("~"); @@ -125,7 +124,6 @@ describe("javascript config", () => { const alias = await getPathAlias({ projectPath: "", isTypescriptProject: true, - usesSrcDir: false, }); expect(alias).toEqual("~"); diff --git a/packages/cli/src/utils/pathAlias.ts b/packages/cli/src/utils/pathAlias.ts index dc949bb72..99d5d9c96 100644 --- a/packages/cli/src/utils/pathAlias.ts +++ b/packages/cli/src/utils/pathAlias.ts @@ -4,7 +4,7 @@ import { parse } from "tsconfck"; type Options = { projectPath: string; isTypescriptProject: boolean; extraDirectories?: string[] }; -// Find the alias that points to the "src" directory. +// Find the alias that points to the extra directories, or root if none are specified directory. // So for example, the paths object could be: // { // "@/*": ["./src/*"]