Bundle registry package (#466)

Author: jdalton

.config/rollup.base.config.mjs

@@ -49,6 +49,8 @@ export const EXTERNAL_PACKAGES = [
   'blessed-contrib'
 ]
 
+export const BUNDLED_PACKAGES = EXTERNAL_PACKAGES.slice()
+
 const builtinAliases = builtinModules.reduce((o, n) => {
   o[n] = `node:${n}`
   return o
@@ -309,7 +311,7 @@ export default function baseConfig(extendConfig = {}) {
       }),
       // Replace requires like require('blessed/lib/widgets/screen') with
       // require('../blessed/lib/widgets/screen').
-      ...[/*'@socketsecurity/registry',*/ 'blessed', 'blessed-contrib'].map(n => {
+      ...BUNDLED_PACKAGES.map(n => {
         const requiresRegExp = new RegExp(
           `(?<=require\\(["'])${escapeRegExp(n)}(?:=(?:\\/[^"']+)?["']\\))`,
           'g'

.config/rollup.dist.config.mjs

@@ -14,7 +14,7 @@ import {
 } from '@socketsecurity/registry/lib/packages'
 import { naturalCompare } from '@socketsecurity/registry/lib/sorts'
 
-import baseConfig from './rollup.base.config.mjs'
+import baseConfig, { BUNDLED_PACKAGES } from './rollup.base.config.mjs'
 import constants from '../scripts/constants.js'
 
 const {
@@ -55,19 +55,21 @@ async function copyPackage(pkgName) {
   // Add 'use strict' directive to js files.
   const jsFiles = await tinyGlob(['**/*.js'], {
     absolute: true,
-    cwd: pkgDestPath
+    cwd: pkgDestPath,
+    ignore: ['node_modules/**']
   })
   await Promise.all(
     jsFiles.map(async p => {
       const content = await fs.readFile(p, 'utf8')
       // Start by trimming the hashbang.
-      const hashbang = /^#!.*(?=\r?\n|$)/.exec(content)?.[0] ?? ''
+      const hashbang = /^#!.*(?:\r?\n)*/.exec(content)?.[0] ?? ''
       let trimmed = content.slice(hashbang.length).trimStart()
       // Then, trim "use strict" directive.
-      const useStrict = /^(['"])use strict\1/.exec(trimmed)?.[0] ?? ''
+      const useStrict =
+        /^(['"])use strict\1;?(?:\r?\n)*/.exec(trimmed)?.[0] ?? ''
       trimmed = trimmed.slice(useStrict.length).trimStart()
       // Add back hashbang and add "use strict" directive.
-      const modded = `${hashbang}${os.EOL}${useStrict ?? "'use strict'"}${os.EOL}${trimmed}`
+      const modded = `${hashbang.trim()}${hashbang ? os.EOL : ''}${useStrict.trim() || "'use strict'"}${os.EOL}${os.EOL}${trimmed}`
       await fs.writeFile(p, modded, 'utf8')
     })
   )
@@ -81,6 +83,38 @@ async function getSentryManifest() {
   return _sentryManifest
 }
 
+async function removeDirs(srcPath, options) {
+  const { exclude } = { __proto__: null, ...options }
+  const ignore = Array.isArray(exclude) ? exclude : exclude ? [exclude] : []
+  return Promise.all([
+    (
+      await tinyGlob(['**/*'], {
+        absolute: true,
+        onlyDirectories: true,
+        cwd: srcPath,
+        dot: true,
+        ignore
+      })
+    ).map(p => remove(p))
+  ])
+}
+
+async function removeFiles(srcPath, options) {
+  const { exclude } = { __proto__: null, ...options }
+  const ignore = Array.isArray(exclude) ? exclude : exclude ? [exclude] : []
+  return Promise.all([
+    (
+      await tinyGlob(['**/*'], {
+        absolute: true,
+        onlyFiles: true,
+        cwd: srcPath,
+        dot: true,
+        ignore
+      })
+    ).map(p => remove(p))
+  ])
+}
+
 function resetBin(bin) {
   const tmpBin = {
     [SOCKET_CLI_BIN_NAME]:
@@ -216,10 +250,8 @@ export default () =>
         async writeBundle() {
           await Promise.all([
             copyInitGradle(),
-            // copyPackage('@socketsecurity/registry'),
-            copyPackage('blessed'),
-            copyPackage('blessed-contrib'),
-            updatePackageJson()
+            updatePackageJson(),
+            ...BUNDLED_PACKAGES.map(n => copyPackage(n))
           ])
 
           const blessedDestPath = path.join(rootDistPath, 'blessed')
@@ -235,55 +267,29 @@ export default () =>
             rootDistPath,
             'blessed-contrib'
           )
-          const blessedContribIgnore = ['lib/**', 'node_modules/**', 'LICENSE*']
+          const blessedContribIgnore = [
+            'lib/**',
+            'node_modules/**',
+            'index.d.ts',
+            'LICENSE*'
+          ]
 
           // Remove directories.
           await Promise.all([
-            // Remove directories from 'blessed'.
-            ...(
-              await tinyGlob(['**/*'], {
-                absolute: true,
-                onlyDirectories: true,
-                cwd: blessedDestPath,
-                dot: true,
-                ignore: blessedIgnore
-              })
-            ).map(p => remove(p)),
-            // Remove directories from 'contrib'.
-            ...(
-              await tinyGlob(['**/*'], {
-                absolute: true,
-                onlyDirectories: true,
-                cwd: blessedContribDestPath,
-                dot: true,
-                ignore: blessedContribIgnore
-              })
-            ).map(p => remove(p))
+            removeDirs(blessedDestPath, { exclude: blessedIgnore }),
+            removeDirs(blessedContribDestPath, {
+              exclude: blessedContribIgnore
+            })
           ])
 
           // Remove files.
           await Promise.all([
-            // Remove files from 'blessed'.
-            ...(
-              await tinyGlob(['**/*'], {
-                absolute: true,
-                cwd: blessedDestPath,
-                dot: true,
-                ignore: blessedIgnore
-              })
-            ).map(p => remove(p)),
-            // Remove files from 'blessed-contrib'.
-            ...(
-              await tinyGlob(['**/*'], {
-                absolute: true,
-                cwd: blessedContribDestPath,
-                dot: true,
-                ignore: blessedContribIgnore
-              })
-            ).map(p => remove(p))
+            removeFiles(blessedDestPath, { exclude: blessedIgnore }),
+            removeFiles(blessedContribDestPath, {
+              exclude: blessedContribIgnore
+            })
           ])
 
-          await Promise.all([])
           // Rewire 'blessed' inside 'blessed-contrib'.
           await Promise.all([
             ...(

.oxlintrc.json

@@ -23,6 +23,7 @@
     "no-unused-vars": "off",
     "no-var": "error",
     "unicorn/no-empty-file": "off",
-    "unicorn/no-new-array": "off"
+    "unicorn/no-new-array": "off",
+    "unicorn/prefer-string-starts-ends-with": "off"
   }
 }

bin/cli.js

@@ -3,8 +3,7 @@
 
 const process = require('node:process')
 
-const { spawn } = require('@socketsecurity/registry/lib/spawn')
-
+const { spawn } = require('../dist/@socketsecurity/registry/lib/spawn')
 const constants = require('../dist/constants')
 
 const { INLINED_SOCKET_CLI_SENTRY_BUILD } = constants

package-lock.json

@@ -67,9 +67,6 @@
     "update": "run-p --aggregate-output update:**",
     "update:deps": "npx --yes npm-check-updates"
   },
-  "dependencies": {
-    "@socketsecurity/registry": "1.0.153"
-  },
   "devDependencies": {
     "@babel/core": "7.26.10",
     "@babel/plugin-proposal-export-default-from": "7.25.9",
@@ -102,6 +99,7 @@
     "@socketregistry/is-interactive": "1.0.5",
     "@socketregistry/packageurl-js": "1.0.6",
     "@socketsecurity/config": "2.1.3",
+    "@socketsecurity/registry": "1.0.153",
     "@socketsecurity/sdk": "1.4.28",
     "@types/blessed": "0.1.25",
     "@types/cmd-shim": "5.0.2",