revert some changes

Author: pvdz

.config/rollup.dist.config.mjs

@@ -384,6 +384,12 @@ export default () => {
                 !!constants.ENV[SOCKET_CLI_SENTRY_BUILD]
               )
           ],
+          [
+            VITEST,
+            () =>
+              // Lazily access constants.ENV[TAP].
+              !!constants.ENV[VITEST]
+          ]
         ].reduce((obj, { 0: name, 1: value }) => {
           obj[`process.env.${name}`] = value
           obj[`process.env['${name}']`] = value

package-lock.json

@@ -59,7 +59,7 @@
     "test": "run-s check build:* test:* test:coverage:*",
     "test-ci": "run-s build:* test:*",
     "test:unit": "vitest --run",
-    "test:coverage:c8": "vitest run --coverage --coverage.reportsDirectory ./coverage/tmp --coverage.exclude=test/dist/** test/socket-npm.test.cjs",
+    "test:coverage:c8": "vitest run --coverage --coverage.reportsDirectory ./coverage/tmp --coverage.exclude=test/dist/** test/socket-npm.test.ts",
     "test:coverage:merge": "c8 --reporter=lcov --reporter=text --include 'dist/{module-sync,require}/*.js' --exclude 'dist/require/vendor.js' report",
     "update": "run-p --aggregate-output update:**",
     "update:deps": "npx --yes npm-check-updates"

package.json

@@ -8,14 +8,13 @@ const spawn = require('@npmcli/promise-spawn')
 
 const constants = require('../dist/constants.js')
 
-const { NODE_MODULES, NPM } = constants
+const { CLI, NODE_MODULES, NPM, abortSignal } = constants
 
 const testPath = __dirname
 const npmFixturesPath = path.join(testPath, 'socket-npm-fixtures')
 
 // These aliases are defined in package.json.
-const versions = ['npm8', 'npm10']
-for (const npmDir of versions) {
+for (const npmDir of ['npm8', 'npm10']) {
   const npmPath = path.join(npmFixturesPath, npmDir)
   const npmBinPath = path.join(npmPath, NODE_MODULES, '.bin')
 
@@ -24,13 +23,14 @@ for (const npmDir of versions) {
   )
   spawnSync(NPM, ['install', '--silent'], {
     cwd: npmPath,
+    signal: abortSignal,
     stdio: 'ignore'
   })
   console.log(`End of npm i`)
 
   describe(`Socket npm wrapper for ${npmDir}`, () => {
     // Lazily access constants.rootBinPath.
-    const entryPath = path.join(constants['rootBinPath'], 'cli.js')
+    const entryPath = path.join(constants['rootBinPath'], `${CLI}.js`)
 
     it('should bail on new typosquat', async () => {
       await new Promise<void>((resolve, reject) => {
@@ -43,7 +43,8 @@ for (const npmDir of versions) {
             cwd: path.join(npmFixturesPath, 'lacking-typosquat'),
             env: {
               PATH: `${npmBinPath}:${process.env.PATH}`
-            }
+            },
+            signal: abortSignal
           }
         )
         spawnPromise.process.stdout.on('data', (buffer: Buffer) => {