From aed277c8961fe73fd5ace225ddc3e07968428f71 Mon Sep 17 00:00:00 2001 From: b2 Date: Thu, 22 Apr 2021 05:25:44 -0600 Subject: [PATCH 1/2] fixes course compile in cli on non-wsl windows --- scripts/cli.js | 2 +- tsconfig.json | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/cli.js b/scripts/cli.js index 32a5a4b3..06e4f3d2 100644 --- a/scripts/cli.js +++ b/scripts/cli.js @@ -220,7 +220,7 @@ function selectLesson() { const aliasBasePath = `${courseAppNames[selectedCourse]}` fs.readdirSync(lessonPath).forEach((file) => { const name = path.basename(file).replace(/\.(js|ts|tsx)$/, '') - alias[path.join(aliasBasePath, name)] = path.join(lessonPath, file) + alias[`${aliasBasePath}/${name}`] = path.join(lessonPath, file) }) return { diff --git a/tsconfig.json b/tsconfig.json index 73d6dc21..bcec99ff 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,9 +1,5 @@ { - // For lessons, TypeScript will use tsconfig.dev.json which is auto generated - // on each launch of a lesson to adjust includes to be specific for the - // lesson. Both extend tsconfig.base.json, but we need the file that VS Code - // uses for intellisense to use the tsconfig.json filename so that files in - // the courses don't show a bunch of errors. + "__comment__": "Used by VSCode intellisense and needed to prevent course file errors", "extends": "./tsconfig.base.json", "include": ["apps", "types", "__mocks__/@types", "courses"] -} +} \ No newline at end of file From a6c7f27babdc6234d8c50d13f44e08e5073c86a8 Mon Sep 17 00:00:00 2001 From: b2 Date: Thu, 22 Apr 2021 05:30:10 -0600 Subject: [PATCH 2/2] fixes course compile in cli on non-wsl windows --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index bcec99ff..3b8d0049 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,4 +2,4 @@ "__comment__": "Used by VSCode intellisense and needed to prevent course file errors", "extends": "./tsconfig.base.json", "include": ["apps", "types", "__mocks__/@types", "courses"] -} \ No newline at end of file +}