From 014ae06e855ad71f5cef773f0ca79fd6c9a35e41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 18:21:41 +0000 Subject: [PATCH] Bump del from 4.1.1 to 7.0.0 (#15120) * Bump del from 4.1.1 to 7.0.0 Bumps [del](https://github.com/sindresorhus/del) from 4.1.1 to 7.0.0. - [Release notes](https://github.com/sindresorhus/del/releases) - [Commits](https://github.com/sindresorhus/del/compare/v4.1.1...v7.0.0) --- updated-dependencies: - dependency-name: del dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Deduplicate dependencies * Adjust to ESM-only and API changes Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Steve Repsher --- build-scripts/gulp/clean.js | 26 +-- ...tions.js => fetch-nightly-translations.js} | 12 +- build-scripts/gulp/locale-data.js | 4 +- build-scripts/gulp/translations.js | 6 +- package.json | 2 +- yarn.lock | 167 +++++++++--------- 6 files changed, 117 insertions(+), 100 deletions(-) rename build-scripts/gulp/{fetch-nightly_translations.js => fetch-nightly-translations.js} (95%) diff --git a/build-scripts/gulp/clean.js b/build-scripts/gulp/clean.js index 7bc0ed9e83..726e932ced 100644 --- a/build-scripts/gulp/clean.js +++ b/build-scripts/gulp/clean.js @@ -1,36 +1,40 @@ -const del = require("del"); +const del = import("del"); const gulp = require("gulp"); const paths = require("../paths"); require("./translations"); gulp.task( "clean", - gulp.parallel("clean-translations", () => - del([paths.app_output_root, paths.build_dir]) + gulp.parallel("clean-translations", async () => + (await del).deleteSync([paths.app_output_root, paths.build_dir]) ) ); gulp.task( "clean-demo", - gulp.parallel("clean-translations", () => - del([paths.demo_output_root, paths.build_dir]) + gulp.parallel("clean-translations", async () => + (await del).deleteSync([paths.demo_output_root, paths.build_dir]) ) ); gulp.task( "clean-cast", - gulp.parallel("clean-translations", () => - del([paths.cast_output_root, paths.build_dir]) + gulp.parallel("clean-translations", async () => + (await del).deleteSync([paths.cast_output_root, paths.build_dir]) ) ); -gulp.task("clean-hassio", () => - del([paths.hassio_output_root, paths.build_dir]) +gulp.task("clean-hassio", async () => + (await del).deleteSync([paths.hassio_output_root, paths.build_dir]) ); gulp.task( "clean-gallery", - gulp.parallel("clean-translations", () => - del([paths.gallery_output_root, paths.gallery_build, paths.build_dir]) + gulp.parallel("clean-translations", async () => + (await del).deleteSync([ + paths.gallery_output_root, + paths.gallery_build, + paths.build_dir, + ]) ) ); diff --git a/build-scripts/gulp/fetch-nightly_translations.js b/build-scripts/gulp/fetch-nightly-translations.js similarity index 95% rename from build-scripts/gulp/fetch-nightly_translations.js rename to build-scripts/gulp/fetch-nightly-translations.js index 87e3e43112..13795995e1 100644 --- a/build-scripts/gulp/fetch-nightly_translations.js +++ b/build-scripts/gulp/fetch-nightly-translations.js @@ -1,9 +1,9 @@ // Task to download the latest Lokalise translations from the nightly workflow artifacts +const del = import("del"); const fs = require("fs/promises"); const path = require("path"); const process = require("process"); -const del = require("del"); const gulp = require("gulp"); const jszip = require("jszip"); const tar = require("tar"); @@ -17,8 +17,8 @@ const WORKFLOW_NAME = "nightly.yaml"; const ARTIFACT_NAME = "translations"; const CLIENT_ID = "Iv1.3914e28cb27834d1"; const EXTRACT_DIR = "translations"; -const TOKEN_FILE = path.join(EXTRACT_DIR, "token.json"); -const ARTIFACT_FILE = path.join(EXTRACT_DIR, "artifact.json"); +const TOKEN_FILE = path.posix.join(EXTRACT_DIR, "token.json"); +const ARTIFACT_FILE = path.posix.join(EXTRACT_DIR, "artifact.json"); let allowTokenSetup = false; gulp.task("allow-setup-fetch-nightly-translations", (done) => { @@ -137,7 +137,11 @@ gulp.task("fetch-nightly-translations", async function () { // Remove the current translations const deleteCurrent = Promise.all(writings).then( - del([`${EXTRACT_DIR}/*`, `!${ARTIFACT_FILE}`, `!${TOKEN_FILE}`]) + (await del).deleteAsync([ + `${EXTRACT_DIR}/*`, + `!${ARTIFACT_FILE}`, + `!${TOKEN_FILE}`, + ]) ); // Get the download URL and follow the redirect to download (stored as ArrayBuffer) diff --git a/build-scripts/gulp/locale-data.js b/build-scripts/gulp/locale-data.js index fbb0131ca5..328ddccf31 100755 --- a/build-scripts/gulp/locale-data.js +++ b/build-scripts/gulp/locale-data.js @@ -1,4 +1,4 @@ -const del = require("del"); +const del = import("del"); const path = require("path"); const gulp = require("gulp"); const fs = require("fs"); @@ -6,7 +6,7 @@ const paths = require("../paths"); const outDir = "build/locale-data"; -gulp.task("clean-locale-data", () => del([outDir])); +gulp.task("clean-locale-data", async () => (await del).deleteSync([outDir])); gulp.task("ensure-locale-data-build-dir", (done) => { if (!fs.existsSync(outDir)) { diff --git a/build-scripts/gulp/translations.js b/build-scripts/gulp/translations.js index 80802cdafc..d3f9b7e1d2 100755 --- a/build-scripts/gulp/translations.js +++ b/build-scripts/gulp/translations.js @@ -1,5 +1,5 @@ +const del = import("del"); const crypto = require("crypto"); -const del = require("del"); const path = require("path"); const source = require("vinyl-source-stream"); const vinylBuffer = require("vinyl-buffer"); @@ -13,7 +13,7 @@ const { mapFiles } = require("../util"); const env = require("../env"); const paths = require("../paths"); -require("./fetch-nightly_translations"); +require("./fetch-nightly-translations"); const inFrontendDir = "translations/frontend"; const inBackendDir = "translations/backend"; @@ -120,7 +120,7 @@ function lokaliseTransform(data, original, file) { return output; } -gulp.task("clean-translations", () => del([workDir])); +gulp.task("clean-translations", async () => (await del).deleteSync([workDir])); gulp.task("ensure-translations-build-dir", (done) => { if (!fs.existsSync(workDir)) { diff --git a/package.json b/package.json index 62342a25f1..6a1adb0b6c 100644 --- a/package.json +++ b/package.json @@ -186,7 +186,7 @@ "@web/dev-server-rollup": "^0.2.11", "babel-loader": "^9.1.0", "chai": "^4.3.4", - "del": "^4.0.0", + "del": "^7.0.0", "eslint": "^7.32.0", "eslint-config-airbnb-base": "^14.2.1", "eslint-config-airbnb-typescript": "^14.0.0", diff --git a/yarn.lock b/yarn.lock index 14baa26362..11e1a01f78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4157,7 +4157,7 @@ __metadata: languageName: node linkType: hard -"@types/glob@npm:^7, @types/glob@npm:^7.1.1": +"@types/glob@npm:^7": version: 7.2.0 resolution: "@types/glob@npm:7.2.0" dependencies: @@ -5331,6 +5331,16 @@ __metadata: languageName: node linkType: hard +"aggregate-error@npm:^4.0.0": + version: 4.0.1 + resolution: "aggregate-error@npm:4.0.1" + dependencies: + clean-stack: ^4.0.0 + indent-string: ^5.0.0 + checksum: bb3ffdfd13447800fff237c2cba752c59868ee669104bb995dfbbe0b8320e967d679e683dabb640feb32e4882d60258165cde0baafc4cd467cc7d275a13ad6b5 + languageName: node + linkType: hard + "ajv-formats@npm:^2.1.1": version: 2.1.1 resolution: "ajv-formats@npm:2.1.1" @@ -5802,15 +5812,6 @@ __metadata: languageName: node linkType: hard -"array-union@npm:^1.0.1": - version: 1.0.2 - resolution: "array-union@npm:1.0.2" - dependencies: - array-uniq: ^1.0.1 - checksum: 82cec6421b6e6766556c484835a6d476a873f1b71cace5ab2b4f1b15b1e3162dc4da0d16f7a2b04d4aec18146c6638fe8f661340b31ba8e469fd811a1b45dc8d - languageName: node - linkType: hard - "array-union@npm:^2.1.0": version: 2.1.0 resolution: "array-union@npm:2.1.0" @@ -5818,13 +5819,6 @@ __metadata: languageName: node linkType: hard -"array-uniq@npm:^1.0.1": - version: 1.0.3 - resolution: "array-uniq@npm:1.0.3" - checksum: 1625f06b093d8bf279b81adfec6e72951c0857d65b5e3f65f053fffe9f9dd61c2fc52cff57e38a4700817e7e3f01a4faa433d505ea9e33cdae4514c334e0bf9e - languageName: node - linkType: hard - "array-unique@npm:^0.3.2": version: 0.3.2 resolution: "array-unique@npm:0.3.2" @@ -6566,6 +6560,15 @@ __metadata: languageName: node linkType: hard +"clean-stack@npm:^4.0.0": + version: 4.2.0 + resolution: "clean-stack@npm:4.2.0" + dependencies: + escape-string-regexp: 5.0.0 + checksum: 373f656a31face5c615c0839213b9b542a0a48057abfb1df66900eab4dc2a5c6097628e4a0b5aa559cdfc4e66f8a14ea47be9681773165a44470ef5fb8ccc172 + languageName: node + linkType: hard + "cli-boxes@npm:^1.0.0": version: 1.0.0 resolution: "cli-boxes@npm:1.0.0" @@ -7345,18 +7348,19 @@ __metadata: languageName: node linkType: hard -"del@npm:^4.0.0": - version: 4.1.1 - resolution: "del@npm:4.1.1" +"del@npm:^7.0.0": + version: 7.0.0 + resolution: "del@npm:7.0.0" dependencies: - "@types/glob": ^7.1.1 - globby: ^6.1.0 - is-path-cwd: ^2.0.0 - is-path-in-cwd: ^2.0.0 - p-map: ^2.0.0 - pify: ^4.0.1 - rimraf: ^2.6.3 - checksum: 521f7da44bd79da841c06d573923d1f64f423aee8b8219c973478d3150ce1dcc024d03ad605929292adbff56d6448bca60d96dcdd2d8a53b46dbcb27e265c94b + globby: ^13.1.2 + graceful-fs: ^4.2.10 + is-glob: ^4.0.3 + is-path-cwd: ^3.0.0 + is-path-inside: ^4.0.0 + p-map: ^5.5.0 + rimraf: ^3.0.2 + slash: ^4.0.0 + checksum: 33e5077f18b5dfbe81971d1f8a2cd8bf676dd5ede491bab85ec17a4a1d59001bd3ec47fd38e9a4ae01a3c98c07b98c7b3dc56190b86d88926798802d7858d827 languageName: node linkType: hard @@ -7780,6 +7784,13 @@ __metadata: languageName: node linkType: hard +"escape-string-regexp@npm:5.0.0": + version: 5.0.0 + resolution: "escape-string-regexp@npm:5.0.0" + checksum: 20daabe197f3cb198ec28546deebcf24b3dbb1a5a269184381b3116d12f0532e06007f4bc8da25669d6a7f8efb68db0758df4cd981f57bc5b57f521a3e12c59e + languageName: node + linkType: hard + "escape-string-regexp@npm:^1.0.5": version: 1.0.5 resolution: "escape-string-regexp@npm:1.0.5" @@ -8385,7 +8396,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.9": +"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.9": version: 3.2.12 resolution: "fast-glob@npm:3.2.12" dependencies: @@ -9053,7 +9064,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": +"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": version: 7.2.0 resolution: "glob@npm:7.2.0" dependencies: @@ -9131,16 +9142,16 @@ fsevents@^1.2.7: languageName: node linkType: hard -"globby@npm:^6.1.0": - version: 6.1.0 - resolution: "globby@npm:6.1.0" +"globby@npm:^13.1.2": + version: 13.1.3 + resolution: "globby@npm:13.1.3" dependencies: - array-union: ^1.0.1 - glob: ^7.0.3 - object-assign: ^4.0.1 - pify: ^2.0.0 - pinkie-promise: ^2.0.0 - checksum: 18109d6b9d55643d2b98b59c3cfae7073ccfe39829632f353d516cc124d836c2ddebe48a23f04af63d66a621b6d86dd4cbd7e6af906f2458a7fe510ffc4bd424 + dir-glob: ^3.0.1 + fast-glob: ^3.2.11 + ignore: ^5.2.0 + merge2: ^1.4.1 + slash: ^4.0.0 + checksum: 93f06e02002cdf368f7e3d55bd59e7b00784c7cc8fe92c7ee5082cc7171ff6109fda45e1c97a80bb48bc811dedaf7843c7c9186f5f84bde4883ab630e13c43df languageName: node linkType: hard @@ -9160,10 +9171,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": - version: 4.2.6 - resolution: "graceful-fs@npm:4.2.6" - checksum: 792e64aafda05a151289f83eaa16aff34ef259658cefd65393883d959409f5a2389b0ec9ebf28f3d21f1b0ddc8f594a1162ae9b18e2b507a6799a70706ec573d +"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": + version: 4.2.10 + resolution: "graceful-fs@npm:4.2.10" + checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da languageName: node linkType: hard @@ -9533,7 +9544,7 @@ fsevents@^1.2.7: date-fns-tz: ^1.3.7 deep-clone-simple: ^1.1.1 deep-freeze: ^0.0.1 - del: ^4.0.0 + del: ^7.0.0 eslint: ^7.32.0 eslint-config-airbnb-base: ^14.2.1 eslint-config-airbnb-typescript: ^14.0.0 @@ -9968,6 +9979,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"indent-string@npm:^5.0.0": + version: 5.0.0 + resolution: "indent-string@npm:5.0.0" + checksum: e466c27b6373440e6d84fbc19e750219ce25865cb82d578e41a6053d727e5520dc5725217d6eb1cc76005a1bb1696a0f106d84ce7ebda3033b963a38583fb3b3 + languageName: node + linkType: hard + "infer-owner@npm:^1.0.4": version: 1.0.4 resolution: "infer-owner@npm:1.0.4" @@ -10398,28 +10416,17 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-path-cwd@npm:^2.0.0": - version: 2.2.0 - resolution: "is-path-cwd@npm:2.2.0" - checksum: 46a840921bb8cc0dc7b5b423a14220e7db338072a4495743a8230533ce78812dc152548c86f4b828411fe98c5451959f07cf841c6a19f611e46600bd699e8048 +"is-path-cwd@npm:^3.0.0": + version: 3.0.0 + resolution: "is-path-cwd@npm:3.0.0" + checksum: bc34d13b6a03dfca4a3ab6a8a5ba78ae4b24f4f1db4b2b031d2760c60d0913bd16a4b980dcb4e590adfc906649d5f5132684079a3972bd219da49deebb9adea8 languageName: node linkType: hard -"is-path-in-cwd@npm:^2.0.0": - version: 2.0.0 - resolution: "is-path-in-cwd@npm:2.0.0" - dependencies: - is-path-inside: ^1.0.0 - checksum: 02ee5f8eba591871f94afeab1eb91133cbb209843d2b66beab2c70d111e57b6ab1351db5a235f956f1e084a36f609b4dcc70a163fceec07f748b259ba903d79b - languageName: node - linkType: hard - -"is-path-inside@npm:^1.0.0": - version: 1.0.1 - resolution: "is-path-inside@npm:1.0.1" - dependencies: - path-is-inside: ^1.0.1 - checksum: 07e52c81163937ff89b4700b7ad474de3b396846b55ed87530fb0a22cb9103926152939f673bc1a0592448e7e4e9d75eb734be21b4ad411311065c6a509fae54 +"is-path-inside@npm:^4.0.0": + version: 4.0.0 + resolution: "is-path-inside@npm:4.0.0" + checksum: 8810fa11c58e6360b82c3e0d6cd7d9c7d0392d3ac9eb10f980b81f9839f40ac6d1d6d6f05d069db0d227759801228f0b072e1b6c343e4469b065ab5fe0b68fe5 languageName: node linkType: hard @@ -12608,13 +12615,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"p-map@npm:^2.0.0": - version: 2.0.0 - resolution: "p-map@npm:2.0.0" - checksum: 2cd16168e2b6dc54cedbdb414809b486fbba05157eeaa657eb78f8f3987a3a3ee39c256ff9f612d9d295fabee5f0d7cfcbd9b8fe500e470ef598bc22e1d6f0fd - languageName: node - linkType: hard - "p-map@npm:^4.0.0": version: 4.0.0 resolution: "p-map@npm:4.0.0" @@ -12624,6 +12624,15 @@ fsevents@^1.2.7: languageName: node linkType: hard +"p-map@npm:^5.5.0": + version: 5.5.0 + resolution: "p-map@npm:5.5.0" + dependencies: + aggregate-error: ^4.0.0 + checksum: 065cb6fca6b78afbd070dd9224ff160dc23eea96e57863c09a0c8ea7ce921043f76854be7ee0abc295cff1ac9adcf700e79a1fbe3b80b625081087be58e7effb + languageName: node + linkType: hard + "p-retry@npm:^4.5.0": version: 4.6.1 resolution: "p-retry@npm:4.6.1" @@ -12822,7 +12831,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"path-is-inside@npm:1.0.2, path-is-inside@npm:^1.0.1": +"path-is-inside@npm:1.0.2": version: 1.0.2 resolution: "path-is-inside@npm:1.0.2" checksum: 0b5b6c92d3018b82afb1f74fe6de6338c4c654de4a96123cb343f2b747d5606590ac0c890f956ed38220a4ab59baddfd7b713d78a62d240b20b14ab801fa02cb @@ -12981,13 +12990,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"pify@npm:^4.0.1": - version: 4.0.1 - resolution: "pify@npm:4.0.1" - checksum: 9c4e34278cb09987685fa5ef81499c82546c033713518f6441778fbec623fc708777fe8ac633097c72d88470d5963094076c7305cafc7ad340aae27cfacd856b - languageName: node - linkType: hard - "pinkie-promise@npm:^2.0.0": version: 2.0.1 resolution: "pinkie-promise@npm:2.0.1" @@ -13833,7 +13835,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rimraf@npm:^2.6.1, rimraf@npm:^2.6.3": +"rimraf@npm:^2.6.1": version: 2.7.1 resolution: "rimraf@npm:2.7.1" dependencies: @@ -14332,6 +14334,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"slash@npm:^4.0.0": + version: 4.0.0 + resolution: "slash@npm:4.0.0" + checksum: da8e4af73712253acd21b7853b7e0dbba776b786e82b010a5bfc8b5051a1db38ed8aba8e1e8f400dd2c9f373be91eb1c42b66e91abb407ff42b10feece5e1d2d + languageName: node + linkType: hard + "slice-ansi@npm:^3.0.0": version: 3.0.0 resolution: "slice-ansi@npm:3.0.0"