Skip to content

Commit d1658bb

Browse files
committed
Move ignored files to lib/content/gitignore
1 parent e3a0075 commit d1658bb

File tree

8 files changed

+25
-15
lines changed

8 files changed

+25
-15
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
# ignore everything in the root
44
/*
5+
# transient test directories
6+
tap-testdir*/
57

68
# keep these
79
!**/.gitignore
@@ -27,7 +29,6 @@
2729
!/SECURITY.md
2830
!/tap-snapshots/
2931
!/test/
30-
tap-testdir-*/
3132
!/workspace/
3233
/workspace/*
3334
!/workspace/test-workspace/

lib/content/gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# ignore everything in the root
22
/*
3+
# transient test directories
4+
tap-testdir*/
35

46
# keep these
57
{{#each ignorePaths}}

lib/content/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ module.exports = {
156156
'/CHANGELOG*',
157157
],
158158
ignorePaths: [
159-
'tap-testdir-*/',
159+
/* to be provided by consuming package */
160160
],
161161
ciVersions: ['14.17.0', '14.x', '16.13.0', '16.x', '18.0.0', '18.x'],
162162
lockfile: false,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"repository": {
2525
"type": "git",
26-
"url": "https://github.com/npm/template-oss.git"
26+
"url": "https://github.com/rotu/npm-template-oss.git"
2727
},
2828
"keywords": [
2929
"npm",

tap-snapshots/test/apply/source-snapshots.js.test.cjs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,6 +1236,8 @@ jobs:
12361236
12371237
# ignore everything in the root
12381238
/*
1239+
# transient test directories
1240+
tap-testdir*/
12391241
12401242
# keep these
12411243
!**/.gitignore
@@ -1261,7 +1263,6 @@ jobs:
12611263
!/SECURITY.md
12621264
!/tap-snapshots/
12631265
!/test/
1264-
tap-testdir-*/
12651266
12661267
.npmrc
12671268
========================================
@@ -2917,6 +2918,8 @@ jobs:
29172918
29182919
# ignore everything in the root
29192920
/*
2921+
# transient test directories
2922+
tap-testdir*/
29202923
29212924
# keep these
29222925
!**/.gitignore
@@ -2942,7 +2945,6 @@ jobs:
29422945
!/SECURITY.md
29432946
!/tap-snapshots/
29442947
!/test/
2945-
tap-testdir-*/
29462948
!/workspaces/
29472949
/workspaces/*
29482950
!/workspaces/a/
@@ -3156,6 +3158,8 @@ workspaces/a/.gitignore
31563158
31573159
# ignore everything in the root
31583160
/*
3161+
# transient test directories
3162+
tap-testdir*/
31593163
31603164
# keep these
31613165
!**/.gitignore
@@ -3173,7 +3177,6 @@ workspaces/a/.gitignore
31733177
!/scripts/
31743178
!/tap-snapshots/
31753179
!/test/
3176-
tap-testdir-*/
31773180
31783181
workspaces/a/package.json
31793182
========================================
@@ -3235,6 +3238,8 @@ workspaces/b/.gitignore
32353238
32363239
# ignore everything in the root
32373240
/*
3241+
# transient test directories
3242+
tap-testdir*/
32383243
32393244
# keep these
32403245
!**/.gitignore
@@ -3252,7 +3257,6 @@ workspaces/b/.gitignore
32523257
!/scripts/
32533258
!/tap-snapshots/
32543259
!/test/
3255-
tap-testdir-*/
32563260
32573261
workspaces/b/package.json
32583262
========================================
@@ -4536,6 +4540,8 @@ workspaces/a/.gitignore
45364540
45374541
# ignore everything in the root
45384542
/*
4543+
# transient test directories
4544+
tap-testdir*/
45394545
45404546
# keep these
45414547
!**/.gitignore
@@ -4553,7 +4559,6 @@ workspaces/a/.gitignore
45534559
!/scripts/
45544560
!/tap-snapshots/
45554561
!/test/
4556-
tap-testdir-*/
45574562
45584563
workspaces/a/package.json
45594564
========================================
@@ -4615,6 +4620,8 @@ workspaces/b/.gitignore
46154620
46164621
# ignore everything in the root
46174622
/*
4623+
# transient test directories
4624+
tap-testdir*/
46184625
46194626
# keep these
46204627
!**/.gitignore
@@ -4632,7 +4639,6 @@ workspaces/b/.gitignore
46324639
!/scripts/
46334640
!/tap-snapshots/
46344641
!/test/
4635-
tap-testdir-*/
46364642
46374643
workspaces/b/package.json
46384644
========================================

tap-snapshots/test/check/snapshots.js.test.cjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ The following files are tracked by git but matching a pattern in .gitignore:
123123
To correct it: move files to not match one of the following patterns:
124124
125125
/*
126+
tap-testdir*/
126127
!**/.gitignore
127128
!/.commitlintrc.js
128129
!/.eslintrc.js
@@ -146,7 +147,6 @@ To correct it: move files to not match one of the following patterns:
146147
!/SECURITY.md
147148
!/tap-snapshots/
148149
!/test/
149-
tap-testdir-*/
150150
151151
-------------------------------------------------------------------
152152
`
@@ -163,6 +163,7 @@ The following files are tracked by git but matching a pattern in .gitignore:
163163
To correct it: move files to not match one of the following patterns:
164164
165165
/*
166+
tap-testdir*/
166167
!**/.gitignore
167168
!/.commitlintrc.js
168169
!/.eslintrc.js
@@ -186,7 +187,6 @@ To correct it: move files to not match one of the following patterns:
186187
!/SECURITY.md
187188
!/tap-snapshots/
188189
!/test/
189-
tap-testdir-*/
190190
!/workspaces/
191191
/workspaces/*
192192
!/workspaces/a/
@@ -201,6 +201,7 @@ The following files are tracked by git but matching a pattern in workspaces/a/.g
201201
To correct it: move files to not match one of the following patterns:
202202
203203
/*
204+
tap-testdir*/
204205
!**/.gitignore
205206
!/.eslintrc.js
206207
!/.eslintrc.local.*
@@ -216,7 +217,6 @@ To correct it: move files to not match one of the following patterns:
216217
!/scripts/
217218
!/tap-snapshots/
218219
!/test/
219-
tap-testdir-*/
220220
221221
-------------------------------------------------------------------
222222
@@ -227,6 +227,7 @@ The following files are tracked by git but matching a pattern in workspaces/b/.g
227227
To correct it: move files to not match one of the following patterns:
228228
229229
/*
230+
tap-testdir*/
230231
!**/.gitignore
231232
!/.eslintrc.js
232233
!/.eslintrc.local.*
@@ -242,7 +243,6 @@ To correct it: move files to not match one of the following patterns:
242243
!/scripts/
243244
!/tap-snapshots/
244245
!/test/
245-
tap-testdir-*/
246246
247247
-------------------------------------------------------------------
248248
`

workspace/test-workspace/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
# ignore everything in the root
44
/*
5+
# transient test directories
6+
tap-testdir*/
57

68
# keep these
79
!**/.gitignore
@@ -19,4 +21,3 @@
1921
!/scripts/
2022
!/tap-snapshots/
2123
!/test/
22-
tap-testdir-*/

workspace/test-workspace/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"repository": {
2222
"type": "git",
23-
"url": "https://github.com/npm/template-oss.git",
23+
"url": "https://github.com/rotu/npm-template-oss.git",
2424
"directory": "workspace/test-workspace"
2525
},
2626
"keywords": [],

0 commit comments

Comments
 (0)