diff --git a/.github/workflows/_meta-build.yaml b/.github/workflows/_meta-build.yaml index b76e8e4b0..9636d12b4 100644 --- a/.github/workflows/_meta-build.yaml +++ b/.github/workflows/_meta-build.yaml @@ -71,7 +71,7 @@ jobs: uses: actions/checkout@v4.1.1 - name: Download Artifacts - uses: actions/download-artifact@v4.1.2 + uses: actions/download-artifact@v4.1.3 with: name: assembled-frontend-node${{ inputs.node-version-package }} diff --git a/.github/workflows/ci-publish.yaml b/.github/workflows/ci-publish.yaml index 70f03c1c7..dd4feb759 100644 --- a/.github/workflows/ci-publish.yaml +++ b/.github/workflows/ci-publish.yaml @@ -49,7 +49,7 @@ jobs: uses: actions/checkout@v4.1.1 - name: Download Artifacts - uses: actions/download-artifact@v4.1.2 + uses: actions/download-artifact@v4.1.3 with: name: assembled-frontend-node18 diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 4a1216fe6..00c513b3a 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM nginxinc/nginx-unprivileged:1.25.4-alpine@sha256:fe7d09315425216cbadaa6b0308b9fb9dcd0aff76d4018931afdf73976840d09 +FROM nginxinc/nginx-unprivileged:1.25.4-alpine@sha256:c50bd1116f195ac5c10a84c008ced70afec201508433701967e35e565cfb0a6b # Arguments that can be passed at build time ARG COMMIT_SHA=unknown diff --git a/package-lock.json b/package-lock.json index d537c61ba..ba5a4367a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,7 +53,7 @@ "devDependencies": { "@babel/core": "7.23.2", "@babel/eslint-parser": "^7.23.10", - "@cyclonedx/cyclonedx-npm": "^1.8.0", + "@cyclonedx/cyclonedx-npm": "^1.16.1", "@cyclonedx/webpack-plugin": "2.0.0", "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0", "@vue/babel-preset-jsx": "^1.4.0", @@ -61,7 +61,6 @@ "@vue/cli-plugin-eslint": "3.12.1", "@vue/cli-service": "3.12.1", "@vue/runtime-dom": "^3.4.15", - "babel-eslint": "^10.1.0", "copy-webpack-plugin": "5.1.2", "cross-env": "^7.0.3", "eslint": "^8.57.0", @@ -77,8 +76,8 @@ "vue-template-compiler": "2.6.14" }, "engines": { - "node": ">= 8.10.x", - "npm": ">= 5.6.0" + "node": ">= 18", + "npm": ">= 9" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -1989,15 +1988,11 @@ } }, "node_modules/@cyclonedx/cyclonedx-library": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-4.0.0.tgz", - "integrity": "sha512-A+LPqMEG+/9KIE4kPM3Q4LjRMh3c3fbLzA/12p1BtYxSNmwj4gnf+1eZV/JsoqgQJagV8RRttNt+Mkn2SjgVgA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-6.4.0.tgz", + "integrity": "sha512-+fowwJDvglwWdWKYvMxdXyu1P8BUVt8sSSpisyvZjRNq+GOM8A8mop23G+aYWcUTjUrDFD2TnMuyyDfM2XdH1g==", "dev": true, "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jkowalleck" - }, { "type": "individual", "url": "https://owasp.org/donate/?reponame=www-project-cyclonedx&title=OWASP+CycloneDX" @@ -2005,7 +2000,7 @@ ], "dependencies": { "packageurl-js": ">=0.0.6 <0.0.8 || ^1", - "spdx-expression-parse": "^3.0.1" + "spdx-expression-parse": "^3.0.1 || ^4" }, "engines": { "node": ">=14.0.0" @@ -2014,7 +2009,7 @@ "ajv": "^8.12.0", "ajv-formats": "^2.1.1", "ajv-formats-draft2019": "^1.6.1", - "libxmljs2": "^0.31.0 || ^0.32.0", + "libxmljs2": "^0.31 || ^0.32 || ^0.33", "xmlbuilder2": "^3.0.2" } }, @@ -2043,24 +2038,21 @@ "optional": true }, "node_modules/@cyclonedx/cyclonedx-npm": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-npm/-/cyclonedx-npm-1.13.0.tgz", - "integrity": "sha512-Os2qznSMiDaQYsRRrJc1wLtVfjEuS/kDeHY8+tdCb70muYWx1IpPz8ReD74qziQcyoG0x23+QtQKA/zBPDkzBw==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-npm/-/cyclonedx-npm-1.16.1.tgz", + "integrity": "sha512-6FoyLWCe5Ca8Rhbd5o5g08IRvaBFEcoNy6RRglcOVAV2dU+fqsm2tY9woAttpRb81LxW6F17QEmV0CH1LkQtAg==", "dev": true, "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jkowalleck" - }, { "type": "individual", "url": "https://owasp.org/donate/?reponame=www-project-cyclonedx&title=OWASP+CycloneDX" } ], "dependencies": { - "@cyclonedx/cyclonedx-library": "^3||^4", + "@cyclonedx/cyclonedx-library": "^6.1.0", "commander": "^10.0.0", - "normalize-package-data": "^3||^4||^5", + "normalize-package-data": "^3||^4||^5||^6", + "packageurl-js": "^1.2.1", "xmlbuilder2": "^3.0.2" }, "bin": { @@ -2068,7 +2060,7 @@ }, "engines": { "node": ">=14", - "npm": "6 - 9" + "npm": "6 - 10" } }, "node_modules/@cyclonedx/cyclonedx-npm/node_modules/commander": { @@ -2116,6 +2108,12 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@cyclonedx/cyclonedx-npm/node_modules/packageurl-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/packageurl-js/-/packageurl-js-1.2.1.tgz", + "integrity": "sha512-cZ6/MzuXaoFd16/k0WnwtI298UCaDHe/XlSh85SeOKbGZ1hq0xvNbx3ILyCMyk7uFQxl6scF3Aucj6/EO9NwcA==", + "dev": true + }, "node_modules/@cyclonedx/cyclonedx-npm/node_modules/semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", @@ -2623,9 +2621,9 @@ } }, "node_modules/@mapbox/node-pre-gyp/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, "optional": true, "dependencies": { @@ -12881,19 +12879,19 @@ } }, "node_modules/libxmljs2": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.32.0.tgz", - "integrity": "sha512-DuvKfSQZeUzw0A4UWZXfcBpr3VqlcJY1b3aw99PxTiX3T5t1rEO4gSpobNrP9S74LIhyDKaAs/lphuErV+n+7w==", + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.33.0.tgz", + "integrity": "sha512-Hw74f2/3rbpxc6tkTqe3yrs4v2Tx0rEukrYxaNkXSVKK540i2eqlQxzf1jjG+RlwMuv66WxkkuZHM/OQq6km4w==", "dev": true, "hasInstallScript": true, "optional": true, "dependencies": { - "@mapbox/node-pre-gyp": "^1.0.10", + "@mapbox/node-pre-gyp": "^1.0.11", "bindings": "~1.5.0", - "nan": "~2.17.0" + "nan": "~2.18.0" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/lines-and-columns": { @@ -13572,9 +13570,9 @@ } }, "node_modules/nan": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", - "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", "dev": true, "optional": true }, @@ -18269,9 +18267,9 @@ } }, "node_modules/tar": { - "version": "6.1.15", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz", - "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", "dev": true, "optional": true, "dependencies": { @@ -22013,17 +22011,17 @@ } }, "@cyclonedx/cyclonedx-library": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-4.0.0.tgz", - "integrity": "sha512-A+LPqMEG+/9KIE4kPM3Q4LjRMh3c3fbLzA/12p1BtYxSNmwj4gnf+1eZV/JsoqgQJagV8RRttNt+Mkn2SjgVgA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-6.4.0.tgz", + "integrity": "sha512-+fowwJDvglwWdWKYvMxdXyu1P8BUVt8sSSpisyvZjRNq+GOM8A8mop23G+aYWcUTjUrDFD2TnMuyyDfM2XdH1g==", "dev": true, "requires": { "ajv": "^8.12.0", "ajv-formats": "^2.1.1", "ajv-formats-draft2019": "^1.6.1", - "libxmljs2": "^0.31.0 || ^0.32.0", + "libxmljs2": "^0.31 || ^0.32 || ^0.33", "packageurl-js": ">=0.0.6 <0.0.8 || ^1", - "spdx-expression-parse": "^3.0.1", + "spdx-expression-parse": "^3.0.1 || ^4", "xmlbuilder2": "^3.0.2" }, "dependencies": { @@ -22050,14 +22048,15 @@ } }, "@cyclonedx/cyclonedx-npm": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-npm/-/cyclonedx-npm-1.13.0.tgz", - "integrity": "sha512-Os2qznSMiDaQYsRRrJc1wLtVfjEuS/kDeHY8+tdCb70muYWx1IpPz8ReD74qziQcyoG0x23+QtQKA/zBPDkzBw==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-npm/-/cyclonedx-npm-1.16.1.tgz", + "integrity": "sha512-6FoyLWCe5Ca8Rhbd5o5g08IRvaBFEcoNy6RRglcOVAV2dU+fqsm2tY9woAttpRb81LxW6F17QEmV0CH1LkQtAg==", "dev": true, "requires": { - "@cyclonedx/cyclonedx-library": "^3||^4", + "@cyclonedx/cyclonedx-library": "^6.1.0", "commander": "^10.0.0", - "normalize-package-data": "^3||^4||^5", + "normalize-package-data": "^3||^4||^5||^6", + "packageurl-js": "^1.2.1", "xmlbuilder2": "^3.0.2" }, "dependencies": { @@ -22094,6 +22093,12 @@ "validate-npm-package-license": "^3.0.4" } }, + "packageurl-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/packageurl-js/-/packageurl-js-1.2.1.tgz", + "integrity": "sha512-cZ6/MzuXaoFd16/k0WnwtI298UCaDHe/XlSh85SeOKbGZ1hq0xvNbx3ILyCMyk7uFQxl6scF3Aucj6/EO9NwcA==", + "dev": true + }, "semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", @@ -22479,9 +22484,9 @@ } }, "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, "optional": true, "requires": { @@ -30569,15 +30574,15 @@ } }, "libxmljs2": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.32.0.tgz", - "integrity": "sha512-DuvKfSQZeUzw0A4UWZXfcBpr3VqlcJY1b3aw99PxTiX3T5t1rEO4gSpobNrP9S74LIhyDKaAs/lphuErV+n+7w==", + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.33.0.tgz", + "integrity": "sha512-Hw74f2/3rbpxc6tkTqe3yrs4v2Tx0rEukrYxaNkXSVKK540i2eqlQxzf1jjG+RlwMuv66WxkkuZHM/OQq6km4w==", "dev": true, "optional": true, "requires": { - "@mapbox/node-pre-gyp": "^1.0.10", + "@mapbox/node-pre-gyp": "^1.0.11", "bindings": "~1.5.0", - "nan": "~2.17.0" + "nan": "~2.18.0" } }, "lines-and-columns": { @@ -31142,9 +31147,9 @@ } }, "nan": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", - "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", "dev": true, "optional": true }, @@ -34966,9 +34971,9 @@ "dev": true }, "tar": { - "version": "6.1.15", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz", - "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", "dev": true, "optional": true, "requires": { diff --git a/package.json b/package.json index 7211dd7c7..2c4aef942 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "devDependencies": { "@babel/core": "7.23.2", "@babel/eslint-parser": "^7.23.10", - "@cyclonedx/cyclonedx-npm": "^1.8.0", + "@cyclonedx/cyclonedx-npm": "^1.16.1", "@cyclonedx/webpack-plugin": "2.0.0", "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0", "@vue/babel-preset-jsx": "^1.4.0", @@ -96,7 +96,7 @@ "not ie <= 10" ], "engines": { - "node": ">= 8.10.x", - "npm": ">= 5.6.0" + "node": ">= 18", + "npm": ">= 9" } -} +} \ No newline at end of file