Comparing version 1.2.0 to 1.2.1
@@ -437,7 +437,17 @@ var __defProp = Object.defineProperty; | ||
function resolveExtends(extended, from) { | ||
let error; | ||
try { | ||
return createRequire(from).resolve(extended); | ||
} catch (e) { | ||
throw new TSConfckParseError(`failed to resolve "extends":"${extended}" in ${from}`, "EXTENDS_RESOLVE", from, e); | ||
error = e; | ||
} | ||
if (!path4.isAbsolute(extended) && !extended.startsWith("./") && !extended.startsWith("../")) { | ||
try { | ||
const fallbackExtended = path4.join(extended, "tsconfig.json"); | ||
return createRequire(from).resolve(fallbackExtended); | ||
} catch (e) { | ||
error = e; | ||
} | ||
} | ||
throw new TSConfckParseError(`failed to resolve "extends":"${extended}" in ${from}`, "EXTENDS_RESOLVE", from, error); | ||
} | ||
@@ -444,0 +454,0 @@ var EXTENDABLE_KEYS = [ |
{ | ||
"name": "tsconfck", | ||
"version": "1.2.0", | ||
"version": "1.2.1", | ||
"description": "A utility to work with tsconfig.json without typescript", | ||
@@ -52,12 +52,12 @@ "license": "MIT", | ||
"@tsconfig/node12": "^1.0.9", | ||
"@types/node": "^16.11.25", | ||
"@typescript-eslint/eslint-plugin": "^5.12.0", | ||
"@typescript-eslint/parser": "^5.12.0", | ||
"@types/node": "^17.0.21", | ||
"@typescript-eslint/eslint-plugin": "^5.15.0", | ||
"@typescript-eslint/parser": "^5.15.0", | ||
"c8": "^7.11.0", | ||
"chalk": "^5.0.0", | ||
"chalk": "^5.0.1", | ||
"conventional-changelog-cli": "^2.2.2", | ||
"enquirer": "^2.3.6", | ||
"esbuild": "^0.14.23", | ||
"eslint": "^8.9.0", | ||
"eslint-config-prettier": "^8.4.0", | ||
"esbuild": "^0.14.26", | ||
"eslint": "^8.11.0", | ||
"eslint-config-prettier": "^8.5.0", | ||
"eslint-plugin-markdown": "^2.2.1", | ||
@@ -68,4 +68,4 @@ "eslint-plugin-node": "^11.1.0", | ||
"husky": "^7.0.4", | ||
"lint-staged": "^12.3.4", | ||
"minimist": "^1.2.5", | ||
"lint-staged": "^12.3.5", | ||
"minimist": "^1.2.6", | ||
"npm-run-all": "^4.1.5", | ||
@@ -77,4 +77,4 @@ "prettier": "^2.5.1", | ||
"tsm": "^2.2.1", | ||
"tsup": "^5.11.13", | ||
"typescript": "^4.5.5", | ||
"tsup": "^5.12.1", | ||
"typescript": "^4.6.2", | ||
"uvu": "^0.5.3", | ||
@@ -81,0 +81,0 @@ "watchlist": "^0.3.1" |
@@ -144,12 +144,25 @@ import path from 'path'; | ||
function resolveExtends(extended: string, from: string): string { | ||
let error: any; | ||
try { | ||
return createRequire(from).resolve(extended); | ||
} catch (e) { | ||
throw new TSConfckParseError( | ||
`failed to resolve "extends":"${extended}" in ${from}`, | ||
'EXTENDS_RESOLVE', | ||
from, | ||
e | ||
); | ||
error = e; | ||
} | ||
if (!path.isAbsolute(extended) && !extended.startsWith('./') && !extended.startsWith('../')) { | ||
try { | ||
const fallbackExtended = path.join(extended, 'tsconfig.json'); | ||
return createRequire(from).resolve(fallbackExtended); | ||
} catch (e) { | ||
error = e; | ||
} | ||
} | ||
throw new TSConfckParseError( | ||
`failed to resolve "extends":"${extended}" in ${from}`, | ||
'EXTENDS_RESOLVE', | ||
from, | ||
error | ||
); | ||
} | ||
@@ -156,0 +169,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
214419
2797