From dbdd78d33240c2b03f1236a5e5c4380b842afe4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Thu, 15 Oct 2020 13:16:39 +0200 Subject: [PATCH] Don't force chokidar@2 to be downloaded from registry.npmjs.org --- packages/babel-cli/package.json | 4 ++-- packages/babel-cli/src/babel/util.js | 4 ++-- yarn.lock | 17 +++++++++++++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/packages/babel-cli/package.json b/packages/babel-cli/package.json index 90d2515c29e4..6b3fdeb54544 100644 --- a/packages/babel-cli/package.json +++ b/packages/babel-cli/package.json @@ -33,8 +33,8 @@ "source-map": "^0.5.0" }, "optionalDependencies": { - "chokidar": "^3.4.0", - "chokidarAt2": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz" + "@nicolo-ribaudo/chokidar-2": "^2.1.8", + "chokidar": "^3.4.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" diff --git a/packages/babel-cli/src/babel/util.js b/packages/babel-cli/src/babel/util.js index e105a1f43850..a147d5a79277 100644 --- a/packages/babel-cli/src/babel/util.js +++ b/packages/babel-cli/src/babel/util.js @@ -116,10 +116,10 @@ process.on("uncaughtException", function (err) { export function requireChokidar(): Object { try { - // todo(babel 8): revert `chokidarAt2` hack + // todo(babel 8): revert `@nicolo-ribaudo/chokidar-2` hack return parseInt(process.version) >= 8 ? require("chokidar") - : require("chokidarAt2"); + : require("@nicolo-ribaudo/chokidar-2"); } catch (err) { console.error( "The optional dependency chokidar failed to install and is required for " + diff --git a/yarn.lock b/yarn.lock index 8b254c43002f..6646f6fc9e0a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -39,8 +39,8 @@ __metadata: dependencies: "@babel/core": "workspace:^7.12.0" "@babel/helper-fixtures": "workspace:^7.10.5" + "@nicolo-ribaudo/chokidar-2": ^2.1.8 chokidar: ^3.4.0 - chokidarAt2: "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz" commander: ^4.0.1 convert-source-map: ^1.1.0 fs-readdir-recursive: ^1.1.0 @@ -53,9 +53,9 @@ __metadata: peerDependencies: "@babel/core": ^7.0.0-0 dependenciesMeta: - chokidar: + "@nicolo-ribaudo/chokidar-2": optional: true - chokidarAt2: + chokidar: optional: true bin: babel: ./bin/babel.js @@ -3547,6 +3547,15 @@ __metadata: languageName: node linkType: hard +"@nicolo-ribaudo/chokidar-2@npm:^2.1.8": + version: 2.1.8 + resolution: "@nicolo-ribaudo/chokidar-2@npm:2.1.8" + dependencies: + chokidar: 2.1.8 + checksum: a3528e53052074df562ad776ac1211dc03d41b0c06d90b5472cd60d6e717900e4a987d89cf269c3c031ee35674f369e6ebd2e4846ed19d06e5da8ed1ffecb682 + languageName: node + linkType: hard + "@nodelib/fs.scandir@npm:2.1.3": version: 2.1.3 resolution: "@nodelib/fs.scandir@npm:2.1.3" @@ -5161,7 +5170,7 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^2.0.0": +"chokidar@npm:2.1.8, chokidar@npm:^2.0.0": version: 2.1.8 resolution: "chokidar@npm:2.1.8" dependencies: