have libs as bundled packages

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

.eslintrc.js

@@ -29,6 +29,9 @@ module.exports = {
   parserOptions: {
     project: './tsconfig.json'
   },
+  ignorePatterns: [
+    'packages'
+  ],
   env: {
     node: true,
     browser: true

.github/workflows/nodejs.yml

@@ -106,3 +106,5 @@ jobs:
         run: npm run test:node
   # test-web:
     # TODO via https://github.com/CycloneDX/cyclonedx-javascript-library/issues/51
+
+# TODO test for packages - maybe just `npm ci && npm test` in a matrix?

.mocharc.js

@@ -26,7 +26,6 @@ Copyright (c) OWASP Foundation. All Rights Reserved.
 module.exports = {
   spec: [
     'tests',
-    'libs'
   ],
   recursive: true,
   parallel: false, // if true, then some IDEs cannot run it

.npmignore

@@ -170,5 +170,7 @@ dist
 
 /examples/
 
+/packages/
+
 /reports/
 /CI_reports/

package.json

@@ -37,7 +37,11 @@
   "engines": {
     "node": ">=14.0.0"
   },
+  "bundleDependencies": [
+    "@cyclonedx/cyclonedx-library-universal-node-xml"
+  ],
   "dependencies": {
+    "@cyclonedx/cyclonedx-library-universal-node-xml": "file:packages/universal-node-xml",
     "packageurl-js": "^0.0.6"
   },
   "optionalDependencies": {

packages/universal-node-xml/package.json

@@ -0,0 +1,39 @@
+{
+  "name": "@cyclonedx/cyclonedx-library-universal-node-xml",
+  "description": "Universal XML lib",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/CycloneDX/cyclonedx-javascript-library"
+  },
+  "bugs": {
+    "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues"
+  },
+  "license": "Apache-2.0",
+  "author": {
+    "name": "Jan Kowalleck",
+    "email": "jan.kowalleck@gmail.com"
+  },
+  "contributors": [
+    {
+      "name": "Jan Kowalleck",
+      "email": "jan.kowalleck@gmail.com"
+    }
+  ],
+  "type": "commonjs",
+  "optionalDependencies": {
+    "xmlbuilder2": "^3.0.2"
+  },
+  "devDependencies": {
+    "xmlbuilder2": "^3.0.2"
+  },
+  "types": "./index.d.ts",
+  "main": "./index.js",
+  "exports": "./index.js",
+  "files": [
+    "index.*",
+    "stringifiers/*.js",
+    "!stringifiers/*.spec.js",
+    "!stringifiers/*.test.js"
+  ]
+}

src/serialize/xmlSerializer.node.ts

@@ -20,7 +20,7 @@ Copyright (c) OWASP Foundation. All Rights Reserved.
 import { SerializerOptions } from './types'
 import { XmlBaseSerializer } from './xmlBaseSerializer'
 import { SimpleXml } from './xml/types'
-import { stringifyFallback } from '../../libs/universal-node-xml'
+import { stringifyFallback } from '@cyclonedx/cyclonedx-library-universal-node-xml'
 
 /**
  * XML serializer for node.