Skip to content

Commit

Permalink
Move ignored files to lib/content/gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
rotu committed Sep 14, 2023
1 parent e3a0075 commit d1658bb
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# ignore everything in the root
/*
# transient test directories
tap-testdir*/

# keep these
!**/.gitignore
Expand All @@ -27,7 +29,6 @@
!/SECURITY.md
!/tap-snapshots/
!/test/
tap-testdir-*/
!/workspace/
/workspace/*
!/workspace/test-workspace/
2 changes: 2 additions & 0 deletions lib/content/gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ignore everything in the root
/*
# transient test directories
tap-testdir*/

# keep these
{{#each ignorePaths}}
Expand Down
2 changes: 1 addition & 1 deletion lib/content/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ module.exports = {
'/CHANGELOG*',
],
ignorePaths: [
'tap-testdir-*/',
/* to be provided by consuming package */
],
ciVersions: ['14.17.0', '14.x', '16.13.0', '16.x', '18.0.0', '18.x'],
lockfile: false,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/npm/template-oss.git"
"url": "https://github.com/rotu/npm-template-oss.git"
},
"keywords": [
"npm",
Expand Down
18 changes: 12 additions & 6 deletions tap-snapshots/test/apply/source-snapshots.js.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -1236,6 +1236,8 @@ jobs:
# ignore everything in the root
/*
# transient test directories
tap-testdir*/
# keep these
!**/.gitignore
Expand All @@ -1261,7 +1263,6 @@ jobs:
!/SECURITY.md
!/tap-snapshots/
!/test/
tap-testdir-*/
.npmrc
========================================
Expand Down Expand Up @@ -2917,6 +2918,8 @@ jobs:
# ignore everything in the root
/*
# transient test directories
tap-testdir*/
# keep these
!**/.gitignore
Expand All @@ -2942,7 +2945,6 @@ jobs:
!/SECURITY.md
!/tap-snapshots/
!/test/
tap-testdir-*/
!/workspaces/
/workspaces/*
!/workspaces/a/
Expand Down Expand Up @@ -3156,6 +3158,8 @@ workspaces/a/.gitignore
# ignore everything in the root
/*
# transient test directories
tap-testdir*/
# keep these
!**/.gitignore
Expand All @@ -3173,7 +3177,6 @@ workspaces/a/.gitignore
!/scripts/
!/tap-snapshots/
!/test/
tap-testdir-*/
workspaces/a/package.json
========================================
Expand Down Expand Up @@ -3235,6 +3238,8 @@ workspaces/b/.gitignore
# ignore everything in the root
/*
# transient test directories
tap-testdir*/
# keep these
!**/.gitignore
Expand All @@ -3252,7 +3257,6 @@ workspaces/b/.gitignore
!/scripts/
!/tap-snapshots/
!/test/
tap-testdir-*/
workspaces/b/package.json
========================================
Expand Down Expand Up @@ -4536,6 +4540,8 @@ workspaces/a/.gitignore
# ignore everything in the root
/*
# transient test directories
tap-testdir*/
# keep these
!**/.gitignore
Expand All @@ -4553,7 +4559,6 @@ workspaces/a/.gitignore
!/scripts/
!/tap-snapshots/
!/test/
tap-testdir-*/
workspaces/a/package.json
========================================
Expand Down Expand Up @@ -4615,6 +4620,8 @@ workspaces/b/.gitignore
# ignore everything in the root
/*
# transient test directories
tap-testdir*/
# keep these
!**/.gitignore
Expand All @@ -4632,7 +4639,6 @@ workspaces/b/.gitignore
!/scripts/
!/tap-snapshots/
!/test/
tap-testdir-*/
workspaces/b/package.json
========================================
Expand Down
8 changes: 4 additions & 4 deletions tap-snapshots/test/check/snapshots.js.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ The following files are tracked by git but matching a pattern in .gitignore:
To correct it: move files to not match one of the following patterns:
/*
tap-testdir*/
!**/.gitignore
!/.commitlintrc.js
!/.eslintrc.js
Expand All @@ -146,7 +147,6 @@ To correct it: move files to not match one of the following patterns:
!/SECURITY.md
!/tap-snapshots/
!/test/
tap-testdir-*/
-------------------------------------------------------------------
`
Expand All @@ -163,6 +163,7 @@ The following files are tracked by git but matching a pattern in .gitignore:
To correct it: move files to not match one of the following patterns:
/*
tap-testdir*/
!**/.gitignore
!/.commitlintrc.js
!/.eslintrc.js
Expand All @@ -186,7 +187,6 @@ To correct it: move files to not match one of the following patterns:
!/SECURITY.md
!/tap-snapshots/
!/test/
tap-testdir-*/
!/workspaces/
/workspaces/*
!/workspaces/a/
Expand All @@ -201,6 +201,7 @@ The following files are tracked by git but matching a pattern in workspaces/a/.g
To correct it: move files to not match one of the following patterns:
/*
tap-testdir*/
!**/.gitignore
!/.eslintrc.js
!/.eslintrc.local.*
Expand All @@ -216,7 +217,6 @@ To correct it: move files to not match one of the following patterns:
!/scripts/
!/tap-snapshots/
!/test/
tap-testdir-*/
-------------------------------------------------------------------
Expand All @@ -227,6 +227,7 @@ The following files are tracked by git but matching a pattern in workspaces/b/.g
To correct it: move files to not match one of the following patterns:
/*
tap-testdir*/
!**/.gitignore
!/.eslintrc.js
!/.eslintrc.local.*
Expand All @@ -242,7 +243,6 @@ To correct it: move files to not match one of the following patterns:
!/scripts/
!/tap-snapshots/
!/test/
tap-testdir-*/
-------------------------------------------------------------------
`
Expand Down
3 changes: 2 additions & 1 deletion workspace/test-workspace/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# ignore everything in the root
/*
# transient test directories
tap-testdir*/

# keep these
!**/.gitignore
Expand All @@ -19,4 +21,3 @@
!/scripts/
!/tap-snapshots/
!/test/
tap-testdir-*/
2 changes: 1 addition & 1 deletion workspace/test-workspace/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/npm/template-oss.git",
"url": "https://github.com/rotu/npm-template-oss.git",
"directory": "workspace/test-workspace"
},
"keywords": [],
Expand Down

0 comments on commit d1658bb

Please sign in to comment.