fixes after applying to the npm cli

Author: fritzy

bin/npm-template-check.js

@@ -17,8 +17,12 @@ const main = async () => {
 
   const problemSets = []
   for (const path of config.paths) {
-    problemSets.push(await checkPackage(path))
-    problemSets.push(await checkGitIgnore(path))
+    if (path !== root || config.applyRootModuleFiles) {
+      problemSets.push(await checkPackage(path))
+    }
+    if (path !== root || config.applyRootRepoFiles) {
+      problemSets.push(await checkGitIgnore(path))
+    }
   }
 
   const problems = problemSets.flat()

bin/postinstall.js

@@ -17,7 +17,7 @@ const main = async () => {
 
   const config = await getConfig(root)
   for (const path of config.paths) {
-    if (!await patchPackage(path)) {
+    if (!await patchPackage(path, root, config)) {
       continue
     }
 

lib/postinstall/copy-content.js

@@ -98,7 +98,8 @@ const copyContent = async (path, rootPath, config) => {
       { encoding: 'utf-8' }
     )
 
-    workflowData = workflowData.replace(/%%pkgpath%%/g, path)
+    const relPath = path.substring(rootPath.length + 1)
+    workflowData = workflowData.replace(/%%pkgpath%%/g, relPath)
     workflowData = workflowData.replace(/%%pkgname%%/g, workspaceName)
 
     await fs.writeFile(join(workflowPath, `ci-${workspaceName}.yml`), workflowData)

lib/postinstall/update-package.js

@@ -26,8 +26,8 @@ const changes = {
   },
 }
 
-const patchPackage = async (root) => {
-  const pkg = await PackageJson.load(root)
+const patchPackage = async (path, root, config) => {
+  const pkg = await PackageJson.load(path)
 
   // If we are running this on itself, we always run the script.
   // We also don't set templateVersion in package.json because
@@ -42,13 +42,22 @@ const patchPackage = async (root) => {
     return false
   }
 
-  // we build a new object here so our exported set of changes is not modified
-  const update = {
-    ...changes,
-    scripts: {
-      ...pkg.content.scripts,
-      ...changes.scripts,
-    },
+  let update
+
+  if (path === root && !config.applyRootModuleFiles) {
+    // only update templateVersion if we're skipping root module files
+    update = {
+      templateVersion: TEMPLATE_VERSION,
+    }
+  } else {
+    // we build a new object here so our exported set of changes is not modified
+    update = {
+      ...changes,
+      scripts: {
+        ...pkg.content.scripts,
+        ...changes.scripts,
+      },
+    }
   }
 
   if (isDogfood) {

test/bin/npm-template-check.js

@@ -81,3 +81,41 @@ t.test('with mocks', (t) => {
     t.strictSame(errors, [], 'errors')
   })
 })
+
+t.test('workspace without root module files', async (t) => {
+  const pkgWithWorkspaces = {
+    'package.json': JSON.stringify({
+      name: 'testpkg',
+      templateOSS: {
+        applyRootRepoFiles: false,
+        applyWorkspaceRepoFiles: true,
+        applyRootModuleFiles: false,
+
+        workspaces: ['amazinga'],
+      },
+    }),
+    workspace: {
+      a: {
+        'package.json': JSON.stringify({
+          name: 'amazinga',
+        }),
+      },
+    },
+  }
+  const root = t.testdir(pkgWithWorkspaces)
+  process.env.npm_config_local_prefix = root
+
+  await check({
+    package: (path, root, config) => [{
+      message: 'package',
+      solution: `${path} ${root} ${config.applyRootModuleFiles}`,
+    }],
+    gitignore: (path, root, config) => [{
+      message: 'gitignore',
+      solution: `${path} ${root} ${config.applyRootRepoFiles}`,
+    }],
+  })
+
+  t.strictSame(logs, [], 'logs')
+  t.strictSame(errors, [], 'errors')
+})

test/postinstall/update-package.js

@@ -76,3 +76,38 @@ t.test('doesnt set templateVersion on own repo', async (t) => {
   })
   t.equal(JSON.parse(contents).templateVersion, undefined, 'did not get template version')
 })
+
+t.test('only sets templateVersion on root pkg when configured', async (t) => {
+  const pkgWithWorkspaces = {
+    'package.json': JSON.stringify({
+      name: 'testpkg',
+      templateOSS: {
+        applyRootRepoFiles: false,
+        applyWorkspaceRepoFiles: true,
+        applyRootModuleFiles: false,
+
+        workspaces: ['amazinga'],
+      },
+    }),
+    workspace: {
+      a: {
+        'package.json': JSON.stringify({
+          name: 'amazinga',
+        }),
+      },
+    },
+  }
+  const root = t.testdir(pkgWithWorkspaces)
+  await patchPackage(root, root, {
+    applyRootRepoFiles: false,
+    applyWorkspaceRepoFiles: true,
+    applyRootModuleFiles: false,
+  })
+
+  const contents = JSON.parse(await fs.readFile(join(root, 'package.json'), {
+    encoding: 'utf8',
+  }))
+
+  t.not(contents.templateVersion, undefined, 'should set templateVersion')
+  t.equal(contents.author, undefined, 'should not set other fields')
+})