fix: don't report node_modules/.bin fix unless it happened

wraithgar · wraithgar · commit 04bc9cf4934a · 2023-07-17T13:34:43.000-07:00
diff --git a/lib/normalize.js b/lib/normalize.js
@@ -240,7 +240,7 @@ const normalize = async (pkg, { strict, steps, root, changes, allowLegacyCase })
         if (typeof data.scripts[name] !== 'string') {
           delete data.scripts[name]
           changes?.push(`Invalid scripts."${name}" was removed`)
-        } else if (steps.includes('scriptpath')) {
+        } else if (steps.includes('scriptpath') && spre.test(data.scripts[name])) {
           data.scripts[name] = data.scripts[name].replace(spre, '')
           changes?.push(`scripts entry "${name}" was fixed to remove node_modules/.bin reference`)
         }
diff --git a/tap-snapshots/test/fix.js.test.cjs b/tap-snapshots/test/fix.js.test.cjs
@@ -127,3 +127,9 @@ Array [
   "Removed invalid \\"scripts\\"",
 ]
 `
+
+exports[`test/fix.js TAP with changes scriptpath strips node_modules/.bin > must match snapshot 1`] = `
+Array [
+  "scripts entry \\"test\\" was fixed to remove node_modules/.bin reference",
+]
+`
diff --git a/test/fix.js b/test/fix.js
@@ -190,6 +190,13 @@ for (const [name, testFix] of Object.entries(testMethods)) {
         const { content } = await testFix(t, testdir)
         t.strictSame(content.scripts, {})
       })
+      t.test('strips node_modules/.bin', async t => {
+        const testdir = {
+          'package.json': pkg({ scripts: { test: './node_modules/.bin/test-script' } }),
+        }
+        const { content } = await testFix(t, testdir)
+        t.strictSame(content.scripts, { test: 'test-script' })
+      })
     })
     t.test('bundleDependencies', async t => {
       t.test('null', async t => {

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ const normalize = async (pkg, { strict, steps, root, changes, allowLegacyCase })`
`240`	`240`	`if (typeof data.scripts[name] !== 'string') {`
`241`	`241`	`delete data.scripts[name]`
`242`	`242`	changes?.push(`Invalid scripts."${name}" was removed`)
`243`		`- } else if (steps.includes('scriptpath')) {`
	`243`	`+ } else if (steps.includes('scriptpath') && spre.test(data.scripts[name])) {`
`244`	`244`	`data.scripts[name] = data.scripts[name].replace(spre, '')`
`245`	`245`	changes?.push(`scripts entry "${name}" was fixed to remove node_modules/.bin reference`)
`246`	`246`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,3 +127,9 @@ Array [`
`127`	`127`	`"Removed invalid \\"scripts\\"",`
`128`	`128`	`]`
`129`	`129`	`
	`130`	`+`
	`131`	+exports[`test/fix.js TAP with changes scriptpath strips node_modules/.bin > must match snapshot 1`] = `
	`132`	`+Array [`
	`133`	`+ "scripts entry \\"test\\" was fixed to remove node_modules/.bin reference",`
	`134`	`+]`
	`135`	+`