Fix spinner and colors

Author: jdalton

.config/rollup.base.config.mjs

@@ -23,15 +23,15 @@ import {
 } from '../scripts/utils/packages.js'
 
 const {
-  INLINED_CYCLONEDX_CDXGEN_VERSION,
+  INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION,
   INLINED_SOCKET_CLI_HOMEPAGE,
   INLINED_SOCKET_CLI_LEGACY_BUILD,
   INLINED_SOCKET_CLI_NAME,
   INLINED_SOCKET_CLI_PUBLISHED_BUILD,
   INLINED_SOCKET_CLI_SENTRY_BUILD,
+  INLINED_SOCKET_CLI_SYNP_VERSION,
   INLINED_SOCKET_CLI_VERSION,
   INLINED_SOCKET_CLI_VERSION_HASH,
-  INLINED_SYNP_VERSION,
   NODE_MODULES,
   ROLLUP_EXTERNAL_SUFFIX,
   VITEST,
@@ -195,7 +195,7 @@ export default function baseConfig(extendConfig = {}) {
         preventAssignment: true,
         values: [
           [
-            INLINED_CYCLONEDX_CDXGEN_VERSION,
+            INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION,
             () =>
               JSON.stringify(
                 getRootPkgJsonSync().devDependencies['@cyclonedx/cdxgen'],
@@ -233,6 +233,10 @@ export default function baseConfig(extendConfig = {}) {
                 !!constants.ENV[INLINED_SOCKET_CLI_SENTRY_BUILD],
               ),
           ],
+          [
+            INLINED_SOCKET_CLI_SYNP_VERSION,
+            () => JSON.stringify(getRootPkgJsonSync().devDependencies['synp']),
+          ],
           [
             INLINED_SOCKET_CLI_VERSION,
             () => JSON.stringify(getRootPkgJsonSync().version),
@@ -241,10 +245,6 @@ export default function baseConfig(extendConfig = {}) {
             INLINED_SOCKET_CLI_VERSION_HASH,
             () => JSON.stringify(getSocketCliVersionHash()),
           ],
-          [
-            INLINED_SYNP_VERSION,
-            () => JSON.stringify(getRootPkgJsonSync().devDependencies['synp']),
-          ],
           [
             VITEST,
             () =>

scripts/constants.js

@@ -13,15 +13,16 @@ const {
 } = registryConstants
 
 const CONSTANTS = 'constants'
-const INLINED_CYCLONEDX_CDXGEN_VERSION = 'INLINED_CYCLONEDX_CDXGEN_VERSION'
+const INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION =
+  'INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION'
 const INLINED_SOCKET_CLI_HOMEPAGE = 'INLINED_SOCKET_CLI_HOMEPAGE'
 const INLINED_SOCKET_CLI_LEGACY_BUILD = 'INLINED_SOCKET_CLI_LEGACY_BUILD'
 const INLINED_SOCKET_CLI_NAME = 'INLINED_SOCKET_CLI_NAME'
 const INLINED_SOCKET_CLI_PUBLISHED_BUILD = 'INLINED_SOCKET_CLI_PUBLISHED_BUILD'
 const INLINED_SOCKET_CLI_SENTRY_BUILD = 'INLINED_SOCKET_CLI_SENTRY_BUILD'
+const INLINED_SOCKET_CLI_SYNP_VERSION = 'INLINED_SOCKET_CLI_SYNP_VERSION'
 const INLINED_SOCKET_CLI_VERSION = 'INLINED_SOCKET_CLI_VERSION'
 const INLINED_SOCKET_CLI_VERSION_HASH = 'INLINED_SOCKET_CLI_VERSION_HASH'
-const INLINED_SYNP_VERSION = 'INLINED_SYNP_VERSION'
 const INSTRUMENT_WITH_SENTRY = 'instrument-with-sentry'
 const ROLLUP_EXTERNAL_SUFFIX = '?commonjs-external'
 const SHADOW_NPM_BIN = 'shadow-npm-bin'
@@ -115,15 +116,15 @@ const constants = createConstantsObject(
     ...registryConstantsAttribs.props,
     CONSTANTS,
     ENV: undefined,
-    INLINED_CYCLONEDX_CDXGEN_VERSION,
+    INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION,
     INLINED_SOCKET_CLI_HOMEPAGE,
     INLINED_SOCKET_CLI_LEGACY_BUILD,
     INLINED_SOCKET_CLI_NAME,
     INLINED_SOCKET_CLI_PUBLISHED_BUILD,
     INLINED_SOCKET_CLI_SENTRY_BUILD,
+    INLINED_SOCKET_CLI_SYNP_VERSION,
     INLINED_SOCKET_CLI_VERSION,
     INLINED_SOCKET_CLI_VERSION_HASH,
-    INLINED_SYNP_VERSION,
     INSTRUMENT_WITH_SENTRY,
     ROLLUP_EXTERNAL_SUFFIX,
     SHADOW_NPM_BIN,

src/commands/manifest/run-cdxgen.mts

@@ -67,8 +67,8 @@ export async function runCdxgen(yargvWithYes: any) {
       try {
         await shadowBin(NPX, [
           ...yesArgs,
-          // Lazily access constants.ENV.INLINED_SYNP_VERSION.
-          `synp@${constants.ENV.INLINED_SYNP_VERSION}`,
+          // Lazily access constants.ENV.INLINED_SOCKET_CLI_SYNP_VERSION.
+          `synp@${constants.ENV.INLINED_SOCKET_CLI_SYNP_VERSION}`,
           '--source-file',
           `./${YARN_LOCK}`,
         ])
@@ -79,8 +79,8 @@ export async function runCdxgen(yargvWithYes: any) {
   }
   await shadowBin(NPX, [
     ...yesArgs,
-    // Lazily access constants.ENV.INLINED_CYCLONEDX_CDXGEN_VERSION.
-    `@cyclonedx/cdxgen@${constants.ENV.INLINED_CYCLONEDX_CDXGEN_VERSION}`,
+    // Lazily access constants.ENV.INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION.
+    `@cyclonedx/cdxgen@${constants.ENV.INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION}`,
     ...argvToArray(yargv),
   ])
   if (cleanupPackageLock) {

src/constants.mts

@@ -53,15 +53,15 @@ type ENV = Remap<
       GITHUB_REPOSITORY: string
       GITHUB_SERVER_URL: string
       GITHUB_TOKEN: string
-      INLINED_CYCLONEDX_CDXGEN_VERSION: string
+      INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION: string
       INLINED_SOCKET_CLI_HOMEPAGE: string
       INLINED_SOCKET_CLI_LEGACY_BUILD: string
       INLINED_SOCKET_CLI_NAME: string
       INLINED_SOCKET_CLI_PUBLISHED_BUILD: string
       INLINED_SOCKET_CLI_SENTRY_BUILD: string
       INLINED_SOCKET_CLI_VERSION: string
       INLINED_SOCKET_CLI_VERSION_HASH: string
-      INLINED_SYNP_VERSION: string
+      INLINED_SOCKET_CLI_SYNP_VERSION: string
       LOCALAPPDATA: string
       NODE_COMPILE_CACHE: string
       NODE_EXTRA_CA_CERTS: string
@@ -274,9 +274,9 @@ const LAZY_ENV = () => {
     // https://docs.github.com/en/actions/security-for-github-actions/security-guides/automatic-token-authentication#about-the-github_token-secret
     GITHUB_TOKEN,
     // Comp-time inlined @cyclonedx/cdxgen package version.
-    // The '@rollup/plugin-replace' will replace "process.env['INLINED_CYCLONEDX_CDXGEN_VERSION']".
-    INLINED_CYCLONEDX_CDXGEN_VERSION: envAsString(
-      process.env['INLINED_CYCLONEDX_CDXGEN_VERSION'],
+    // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION']".
+    INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION: envAsString(
+      process.env['INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION'],
     ),
     // Comp-time inlined Socket package homepage.
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_HOMEPAGE']".
@@ -303,6 +303,11 @@ const LAZY_ENV = () => {
     INLINED_SOCKET_CLI_SENTRY_BUILD: envAsBoolean(
       process.env['INLINED_SOCKET_CLI_SENTRY_BUILD'],
     ),
+    // Comp-time inlined synp package version.
+    // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_SYNP_VERSION']".
+    INLINED_SOCKET_CLI_SYNP_VERSION: envAsString(
+      process.env['INLINED_SOCKET_CLI_SYNP_VERSION'],
+    ),
     // Comp-time inlined Socket package version.
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION']".
     INLINED_SOCKET_CLI_VERSION: envAsString(
@@ -313,9 +318,6 @@ const LAZY_ENV = () => {
     INLINED_SOCKET_CLI_VERSION_HASH: envAsString(
       process.env['INLINED_SOCKET_CLI_VERSION_HASH'],
     ),
-    // Comp-time inlined synp package version.
-    // The '@rollup/plugin-replace' will replace "process.env['INLINED_SYNP_VERSION']".
-    INLINED_SYNP_VERSION: envAsString(process.env['INLINED_SYNP_VERSION']),
     // The location of the %localappdata% folder on Windows used to store user-specific,
     // non-roaming application data, like temporary files, cached data, and program
     // settings, that are specific to the current machine and user.
@@ -520,12 +522,15 @@ const lazyProcessEnv = () =>
       Object.entries(constants.ENV).reduce(
         (entries, entry) => {
           const { 0: key, 1: value } = entry
+          if (key.startsWith('INLINED_SOCKET_CLI_')) {
+            return entries
+          }
           if (typeof value === 'string') {
             if (value) {
               entries.push(entry as [string, string])
             }
-          } else if (typeof value === 'boolean') {
-            entries.push([key, value ? '1' : '0'])
+          } else if (typeof value === 'boolean' && value) {
+            entries.push([key, '1'])
           }
           return entries
         },