fix: set package.json fields when using tap@16 + ts

npm · Nov 25, 2023 · 2201c77 · 2201c77
1 parent 84d1bef
commit 2201c77
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -166,6 +166,7 @@ const getFullConfig = async ({
     deleteJsExt: esm ? 'js' : 'cjs',
     // tap
     tap18: semver.coerce(pkg.pkgJson?.devDependencies?.tap)?.major === 18,
+    tap16: semver.coerce(pkg.pkgJson?.devDependencies?.tap)?.major === 16,
     // booleans to control application of updates
     isForce,
     isDogFood,
@@ -198,11 +199,13 @@ const getFullConfig = async ({
   if (pkgConfig.typescript) {
     defaultsDeep(pkgConfig, { allowPaths: [], requiredPackages: { devDependencies: [] } })
     pkgConfig.distPaths = ['dist/']
+    pkgConfig.allowDistPaths = false
     pkgConfig.allowPaths.push('/src/')
     pkgConfig.requiredPackages.devDependencies.push(
       'typescript',
       'tshy',
-      '@typescript-eslint/parser'
+      '@typescript-eslint/parser',
+      ...derived.tap16 ? ['c8', 'ts-node'] : []
     )
   }
 
@@ -252,7 +255,7 @@ const getFullConfig = async ({
         ]),
         ...isRoot && pkgConfig.lockfile ? ['!/package-lock.json'] : [],
         ...(pkgConfig.allowPaths || []).map((p) => `!${p}`),
-        ...(pkgConfig.distPaths || []).map((p) => `!/${p}`),
+        ...pkgConfig.allowDistPaths ? (pkgConfig.distPaths || []).map((p) => `!/${p}`) : [],
         ...(pkgConfig.ignorePaths || []),
       ]),
       // these cant be sorted since they rely on order

diff --git a/lib/content/index.js b/lib/content/index.js
@@ -155,6 +155,7 @@ module.exports = {
     'bin/',
     'lib/',
   ],
+  allowDistPaths: true,
   allowPaths: [
     '/.eslintrc.local.*',
     '**/.gitignore',

diff --git a/lib/content/package-json.hbs b/lib/content/package-json.hbs
@@ -7,8 +7,8 @@
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
     "lintfix": "{{ localNpmPath }} run lint -- --fix",
-    "snap": "tap",
-    "test": "tap",
+    "snap": "{{#if typescript}}{{#if tap16}}c8 {{/if}}{{/if}}tap",
+    "test": "{{#if typescript}}{{#if tap16}}c8 {{/if}}{{/if}}tap",
     "posttest": "{{ localNpmPath }} run lint",
     {{#if isRootMono}}
     "test-all": "{{ localNpmPath }} run test {{ allFlags }}",
@@ -34,6 +34,16 @@
     {{#if workspacePaths}}
     "test-ignore": "^({{ join workspacePaths "|" }})/",
     {{/if}}
+    {{#if typescript}}
+    {{#if tap16}}
+    "coverage": false,
+    "node-arg": [
+      "--no-warnings",
+      "--loader",
+      "ts-node/esm"
+    ],
+    {{/if}}
+    {{/if}}
     "nyc-arg": {{#if tap18}}{{{ del }}}{{else}}[
       {{#each workspaceGlobs}}
       "--exclude",