diff --git a/package.json b/package.json index e6d21d5a8f3a..0739e2e7d380 100644 --- a/package.json +++ b/package.json @@ -210,7 +210,7 @@ "gulp": "4.0.2", "gulp-flatmap": "1.0.2", "gulp-json-transform": "0.5.0", - "gulp-merge-json": "2.1.2", + "gulp-merge-json": "2.2.1", "gulp-rename": "2.0.0", "gulp-zopfli-green": "6.0.1", "html-minifier-terser": "7.2.0", diff --git a/yarn.lock b/yarn.lock index 4c5fdf097808..3f23111d8572 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6077,6 +6077,13 @@ __metadata: languageName: node linkType: hard +"bare-events@npm:^2.2.0": + version: 2.2.1 + resolution: "bare-events@npm:2.2.1" + checksum: 10/a2c96a638e5a049960e42660320bcd9e3c5e83da2072e4c05080661219eae744931751be86c814590dcce5107c30cbb60dc2d15097b1b14e2f42db1cd9b80898 + languageName: node + linkType: hard + "base64-js@npm:^1.3.0, base64-js@npm:^1.3.1": version: 1.5.1 resolution: "base64-js@npm:1.5.1" @@ -8486,6 +8493,13 @@ __metadata: languageName: node linkType: hard +"fast-fifo@npm:^1.1.0": + version: 1.3.2 + resolution: "fast-fifo@npm:1.3.2" + checksum: 10/6bfcba3e4df5af7be3332703b69a7898a8ed7020837ec4395bb341bd96cc3a6d86c3f6071dd98da289618cf2234c70d84b2a6f09a33dd6f988b1ff60d8e54275 + languageName: node + linkType: hard + "fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0": version: 3.3.1 resolution: "fast-glob@npm:3.3.1" @@ -9394,16 +9408,17 @@ __metadata: languageName: node linkType: hard -"gulp-merge-json@npm:2.1.2": - version: 2.1.2 - resolution: "gulp-merge-json@npm:2.1.2" +"gulp-merge-json@npm:2.2.1": + version: 2.2.1 + resolution: "gulp-merge-json@npm:2.2.1" dependencies: - json5: "npm:^2.2.1" + json5: "npm:^2.2.3" + lodash.clonedeep: "npm:^4.5.0" lodash.mergewith: "npm:^4.6.1" - plugin-error: "npm:^1.0.1" + plugin-error: "npm:^2.0.1" through: "npm:^2.3.8" - vinyl: "npm:^2.2.1" - checksum: 10/21325538cf882306e13aa4079913eb17d22605b91361d400ea9b7c8917c3b2782020199b219dfbac582205d8104ea283a9c385e32c25125cd456f01e0b0c04e6 + vinyl: "npm:^3.0.0" + checksum: 10/fe87fd2101d0a35f2c5d488d546affaa6115d3be376fcf07b56029eed22ccfa8811206ac8bdf13ff79e5f518d0a65d886506204d2bdc3c0f871dc7cfa82c75eb languageName: node linkType: hard @@ -9732,7 +9747,7 @@ __metadata: gulp: "npm:4.0.2" gulp-flatmap: "npm:1.0.2" gulp-json-transform: "npm:0.5.0" - gulp-merge-json: "npm:2.1.2" + gulp-merge-json: "npm:2.2.1" gulp-rename: "npm:2.0.0" gulp-zopfli-green: "npm:6.0.1" hls.js: "npm:1.5.7" @@ -11038,7 +11053,7 @@ __metadata: languageName: node linkType: hard -"json5@npm:^2.2.0, json5@npm:^2.2.1, json5@npm:^2.2.3": +"json5@npm:^2.2.0, json5@npm:^2.2.3": version: 2.2.3 resolution: "json5@npm:2.2.3" bin: @@ -11540,6 +11555,13 @@ __metadata: languageName: node linkType: hard +"lodash.clonedeep@npm:^4.5.0": + version: 4.5.0 + resolution: "lodash.clonedeep@npm:4.5.0" + checksum: 10/957ed243f84ba6791d4992d5c222ffffca339a3b79dbe81d2eaf0c90504160b500641c5a0f56e27630030b18b8e971ea10b44f928a977d5ced3c8948841b555f + languageName: node + linkType: hard + "lodash.debounce@npm:^4.0.8": version: 4.0.8 resolution: "lodash.debounce@npm:4.0.8" @@ -13212,6 +13234,15 @@ __metadata: languageName: node linkType: hard +"plugin-error@npm:^2.0.1": + version: 2.0.1 + resolution: "plugin-error@npm:2.0.1" + dependencies: + ansi-colors: "npm:^1.0.1" + checksum: 10/9a4f91461cd24cce401112098969991d7aa6b4c94f78e0381234280c07da779570a8b21ab143292b534ec0117c09705a67e5d756c1c303d4706fdd7f861bf5bc + languageName: node + linkType: hard + "pngjs@npm:^3.0.0, pngjs@npm:^3.3.3": version: 3.4.0 resolution: "pngjs@npm:3.4.0" @@ -13432,6 +13463,13 @@ __metadata: languageName: node linkType: hard +"queue-tick@npm:^1.0.1": + version: 1.0.1 + resolution: "queue-tick@npm:1.0.1" + checksum: 10/f447926c513b64a857906f017a3b350f7d11277e3c8d2a21a42b7998fa1a613d7a829091e12d142bb668905c8f68d8103416c7197856efb0c72fa835b8e254b5 + languageName: node + linkType: hard + "randombytes@npm:^2.1.0": version: 2.1.0 resolution: "randombytes@npm:2.1.0" @@ -13703,6 +13741,13 @@ __metadata: languageName: node linkType: hard +"replace-ext@npm:^2.0.0": + version: 2.0.0 + resolution: "replace-ext@npm:2.0.0" + checksum: 10/ed640ac90d24cce4be977642847d138908d430049cc097633be33b072143515cc7d29699675a0c35f6dc3c3c73cb529ed352d59649cf15931740eb31ae083c1e + languageName: node + linkType: hard + "replace-homedir@npm:^1.0.0": version: 1.0.0 resolution: "replace-homedir@npm:1.0.0" @@ -14798,6 +14843,20 @@ __metadata: languageName: node linkType: hard +"streamx@npm:^2.12.5": + version: 2.16.1 + resolution: "streamx@npm:2.16.1" + dependencies: + bare-events: "npm:^2.2.0" + fast-fifo: "npm:^1.1.0" + queue-tick: "npm:^1.0.1" + dependenciesMeta: + bare-events: + optional: true + checksum: 10/f6d0899adf089385d9c58a630fc705dc6c3931b18181c32860e5013955a339a3b763a4df62168f37c7fc56b1f7bb2a38db989fa9df487995278cb5d46f248da6 + languageName: node + linkType: hard + "string-argv@npm:0.3.2": version: 0.3.2 resolution: "string-argv@npm:0.3.2" @@ -15119,6 +15178,15 @@ __metadata: languageName: node linkType: hard +"teex@npm:^1.0.1": + version: 1.0.1 + resolution: "teex@npm:1.0.1" + dependencies: + streamx: "npm:^2.12.5" + checksum: 10/36bf7ce8bb5eb428ad7b14b695ee7fb0a02f09c1a9d8181cc42531208543a920b299d711bf78dad4ff9bcf36ac437ae8e138053734746076e3e0e7d6d76eef64 + languageName: node + linkType: hard + "temp-dir@npm:^2.0.0": version: 2.0.0 resolution: "temp-dir@npm:2.0.0" @@ -16067,7 +16135,7 @@ __metadata: languageName: node linkType: hard -"vinyl@npm:^2.0.0, vinyl@npm:^2.1.0, vinyl@npm:^2.2.1": +"vinyl@npm:^2.0.0, vinyl@npm:^2.1.0": version: 2.2.1 resolution: "vinyl@npm:2.2.1" dependencies: @@ -16081,6 +16149,19 @@ __metadata: languageName: node linkType: hard +"vinyl@npm:^3.0.0": + version: 3.0.0 + resolution: "vinyl@npm:3.0.0" + dependencies: + clone: "npm:^2.1.2" + clone-stats: "npm:^1.0.0" + remove-trailing-separator: "npm:^1.1.0" + replace-ext: "npm:^2.0.0" + teex: "npm:^1.0.1" + checksum: 10/3371947a92c4b65c7adb944b22586480ffc723ec62347d09b64e593193cb523ce5f472d52549f0e0bbfa82db6c320cae46739461594b0602bba0419d0d7800fb + languageName: node + linkType: hard + "vis-data@npm:7.1.9": version: 7.1.9 resolution: "vis-data@npm:7.1.9"