@npmcli/template-oss 4.21.4 → 4.23.0

package/bin/apply.js

@@ -3,10 +3,7 @@
 const apply = require('../lib/apply/index.js')
 
 const main = async () => {
-  const {
-    npm_config_global: globalMode,
-    npm_config_local_prefix: root,
-  } = process.env
+  const { npm_config_global: globalMode, npm_config_local_prefix: root } = process.env
 
   // do nothing in global mode or when the local prefix isn't set
   if (globalMode === 'true' || !root) {
@@ -16,7 +13,7 @@ const main = async () => {
   await apply(root)
 }
 
-module.exports = main().catch((err) => {
+module.exports = main().catch(err => {
   console.error(err.stack)
   process.exitCode = 1
 })

package/bin/check.js

@@ -4,9 +4,7 @@ const check = require('../lib/check/index.js')
 const output = require('../lib/util/output.js')
 
 const main = async () => {
-  const {
-    npm_config_local_prefix: root,
-  } = process.env
+  const { npm_config_local_prefix: root } = process.env
 
   if (!root) {
     throw new Error('This package requires npm >7.21.1')
@@ -20,7 +18,7 @@ const main = async () => {
   }
 }
 
-module.exports = main().catch((err) => {
+module.exports = main().catch(err => {
   console.error(err.stack)
   process.exitCode = 1
 })

package/bin/release-manager.js

@@ -19,7 +19,7 @@ ReleaseManager.run({
     },
   }).values,
 })
-  .then((result) => {
+  .then(result => {
     core.setOutput('result', result)
     return null
   })

package/bin/release-please.js

@@ -18,23 +18,27 @@ ReleasePlease.run({
   // `RELEASE_PLEASE_<manfiestOverrideConfigName>`
   // (eg`RELEASE_PLEASE_lastReleaseSha=<SHA>`) to set one-off config items for
   // the release please run without needing to commit and push the config.
-  overrides: Object.fromEntries(Object.entries(process.env)
-    .filter(([k, v]) => k.startsWith('RELEASE_PLEASE_') && v != null)
-    .map(([k, v]) => [k.replace('RELEASE_PLEASE_', ''), v])),
-}).then(({ pr, releases }) => {
-  if (pr) {
-    core.setOutput('pr', JSON.stringify(pr))
-    core.setOutput('pr-branch', pr.headBranchName)
-    core.setOutput('pr-number', pr.number)
-    core.setOutput('pr-sha', pr.sha)
-  }
+  overrides: Object.fromEntries(
+    Object.entries(process.env)
+      .filter(([k, v]) => k.startsWith('RELEASE_PLEASE_') && v != null)
+      .map(([k, v]) => [k.replace('RELEASE_PLEASE_', ''), v]),
+  ),
+})
+  .then(({ pr, releases }) => {
+    if (pr) {
+      core.setOutput('pr', JSON.stringify(pr))
+      core.setOutput('pr-branch', pr.headBranchName)
+      core.setOutput('pr-number', pr.number)
+      core.setOutput('pr-sha', pr.sha)
+    }
 
-  if (releases) {
-    core.setOutput('releases', JSON.stringify(releases))
-  }
+    if (releases) {
+      core.setOutput('releases', JSON.stringify(releases))
+    }
 
-  return null
-}).catch(err => {
-  core.setFailed('Release Please failed')
-  core.error(err)
-})
+    return null
+  })
+  .catch(err => {
+    core.setFailed('Release Please failed')
+    core.error(err)
+  })

package/lib/apply/apply-files.js

@@ -6,26 +6,21 @@ const run = async (dir, files, options) => {
   const { rm, add } = files
 
   log.verbose('apply-files', 'rm', rm)
-  await rmEach(dir, rm, options, (f) => fs.rm(f))
+  await rmEach(dir, rm, options, f => fs.rm(f))
 
   log.verbose('apply-files', 'add', add)
-  await parseEach(dir, add, options, {}, (p) => p.applyWrite())
+  await parseEach(dir, add, options, {}, p => p.applyWrite())
 }
 
-module.exports = [{
-  run: (options) => run(
-    options.config.repoDir,
-    options.config.repoFiles,
-    options
-  ),
-  when: ({ config: c }) => c.applyRepo && c.needsUpdate,
-  name: 'apply-repo',
-}, {
-  run: (options) => run(
-    options.config.moduleDir,
-    options.config.moduleFiles,
-    options
-  ),
-  when: ({ config: c }) => c.applyModule && c.needsUpdate,
-  name: 'apply-module',
-}]
+module.exports = [
+  {
+    run: options => run(options.config.repoDir, options.config.repoFiles, options),
+    when: ({ config: c }) => c.applyRepo && c.needsUpdate,
+    name: 'apply-repo',
+  },
+  {
+    run: options => run(options.config.moduleDir, options.config.moduleFiles, options),
+    when: ({ config: c }) => c.applyModule && c.needsUpdate,
+    name: 'apply-module',
+  },
+]

package/lib/apply/apply-version.js

@@ -2,11 +2,7 @@ const { log } = require('proc-log')
 const PackageJson = require('@npmcli/package-json')
 
 const run = async ({ config: c }) => {
-  const {
-    moduleDir: dir,
-    __CONFIG_KEY__: key,
-    __VERSION__: version,
-  } = c
+  const { moduleDir: dir, __CONFIG_KEY__: key, __VERSION__: version } = c
 
   log.verbose('apply-version', dir)
 

package/lib/apply/index.js

@@ -1,6 +1,3 @@
 const run = require('../index.js')
 
-module.exports = (root) => run(root, [
-  require('./apply-files.js'),
-  require('./apply-version.js'),
-])
+module.exports = root => run(root, [require('./apply-files.js'), require('./apply-version.js')])

package/lib/check/check-apply.js

@@ -8,23 +8,25 @@ const solution = 'npx template-oss-apply --force'
 
 const run = async (type, dir, files, options) => {
   const res = []
-  const rel = (f) => relative(options.root, f)
+  const rel = f => relative(options.root, f)
   const { add: addFiles, rm: rmFiles } = files
 
-  const rm = await rmEach(dir, rmFiles, options, (f) => rel(f))
-  const parseOpts = { allowMultipleSources: false }
-  const [add, update] = partition(await parseEach(dir, addFiles, options, parseOpts, async (p) => {
-    const diff = await p.applyDiff()
-    const target = rel(p.target)
-    if (diff === null) {
-      // needs to be added
-      return target
-    } else if (diff === true) {
-      // its ok, no diff, this is filtered out
-      return null
-    }
-    return { file: target, diff }
-  }), (d) => typeof d === 'string')
+  const rm = await rmEach(dir, rmFiles, options, f => rel(f))
+  const [add, update] = partition(
+    await parseEach(dir, addFiles, options, {}, async p => {
+      const diff = await p.applyDiff()
+      const target = rel(p.target)
+      if (diff === null) {
+        // needs to be added
+        return target
+      } else if (diff === true) {
+        // its ok, no diff, this is filtered out
+        return null
+      }
+      return { file: target, diff }
+    }),
+    d => typeof d === 'string',
+  )
 
   log.verbose('check-apply', 'rm', rm)
   if (rm.length) {
@@ -45,31 +47,28 @@ const run = async (type, dir, files, options) => {
   }
 
   log.verbose('check-apply', 'update', update)
-  res.push(...update.sort((a, b) => localeCompare(a.file, b.file)).map(({ file, diff }) => ({
-    title: `The ${type} file ${basename(file)} needs to be updated:`,
-    body: [`${file}\n${'='.repeat(40)}\n${diff}`],
-    solution,
-  })))
+  res.push(
+    ...update
+      .sort((a, b) => localeCompare(a.file, b.file))
+      .map(({ file, diff }) => ({
+        title: `The ${type} file ${basename(file)} needs to be updated:`,
+        body: [`${file}\n${'='.repeat(40)}\n${diff}`],
+        solution,
+      })),
+  )
 
   return res
 }
 
-module.exports = [{
-  run: (options) => run(
-    'repo',
-    options.config.repoDir,
-    options.config.repoFiles,
-    options
-  ),
-  when: ({ config: c }) => c.applyRepo,
-  name: 'check-repo',
-}, {
-  run: (options) => run(
-    'module',
-    options.config.moduleDir,
-    options.config.moduleFiles,
-    options
-  ),
-  when: ({ config: c }) => c.applyModule,
-  name: 'check-module',
-}]
+module.exports = [
+  {
+    run: options => run('repo', options.config.repoDir, options.config.repoFiles, options),
+    when: ({ config: c }) => c.applyRepo,
+    name: 'check-repo',
+  },
+  {
+    run: options => run('module', options.config.moduleDir, options.config.moduleFiles, options),
+    when: ({ config: c }) => c.applyModule,
+    name: 'check-module',
+  },
+]

package/lib/check/check-changelog.js

@@ -14,10 +14,7 @@ const run = async ({ root, path }) => {
     if (!mustStart.test(content)) {
       return {
         title: `The ${relative(root, changelog)} is incorrect:`,
-        body: [
-          'The changelog should start with',
-          `"# Changelog\n\n#"`,
-        ],
+        body: ['The changelog should start with', `"# Changelog\n\n#"`],
         solution: 'reformat the changelog to have the correct heading',
       }
     }

package/lib/check/check-engines.js

@@ -27,15 +27,14 @@ const run = async ({ root, path, pkg, config: { omitEngines = [] } }) => {
   }
 
   if (invalid.length) {
-    const title = `The following production dependencies are not compatible with ` +
+    const title =
+      `The following production dependencies are not compatible with ` +
       `\`engines.node: ${engines}\` found in \`${pkgPath}\`:`
     return {
       title,
-      body: invalid.map((dep) => [
-        `${dep.name}:`,
-        `  engines.node: ${dep.engines}`,
-        `  location: ${dep.location}`,
-      ].join('\n')).join('\n'),
+      body: invalid
+        .map(dep => [`${dep.name}:`, `  engines.node: ${dep.engines}`, `  location: ${dep.location}`].join('\n'))
+        .join('\n'),
       solution: 'Remove them or move them to devDependencies.',
     }
   }

package/lib/check/check-gitignore.js

@@ -13,34 +13,34 @@ const NAME = 'check-gitignore'
 const run = async ({ root, path, config }) => {
   log.verbose(NAME, { root, path })
 
-  const relativeToRoot = (f) => relative(root, resolve(path, f))
+  const relativeToRoot = f => relative(root, resolve(path, f))
 
   // use the root to detect a git repo but the project directory (path) for the
   // ignore check
   const ignoreFile = resolve(path, '.gitignore')
-  if (!await git.is({ cwd: root }) || !existsSync(ignoreFile)) {
+  if (!(await git.is({ cwd: root })) || !existsSync(ignoreFile)) {
     log.verbose(NAME, 'no git or no gitignore')
     return null
   }
 
   log.verbose(NAME, `using ignore file ${ignoreFile}`)
 
-  const res = await git.spawn([
-    'ls-files',
-    '--cached',
-    '--ignored',
-    // https://git-scm.com/docs/git-ls-files#_exclude_patterns
-    `--${config.isRoot ? 'exclude-from' : 'exclude-per-directory'}=${basename(ignoreFile)}`,
-  ], { cwd: path })
+  const res = await git.spawn(
+    [
+      'ls-files',
+      '--cached',
+      '--ignored',
+      // https://git-scm.com/docs/git-ls-files#_exclude_patterns
+      `--${config.isRoot ? 'exclude-from' : 'exclude-per-directory'}=${basename(ignoreFile)}`,
+    ],
+    { cwd: path },
+  )
 
   log.verbose(NAME, 'ls-files', res)
 
   // TODO: files should be filtered if they have already been moved/deleted
   // but not committed. Currently you must commit for this check to pass.
-  const files = res.stdout
-    .trim()
-    .split('\n')
-    .filter(Boolean)
+  const files = res.stdout.trim().split('\n').filter(Boolean)
 
   if (!files.length) {
     return null
@@ -49,7 +49,7 @@ const run = async ({ root, path, config }) => {
   const ignores = (await fs.readFile(ignoreFile))
     .toString()
     .split(/\r?\n/)
-    .filter((l) => l && !l.trim().startsWith('#'))
+    .filter(l => l && !l.trim().startsWith('#'))
 
   const relIgnore = relativeToRoot(ignoreFile)
 

package/lib/check/check-required.js

@@ -3,25 +3,21 @@ const npa = require('npm-package-arg')
 const { partition } = require('lodash')
 const hasPackage = require('../util/has-package.js')
 
-const rmCommand = (specs) =>
-  `npm rm ${specs.map((s) => s.name).join(' ')}`.trim()
+const rmCommand = specs => `npm rm ${specs.map(s => s.name).join(' ')}`.trim()
 
-const installCommand = (specs, flags) => specs.length ?
-  `npm i ${specs.map((s) => `${s.name}@${s.fetchSpec}`).join(' ')} ${flags.join(' ')}`.trim() : ''
+const installCommand = (specs, flags) =>
+  specs.length ? `npm i ${specs.map(s => `${s.name}@${s.fetchSpec}`).join(' ')} ${flags.join(' ')}`.trim() : ''
 
 // ensure required packages are present in the correct place
 const run = ({ pkg, path, config: { requiredPackages = {} } }) => {
   // keys are the dependency location in package.json
   // values are a filtered list of parsed specs that dont exist in the current package
   // { [location]: [spec1, spec2] }
-  const requiredByLocation = Object.entries(requiredPackages)
-    .reduce((acc, [location, pkgs]) => {
-      acc[location] = pkgs
-        .filter((spec) => !hasPackage(pkg, spec, [location], path))
-        .map((spec) => npa(spec))
-      log.verbose(location, pkg, pkgs)
-      return acc
-    }, {})
+  const requiredByLocation = Object.entries(requiredPackages).reduce((acc, [location, pkgs]) => {
+    acc[location] = pkgs.filter(spec => !hasPackage(pkg, spec, [location], path)).map(spec => npa(spec))
+    log.verbose(location, pkg, pkgs)
+    return acc
+  }, {})
 
   const requiredEntries = Object.entries(requiredByLocation)
 
@@ -30,19 +26,21 @@ const run = ({ pkg, path, config: { requiredPackages = {} } }) => {
   if (requiredEntries.flatMap(([, specs]) => specs).length) {
     return requiredEntries.map(([location, specs]) => {
       const locationFlag = hasPackage.flags[location]
-      const [exactSpecs, saveSpecs] = partition(specs, (s) => s.type === 'version')
+      const [exactSpecs, saveSpecs] = partition(specs, s => s.type === 'version')
 
       log.verbose('check-required', location, specs)
 
       return {
         title: `The following required ${location} were not found:`,
-        body: specs.map((s) => s.rawSpec === '*' ? s.name : `${s.name}@${s.rawSpec}`),
+        body: specs.map(s => (s.rawSpec === '*' ? s.name : `${s.name}@${s.rawSpec}`)),
         // solution is to remove any existing all at once but add back in by --save-<location>
         solution: [
           rmCommand(specs),
           installCommand(saveSpecs, [locationFlag]),
           installCommand(exactSpecs, [locationFlag, '--save-exact']),
-        ].filter(Boolean).join(' && '),
+        ]
+          .filter(Boolean)
+          .join(' && '),
       }
     })
   }

package/lib/check/check-unwanted.js

@@ -1,11 +1,10 @@
-
 const hasPackage = require('../util/has-package.js')
 
 const run = ({ pkg, config: { allowedPackages = [], unwantedPackages = [] } }) => {
   // ensure packages that should not be present are removed
   const hasUnwanted = unwantedPackages
-    .filter((name) => !allowedPackages.includes(name))
-    .filter((name) => hasPackage(pkg, name))
+    .filter(name => !allowedPackages.includes(name))
+    .filter(name => hasPackage(pkg, name))
 
   if (hasUnwanted.length) {
     return {

package/lib/check/index.js

@@ -1,10 +1,11 @@
 const run = require('../index.js')
 
-module.exports = (root) => run(root, [
-  require('./check-apply.js'),
-  require('./check-required.js'),
-  require('./check-unwanted.js'),
-  require('./check-gitignore.js'),
-  require('./check-changelog.js'),
-  require('./check-engines.js'),
-])
+module.exports = root =>
+  run(root, [
+    require('./check-apply.js'),
+    require('./check-required.js'),
+    require('./check-unwanted.js'),
+    require('./check-gitignore.js'),
+    require('./check-changelog.js'),
+    require('./check-engines.js'),
+  ])

package/lib/config.js

@@ -16,15 +16,24 @@ const { name: NAME, version: LATEST_VERSION } = require('../package.json')
 const CONFIG_KEY = 'templateOSS'
 const MERGE_KEYS = [...FILE_KEYS, 'defaultContent', 'content']
 const DEFAULT_CONTENT = require.resolve(NAME)
-const getPkgConfig = (pkg) => pkg[CONFIG_KEY] || {}
+const getPkgConfig = pkg => pkg[CONFIG_KEY] || {}
 
 const merge = mergeWithCustomizers(
-  customizers.mergeArrays('branches', 'distPaths', 'allowPaths', 'ignorePaths'),
+  customizers.mergeArrays(
+    'branches',
+    'distPaths',
+    'allowPaths',
+    'ignorePaths',
+    'lintIgnorePaths',
+    'lintExtensions',
+    'formatIgnorePaths',
+    'formatExtensions',
+  ),
   (value, srcValue, key) => {
     if (key === 'ciVersions' && (Array.isArray(srcValue) || isPlainObject(srcValue))) {
       return { ...ciVersions.parse(value), ...ciVersions.parse(srcValue) }
     }
-  }
+  },
 )
 
 const mergeConfigs = (...configs) => {
@@ -39,7 +48,7 @@ const mergeConfigs = (...configs) => {
   })
 }
 
-const readContentPath = async (path) => {
+const readContentPath = async path => {
   if (!path) {
     return {}
   }
@@ -62,10 +71,7 @@ const getFiles = async (path, rawConfig, templateSettings) => {
   if (!dir) {
     return []
   }
-  return [
-    parseFiles(pick(content, FILE_KEYS), dir, pick(rawConfig, FILE_KEYS), templateSettings),
-    dir,
-  ]
+  return [parseFiles(pick(content, FILE_KEYS), dir, pick(rawConfig, FILE_KEYS), templateSettings), dir]
 }
 
 const getFullConfig = async ({
@@ -115,13 +121,11 @@ const getFullConfig = async ({
   const publicPkgs = pkgs.filter(p => !p.pkgJson.private)
   const allPrivate = pkgs.every(p => p.pkgJson.private)
 
-  const branches = uniq([...pkgConfig.branches ?? [], pkgConfig.releaseBranch]).filter(Boolean)
+  const branches = uniq([...(pkgConfig.branches ?? []), pkgConfig.releaseBranch]).filter(Boolean)
   const gitBranches = await git.getBranches(rootPkg.path, branches)
-  const defaultBranch = await git.defaultBranch(rootPkg.path) ?? 'main'
+  const defaultBranch = (await git.defaultBranch(rootPkg.path)) ?? 'main'
   const isReleaseBranch = !!pkgConfig.backport
-  const releaseBranch = isReleaseBranch
-    ? pkgConfig.releaseBranch.replace(/\*/g, pkgConfig.backport)
-    : defaultBranch
+  const releaseBranch = isReleaseBranch ? pkgConfig.releaseBranch.replace(/\*/g, pkgConfig.backport) : defaultBranch
 
   const esm = pkg.pkgJson?.type === 'module' || !!pkgConfig.typescript || !!pkgConfig.esm
 
@@ -192,21 +196,47 @@ const getFullConfig = async ({
   }
 
   if (!pkgConfig.eslint && Array.isArray(pkgConfig.requiredPackages?.devDependencies)) {
-    pkgConfig.requiredPackages.devDependencies =
-      pkgConfig.requiredPackages.devDependencies.filter(p => !p.includes('eslint'))
+    pkgConfig.requiredPackages.devDependencies = pkgConfig.requiredPackages.devDependencies.filter(
+      p => !p.includes('eslint'),
+    )
   }
 
+  pkgConfig.lintIgnorePaths = [
+    ...(pkgConfig.ignorePaths || []),
+    ...(pkgConfig.lintIgnorePaths || []),
+    ...derived.workspaceGlobs,
+  ]
+
+  pkgConfig.formatIgnorePaths = [
+    ...(pkgConfig.ignorePaths || []),
+    ...(pkgConfig.formatIgnorePaths || []),
+    ...derived.workspaceGlobs,
+  ]
+
   if (pkgConfig.typescript) {
     defaultsDeep(pkgConfig, { allowPaths: [], requiredPackages: { devDependencies: [] } })
     pkgConfig.distPaths = ['dist/']
+    pkgConfig.lintIgnorePaths = uniq([...pkgConfig.lintIgnorePaths, 'dist/'])
+    pkgConfig.formatIgnorePaths = uniq([...pkgConfig.formatIgnorePaths, 'dist/'])
     pkgConfig.allowDistPaths = false
-    pkgConfig.allowPaths.push('/src/')
-    pkgConfig.requiredPackages.devDependencies.push(
+    pkgConfig.allowPaths = uniq([...pkgConfig.allowPaths, '/src/'])
+    pkgConfig.requiredPackages.devDependencies = uniq([
+      ...pkgConfig.requiredPackages.devDependencies,
       'typescript',
       'tshy',
       '@typescript-eslint/parser',
-      ...derived.tap16 ? ['c8', 'ts-node'] : []
-    )
+      ...(derived.tap16 ? ['c8', 'ts-node'] : []),
+    ])
+  }
+
+  if (pkgConfig.prettier) {
+    defaultsDeep(pkgConfig, { requiredPackages: { devDependencies: [] } })
+    pkgConfig.requiredPackages.devDependencies = uniq([
+      ...pkgConfig.requiredPackages.devDependencies,
+      'prettier',
+      'eslint-config-prettier',
+      '@github/prettier-config',
+    ])
   }
 
   const gitUrl = await git.getUrl(rootPkg.path)
@@ -238,32 +268,53 @@ const getFullConfig = async ({
     applyRepo: !!repoFiles,
     applyModule: !!moduleFiles,
     __PARTIAL_DIRS__: fileDirs,
-    // gitignore, these use the full config so need to come at the very end
-    ignorePaths: [
-      ...gitignore.sort([
-        ...gitignore.allowRootDir([
-          // Allways allow module files in root or workspaces
-          ...getAddedFiles(moduleFiles).map(s => template(s, fullConfig)),
-          ...isRoot ? [
+  })
+
+  const ignoreAddedPaths = gitignore.sort([
+    ...gitignore.allowRootDir([
+      // Allways allow module files in root or workspaces
+      ...getAddedFiles(moduleFiles).map(s => template(s, fullConfig)),
+      ...(isRoot
+        ? [
             // in the root allow all repo files
             ...getAddedFiles(repoFiles).map(s => template(s, fullConfig)),
             // and allow all workspace repo level files in the root
             ...pkgs
               .filter(p => p.path !== rootPkg.path && p.config.workspaceRepo !== false)
               .flatMap(() => getAddedFiles(files.workspaceRepo)),
-          ] : [],
-        ]),
-        ...isRoot && pkgConfig.lockfile ? ['!/package-lock.json'] : [],
-        ...(pkgConfig.allowPaths || []).map((p) => `!${p}`),
-        ...(pkgConfig.allowDistPaths ? pkgConfig.distPaths : []).map((p) => `!/${p}`),
+          ]
+        : []),
+    ]),
+    ...(isRoot && pkgConfig.lockfile ? ['!/package-lock.json'] : []),
+  ])
+
+  Object.assign(fullConfig, {
+    // Make sure we don't format any files that are being generated since they will cause template-oss-check to fail
+    // This could be changed if those files were also formatted before save but then we would need to read generated
+    // the prettier config first and use that as the formatting rules which would get weird
+    formatIgnorePaths: [
+      ...fullConfig.formatIgnorePaths,
+      ...ignoreAddedPaths
+        .filter(f => f.startsWith('!'))
+        .map(f => f.replace(/^!/, ''))
+        .filter(f => {
+          const ext = extname(f).slice(1)
+          // ignore it if the specified format extensions match or if its a directory
+          return (fullConfig.formatExtensions || []).includes(ext) || (!ext && f.endsWith('/'))
+        }),
+    ],
+    // gitignore, these use the full config so need to come at the very end
+    ignorePaths: [
+      ...gitignore.sort([
+        ...ignoreAddedPaths,
+        ...(pkgConfig.allowPaths || []).map(p => `!${p}`),
+        ...(pkgConfig.allowDistPaths ? pkgConfig.distPaths : []).map(p => `!/${p}`),
         ...(pkgConfig.ignorePaths || []),
       ]),
       // these cant be sorted since they rely on order
       // to allow a previously ignored directoy
-      ...isRoot
-        ? gitignore.allowDir(wsPkgs.map((p) => makePosix(relative(rootPkg.path, p.path))))
-        : [],
-    ].filter(p => !pkgConfig.eslint ? !p.includes('eslint') : true),
+      ...(isRoot ? gitignore.allowDir(wsPkgs.map(p => makePosix(relative(rootPkg.path, p.path)))) : []),
+    ].filter(p => (!pkgConfig.eslint ? !p.includes('eslint') : true)),
   })
 
   return fullConfig

package/lib/content/LICENSE-md.hbs

@@ -7,10 +7,10 @@ software for any purpose with or without fee is hereby
 granted, provided that the above copyright notice and this
 permission notice appear in all copies.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND NPM DISCLAIMS ALL
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
 WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
-EVENT SHALL NPM BE LIABLE FOR ANY SPECIAL, DIRECT,
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
 INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
 WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER