diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4afb0913..d1d752a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: echo -n "$PROVISIONING_PROFILE_BASE64" | base64 --decode > LosslessCut_Mac_App_Store_provisioning_profile.provisionprofile - name: Prepare Apple API key - # Import Apple API key for app notarization on macOS and for uploading to Mac App Store + # Import Apple API key for uploading to Mac App Store # 'altool --help': '--apiKey' will search the following directories in sequence for a private key file with the name of: # 'AuthKey_.p8': './private_keys', '~/private_keys', '~/.private_keys', and '~/.appstoreconnect/private_keys'. if: startsWith(matrix.os, 'macos') @@ -92,9 +92,13 @@ jobs: # windows_certs: ${{ secrets.windows_certs }} # windows_certs_password: ${{ secrets.windows_certs_password }} env: - # macOS notarization API key - API_KEY_ID: ${{ secrets.api_key_id }} - API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }} + # https://github.com/electron-userland/electron-builder/issues/7683 + APPLE_ID: 1505323402 + APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.apple_app_specific_password }} + # TODO use appleApiKey, appleApiKeyId and appleApiIssuer from https://github.com/electron/notarize + # once electron-builder supports those: https://github.com/electron-userland/electron-builder/blob/7c7db837bdf650228594a30114975f1581c37130/packages/app-builder-lib/src/macPackager.ts#L489 + #API_KEY_ID: ${{ secrets.api_key_id }} + #API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }} - name: Upload to Mac App Store if: startsWith(matrix.os, 'macos') && env.is_tag == 'true' diff --git a/package.json b/package.json index 86a5bc62..6a1fe36c 100644 --- a/package.json +++ b/package.json @@ -52,8 +52,7 @@ "csv-parse": "^4.15.3", "csv-stringify": "^5.6.2", "electron": "^27.0.0", - "electron-builder": "^24.6.3", - "electron-builder-notarize": "^1.5.1", + "electron-builder": "^24.6.4", "electron-devtools-installer": "^3.2.0", "eslint": "^7.32.0 || ^8.2.0", "eslint-config-airbnb": "^19.0.4", @@ -141,11 +140,13 @@ }, "appId": "no.mifi.losslesscut", "artifactName": "${productName}-${os}-${arch}.${ext}", - "afterSign": "electron-builder-notarize", "mac": { "hardenedRuntime": true, "appId": "no.mifi.losslesscut-mac", "category": "public.app-category.productivity", + "notarize": { + "teamId": "46F6T3M669" + }, "target": [ { "target": "mas", diff --git a/script/xcrun-wrapper.mjs b/script/xcrun-wrapper.mjs index c128ac19..b2b4c404 100644 --- a/script/xcrun-wrapper.mjs +++ b/script/xcrun-wrapper.mjs @@ -8,7 +8,7 @@ import { readFile } from 'fs/promises'; const args = process.argv.slice(2); const filePath = args[0]; -const apiKey = args[1]; +const apiKeyId = args[1]; const apiIssuer = args[2]; const appleId = args[3]; const bundleId = args[4]; @@ -54,13 +54,13 @@ Example JSON response: */ async function runAttempt() { - // const xcrunArgs = ['altool', '--list-apps', '--output-format', 'json', '--apiKey', apiKey, '--apiIssuer', apiIssuer]; + // const xcrunArgs = ['altool', '--list-apps', '--output-format', 'json', '--apiKey', apiKeyId, '--apiIssuer', apiIssuer]; const xcrunArgs = [ 'altool', '--output-format', 'json', '--upload-package', filePath, '--type', 'macos', - '--apiKey', apiKey, '--apiIssuer', apiIssuer, + '--apiKey', apiKeyId, '--apiIssuer', apiIssuer, '--asc-public-id', ascPublicId, '--apple-id', appleId, '--bundle-id', bundleId, diff --git a/yarn.lock b/yarn.lock index 48279e52..0819f496 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,15 +22,6 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0": - version: 7.16.7 - resolution: "@babel/code-frame@npm:7.16.7" - dependencies: - "@babel/highlight": ^7.16.7 - checksum: db2f7faa31bc2c9cf63197b481b30ea57147a5fc1a6fab60e5d6c02cdfbf6de8e17b5121f99917b3dabb5eeb572da078312e70697415940383efc140d4e0808b - languageName: node - linkType: hard - "@babel/code-frame@npm:^7.18.6": version: 7.18.6 resolution: "@babel/code-frame@npm:7.18.6" @@ -179,13 +170,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.16.7": - version: 7.16.7 - resolution: "@babel/helper-validator-identifier@npm:7.16.7" - checksum: dbb3db9d184343152520a209b5684f5e0ed416109cde82b428ca9c759c29b10c7450657785a8b5c5256aa74acc6da491c1f0cf6b784939f7931ef82982051b69 - languageName: node - linkType: hard - "@babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1": version: 7.19.1 resolution: "@babel/helper-validator-identifier@npm:7.19.1" @@ -211,17 +195,6 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.16.7": - version: 7.16.7 - resolution: "@babel/highlight@npm:7.16.7" - dependencies: - "@babel/helper-validator-identifier": ^7.16.7 - chalk: ^2.0.0 - js-tokens: ^4.0.0 - checksum: f7e04e7e03b83c2cca984f4d3e180c9b018784f45d03367e94daf983861229ddc47264045f3b58dfeb0007f9c67bc2a76c4de1693bad90e5394876ef55ece5bb - languageName: node - linkType: hard - "@babel/highlight@npm:^7.18.6": version: 7.18.6 resolution: "@babel/highlight@npm:7.18.6" @@ -433,17 +406,18 @@ __metadata: languageName: node linkType: hard -"@electron/notarize@npm:^1.2.3": - version: 1.2.4 - resolution: "@electron/notarize@npm:1.2.4" +"@electron/notarize@npm:2.1.0": + version: 2.1.0 + resolution: "@electron/notarize@npm:2.1.0" dependencies: debug: ^4.1.1 fs-extra: ^9.0.1 - checksum: 3aa19fb247f9297b96a25f1a082f552e0c78a726ddfc98de9cdd4e4b092fc36fe07d680b762dd5a2bceda97b1044d3a0e6d9eadc5022f7c329a1fcf081133c9b + promise-retry: ^2.0.1 + checksum: ac58f39f4b2370ea929837cef50ebeedb4108ed9bd2a3fef0b89254891014a745da2db703b18b8e0d097a17000cc8fa984bcff3f087368986cb4a59753365a2f languageName: node linkType: hard -"@electron/osx-sign@npm:^1.0.4": +"@electron/osx-sign@npm:1.0.5": version: 1.0.5 resolution: "@electron/osx-sign@npm:1.0.5" dependencies: @@ -469,9 +443,9 @@ __metadata: languageName: node linkType: hard -"@electron/universal@npm:1.3.4": - version: 1.3.4 - resolution: "@electron/universal@npm:1.3.4" +"@electron/universal@npm:1.4.1": + version: 1.4.1 + resolution: "@electron/universal@npm:1.4.1" dependencies: "@electron/asar": ^3.2.1 "@malept/cross-spawn-promise": ^1.1.0 @@ -480,7 +454,7 @@ __metadata: fs-extra: ^9.0.1 minimatch: ^3.0.4 plist: ^3.0.4 - checksum: 2abc051d9ad3faa87406a72829817dc8d432018ad19cde021b265947e2733190ef7024d50e80690f2bfbcde363332dc3ff6c366ecc6d30e63a826e4c2cf6728a + checksum: 257f3a25a4f940ccbe601a0f3a2a925a28657bc3c5fc46018980b771825834665d184e5ce75cfa0b8639525a0bdbb7f0bc02e69e2d4fb044add64638db4d48a4 languageName: node linkType: hard @@ -1535,13 +1509,6 @@ __metadata: languageName: node linkType: hard -"@types/normalize-package-data@npm:^2.4.0": - version: 2.4.1 - resolution: "@types/normalize-package-data@npm:2.4.1" - checksum: e87bccbf11f95035c89a132b52b79ce69a1e3652fe55962363063c9c0dae0fe2477ebc585e03a9652adc6f381d24ba5589cc5e51849df4ced3d3e004a7d40ed5 - languageName: node - linkType: hard - "@types/plist@npm:^3.0.1": version: 3.0.2 resolution: "@types/plist@npm:3.0.2" @@ -1902,15 +1869,15 @@ __metadata: languageName: node linkType: hard -"app-builder-lib@npm:24.6.3": - version: 24.6.3 - resolution: "app-builder-lib@npm:24.6.3" +"app-builder-lib@npm:24.7.0": + version: 24.7.0 + resolution: "app-builder-lib@npm:24.7.0" dependencies: 7zip-bin: ~5.1.1 "@develar/schema-utils": ~2.6.5 - "@electron/notarize": ^1.2.3 - "@electron/osx-sign": ^1.0.4 - "@electron/universal": 1.3.4 + "@electron/notarize": 2.1.0 + "@electron/osx-sign": 1.0.5 + "@electron/universal": 1.4.1 "@malept/flatpak-bundler": ^0.4.0 "@types/fs-extra": 9.0.13 async-exit-hook: ^2.0.1 @@ -1934,7 +1901,7 @@ __metadata: semver: ^7.3.8 tar: ^6.1.12 temp-file: ^3.4.0 - checksum: 5268895465d491a8cb48b0a8ee9dce8cfbb47f2ee56f4be219aead726df0a01e9086f7d9aeea1410a52a79448a2b749948987b6465d615444f65bf53ae2116bd + checksum: fa42b782fb396a002f72398eb9264d22d85fb9caf062d5246a9f5e23b03f0daa206753fae2129fb71ed6f9aad5f67180158959f2db88b31d78bfffe9735c503a languageName: node linkType: hard @@ -1981,15 +1948,6 @@ __metadata: languageName: node linkType: hard -"argparse@npm:^1.0.7": - version: 1.0.10 - resolution: "argparse@npm:1.0.10" - dependencies: - sprintf-js: ~1.0.2 - checksum: 7ca6e45583a28de7258e39e13d81e925cfa25d7d4aacbf806a382d3c02fcb13403a07fb8aeef949f10a7cfe4a62da0e2e807b348a5980554cc28ee573ef95945 - languageName: node - linkType: hard - "argparse@npm:^2.0.1": version: 2.0.1 resolution: "argparse@npm:2.0.1" @@ -3374,11 +3332,11 @@ __metadata: languageName: node linkType: hard -"dmg-builder@npm:24.6.3": - version: 24.6.3 - resolution: "dmg-builder@npm:24.6.3" +"dmg-builder@npm:24.7.0": + version: 24.7.0 + resolution: "dmg-builder@npm:24.7.0" dependencies: - app-builder-lib: 24.6.3 + app-builder-lib: 24.7.0 builder-util: 24.5.0 builder-util-runtime: 9.2.1 dmg-license: ^1.0.11 @@ -3388,7 +3346,7 @@ __metadata: dependenciesMeta: dmg-license: optional: true - checksum: a3bd6901ee73f4e17c582d394347dbcc1c08bc9d05fba2bfe1ec1c616d13c0e7ffd436d586f5cd698a93060cf2ea49794356f5352ff75e533fc8ff97966070bc + checksum: f080a01a60f87ce21709854d1e2e4515add20bc6245bed20720fa4dffa27c81e18e0ab8ab76e97256390d0717722f0355c7618877297264ba94ea7e38cd247a4 languageName: node linkType: hard @@ -3492,13 +3450,6 @@ __metadata: languageName: node linkType: hard -"dotenv@npm:^8.2.0": - version: 8.6.0 - resolution: "dotenv@npm:8.6.0" - checksum: 38e902c80b0666ab59e9310a3d24ed237029a7ce34d976796349765ac96b8d769f6df19090f1f471b77a25ca391971efde8a1ea63bb83111bd8bec8e5cc9b2cd - languageName: node - linkType: hard - "dotenv@npm:^9.0.2": version: 9.0.2 resolution: "dotenv@npm:9.0.2" @@ -3557,29 +3508,15 @@ __metadata: languageName: node linkType: hard -"electron-builder-notarize@npm:^1.5.1": - version: 1.5.1 - resolution: "electron-builder-notarize@npm:1.5.1" +"electron-builder@npm:^24.6.4": + version: 24.7.0 + resolution: "electron-builder@npm:24.7.0" dependencies: - dotenv: ^8.2.0 - electron-notarize: ^1.1.1 - js-yaml: ^3.14.0 - read-pkg-up: ^7.0.0 - peerDependencies: - electron-builder: ">= 20.44.4" - checksum: a5d1e34bda4ec7ab2cb7b421f4c0013b434e350fa79b20c5ed74ff200f582f9e6bdef870b32b4a7febf2fc4535021150d2c3f01aaf57309ea0b225900c65b2c8 - languageName: node - linkType: hard - -"electron-builder@npm:^24.6.3": - version: 24.6.3 - resolution: "electron-builder@npm:24.6.3" - dependencies: - app-builder-lib: 24.6.3 + app-builder-lib: 24.7.0 builder-util: 24.5.0 builder-util-runtime: 9.2.1 chalk: ^4.1.2 - dmg-builder: 24.6.3 + dmg-builder: 24.7.0 fs-extra: ^10.1.0 is-ci: ^3.0.0 lazy-val: ^1.0.5 @@ -3589,7 +3526,7 @@ __metadata: bin: electron-builder: cli.js install-app-deps: install-app-deps.js - checksum: b5a9758353143f6d96318b893010eee2886d36d0aef264e68dc7b2d825738b2785e73708db3ceff9c82a3e66e5c3a3170954660fb8b533b735e11aad3a92b2e8 + checksum: cbebcaf2003c20f313ee0bb6a26855ce1bf78fa506073c6ffa57474c39a7649e61cc77eb45c064e6dcbd695926c1447d52b273b5b3b948dc3ca0a2cd4da4a8ad languageName: node linkType: hard @@ -3612,16 +3549,6 @@ __metadata: languageName: node linkType: hard -"electron-notarize@npm:^1.1.1": - version: 1.1.1 - resolution: "electron-notarize@npm:1.1.1" - dependencies: - debug: ^4.1.1 - fs-extra: ^9.0.1 - checksum: c1f822761277c817c3b7b5ed1ef2a2aabf70733f79e670b2f0b5bac31b9d63fb9ef4d9fae2051192727d811c6b6007de846e39844ab51d13986c1771d5d04d28 - languageName: node - linkType: hard - "electron-publish@npm:24.5.0": version: 24.5.0 resolution: "electron-publish@npm:24.5.0" @@ -3777,15 +3704,6 @@ __metadata: languageName: node linkType: hard -"error-ex@npm:^1.3.1": - version: 1.3.2 - resolution: "error-ex@npm:1.3.2" - dependencies: - is-arrayish: ^0.2.1 - checksum: c1c2b8b65f9c91b0f9d75f0debaa7ec5b35c266c2cac5de412c1a6de86d4cbae04ae44e510378cb14d032d0645a36925d0186f8bb7367bcc629db256b743a001 - languageName: node - linkType: hard - "error-stack-parser@npm:^2.0.6": version: 2.0.6 resolution: "error-stack-parser@npm:2.0.6" @@ -4331,16 +4249,6 @@ __metadata: languageName: node linkType: hard -"esprima@npm:^4.0.0": - version: 4.0.1 - resolution: "esprima@npm:4.0.1" - bin: - esparse: ./bin/esparse.js - esvalidate: ./bin/esvalidate.js - checksum: b45bc805a613dbea2835278c306b91aff6173c8d034223fa81498c77dcbce3b2931bf6006db816f62eacd9fd4ea975dfd85a5b7f3c6402cfd050d4ca3c13a628 - languageName: node - linkType: hard - "esquery@npm:^1.4.0": version: 1.4.0 resolution: "esquery@npm:1.4.0" @@ -4707,16 +4615,6 @@ __metadata: languageName: node linkType: hard -"find-up@npm:^4.1.0": - version: 4.1.0 - resolution: "find-up@npm:4.1.0" - dependencies: - locate-path: ^5.0.0 - path-exists: ^4.0.0 - checksum: 4c172680e8f8c1f78839486e14a43ef82e9decd0e74145f40707cc42e7420506d5ec92d9a11c22bd2c48fb0c384ea05dd30e10dd152fefeec6f2f75282a8b844 - languageName: node - linkType: hard - "find-yarn-workspace-root@npm:^2.0.0": version: 2.0.0 resolution: "find-yarn-workspace-root@npm:2.0.0" @@ -5394,13 +5292,6 @@ __metadata: languageName: node linkType: hard -"hosted-git-info@npm:^2.1.4": - version: 2.8.9 - resolution: "hosted-git-info@npm:2.8.9" - checksum: c955394bdab888a1e9bb10eb33029e0f7ce5a2ac7b3f158099dc8c486c99e73809dca609f5694b223920ca2174db33d32b12f9a2a47141dc59607c29da5a62dd - languageName: node - linkType: hard - "hosted-git-info@npm:^4.1.0": version: 4.1.0 resolution: "hosted-git-info@npm:4.1.0" @@ -5789,13 +5680,6 @@ __metadata: languageName: node linkType: hard -"is-arrayish@npm:^0.2.1": - version: 0.2.1 - resolution: "is-arrayish@npm:0.2.1" - checksum: eef4417e3c10e60e2c810b6084942b3ead455af16c4509959a27e490e7aee87cfb3f38e01bbde92220b528a0ee1a18d52b787e1458ee86174d8c7f0e58cd488f - languageName: node - linkType: hard - "is-arrayish@npm:^0.3.1": version: 0.3.2 resolution: "is-arrayish@npm:0.3.2" @@ -6238,18 +6122,6 @@ __metadata: languageName: node linkType: hard -"js-yaml@npm:^3.14.0": - version: 3.14.1 - resolution: "js-yaml@npm:3.14.1" - dependencies: - argparse: ^1.0.7 - esprima: ^4.0.0 - bin: - js-yaml: bin/js-yaml.js - checksum: bef146085f472d44dee30ec34e5cf36bf89164f5d585435a3d3da89e52622dff0b188a580e4ad091c3341889e14cb88cac6e4deb16dc5b1e9623bb0601fc255c - languageName: node - linkType: hard - "jsesc@npm:^2.5.1": version: 2.5.2 resolution: "jsesc@npm:2.5.2" @@ -6266,13 +6138,6 @@ __metadata: languageName: node linkType: hard -"json-parse-even-better-errors@npm:^2.3.0": - version: 2.3.1 - resolution: "json-parse-even-better-errors@npm:2.3.1" - checksum: 798ed4cf3354a2d9ccd78e86d2169515a0097a5c133337807cdf7f1fc32e1391d207ccfc276518cc1d7d8d4db93288b8a50ba4293d212ad1336e52a8ec0a941f - languageName: node - linkType: hard - "json-schema-traverse@npm:^0.4.1": version: 0.4.1 resolution: "json-schema-traverse@npm:0.4.1" @@ -6485,13 +6350,6 @@ __metadata: languageName: node linkType: hard -"lines-and-columns@npm:^1.1.6": - version: 1.2.4 - resolution: "lines-and-columns@npm:1.2.4" - checksum: 0c37f9f7fa212b38912b7145e1cd16a5f3cd34d782441c3e6ca653485d326f58b3caccda66efce1c5812bde4961bbde3374fae4b0d11bf1226152337f3894aa5 - languageName: node - linkType: hard - "local-pkg@npm:^0.4.2": version: 0.4.3 resolution: "local-pkg@npm:0.4.3" @@ -6519,15 +6377,6 @@ __metadata: languageName: node linkType: hard -"locate-path@npm:^5.0.0": - version: 5.0.0 - resolution: "locate-path@npm:5.0.0" - dependencies: - p-locate: ^4.1.0 - checksum: 83e51725e67517287d73e1ded92b28602e3ae5580b301fe54bfb76c0c723e3f285b19252e375712316774cf52006cb236aed5704692c32db0d5d089b69696e30 - languageName: node - linkType: hard - "lodash.debounce@npm:^4.0.8": version: 4.0.8 resolution: "lodash.debounce@npm:4.0.8" @@ -6619,8 +6468,7 @@ __metadata: cue-parser: ^0.3.0 data-uri-to-buffer: ^4.0.0 electron: ^27.0.0 - electron-builder: ^24.6.3 - electron-builder-notarize: ^1.5.1 + electron-builder: ^24.6.4 electron-devtools-installer: ^3.2.0 electron-is-dev: ^2.0.0 electron-store: 5.1.1 @@ -7296,18 +7144,6 @@ __metadata: languageName: node linkType: hard -"normalize-package-data@npm:^2.5.0": - version: 2.5.0 - resolution: "normalize-package-data@npm:2.5.0" - dependencies: - hosted-git-info: ^2.1.4 - resolve: ^1.10.0 - semver: 2 || 3 || 4 || 5 - validate-npm-package-license: ^3.0.1 - checksum: 7999112efc35a6259bc22db460540cae06564aa65d0271e3bdfa86876d08b0e578b7b5b0028ee61b23f1cae9fc0e7847e4edc0948d3068a39a2a82853efc8499 - languageName: node - linkType: hard - "normalize-path@npm:^2.1.1": version: 2.1.1 resolution: "normalize-path@npm:2.1.1" @@ -7566,7 +7402,7 @@ __metadata: languageName: node linkType: hard -"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0": +"p-limit@npm:^2.0.0": version: 2.3.0 resolution: "p-limit@npm:2.3.0" dependencies: @@ -7602,15 +7438,6 @@ __metadata: languageName: node linkType: hard -"p-locate@npm:^4.1.0": - version: 4.1.0 - resolution: "p-locate@npm:4.1.0" - dependencies: - p-limit: ^2.2.0 - checksum: 513bd14a455f5da4ebfcb819ef706c54adb09097703de6aeaa5d26fe5ea16df92b48d1ac45e01e3944ce1e6aa2a66f7f8894742b8c9d6e276e16cd2049a2b870 - languageName: node - linkType: hard - "p-map@npm:^4.0.0": version: 4.0.0 resolution: "p-map@npm:4.0.0" @@ -7673,18 +7500,6 @@ __metadata: languageName: node linkType: hard -"parse-json@npm:^5.0.0": - version: 5.2.0 - resolution: "parse-json@npm:5.2.0" - dependencies: - "@babel/code-frame": ^7.0.0 - error-ex: ^1.3.1 - json-parse-even-better-errors: ^2.3.0 - lines-and-columns: ^1.1.6 - checksum: 62085b17d64da57f40f6afc2ac1f4d95def18c4323577e1eced571db75d9ab59b297d1d10582920f84b15985cbfc6b6d450ccbf317644cfa176f3ed982ad87e2 - languageName: node - linkType: hard - "parse5-htmlparser2-tree-adapter@npm:^7.0.0": version: 7.0.0 resolution: "parse5-htmlparser2-tree-adapter@npm:7.0.0" @@ -7748,13 +7563,6 @@ __metadata: languageName: node linkType: hard -"path-exists@npm:^4.0.0": - version: 4.0.0 - resolution: "path-exists@npm:4.0.0" - checksum: 505807199dfb7c50737b057dd8d351b82c033029ab94cb10a657609e00c1bc53b951cfdbccab8de04c5584d5eff31128ce6afd3db79281874a5ef2adbba55ed1 - languageName: node - linkType: hard - "path-is-absolute@npm:^1.0.0": version: 1.0.1 resolution: "path-is-absolute@npm:1.0.1" @@ -8353,29 +8161,6 @@ __metadata: languageName: node linkType: hard -"read-pkg-up@npm:^7.0.0": - version: 7.0.1 - resolution: "read-pkg-up@npm:7.0.1" - dependencies: - find-up: ^4.1.0 - read-pkg: ^5.2.0 - type-fest: ^0.8.1 - checksum: e4e93ce70e5905b490ca8f883eb9e48b5d3cebc6cd4527c25a0d8f3ae2903bd4121c5ab9c5a3e217ada0141098eeb661313c86fa008524b089b8ed0b7f165e44 - languageName: node - linkType: hard - -"read-pkg@npm:^5.2.0": - version: 5.2.0 - resolution: "read-pkg@npm:5.2.0" - dependencies: - "@types/normalize-package-data": ^2.4.0 - normalize-package-data: ^2.5.0 - parse-json: ^5.0.0 - type-fest: ^0.6.0 - checksum: eb696e60528b29aebe10e499ba93f44991908c57d70f2d26f369e46b8b9afc208ef11b4ba64f67630f31df8b6872129e0a8933c8c53b7b4daf0eace536901222 - languageName: node - linkType: hard - "readable-stream@npm:3, readable-stream@npm:^3.0.2, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": version: 3.6.0 resolution: "readable-stream@npm:3.6.0" @@ -8532,7 +8317,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.10.0, resolve@npm:^1.20.0": +"resolve@npm:^1.20.0": version: 1.21.0 resolution: "resolve@npm:1.21.0" dependencies: @@ -8568,7 +8353,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin": +"resolve@patch:resolve@^1.20.0#~builtin": version: 1.21.0 resolution: "resolve@patch:resolve@npm%3A1.21.0#~builtin::version=1.21.0&hash=c3c19d" dependencies: @@ -8824,7 +8609,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0, semver@npm:^5.6.0": +"semver@npm:^5.5.0, semver@npm:^5.6.0": version: 5.7.1 resolution: "semver@npm:5.7.1" bin: @@ -9226,40 +9011,6 @@ __metadata: languageName: node linkType: hard -"spdx-correct@npm:^3.0.0": - version: 3.1.1 - resolution: "spdx-correct@npm:3.1.1" - dependencies: - spdx-expression-parse: ^3.0.0 - spdx-license-ids: ^3.0.0 - checksum: 77ce438344a34f9930feffa61be0eddcda5b55fc592906ef75621d4b52c07400a97084d8701557b13f7d2aae0cb64f808431f469e566ef3fe0a3a131dcb775a6 - languageName: node - linkType: hard - -"spdx-exceptions@npm:^2.1.0": - version: 2.3.0 - resolution: "spdx-exceptions@npm:2.3.0" - checksum: cb69a26fa3b46305637123cd37c85f75610e8c477b6476fa7354eb67c08128d159f1d36715f19be6f9daf4b680337deb8c65acdcae7f2608ba51931540687ac0 - languageName: node - linkType: hard - -"spdx-expression-parse@npm:^3.0.0": - version: 3.0.1 - resolution: "spdx-expression-parse@npm:3.0.1" - dependencies: - spdx-exceptions: ^2.1.0 - spdx-license-ids: ^3.0.0 - checksum: a1c6e104a2cbada7a593eaa9f430bd5e148ef5290d4c0409899855ce8b1c39652bcc88a725259491a82601159d6dc790bedefc9016c7472f7de8de7361f8ccde - languageName: node - linkType: hard - -"spdx-license-ids@npm:^3.0.0": - version: 3.0.11 - resolution: "spdx-license-ids@npm:3.0.11" - checksum: 1da1acb090257773e60b022094050e810ae9fec874dc1461f65dc0400cd42dd830ab2df6e64fb49c2db3dce386dd0362110780e1b154db7c0bb413488836aaeb - languageName: node - linkType: hard - "sprintf-js@npm:^1.1.1, sprintf-js@npm:^1.1.2": version: 1.1.2 resolution: "sprintf-js@npm:1.1.2" @@ -9267,13 +9018,6 @@ __metadata: languageName: node linkType: hard -"sprintf-js@npm:~1.0.2": - version: 1.0.3 - resolution: "sprintf-js@npm:1.0.3" - checksum: 19d79aec211f09b99ec3099b5b2ae2f6e9cdefe50bc91ac4c69144b6d3928a640bb6ae5b3def70c2e85a2c3d9f5ec2719921e3a59d3ca3ef4b2fd1a4656a0df3 - languageName: node - linkType: hard - "ssri@npm:^9.0.0": version: 9.0.1 resolution: "ssri@npm:9.0.1" @@ -10003,13 +9747,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^0.6.0": - version: 0.6.0 - resolution: "type-fest@npm:0.6.0" - checksum: b2188e6e4b21557f6e92960ec496d28a51d68658018cba8b597bd3ef757721d1db309f120ae987abeeda874511d14b776157ff809f23c6d1ce8f83b9b2b7d60f - languageName: node - linkType: hard - "type-fest@npm:^0.7.1": version: 0.7.1 resolution: "type-fest@npm:0.7.1" @@ -10017,13 +9754,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^0.8.1": - version: 0.8.1 - resolution: "type-fest@npm:0.8.1" - checksum: d61c4b2eba24009033ae4500d7d818a94fd6d1b481a8111612ee141400d5f1db46f199c014766b9fa9b31a6a7374d96fc748c6d688a78a3ce5a33123839becb7 - languageName: node - linkType: hard - "type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" @@ -10269,16 +9999,6 @@ __metadata: languageName: node linkType: hard -"validate-npm-package-license@npm:^3.0.1": - version: 3.0.4 - resolution: "validate-npm-package-license@npm:3.0.4" - dependencies: - spdx-correct: ^3.0.0 - spdx-expression-parse: ^3.0.0 - checksum: 35703ac889d419cf2aceef63daeadbe4e77227c39ab6287eeb6c1b36a746b364f50ba22e88591f5d017bc54685d8137bc2d328d0a896e4d3fd22093c0f32a9ad - languageName: node - linkType: hard - "value-or-function@npm:^3.0.0": version: 3.0.0 resolution: "value-or-function@npm:3.0.0"