yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-27 01:09:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13950 from strapi/fix/ts-get-config-path-invalid-return-type

Browse Source 
Fix invalid return for ts get-config-path
This commit is contained in:
Jean-Sébastien Herbaux 2022-08-03 11:31:07 +02:00 committed by GitHub
commit 0f7d51a996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/utils/typescript/lib/utils/get-config-path.js
View File

@ -5,6 +5,16 @@ const ts = require('typescript');
const DEFAULT_TS_CONFIG_FILENAME = 'tsconfig.json'; const DEFAULT_TS_CONFIG_FILENAME = 'tsconfig.json';
/**
* Get the path of the typescript config file for a given directory
*
* @param {string} dir
* @param {object} [options]
* @param {string} [options.filename]
* @param {boolean} [options.ancestorsLookup]
*
* @return {string | undefined}
*/
module.exports = (dir, { filename = DEFAULT_TS_CONFIG_FILENAME, ancestorsLookup = false } = {}) => { module.exports = (dir, { filename = DEFAULT_TS_CONFIG_FILENAME, ancestorsLookup = false } = {}) => {
const dirAbsolutePath = path.resolve(dir); const dirAbsolutePath = path.resolve(dir);
const configFilePath = ts.findConfigFile(dirAbsolutePath, ts.sys.fileExists, filename); const configFilePath = ts.findConfigFile(dirAbsolutePath, ts.sys.fileExists, filename);
@ -13,5 +23,5 @@ module.exports = (dir, { filename = DEFAULT_TS_CONFIG_FILENAME, ancestorsLookup
return configFilePath; return configFilePath;
} }
return configFilePath.startsWith(dirAbsolutePath); return configFilePath.startsWith(dirAbsolutePath) ? configFilePath : undefined;
}; };