Cleanup more dependencies

Author: jdalton

.config/rollup.base.config.mjs

@@ -12,16 +12,18 @@ import { purgePolyfills } from 'unplugin-purge-polyfills'
 
 import { isRelative } from '@socketsecurity/registry/lib/path'
 import { escapeRegExp } from '@socketsecurity/registry/lib/regexps'
+import {
+  isValidPackageName,
+  readPackageJsonSync
+} from '@socketsecurity/registry/lib/packages'
 
 import socketModifyPlugin from '../scripts/rollup/socket-modify-plugin.js'
 import {
   getPackageName,
   getPackageNameEnd,
   isEsmId,
   normalizeId,
-  isPackageName,
   isBuiltin,
-  readPackageJsonSync,
   resolveId
 } from '../scripts/utils/packages.js'
 
@@ -106,7 +108,7 @@ export default (extendConfig = {}) => {
         return isAncestorsCjs(resolvedId, parentId)
       }
       const name = getPackageName(id)
-      if (!isPackageName(name) || name === '@babel/runtime') {
+      if (!isValidPackageName(name) || name === '@babel/runtime') {
         return false
       }
       if (isEsmId(resolvedId, parentId)) {
@@ -202,7 +204,7 @@ export default (extendConfig = {}) => {
         replace: ''
       }),
       // Fix incorrectly set "spinners" binding caused by a transpilation bug
-      // https://github.com/sindresorhus/ora/blob/v8.1.0/index.js#L415
+      // https://github.com/sindresorhus/ora/blob/v8.1.1/index.js#L424
       // export {default as spinners} from 'cli-spinners'
       socketModifyPlugin({
         find: /(?<=ora[^.]+\.spinners\s*=\s*)[$\w]+/g,

.config/rollup.dist.config.mjs

@@ -1,13 +1,13 @@
-import { chmodSync, readFileSync, writeFileSync } from 'node:fs'
+import { chmodSync, writeFileSync } from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-import { hasKeys, toSortedObject } from '@socketsecurity/registry/lib/objects'
+import { toSortedObject } from '@socketsecurity/registry/lib/objects'
+import { readPackageJsonSync } from '@socketsecurity/registry/lib/packages'
 
 import baseConfig from './rollup.base.config.mjs'
 import { readJsonSync } from '../scripts/utils/fs.js'
 import { formatObject } from '../scripts/utils/objects.js'
-import { readPackageJsonSync } from '../scripts/utils/packages.js'
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url))
 
@@ -16,8 +16,7 @@ const depStatsPath = path.join(rootPath, '.dep-stats.json')
 const distPath = path.join(rootPath, 'dist')
 const srcPath = path.join(rootPath, 'src')
 
-const pkgJsonPath = path.resolve(rootPath, 'package.json')
-const pkgJson = readPackageJsonSync(pkgJsonPath)
+const editablePkgJson = readPackageJsonSync(rootPath, { editable: true })
 
 export default () => {
   const config = baseConfig({
@@ -40,6 +39,7 @@ export default () => {
     plugins: [
       {
         writeBundle() {
+          const { content: pkgJson } = editablePkgJson
           const { '@cyclonedx/cdxgen': cdxgenRange, synp: synpRange } =
             pkgJson.dependencies
           const { depStats } = config.meta
@@ -71,28 +71,19 @@ export default () => {
 
           // Write dep stats
           writeFileSync(depStatsPath, `${formatObject(depStats)}\n`, 'utf8')
-
           // Make dist files chmod +x
           chmodSync(path.join(distPath, 'cli.js'), 0o755)
           chmodSync(path.join(distPath, 'npm-cli.js'), 0o755)
           chmodSync(path.join(distPath, 'npx-cli.js'), 0o755)
-
           // Update dependencies with additional inlined modules
-          writeFileSync(
-            pkgJsonPath,
-            readFileSync(pkgJsonPath, 'utf8').replace(
-              /(?<="dependencies":\s*)\{[^\}]*\}/,
-              () => {
-                const deps = {
-                  ...depStats.dependencies,
-                  ...depStats.transitives
-                }
-                const formatted = formatObject(deps, 4)
-                return hasKeys(deps) ? formatted.replace('}', '  }') : formatted
+          editablePkgJson
+            .update({
+              dependencies: {
+                ...depStats.dependencies,
+                ...depStats.transitives
               }
-            ),
-            'utf8'
-          )
+            })
+            .saveSync()
         }
       }
     ]

.dep-stats.json

@@ -6,7 +6,7 @@
     "@npmcli/promise-spawn": "^8.0.2",
     "@socketregistry/hyrious__bun.lockb": "1.0.4",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.22",
+    "@socketsecurity/registry": "^1.0.25",
     "@socketsecurity/sdk": "^1.3.0",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",
@@ -64,7 +64,7 @@
     "@npmcli/promise-spawn": "^8.0.2",
     "@socketregistry/hyrious__bun.lockb": "1.0.4",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.22",
+    "@socketsecurity/registry": "^1.0.25",
     "@socketsecurity/sdk": "^1.3.0",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",

package-lock.json

@@ -45,7 +45,7 @@
     "@npmcli/promise-spawn": "^8.0.2",
     "@socketregistry/hyrious__bun.lockb": "1.0.4",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.22",
+    "@socketsecurity/registry": "^1.0.25",
     "@socketsecurity/sdk": "^1.3.0",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",
@@ -115,7 +115,6 @@
     "meow": "^13.2.0",
     "mock-fs": "^5.4.1",
     "nock": "^13.5.5",
-    "normalize-package-data": "^7.0.0",
     "npm-run-all2": "^7.0.1",
     "open": "^10.1.0",
     "ora": "^8.1.1",
@@ -130,8 +129,7 @@
     "type-coverage": "^2.29.7",
     "typescript": "5.4.5",
     "typescript-eslint": "^8.13.0",
-    "unplugin-purge-polyfills": "^0.0.7",
-    "validate-npm-package-name": "^6.0.0"
+    "unplugin-purge-polyfills": "^0.0.7"
   },
   "overrides": {
     "aggregate-error": "npm:@socketregistry/aggregate-error@^1",

package.json

@@ -5,9 +5,7 @@ const Module = require('node:module')
 const path = require('node:path')
 const vm = require('node:vm')
 
-const normalizePackageData = require('normalize-package-data')
-const validatePackageName = require('validate-npm-package-name')
-
+const { isValidPackageName } = require('@socketsecurity/registry/lib/packages')
 const {
   isRelative,
   normalizePath
@@ -17,8 +15,6 @@ const { findUpSync } = require('./fs')
 
 const { createRequire, isBuiltin } = Module
 
-const PACKAGE_JSON = 'package.json'
-
 // eslint-disable-next-line no-control-regex
 const cjsPluginPrefixRegExp = /^\x00/
 const cjsPluginSuffixRegExp =
@@ -65,17 +61,13 @@ function resolveId(id_, req = require) {
   if (resolvedId === undefined) {
     resolvedId = id
   }
-  if (isPackageName(id)) {
+  if (isValidPackageName(id)) {
     return resolvedId
   }
   const tsId = `${resolvedId}.ts`
   return fs.existsSync(tsId) ? tsId : resolvedId
 }
 
-function isPackageName(id) {
-  return validatePackageName(id).validForOldPackages
-}
-
 function isEsmId(id_, parentId_) {
   if (isBuiltin(id_)) {
     return false
@@ -131,26 +123,11 @@ function normalizeId(id) {
     .replace(cjsPluginSuffixRegExp, '')
 }
 
-function normalizePackageJson(pkgJson) {
-  normalizePackageData(pkgJson)
-  return pkgJson
-}
-
-function readPackageJsonSync(filepath_) {
-  const filepath = filepath_.endsWith(PACKAGE_JSON)
-    ? filepath_
-    : path.join(filepath_, PACKAGE_JSON)
-  return normalizePackageJson(JSON.parse(fs.readFileSync(filepath, 'utf8')))
-}
-
 module.exports = {
   isBuiltin,
   isEsmId,
-  isPackageName,
   getPackageName,
   getPackageNameEnd,
   normalizeId,
-  normalizePackageJson,
-  readPackageJsonSync,
   resolveId
 }

scripts/utils/packages.js

@@ -15,7 +15,10 @@ import {
   isObject,
   toSortedObject
 } from '@socketsecurity/registry/lib/objects'
-import { fetchPackageManifest, readPackageJson } from '@socketsecurity/registry/lib/packages'
+import {
+  fetchPackageManifest,
+  readPackageJson
+} from '@socketsecurity/registry/lib/packages'
 import { pEach } from '@socketsecurity/registry/lib/promises'
 import { escapeRegExp } from '@socketsecurity/registry/lib/regexps'
 import { isNonEmptyString } from '@socketsecurity/registry/lib/strings'