Move ignored files to lib/content/gitignore

npm · Sep 14, 2023 · d1658bb · d1658bb
1 parent e3a0075
commit d1658bb
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 
 # ignore everything in the root
 /*
+# transient test directories
+tap-testdir*/
 
 # keep these
 !**/.gitignore
@@ -27,7 +29,6 @@
 !/SECURITY.md
 !/tap-snapshots/
 !/test/
-tap-testdir-*/
 !/workspace/
 /workspace/*
 !/workspace/test-workspace/
diff --git a/lib/content/gitignore b/lib/content/gitignore
@@ -1,5 +1,7 @@
 # ignore everything in the root
 /*
+# transient test directories
+tap-testdir*/
 
 # keep these
 {{#each ignorePaths}}

diff --git a/lib/content/index.js b/lib/content/index.js
@@ -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,

diff --git a/package.json b/package.json
@@ -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",

diff --git a/tap-snapshots/test/apply/source-snapshots.js.test.cjs b/tap-snapshots/test/apply/source-snapshots.js.test.cjs
@@ -1236,6 +1236,8 @@ jobs:
 
 # ignore everything in the root
 /*
+# transient test directories
+tap-testdir*/
 
 # keep these
 !**/.gitignore
@@ -1261,7 +1263,6 @@ jobs:
 !/SECURITY.md
 !/tap-snapshots/
 !/test/
-tap-testdir-*/
 
 .npmrc
 ========================================
@@ -2917,6 +2918,8 @@ jobs:
 
 # ignore everything in the root
 /*
+# transient test directories
+tap-testdir*/
 
 # keep these
 !**/.gitignore
@@ -2942,7 +2945,6 @@ jobs:
 !/SECURITY.md
 !/tap-snapshots/
 !/test/
-tap-testdir-*/
 !/workspaces/
 /workspaces/*
 !/workspaces/a/
@@ -3156,6 +3158,8 @@ workspaces/a/.gitignore
 
 # ignore everything in the root
 /*
+# transient test directories
+tap-testdir*/
 
 # keep these
 !**/.gitignore
@@ -3173,7 +3177,6 @@ workspaces/a/.gitignore
 !/scripts/
 !/tap-snapshots/
 !/test/
-tap-testdir-*/
 
 workspaces/a/package.json
 ========================================
@@ -3235,6 +3238,8 @@ workspaces/b/.gitignore
 
 # ignore everything in the root
 /*
+# transient test directories
+tap-testdir*/
 
 # keep these
 !**/.gitignore
@@ -3252,7 +3257,6 @@ workspaces/b/.gitignore
 !/scripts/
 !/tap-snapshots/
 !/test/
-tap-testdir-*/
 
 workspaces/b/package.json
 ========================================
@@ -4536,6 +4540,8 @@ workspaces/a/.gitignore
 
 # ignore everything in the root
 /*
+# transient test directories
+tap-testdir*/
 
 # keep these
 !**/.gitignore
@@ -4553,7 +4559,6 @@ workspaces/a/.gitignore
 !/scripts/
 !/tap-snapshots/
 !/test/
-tap-testdir-*/
 
 workspaces/a/package.json
 ========================================
@@ -4615,6 +4620,8 @@ workspaces/b/.gitignore
 
 # ignore everything in the root
 /*
+# transient test directories
+tap-testdir*/
 
 # keep these
 !**/.gitignore
@@ -4632,7 +4639,6 @@ workspaces/b/.gitignore
 !/scripts/
 !/tap-snapshots/
 !/test/
-tap-testdir-*/
 
 workspaces/b/package.json
 ========================================

diff --git a/tap-snapshots/test/check/snapshots.js.test.cjs b/tap-snapshots/test/check/snapshots.js.test.cjs
@@ -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
@@ -146,7 +147,6 @@ To correct it: move files to not match one of the following patterns:
   !/SECURITY.md
   !/tap-snapshots/
   !/test/
-  tap-testdir-*/
 
 -------------------------------------------------------------------
 `
@@ -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
@@ -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/
@@ -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.*
@@ -216,7 +217,6 @@ To correct it: move files to not match one of the following patterns:
   !/scripts/
   !/tap-snapshots/
   !/test/
-  tap-testdir-*/
 
 -------------------------------------------------------------------
 
@@ -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.*
@@ -242,7 +243,6 @@ To correct it: move files to not match one of the following patterns:
   !/scripts/
   !/tap-snapshots/
   !/test/
-  tap-testdir-*/
 
 -------------------------------------------------------------------
 `

diff --git a/workspace/test-workspace/.gitignore b/workspace/test-workspace/.gitignore
@@ -2,6 +2,8 @@
 
 # ignore everything in the root
 /*
+# transient test directories
+tap-testdir*/
 
 # keep these
 !**/.gitignore
@@ -19,4 +21,3 @@
 !/scripts/
 !/tap-snapshots/
 !/test/
-tap-testdir-*/
diff --git a/workspace/test-workspace/package.json b/workspace/test-workspace/package.json
@@ -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": [],