Skip to content

Commit 2b22b01

Browse files
F3n67uMichaelDeBoey
authored andcommitted
refactor(remix-dev): clean up custom tsconfig loader
1 parent fd210bf commit 2b22b01

File tree

5 files changed

+12
-222
lines changed

5 files changed

+12
-222
lines changed

packages/remix-dev/compiler/utils/tsconfig/configLoader.ts

Lines changed: 0 additions & 63 deletions
This file was deleted.

packages/remix-dev/compiler/utils/tsconfig/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import tsConfigPaths from "tsconfig-paths";
22

3-
import { loadTsConfig } from "./configLoader";
43
import { writeConfigDefaults } from "./write-config-defaults";
5-
export { loadTsConfig } from "./configLoader";
64

75
export function createMatchPath() {
8-
let configLoaderResult = loadTsConfig();
6+
let configLoaderResult = tsConfigPaths.loadConfig();
97
if (configLoaderResult.resultType === "failed") {
108
if (configLoaderResult.message === "Missing baseUrl in compilerOptions") {
119
throw new Error(

packages/remix-dev/compiler/utils/tsconfig/tsConfigLoader.ts

Lines changed: 0 additions & 153 deletions
This file was deleted.

packages/remix-dev/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@
5151
"remark-mdx-frontmatter": "^1.0.1",
5252
"semver": "^7.3.5",
5353
"sort-package-json": "^1.55.0",
54-
"strip-bom": "^4.0.0",
5554
"tar-fs": "^2.1.1",
56-
"tsconfig-paths": "^3.14.0",
55+
"tsconfig-paths": "^4.0.0",
5756
"ws": "^7.4.5",
5857
"xdm": "^2.0.0"
5958
},

yarn.lock

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9846,7 +9846,7 @@ ts-node@8.9.1:
98469846
source-map-support "^0.5.17"
98479847
yn "3.1.1"
98489848

9849-
tsconfig-paths@^3.12.0, tsconfig-paths@^3.14.0, tsconfig-paths@^3.9.0:
9849+
tsconfig-paths@^3.12.0, tsconfig-paths@^3.9.0:
98509850
version "3.14.1"
98519851
resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"
98529852
integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
@@ -9856,6 +9856,15 @@ tsconfig-paths@^3.12.0, tsconfig-paths@^3.14.0, tsconfig-paths@^3.9.0:
98569856
minimist "^1.2.6"
98579857
strip-bom "^3.0.0"
98589858

9859+
tsconfig-paths@^4.0.0:
9860+
version "4.0.0"
9861+
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz#1082f5d99fd127b72397eef4809e4dd06d229b64"
9862+
integrity sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==
9863+
dependencies:
9864+
json5 "^2.2.1"
9865+
minimist "^1.2.6"
9866+
strip-bom "^3.0.0"
9867+
98599868
tslib@^1.8.1, tslib@^1.9.0:
98609869
version "1.14.1"
98619870
resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"

0 commit comments

Comments
 (0)