Merge branch 'main' into add-sbom

Author: pvdz

.dep-stats.json

@@ -8,8 +8,9 @@
     "@socketregistry/indent-string": "^1.0.9",
     "@socketregistry/is-interactive": "^1.0.1",
     "@socketregistry/is-unicode-supported": "^1.0.0",
+    "@socketregistry/packageurl-js": "^1.0.2",
     "@socketsecurity/config": "^2.1.3",
-    "@socketsecurity/registry": "^1.0.82",
+    "@socketsecurity/registry": "^1.0.85",
     "@socketsecurity/sdk": "^1.4.5",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",

.gitignore

@@ -4,15 +4,14 @@ Thumbs.db
 /.env
 /.nvm
 /.tap
+/.type-coverage
 /.vscode
 /coverage
 /npm-debug.log
 **/dist
-**/dist-legacy
 **/node_modules
 /*.tsbuildinfo
 *.d.ts
 *.d.ts.map
 
 !/.vscode/extensions.json
-/test/socket-npm-fixtures/**/node_modules/

.husky/pre-commit

@@ -1 +1,11 @@
-npm test
+if [ -z "${DISABLE_PRECOMMIT_LINT}" ]; then
+  npm run lint-staged
+else
+  echo "Skipping lint due to DISABLE_PRECOMMIT_LINT env var"
+fi
+
+if [ -z "${DISABLE_PRECOMMIT_TEST}" ]; then
+  npm test
+else
+  echo "Skipping testing due to DISABLE_PRECOMMIT_TEST env var"
+fi

.oxlintignore

@@ -0,0 +1 @@
+package-lock.json

.prettierignore

@@ -0,0 +1,47 @@
+{
+  "$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
+  "files": {
+    "ignore": [
+      "**/.*",
+      "**/coverage",
+      "**/dist",
+      "**/package.json",
+      "**/package-lock.json"
+    ],
+    "maxSize": 5242880
+  },
+  "formatter": {
+    "enabled": true,
+    "attributePosition": "auto",
+    "bracketSpacing": true,
+    "formatWithErrors": false,
+    "indentStyle": "space",
+    "indentWidth": 2,
+    "lineEnding": "lf",
+    "lineWidth": 80,
+    "useEditorconfig": true
+  },
+  "javascript": {
+    "formatter": {
+      "arrowParentheses": "asNeeded",
+      "attributePosition": "auto",
+      "bracketSameLine": false,
+      "bracketSpacing": true,
+      "jsxQuoteStyle": "double",
+      "quoteProperties": "asNeeded",
+      "quoteStyle": "single",
+      "semicolons": "asNeeded",
+      "trailingCommas": "none"
+    }
+  },
+  "json": {
+    "formatter": {
+      "enabled": true,
+      "trailingCommas": "none"
+    },
+    "parser": {
+      "allowComments": true,
+      "allowTrailingCommas": true
+    }
+  }
+}

.prettierrc

@@ -2,7 +2,10 @@
 
 const path = require('node:path')
 
-const { includeIgnoreFile } = require('@eslint/compat')
+const {
+  convertIgnorePatternToMinimatch,
+  includeIgnoreFile
+} = require('@eslint/compat')
 const js = require('@eslint/js')
 const tsParser = require('@typescript-eslint/parser')
 const { createOxcImportResolver } = require('eslint-import-resolver-oxc')
@@ -13,15 +16,17 @@ const unicornPlugin = require('eslint-plugin-unicorn')
 const tsEslint = require('typescript-eslint')
 
 const constants = require('@socketsecurity/registry/lib/constants')
-const { GIT_IGNORE, LATEST, PRETTIER_IGNORE, TSCONFIG_JSON } = constants
+const { BIOME_JSON, GIT_IGNORE, LATEST, TSCONFIG_JSON } = constants
 
 const { flatConfigs: origImportXFlatConfigs } = importXPlugin
 
 const rootPath = __dirname
 const rootTsConfigPath = path.join(rootPath, TSCONFIG_JSON)
 
+const biomeConfigPath = path.join(rootPath, BIOME_JSON)
 const gitignorePath = path.join(rootPath, GIT_IGNORE)
-const prettierignorePath = path.join(rootPath, PRETTIER_IGNORE)
+
+const biomeConfig = require(biomeConfigPath)
 
 const sharedPlugins = {
   'sort-destructure-keys': sortDestructureKeysPlugin,
@@ -112,7 +117,10 @@ const importFlatConfigsForModule = getImportXFlatConfigs(true)
 
 module.exports = [
   includeIgnoreFile(gitignorePath),
-  includeIgnoreFile(prettierignorePath),
+  {
+    name: 'Imported biome.json ignore patterns',
+    ignores: biomeConfig.files.ignore.map(convertIgnorePatternToMinimatch)
+  },
   {
     files: ['**/*.{c,}js'],
     ...importFlatConfigsForScript.recommended