From 2253a56b4ef57b3fc754b5d8c8b5df6d6cca001a Mon Sep 17 00:00:00 2001 From: jorenbroekema Date: Fri, 28 Jun 2024 15:23:41 +0200 Subject: [PATCH] chore: format changelog and type error after rebase --- CHANGELOG.md | 18 +++++++----------- lib/utils/combineJSON.js | 1 - package-lock.json | 34 +++++++++++++++++----------------- 3 files changed, 24 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fcea04a8..1ddf60bee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -926,32 +926,28 @@ All notable changes to this project will be documented in this file. See [standa ### [3.9.2](https://github.com/amzn/style-dictionary/compare/v3.9.1...v3.9.2) (2024-01-17) - ### Bug Fixes -* regression, glob to return posix style paths ([#1085](https://github.com/amzn/style-dictionary/issues/1085)) ([473ca82](https://github.com/amzn/style-dictionary/commit/473ca82f94993ef9a522680bf06ab15b972e7af4)) +- regression, glob to return posix style paths ([#1085](https://github.com/amzn/style-dictionary/issues/1085)) ([473ca82](https://github.com/amzn/style-dictionary/commit/473ca82f94993ef9a522680bf06ab15b972e7af4)) ### [3.9.1](https://github.com/amzn/style-dictionary/compare/v3.9.0...v3.9.1) (2023-12-07) - ### Bug Fixes -* allow falsy token values for outputReferences, e.g. 0 ([83a9934](https://github.com/amzn/style-dictionary/commit/83a9934c4bda0bfe6ba711b92ddee6a064dfb0e5)) -* types for FormatHelpers.LineFormatting to add commentPosition ([fcce1d4](https://github.com/amzn/style-dictionary/commit/fcce1d45e9f879703b26db0dd281a338bb6db988)) +- allow falsy token values for outputReferences, e.g. 0 ([83a9934](https://github.com/amzn/style-dictionary/commit/83a9934c4bda0bfe6ba711b92ddee6a064dfb0e5)) +- types for FormatHelpers.LineFormatting to add commentPosition ([fcce1d4](https://github.com/amzn/style-dictionary/commit/fcce1d45e9f879703b26db0dd281a338bb6db988)) ## [3.9.0](https://github.com/amzn/style-dictionary/compare/v3.8.0...v3.9.0) (2023-10-23) - ### Features -* allow overriding formatting, add commentStyle long-above, short-above ([b627ff1](https://github.com/amzn/style-dictionary/commit/b627ff1e2b9ec0b9d72ba7181f2e66f73c08b04b)) - +- allow overriding formatting, add commentStyle long-above, short-above ([b627ff1](https://github.com/amzn/style-dictionary/commit/b627ff1e2b9ec0b9d72ba7181f2e66f73c08b04b)) ### Bug Fixes -* account for multi-line comments in tokens, improve comment style ([b5d4cc2](https://github.com/amzn/style-dictionary/commit/b5d4cc2384202e8a2f69e0439dbbeab136364911)) -* allow outputReferences to work on non-string values ([8021ec0](https://github.com/amzn/style-dictionary/commit/8021ec0c914d904333cdcc063a4e34c49d2db418)) -* outputReferences to use original.value when possible ([#1002](https://github.com/amzn/style-dictionary/issues/1002)) ([bd73b62](https://github.com/amzn/style-dictionary/commit/bd73b622b01839325faf2f0129b57e5e58716588)) +- account for multi-line comments in tokens, improve comment style ([b5d4cc2](https://github.com/amzn/style-dictionary/commit/b5d4cc2384202e8a2f69e0439dbbeab136364911)) +- allow outputReferences to work on non-string values ([8021ec0](https://github.com/amzn/style-dictionary/commit/8021ec0c914d904333cdcc063a4e34c49d2db418)) +- outputReferences to use original.value when possible ([#1002](https://github.com/amzn/style-dictionary/issues/1002)) ([bd73b62](https://github.com/amzn/style-dictionary/commit/bd73b622b01839325faf2f0129b57e5e58716588)) ## [3.8.0](https://github.com/amzn/style-dictionary/compare/v3.7.2...v3.8.0) (2023-04-25) diff --git a/lib/utils/combineJSON.js b/lib/utils/combineJSON.js index e271c870b..ec5eeaed7 100644 --- a/lib/utils/combineJSON.js +++ b/lib/utils/combineJSON.js @@ -71,7 +71,6 @@ export default async function combineJSON( let files = []; for (let i = 0; i < arr.length; i++) { - /** @ts-expect-error memfs's IFs type does not seem to implement readdir correctly, 2nd param seems incorrect? path-scurry throws type error on it */ const new_files = globSync(arr[i], { fs: volume, posix: true }).sort(); files = files.concat(new_files); } diff --git a/package-lock.json b/package-lock.json index 472f9a6ad..e9d62f832 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4840,12 +4840,19 @@ "license": "MIT" }, "node_modules/@types/istanbul-lib-report": { - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } }, "node_modules/@types/istanbul-reports": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/istanbul-lib-report": "*" } @@ -4952,7 +4959,13 @@ } }, "node_modules/@types/node": { - "dev": true + "version": "20.14.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", + "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/normalize-package-data": { "version": "2.4.4", @@ -6278,17 +6291,6 @@ "astro": "^4.0.0-beta || ^3.3.0" } }, - "node_modules/astro/node_modules/@types/node": { - "version": "20.14.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", - "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", - "dev": true, - "optional": true, - "peer": true, - "dependencies": { - "undici-types": "~5.26.4" - } - }, "node_modules/astro/node_modules/ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", @@ -20208,9 +20210,7 @@ "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true, - "optional": true, - "peer": true + "dev": true }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0",