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.

7 files changed, 24 insertions, 30 deletions

diff --git a/workspaces/libnpmaccess/.eslintrc.js b/workspaces/libnpmaccess/.eslintrc.js
index 022767bc3..0e8ad0071 100644
--- a/workspaces/libnpmaccess/.eslintrc.js
+++ b/workspaces/libnpmaccess/.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/libnpmaccess/.gitignore b/workspaces/libnpmaccess/.gitignore
index 6ed44c72b..617e50ca0 100644
--- a/workspaces/libnpmaccess/.gitignore
+++ b/workspaces/libnpmaccess/.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/libnpmaccess/.npmrc b/workspaces/libnpmaccess/.npmrc
deleted file mode 100644
index 878b7ddef..000000000
--- a/workspaces/libnpmaccess/.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/libnpmaccess/CHANGELOG.md b/workspaces/libnpmaccess/CHANGELOG.md
index d79d9b54c..fd590f39b 100644
--- a/workspaces/libnpmaccess/CHANGELOG.md
+++ b/workspaces/libnpmaccess/CHANGELOG.md
@@ -1,6 +1,5 @@
 # Changelog
 
-<a name="4.0.0"></a>
 ### [6.0.2](https://www.github.com/npm/cli/compare/libnpmaccess-v6.0.1...libnpmaccess-v6.0.2) (2022-03-15)
 
 
diff --git a/workspaces/libnpmaccess/SECURITY.md b/workspaces/libnpmaccess/SECURITY.md
deleted file mode 100644
index a93106d0c..000000000
--- a/workspaces/libnpmaccess/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/libnpmaccess/lib/index.js b/workspaces/libnpmaccess/lib/index.js
index 925f74292..71219d009 100644
--- a/workspaces/libnpmaccess/lib/index.js
+++ b/workspaces/libnpmaccess/lib/index.js
@@ -116,7 +116,7 @@ cmd.lsPackages.stream = (entity, opts = {}) => {
       if (err.code === 'E404' && !team) {
         uri = `/-/user/${eu(scope)}/package`
         npmFetch.json.stream(uri, '*', nextOpts)
-          .on('error', err => ret.emit('error', err))
+          .on('error', streamErr => ret.emit('error', streamErr))
           .pipe(ret)
       } else {
         ret.emit('error', err)
diff --git a/workspaces/libnpmaccess/package.json b/workspaces/libnpmaccess/package.json
index ab3880a46..9efc85076 100644
--- a/workspaces/libnpmaccess/package.json
+++ b/workspaces/libnpmaccess/package.json
@@ -9,23 +9,24 @@
     "preversion": "npm test",
     "postversion": "npm publish",
     "postpublish": "git push origin --follow-tags",
-    "lint": "eslint '**/*.js'",
+    "lint": "eslint \"**/*.js\"",
     "test": "tap",
-    "postlint": "npm-template-check",
+    "postlint": "template-oss-check",
     "lintfix": "npm run lint -- --fix",
     "prepublishOnly": "git push origin --follow-tags",
     "snap": "tap",
     "posttest": "npm run lint",
-    "template-copy": "npm-template-copy --force"
+    "template-oss-apply": "template-oss-apply --force"
   },
   "devDependencies": {
-    "@npmcli/template-oss": "^2.4.2",
+    "@npmcli/eslint-config": "^3.0.1",
+    "@npmcli/template-oss": "3.2.1",
     "nock": "^13.2.4",
     "tap": "^15.1.0"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/npm/cli",
+    "url": "https://github.com/npm/cli.git",
     "directory": "workspaces/libnpmaccess"
   },
   "bugs": "https://github.com/npm/libnpmaccess/issues",
@@ -37,16 +38,17 @@
     "npm-registry-fetch": "^13.0.0"
   },
   "engines": {
-    "node": "^12.13.0 || ^14.15.0 || >=16"
+    "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
   },
   "tap": {
     "check-coverage": true
   },
   "files": [
-    "bin",
-    "lib"
+    "bin/",
+    "lib/"
   ],
   "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"
   }
 }