yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13937 from strapi/fix/ts-false-positive-get-config-path

Browse Source 
Fix false positive results for ts utils' getConfigPath
This commit is contained in:
Jean-Sébastien Herbaux 2022-08-02 17:56:48 +02:00 committed by GitHub
commit f7a7098ef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 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

@ -1,9 +1,17 @@
'use strict'; 'use strict';
const path = require('path');
const ts = require('typescript'); const ts = require('typescript');
const DEFAULT_TS_CONFIG_FILENAME = 'tsconfig.json'; const DEFAULT_TS_CONFIG_FILENAME = 'tsconfig.json';
module.exports = (dir, filename = DEFAULT_TS_CONFIG_FILENAME) => { module.exports = (dir, { filename = DEFAULT_TS_CONFIG_FILENAME, ancestorsLookup = false } = {}) => {
return ts.findConfigFile(dir, ts.sys.fileExists, filename); const dirAbsolutePath = path.resolve(dir);
const configFilePath = ts.findConfigFile(dirAbsolutePath, ts.sys.fileExists, filename);
if (!configFilePath || ancestorsLookup) {
return configFilePath;
}
return configFilePath.startsWith(dirAbsolutePath);
}; };

2
packages/utils/typescript/lib/utils/is-using-typescript-sync.js
View File

@ -11,7 +11,7 @@ const getConfigPath = require('./get-config-path');
* @returns {boolean} * @returns {boolean}
*/ */
module.exports = (dir, filename = undefined) => { module.exports = (dir, filename = undefined) => {
const filePath = getConfigPath(dir, filename); const filePath = getConfigPath(dir, { filename });
return fse.pathExistsSync(filePath); return fse.pathExistsSync(filePath);
}; };

2
packages/utils/typescript/lib/utils/is-using-typescript.js
View File

@ -11,7 +11,7 @@ const getConfigPath = require('./get-config-path');
* @returns {Promise<boolean>} * @returns {Promise<boolean>}
*/ */
module.exports = (dir, filename = undefined) => { module.exports = (dir, filename = undefined) => {
const filePath = getConfigPath(dir, filename); const filePath = getConfigPath(dir, { filename });
return fse.pathExists(filePath); return fse.pathExists(filePath);
}; };