@npmcli/template-oss 4.15.0 → 4.16.0

package/lib/config.js

@@ -195,7 +195,7 @@ const getFullConfig = async ({
     isLatest,
     // whether to install and update npm in ci
     // only do this if we aren't using a custom path to bin
-    updateNpm: !npmPath.isLocal,
+    updateNpm: !npmPath.isLocal && pkgConfig.updateNpm,
     rootNpmPath: npmPath.root,
     localNpmPath: npmPath.local,
     rootNpxPath: npxPath.root,
@@ -228,9 +228,11 @@ const getFullConfig = async ({
 
   if (pkgConfig.ciVersions) {
     let versions = pkgConfig.ciVersions
-    if (versions === 'latest') {
-      const defaultVersions = [rootPkgConfig, defaultConfig].find(c => Array.isArray(c.ciVersions))
-      versions = defaultVersions.ciVersions.slice(-1)
+    if (versions === 'latest' || (Array.isArray(versions) && versions.includes('latest'))) {
+      const { ciVersions } = [isWorkspace ? rootPkgConfig : {}, defaultConfig]
+        .find(c => Array.isArray(c.ciVersions))
+      const defaultLatest = ciVersions[ciVersions.length - 1]
+      versions = [].concat(versions).map(v => v === 'latest' ? defaultLatest : v)
     }
 
     const { targets, engines } = parseCIVersions(versions)
@@ -251,6 +253,14 @@ const getFullConfig = async ({
     derived.engines = pkgConfig.engines || engines
   }
 
+  if (!pkgConfig.eslint) {
+    derived.ignorePaths = derived.ignorePaths.filter(p => !p.includes('eslint'))
+    if (Array.isArray(pkgConfig.requiredPackages?.devDependencies)) {
+      pkgConfig.requiredPackages.devDependencies =
+        pkgConfig.requiredPackages.devDependencies.filter(p => !p.includes('eslint'))
+    }
+  }
+
   const gitUrl = await getGitUrl(rootPkg.path)
   if (gitUrl) {
     derived.repository = {

package/lib/content/index.js

@@ -85,7 +85,10 @@ const rootRepo = {
 // dir. so we might want to combine these
 const rootModule = {
   add: {
-    '.eslintrc.js': 'eslintrc.js',
+    '.eslintrc.js': {
+      file: 'eslintrc.js',
+      filter: (p) => p.config.eslint,
+    },
     '.gitignore': 'gitignore',
     '.npmrc': 'npmrc',
     'SECURITY.md': 'SECURITY.md',
@@ -113,7 +116,10 @@ const workspaceRepo = {
 // Changes for each workspace but applied to the relative workspace dir
 const workspaceModule = {
   add: {
-    '.eslintrc.js': 'eslintrc.js',
+    '.eslintrc.js': {
+      file: 'eslintrc.js',
+      filter: (p) => p.config.eslint,
+    },
     '.gitignore': 'gitignore',
     'package.json': 'pkg.json',
   },
@@ -131,7 +137,7 @@ module.exports = {
   workspaceModule,
   windowsCI: true,
   macCI: true,
-  branches: ['main', 'latest'],
+  branches: ['main', 'latest', 'release/v*'],
   defaultBranch: 'main',
   distPaths: [
     'bin/',
@@ -155,10 +161,12 @@ module.exports = {
   ciVersions: ['14.17.0', '14.x', '16.13.0', '16.x', '18.0.0', '18.x'],
   lockfile: false,
   codeowner: '@npm/cli-team',
+  eslint: true,
   publish: false,
   npm: 'npm',
   npx: 'npx',
   npmSpec: 'latest',
+  updateNpm: true,
   dependabot: 'increase-if-necessary',
   unwantedPackages: [
     'eslint',

package/lib/content/pkg.json

@@ -2,7 +2,7 @@
   "author": "GitHub Inc.",
   "files": {{{ json distPaths }}},
   "scripts": {
-    "lint": "eslint \"**/*.js\"",
+    "lint": "{{#if eslint}}eslint \"**/*.js\"{{else}}echo linting disabled{{/if}}",
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
     "lintfix": "{{ localNpmPath }} run lint -- --fix",

package/lib/content/release.yml

@@ -11,7 +11,6 @@ on:
       {{#each branches}}
       - {{ . }}
       {{/each}}
-      - release/v*
 
 permissions:
   contents: write

package/lib/content/settings.yml

@@ -9,16 +9,16 @@ repository:
   enable_vulnerability_alerts: true
 
 branches:
-  {{#each branches}}
-  - name: {{ . }}
+  - name: {{ defaultBranch }}
     protection:
+      required_status_checks: null
+      enforce_admins: true
       required_pull_request_reviews:
-        required_pull_request_review_count: 1
-        dismiss_stale_reviews: true
+        required_approving_review_count: 1
         require_code_owner_reviews: true
+        require_last_push_approval: true
+        dismiss_stale_reviews: true
       restrictions:
-        teams:
-          - "npm/cli-team"
-      enforce_admins: true
-      required_status_checks: null
-  {{/each}}
+        apps: []
+        users: []
+        teams: ["cli-team"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "4.15.0",
+  "version": "4.16.0",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {