Skip to content

Commit e4bf7d4

Browse files
committed
refactor: merge built in ignore rules
1 parent bea8f67 commit e4bf7d4

1 file changed

Lines changed: 15 additions & 12 deletions

File tree

src/lib/ignore.ts

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,35 @@ import { fse } from '@serverless-devs/core';
44
import readline from 'readline';
55
import logger from '../common/logger';
66

7-
const ignoredFile = ['.git', '.svn', '.env', '.DS_Store', 'template.packaged.yml', '.nas.yml', '.s/nas', '.s/tmp', '.s/package'];
87

9-
function selectIgnored(runtime) {
8+
function selectIgnored(runtime: string) {
9+
const ignoredFile = ['.git', '.svn', '.env', '.DS_Store', 'template.packaged.yml', '.nas.yml', '.s/nas', '.s/tmp', '.s/package'];
1010
switch (runtime) {
1111
case 'nodejs6':
1212
case 'nodejs8':
1313
case 'nodejs10':
1414
case 'nodejs12':
15-
16-
return ['.s/python'];
15+
ignoredFile.push('.s/python');
16+
break;
1717
case 'python2.7':
1818
case 'python3':
19-
20-
return ['node_modules'];
19+
ignoredFile.push('node_modules');
20+
break;
2121
case 'php7.2':
22-
23-
return ['node_modules', '.s/python'];
22+
ignoredFile.push('node_modules', '.s/python');
23+
break;
2424
default:
25-
return [];
25+
break;
2626
}
27+
logger.debug(`Inject built in .fcignore rules: ${ignoredFile}`);
28+
return ignoredFile;
2729
}
2830

2931
async function getIgnoreContent(ignoreFilePath: string): Promise<string[]> {
3032
if (fse.existsSync(ignoreFilePath)) {
33+
logger.debug(`Found ignore file at ${ignoreFilePath}`);
3134
return await new Promise((resolve, reject) => {
32-
const lines = [];
35+
const lines: string[] = [];
3336

3437
readline.createInterface({ input: fse.createReadStream(ignoreFilePath) })
3538
.on('line', (line) => {
@@ -50,7 +53,7 @@ export async function isIgnoredInCodeUri(actualCodeUri: string, runtime: string)
5053
const fileContentList: string[] = await getIgnoreContent(ignoreFilePath);
5154
const ignoreDependencies = selectIgnored(runtime);
5255

53-
const packageJsonFilePaths = (await globby([...ignoredFile, ...ignoreDependencies, ...fileContentList], {
56+
const packageJsonFilePaths = (await globby([...ignoreDependencies, ...fileContentList], {
5457
cwd: actualCodeUri,
5558
dot: true,
5659
absolute: true,
@@ -83,7 +86,7 @@ export async function isIgnored(baseDir: string, runtime: string, actualCodeUri:
8386
}
8487
const ignoreDependencies = selectIgnored(runtime);
8588

86-
const packageJsonFilePaths = (await globby([...ignoredFile, ...ignoreDependencies, ...fileContentList], {
89+
const packageJsonFilePaths = (await globby([...ignoreDependencies, ...fileContentList], {
8790
cwd: actualCodeUri,
8891
dot: true,
8992
absolute: true,

0 commit comments

Comments
 (0)