From 6b7f876b401127b4abf1699ee0aec66f49163b5c Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Tue, 30 Apr 2024 11:21:48 +0100 Subject: [PATCH 1/2] fozzie-components@7.56.2 - More package updates --- packages/tools/f-vue-icons/package.json | 1 - packages/tools/fozzie/package.json | 2 +- .../fozzie/src/test/scss/scss-setup.spec.js | 4 +- .../fozzie/src/utilities/getSubdirectories.js | 4 +- yarn.lock | 53 ++++++++++--------- 5 files changed, 34 insertions(+), 30 deletions(-) diff --git a/packages/tools/f-vue-icons/package.json b/packages/tools/f-vue-icons/package.json index 9a1a75f227..598eb95a8f 100644 --- a/packages/tools/f-vue-icons/package.json +++ b/packages/tools/f-vue-icons/package.json @@ -60,7 +60,6 @@ "@rollup/plugin-node-resolve": "15.1.0", "fs-extra": "9.0.1", "lodash.kebabcase": "4.1.1", - "marked": "2.0.0", "pascal-case": "3.1.2", "prismjs": "1.27.0", "rollup": "3.20.2" diff --git a/packages/tools/fozzie/package.json b/packages/tools/fozzie/package.json index 4cefc746f4..d24d5e6267 100644 --- a/packages/tools/fozzie/package.json +++ b/packages/tools/fozzie/package.json @@ -56,7 +56,7 @@ "eslint": "8.26.0", "eslint-plugin-import": "2.26.0", "fontfaceobserver": "2.3.0", - "glob": "8.0.3", + "glob": "9.0.0", "jest": "29.7.0", "jest-environment-jsdom": "29.7.0", "postcss": "8.4.31", diff --git a/packages/tools/fozzie/src/test/scss/scss-setup.spec.js b/packages/tools/fozzie/src/test/scss/scss-setup.spec.js index 34bffcb698..e661e0c456 100644 --- a/packages/tools/fozzie/src/test/scss/scss-setup.spec.js +++ b/packages/tools/fozzie/src/test/scss/scss-setup.spec.js @@ -8,7 +8,7 @@ const path = require('path'); const sassTrue = require('sass-true'); -const glob = require('glob'); +const { globSync } = require('glob'); describe('SCSS', () => { // All Scss unit tests should follow this naming convention @@ -16,7 +16,7 @@ describe('SCSS', () => { const testFilePathGlob = path.resolve(process.cwd(), testFileGlob); // Find all of the Scss files that end in `*.spec.scss` in any directory of this project - const scssTestFiles = glob.sync(testFilePathGlob); + const scssTestFiles = globSync(testFilePathGlob); // Run True on every file found with the describe and it methods provided scssTestFiles.forEach(file => sassTrue.runSass({ file, includePaths: ['node_modules'] }, { describe, it })); diff --git a/packages/tools/fozzie/src/utilities/getSubdirectories.js b/packages/tools/fozzie/src/utilities/getSubdirectories.js index 230c89f786..29f6d220f7 100644 --- a/packages/tools/fozzie/src/utilities/getSubdirectories.js +++ b/packages/tools/fozzie/src/utilities/getSubdirectories.js @@ -1,11 +1,11 @@ -const glob = require('glob'); +const { globSync } = require('glob'); /** * Get all subdirectory paths for a given source * @param {string} src - The source to search from for subdirectories * @returns {string[]} - An array of all subdirectory paths */ -const getAllSubdirectoryPaths = src => glob.sync(`${src}/**/`); +const getAllSubdirectoryPaths = src => globSync(`${src}/**/`); module.exports = { getAllSubdirectoryPaths diff --git a/yarn.lock b/yarn.lock index 1e711666aa..775ad316b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4537,7 +4537,6 @@ __metadata: "@rollup/plugin-node-resolve": 15.1.0 fs-extra: 9.0.1 lodash.kebabcase: 4.1.1 - marked: 2.0.0 pascal-case: 3.1.2 prismjs: 1.27.0 rollup: 3.20.2 @@ -4586,7 +4585,7 @@ __metadata: eslint: 8.26.0 eslint-plugin-import: 2.26.0 fontfaceobserver: 2.3.0 - glob: 8.0.3 + glob: 9.0.0 include-media: 2.0.0 jest: 29.7.0 jest-environment-jsdom: 29.7.0 @@ -18284,29 +18283,28 @@ __metadata: languageName: node linkType: hard -"glob@npm:8.0.3": - version: 8.0.3 - resolution: "glob@npm:8.0.3" +"glob@npm:8.1.0, glob@npm:^8.0.3": + version: 8.1.0 + resolution: "glob@npm:8.1.0" dependencies: fs.realpath: ^1.0.0 inflight: ^1.0.4 inherits: 2 minimatch: ^5.0.1 once: ^1.3.0 - checksum: 50bcdea19d8e79d8de5f460b1939ffc2b3299eac28deb502093fdca22a78efebc03e66bf54f0abc3d3d07d8134d19a32850288b7440d77e072aa55f9d33b18c5 + checksum: 92fbea3221a7d12075f26f0227abac435de868dd0736a17170663783296d0dd8d3d532a5672b4488a439bf5d7fb85cdd07c11185d6cd39184f0385cbdfb86a47 languageName: node linkType: hard -"glob@npm:8.1.0, glob@npm:^8.0.3": - version: 8.1.0 - resolution: "glob@npm:8.1.0" +"glob@npm:9.0.0": + version: 9.0.0 + resolution: "glob@npm:9.0.0" dependencies: fs.realpath: ^1.0.0 - inflight: ^1.0.4 - inherits: 2 - minimatch: ^5.0.1 - once: ^1.3.0 - checksum: 92fbea3221a7d12075f26f0227abac435de868dd0736a17170663783296d0dd8d3d532a5672b4488a439bf5d7fb85cdd07c11185d6cd39184f0385cbdfb86a47 + minimatch: ^7.3.0 + minipass: ^4.2.4 + path-scurry: ^1.5.0 + checksum: a26e06d253d19ee6889a6dc67e0a456d23b13ae197d1cd945961bbba5166ce9bd46db0bc49324a6da9003217a8fe8b2052dbc35c0e97dbba61db67c87a8d03f7 languageName: node linkType: hard @@ -24000,15 +23998,6 @@ __metadata: languageName: node linkType: hard -"marked@npm:2.0.0": - version: 2.0.0 - resolution: "marked@npm:2.0.0" - bin: - marked: bin/marked - checksum: 80eadb93340cd043b69c1c7ce95836f0f2cb0355121dbd4b4189b6efb7559884e719eaf5cd9300ca51679f54a4f3d8388bc8e7ca0fd0da76619c4f238e72e1ea - languageName: node - linkType: hard - "marky@npm:^1.2.2": version: 1.2.5 resolution: "marky@npm:1.2.5" @@ -24537,6 +24526,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:^7.3.0": + version: 7.4.6 + resolution: "minimatch@npm:7.4.6" + dependencies: + brace-expansion: ^2.0.1 + checksum: 1a6c8d22618df9d2a88aabeef1de5622eb7b558e9f8010be791cb6b0fa6e102d39b11c28d75b855a1e377b12edc7db8ff12a99c20353441caa6a05e78deb5da9 + languageName: node + linkType: hard + "minimatch@npm:^9.0.1, minimatch@npm:^9.0.3": version: 9.0.4 resolution: "minimatch@npm:9.0.4" @@ -24669,6 +24667,13 @@ __metadata: languageName: node linkType: hard +"minipass@npm:^4.2.4": + version: 4.2.8 + resolution: "minipass@npm:4.2.8" + checksum: 7f4914d5295a9a30807cae5227a37a926e6d910c03f315930fde52332cf0575dfbc20295318f91f0baf0e6bb11a6f668e30cde8027dea7a11b9d159867a3c830 + languageName: node + linkType: hard + "minipass@npm:^5.0.0": version: 5.0.0 resolution: "minipass@npm:5.0.0" @@ -26674,7 +26679,7 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^1.10.2": +"path-scurry@npm:^1.10.2, path-scurry@npm:^1.5.0": version: 1.10.2 resolution: "path-scurry@npm:1.10.2" dependencies: From 3dc47c21b3ecade3c71f5c902facb751911026b5 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Tue, 30 Apr 2024 12:29:48 +0100 Subject: [PATCH 2/2] Package updates --- packages/tools/f-vue-icons/CHANGELOG.md | 8 +++++++- packages/tools/f-vue-icons/package.json | 2 +- packages/tools/fozzie/CHANGELOG.md | 11 ++++++++--- packages/tools/fozzie/package.json | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/packages/tools/f-vue-icons/CHANGELOG.md b/packages/tools/f-vue-icons/CHANGELOG.md index ef33a2d4fa..4b60c99fc1 100644 --- a/packages/tools/f-vue-icons/CHANGELOG.md +++ b/packages/tools/f-vue-icons/CHANGELOG.md @@ -3,6 +3,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) +## v3.14.1 +_April 30, 2024_ + +### Removed +- Unused `marked` dependency. + + ## v3.14.0 _March 13, 2024_ @@ -12,7 +19,6 @@ _March 13, 2024_ - node engines in `package.json` to include all versions above 14 - Replaced vulnerable `bili` package with rollup for generating icons - bumped vulnerable `marked` package (snyk vulnerability) -- ## v3.13.1 diff --git a/packages/tools/f-vue-icons/package.json b/packages/tools/f-vue-icons/package.json index 598eb95a8f..c40561c88f 100644 --- a/packages/tools/f-vue-icons/package.json +++ b/packages/tools/f-vue-icons/package.json @@ -1,6 +1,6 @@ { "name": "@justeat/f-vue-icons", - "version": "3.14.0", + "version": "3.14.1", "main": "dist/index.cjs", "maxBundleSize": "155kB", "module": "esm/index.mjs", diff --git a/packages/tools/fozzie/CHANGELOG.md b/packages/tools/fozzie/CHANGELOG.md index c8a2f8362b..b5a301d64f 100644 --- a/packages/tools/fozzie/CHANGELOG.md +++ b/packages/tools/fozzie/CHANGELOG.md @@ -3,12 +3,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) -## v11.2.1 - -_April 10, 2024_ +## v11.2.2 +_April 30, 2024_ ### Changed +- Update `glob` to v9. + +## v11.2.1 +_April 26, 2024_ + +### Changed - Update `jest` to latest version. diff --git a/packages/tools/fozzie/package.json b/packages/tools/fozzie/package.json index d24d5e6267..4ab5c53816 100644 --- a/packages/tools/fozzie/package.json +++ b/packages/tools/fozzie/package.json @@ -2,7 +2,7 @@ "name": "@justeat/fozzie", "title": "Fozzie – Just Eat UI Web Framework", "description": "UI Web Framework for the Just Eat Global Platform", - "version": "11.2.1", + "version": "11.2.2", "main": "dist/js/index.js", "files": [ "dist/js",