Skip to content

Commit

Permalink
configs: Separate user configs from output files (#36236)
Browse files Browse the repository at this point in the history
Identify user configuration files under build-system/global-configs as
distinct from generated output. This will help avoid accidentally
including them in the cleanup script in the future.
  • Loading branch information
mdmower committed Oct 5, 2021
1 parent 324eb1e commit e2a9689
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ build-system/dist
build-system/server/new-server/transforms/dist
build-system/tasks/performance/cache
build-system/tasks/performance/results.json
build-system/global-configs/custom-config.json
dist
dist.3p
dist.tools
Expand All @@ -28,6 +27,11 @@ test/coverage-e2e
validator/**/dist
validator/export

# User configuration files
# Keep this list in sync with .gitignore, .prettierignore, and build-system/tasks/clean.js
build-system/global-configs/custom-config.json
build-system/global-configs/custom-flavors-config.json

# Files and directories explicitly ignored by eslint
**/node_modules/**
build-system/babel-plugins/**/fixtures/**/*.js
Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ build-system/dist
build-system/server/new-server/transforms/dist
build-system/tasks/performance/cache
build-system/tasks/performance/results.json
build-system/global-configs/custom-config.json
build-system/global-configs/custom-flavors-config.json
dist
dist.3p
dist.tools
Expand All @@ -29,6 +27,11 @@ test/coverage-e2e
validator/**/dist
validator/export

# User configuration files
# Keep this list in sync with .eslintignore, .prettierignore, and build-system/tasks/clean.js
build-system/global-configs/custom-config.json
build-system/global-configs/custom-flavors-config.json

# OS level files
.DS_Store
.g4ignore
Expand Down
6 changes: 5 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ build-system/dist
build-system/server/new-server/transforms/dist
build-system/tasks/performance/cache
build-system/tasks/performance/results.json
build-system/global-configs/custom-config.json
dist
dist.3p
dist.tools
Expand All @@ -28,6 +27,11 @@ test/coverage-e2e
validator/**/dist
validator/export

# User configuration files
# Keep this list in sync with .gitignore, .eslintignore, and build-system/tasks/clean.js
build-system/global-configs/custom-config.json
build-system/global-configs/custom-flavors-config.json

# Files and directories explicitly ignored by prettier
**/package*.json
**/node_modules/**
2 changes: 2 additions & 0 deletions build-system/tasks/clean.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ async function clean() {
if (argv.include_subpackages) {
pathsToDelete.push('**/node_modules', '!node_modules');
}
// User configuration files
// Keep this list in sync with .gitignore, .eslintignore, and .prettierignore
const customConfigs = [
'build-system/global-configs/custom-config.json',
'build-system/global-configs/custom-flavors-config.json',
Expand Down

0 comments on commit e2a9689

Please sign in to comment.