diff --git a/package.json b/package.json index 85f2f5742fa6fcaf566b90dcfd5a805ea700fa6f..de0bf4b4a5426f355445499eefc006abe4f791e0 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ }, "dependencies": { "applicationinsights": "0.17.1", - "chokidar": "bpasero/chokidar#vscode", "fast-plist": "0.1.2", "gc-signals": "^0.0.1", "getmac": "1.0.7", @@ -40,6 +39,7 @@ "nsfw": "1.0.16", "semver": "4.3.6", "v8-profiler": "jrieken/v8-profiler#vscode", + "vscode-chokidar": "1.6.2", "vscode-debugprotocol": "1.24.0", "vscode-ripgrep": "0.6.0-patch.0.2", "vscode-textmate": "^3.2.0", @@ -123,7 +123,6 @@ "url": "https://github.com/Microsoft/vscode/issues" }, "optionalDependencies": { - "fsevents": "0.3.8", "windows-foreground-love": "0.1.0", "windows-mutex": "^0.2.0", "windows-process-tree": "0.1.6" diff --git a/src/typings/chokidar.d.ts b/src/typings/chokidar.d.ts index 019a9e80e6c22c664378ced5ab4b92991605f492..2aeacfc8db30771197daa19b580ebff78cd531e0 100644 --- a/src/typings/chokidar.d.ts +++ b/src/typings/chokidar.d.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -declare module 'chokidar' { +declare module 'vscode-chokidar' { /** * takes paths to be watched recursively and options diff --git a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts index ecc68bde9c033e3a3aa79a29096f34f05b0d5de7..28d609c8e1fcc2a1099096de29a10e6189047958 100644 --- a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts +++ b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts @@ -5,7 +5,7 @@ 'use strict'; -import chokidar = require('chokidar'); +import chokidar = require('vscode-chokidar'); import fs = require('fs'); import gracefulFs = require('graceful-fs'); diff --git a/yarn.lock b/yarn.lock index 25dfc2150a9cfae38ab36a005ba6e2d6b51bc7a5..6e08afe00e2f4e7216d5766742eef9bf43bf2048 100644 --- a/yarn.lock +++ b/yarn.lock @@ -141,11 +141,11 @@ ansi-styles@^3.1.0: color-convert "^1.9.0" anymatch@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507" + version "1.3.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" dependencies: - arrify "^1.0.0" micromatch "^2.1.5" + normalize-path "^2.0.0" applicationinsights@0.17.1: version "0.17.1" @@ -372,8 +372,8 @@ big-integer@^1.6.25: resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.25.tgz#1de45a9f57542ac20121c682f8d642220a34e823" binary-extensions@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.6.0.tgz#aa2184cbc434d29862c66a69bf81cc0a3383ee79" + version "1.10.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0" binary-search-bounds@2.0.3: version "2.0.3" @@ -580,21 +580,6 @@ cheerio@^1.0.0-rc.1: lodash "^4.15.0" parse5 "^3.0.1" -chokidar@bpasero/chokidar#vscode: - version "1.6.0" - resolved "https://codeload.github.com/bpasero/chokidar/tar.gz/8b64fda5a22cc9850f1346d12302051c5ba65b10" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents bpasero/fsevents#vscode - ci-info@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.1.tgz#47b44df118c48d2597b56d342e7e25791060171a" @@ -1847,12 +1832,6 @@ fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" -fsevents@0.3.8, fsevents@bpasero/fsevents#vscode: - version "0.3.8" - resolved "https://codeload.github.com/bpasero/fsevents/tar.gz/fe2aaccaaffbd69a23374cf46a8c6bafe8e51b01" - dependencies: - nan "^2.3.0" - function-bind@^1.0.2: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -3815,6 +3794,12 @@ normalize-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379" +normalize-path@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + dependencies: + remove-trailing-separator "^1.0.1" + normalize-path@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a" @@ -5736,10 +5721,31 @@ vsce@1.33.2: yauzl "^2.3.1" yazl "^2.2.2" +vscode-chokidar@1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/vscode-chokidar/-/vscode-chokidar-1.6.2.tgz#4db06e2d963befe42dd44434212f5b8606b53831" + dependencies: + anymatch "^1.3.0" + async-each "^1.0.0" + glob-parent "^2.0.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^2.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + optionalDependencies: + vscode-fsevents "0.3.8" + vscode-debugprotocol@1.24.0: version "1.24.0" resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.24.0.tgz#dbc10e8d7d95b102727a19af3f0fcef7e252b08e" +vscode-fsevents@0.3.8: + version "0.3.8" + resolved "https://registry.yarnpkg.com/vscode-fsevents/-/vscode-fsevents-0.3.8.tgz#389647fa2f6daffedf1b40132a5bb96ac6501521" + dependencies: + nan "^2.3.0" + vscode-nls-dev@^2.0.1: version "2.1.5" resolved "https://registry.yarnpkg.com/vscode-nls-dev/-/vscode-nls-dev-2.1.5.tgz#19faa3b18a7f302201039a4c967bbd22fa12844d"