yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-06 03:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into patch-1

Browse Source
This commit is contained in:
Iago Calazans 2022-09-28 11:34:48 -03:00 committed by GitHub
commit 01eed9f00c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/admin/utils/__tests__/get-custom-app-config-file.test.js
View File

@ -10,6 +10,12 @@ jest.mock('@strapi/typescript-utils', () => ({
})); }));
describe('getCustomAppConfigFile', () => { describe('getCustomAppConfigFile', () => {
test('It should return undefined when the src/admin does no exist', async () => {
const result = await getCustomAppConfigFile('/');
expect(result).toBeUndefined();
});
test('It should return undefined when the app config file extension is not .js and useTypeScript is falsy', async () => { test('It should return undefined when the app config file extension is not .js and useTypeScript is falsy', async () => {
fse.readdir = jest.fn(() => { fse.readdir = jest.fn(() => {
return ['app.example.js', 'webpack.config.js', 'app.ts', 'app.tsx']; return ['app.example.js', 'webpack.config.js', 'app.ts', 'app.tsx'];
@ -23,6 +29,10 @@ describe('getCustomAppConfigFile', () => {
}); });
test('It should return app.js when the app config file extension is not (.ts|.tsx) and useTypeScript is truthy', async () => { test('It should return app.js when the app config file extension is not (.ts|.tsx) and useTypeScript is truthy', async () => {
fse.pathExistsSync = jest.fn(() => {
return true;
});
fse.readdir = jest.fn(() => { fse.readdir = jest.fn(() => {
return ['app.js', 'webpack.config.js', 'app.example.ts', 'app.example.tsx']; return ['app.js', 'webpack.config.js', 'app.example.ts', 'app.example.tsx'];
}); });
@ -35,6 +45,10 @@ describe('getCustomAppConfigFile', () => {
}); });
test('It should return app.js when the app config file extension is .js and useTypeScript is falsy', async () => { test('It should return app.js when the app config file extension is .js and useTypeScript is falsy', async () => {
fse.pathExistsSync = jest.fn(() => {
return true;
});
fse.readdir = jest.fn(() => { fse.readdir = jest.fn(() => {
return ['app.js', 'webpack.config.js', 'app.ts', 'app.tsx']; return ['app.js', 'webpack.config.js', 'app.ts', 'app.tsx'];
}); });

5
packages/core/admin/utils/get-custom-app-config-file.js
View File

@ -11,6 +11,11 @@ const { isUsingTypeScript } = require('@strapi/typescript-utils');
*/ */
const getCustomAppConfigFile = async (dir) => { const getCustomAppConfigFile = async (dir) => {
const adminSrcPath = join(dir, 'src', 'admin'); const adminSrcPath = join(dir, 'src', 'admin');
if (!fse.pathExistsSync(adminSrcPath)) {
return undefined;
}
const useTypeScript = await isUsingTypeScript(adminSrcPath, 'tsconfig.json'); const useTypeScript = await isUsingTypeScript(adminSrcPath, 'tsconfig.json');
const files = await fse.readdir(adminSrcPath); const files = await fse.readdir(adminSrcPath);