diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts index 78c6255ba0..a168f58184 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts @@ -165,7 +165,7 @@ describe('fetch:template', () => { showDummyFile: false, skipRootDirectory: true, skipSubdirectory: true, - skipMultiplesDirectories: true + skipMultiplesDirectories: true, }, }); @@ -178,21 +178,22 @@ describe('fetch:template', () => { '${{ "dummy-file2.txt" if values.showDummyFile else "" }}': 'some dummy file', '${{ "dummy-dir" if not values.skipRootDirectory else "" }}': { - 'file.txt': - 'file inside optional directory', - subdir: { - '${{ "dummy-subdir" if not values.skipSubdirectory else "" }}': - 'file inside optional subdirectory' - } + 'file.txt': 'file inside optional directory', + subdir: { + '${{ "dummy-subdir" if not values.skipSubdirectory else "" }}': + 'file inside optional subdirectory', + }, }, subdir2: { - '${{ "dummy-subdir" if not values.skipMultiplesDirectories else "" }}': { - '${{ "dummy-subdir" if not values.skipMultiplesDirectories else "" }}': { - 'multipleDirectorySkippedFile.txt': - 'file inside multiple optional subdirectories' - } - } - } + '${{ "dummy-subdir" if not values.skipMultiplesDirectories else "" }}': + { + '${{ "dummy-subdir" if not values.skipMultiplesDirectories else "" }}': + { + 'multipleDirectorySkippedFile.txt': + 'file inside multiple optional subdirectories', + }, + }, + }, }, }); @@ -222,12 +223,16 @@ describe('fetch:template', () => { it('skips content of empty subdirectory', async () => { await expect( - fs.pathExists(`${workspacePath}/target/subdir2/multipleDirectorySkippedFile.txt`), + fs.pathExists( + `${workspacePath}/target/subdir2/multipleDirectorySkippedFile.txt`, + ), ).resolves.toEqual(false); await expect( - fs.pathExists(`${workspacePath}/target/subdir2/dummy-subdir/dummy-subdir/multipleDirectorySkippedFile.txt`), - ).resolves.toEqual(false); + fs.pathExists( + `${workspacePath}/target/subdir2/dummy-subdir/dummy-subdir/multipleDirectorySkippedFile.txt`, + ), + ).resolves.toEqual(false); }); }); diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts index 15e1a6fd75..93ed7645c0 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts @@ -263,7 +263,9 @@ function containsSkippedContent(localOutputPath: string): boolean { // if the path starts with / means that the root directory has been skipped // if the path is empty means that there is a file skipped in the root // if the path includes // means that there is a subdirectory skipped - return localOutputPath.startsWith('/') - || localOutputPath === '' - || localOutputPath.includes('//'); + return ( + localOutputPath.startsWith('/') || + localOutputPath === '' || + localOutputPath.includes('//') + ); }