deps: @npmcli/template-oss@3.2.1

- `no-shadow` was disabled for the cli and arborist due to the amount
of changes required. These should be fixed later.
- Manually updated linting in the cli root to match closer to what
template-oss does
- Included docs to be managed with template-oss. This required adding
an empty test for now, with the plan to add real tests later.

6 files changed, 25 insertions, 31 deletions

diff --git a/workspaces/libnpmdiff/.eslintrc.js b/workspaces/libnpmdiff/.eslintrc.js
index 022767bc3..0e8ad0071 100644
--- a/workspaces/libnpmdiff/.eslintrc.js
+++ b/workspaces/libnpmdiff/.eslintrc.js
@@ -1,4 +1,4 @@
-// This file is automatically added by @npmcli/template-oss. Do not edit.
+/* This file is automatically added by @npmcli/template-oss. Do not edit. */
 
 const { readdirSync: readdir } = require('fs')
 
@@ -7,6 +7,7 @@ const localConfigs = readdir(__dirname)
   .map((file) => `./${file}`)
 
 module.exports = {
+  root: true,
   extends: [
     '@npmcli',
     ...localConfigs,
diff --git a/workspaces/libnpmdiff/.gitignore b/workspaces/libnpmdiff/.gitignore
index 6ed44c72b..617e50ca0 100644
--- a/workspaces/libnpmdiff/.gitignore
+++ b/workspaces/libnpmdiff/.gitignore
@@ -4,20 +4,18 @@
 /*
 
 # keep these
-!/.commitlintrc.js
-!/.npmrc
-!/.eslintrc*
-!/.github
+!/.eslintrc.local.*
 !**/.gitignore
-!/package.json
-!/docs
-!/bin
-!/lib
+!/docs/
+!/tap-snapshots/
+!/test/
 !/map.js
-!/tap-snapshots
-!/test
-!/scripts
+!/scripts/
 !/README*
 !/LICENSE*
-!/SECURITY*
 !/CHANGELOG*
+!/.eslintrc.js
+!/.gitignore
+!/bin/
+!/lib/
+!/package.json
diff --git a/workspaces/libnpmdiff/.npmrc b/workspaces/libnpmdiff/.npmrc
deleted file mode 100644
index 878b7ddef..000000000
--- a/workspaces/libnpmdiff/.npmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-;This file is automatically added by @npmcli/template-oss. Do not edit.
-
-package-lock=false
diff --git a/workspaces/libnpmdiff/SECURITY.md b/workspaces/libnpmdiff/SECURITY.md
deleted file mode 100644
index a93106d0c..000000000
--- a/workspaces/libnpmdiff/SECURITY.md
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- This file is automatically added by @npmcli/template-oss. Do not edit. -->
-
-Please send vulnerability reports through [hackerone](https://hackerone.com/github).
diff --git a/workspaces/libnpmdiff/package.json b/workspaces/libnpmdiff/package.json
index 11d0f5887..eff595823 100644
--- a/workspaces/libnpmdiff/package.json
+++ b/workspaces/libnpmdiff/package.json
@@ -4,16 +4,16 @@
   "description": "The registry diff",
   "repository": {
     "type": "git",
-    "url": "https://github.com/npm/cli",
+    "url": "https://github.com/npm/cli.git",
     "directory": "workspaces/libnpmdiff"
   },
   "main": "lib/index.js",
   "files": [
-    "bin",
-    "lib"
+    "bin/",
+    "lib/"
   ],
   "engines": {
-    "node": "^12.13.0 || ^14.15.0 || >=16"
+    "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
   },
   "keywords": [
     "npm",
@@ -33,7 +33,7 @@
   "license": "ISC",
   "scripts": {
     "eslint": "eslint",
-    "lint": "eslint '**/*.js'",
+    "lint": "eslint \"**/*.js\"",
     "lintfix": "npm run lint -- --fix",
     "test": "tap",
     "posttest": "npm run lint",
@@ -41,15 +41,15 @@
     "preversion": "npm test",
     "postversion": "npm publish",
     "prepublishOnly": "git push origin --follow-tags",
-    "postlint": "npm-template-check",
-    "template-copy": "npm-template-copy --force"
+    "postlint": "template-oss-check",
+    "template-oss-apply": "template-oss-apply --force"
   },
   "tap": {
     "check-coverage": true
   },
   "devDependencies": {
-    "@npmcli/template-oss": "^2.4.2",
-    "eslint": "^8.1.0",
+    "@npmcli/eslint-config": "^3.0.1",
+    "@npmcli/template-oss": "3.2.1",
     "tap": "^15.0.9"
   },
   "dependencies": {
@@ -63,6 +63,7 @@
     "tar": "^6.1.0"
   },
   "templateOSS": {
-    "version": "2.9.2"
+    "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
+    "version": "3.2.1"
   }
 }
diff --git a/workspaces/libnpmdiff/test/tarball.js b/workspaces/libnpmdiff/test/tarball.js
index 3a959be6e..b0a507c84 100644
--- a/workspaces/libnpmdiff/test/tarball.js
+++ b/workspaces/libnpmdiff/test/tarball.js
@@ -36,9 +36,9 @@ t.test('returns a tarball from node_modules', t => {
   tarball({ bin: { a: 'index.js' }, _resolved: resolve(path, 'node_modules/a') }, { where: path })
     .then(res => {
       tar.list({
-        filter: path => {
+        filter: p => {
           t.match(
-            path,
+            p,
             /package.json|index.js/,
             'should return tarball with expected files'
           )