Update atom

Signed-off-by: Prabhu Subramanian <[email protected]>
AnsahMohammad · Jan 17, 2025 · 6c22740 · 6c22740
1 parent c41dfe0
commit 6c22740
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 10 deletions.
diff --git a/ci/base-images/cdxgen/Dockerfile.ruby25 b/ci/base-images/cdxgen/Dockerfile.ruby25
@@ -21,6 +21,7 @@ ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
 COPY . /opt/cdxgen
 
 RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy && corepack pnpm cache delete \
+    && npm install -g @appthreat/atom \
     && mkdir -p /opt/cdxgen-node-cache \
     && node /opt/cdxgen/bin/cdxgen.js --help \
     && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \

diff --git a/ci/base-images/cdxgen/debian/Dockerfile.ruby26 b/ci/base-images/cdxgen/debian/Dockerfile.ruby26
@@ -21,6 +21,7 @@ ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
 COPY . /opt/cdxgen
 
 RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy && corepack pnpm cache delete \
+    && npm install -g @appthreat/atom \
     && mkdir -p /opt/cdxgen-node-cache \
     && node /opt/cdxgen/bin/cdxgen.js --help \
     && rbastgen --help \

diff --git a/ci/base-images/cdxgen/debian/Dockerfile.ruby33 b/ci/base-images/cdxgen/debian/Dockerfile.ruby33
@@ -21,6 +21,7 @@ ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
 COPY . /opt/cdxgen
 
 RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy && corepack pnpm cache delete \
+    && npm install -g @appthreat/atom \
     && mkdir -p /opt/cdxgen-node-cache \
     && node /opt/cdxgen/bin/cdxgen.js --help \
     && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \

diff --git a/ci/base-images/cdxgen/debian/Dockerfile.ruby34 b/ci/base-images/cdxgen/debian/Dockerfile.ruby34
@@ -20,6 +20,7 @@ ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
 COPY . /opt/cdxgen
 
 RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy && corepack pnpm cache delete \
+    && npm install -g @appthreat/atom \
     && mkdir -p /opt/cdxgen-node-cache \
     && node /opt/cdxgen/bin/cdxgen.js --help \
     && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \

diff --git a/deno.json b/deno.json
@@ -48,7 +48,7 @@
     "gen-types": "npx -p typescript tsc"
   },
   "imports": {
-    "@appthreat/atom": "npm:@appthreat/[email protected].8",
+    "@appthreat/atom": "npm:@appthreat/[email protected].11",
     "@appthreat/cdx-proto": "npm:@appthreat/[email protected]",
     "@babel/parser": "npm:@babel/parser@^7.26.3",
     "@babel/traverse": "npm:@babel/traverse@^7.26.4",

diff --git a/lib/helpers/envcontext.js b/lib/helpers/envcontext.js
@@ -820,6 +820,9 @@ export function installRubyVersion(rubyVersion, filePath) {
       console.log(
         "Try running the commands `sudo xcode-select --install` followed by `xcodebuild -runFirstLaunch`.",
       );
+      console.log(
+        "TIP: Run the command `brew info ruby` and follow the instructions to set the environment variables sLDFLAGS, CPPFLAGS, and PKG_CONFIG_PATH.",
+      );
     }
     if (process.env?.CDXGEN_IN_CONTAINER === "true") {
       console.log(

diff --git a/package.json b/package.json
@@ -99,7 +99,7 @@
     "@iarna/toml": "2.2.5"
   },
   "optionalDependencies": {
-    "@appthreat/atom": "2.1.8",
+    "@appthreat/atom": "2.1.11",
     "@appthreat/cdx-proto": "1.0.1",
     "@cyclonedx/cdxgen-plugins-bin": "1.6.9",
     "@cyclonedx/cdxgen-plugins-bin-arm": "1.6.9",
@@ -123,7 +123,7 @@
     "typescript": "^5.7.2"
   },
   "pnpm": {
-    "onlyBuiltDependencies": ["sqlite3", "@biomejs/biome", "@appthreat/atom"],
+    "onlyBuiltDependencies": ["sqlite3", "@biomejs/biome"],
     "overrides": {
       "glob": "^11.0.0",
       "node-gyp": "^10.2.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/types/lib/cli/index.d.ts.map b/types/lib/cli/index.d.ts.map
diff --git a/types/lib/helpers/envcontext.d.ts.map b/types/lib/helpers/envcontext.d.ts.map