From 8268bb53768704fcd893326cbaa958b97d9855c6 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Fri, 13 Aug 2021 15:06:13 +0800 Subject: [PATCH 1/2] fix: watch is only used in local development, move it to devDependencies --- packages/@vue/cli-ui/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json index d1c5f0c19f..afd9293c8d 100644 --- a/packages/@vue/cli-ui/package.json +++ b/packages/@vue/cli-ui/package.json @@ -60,8 +60,7 @@ "prismjs": "^1.23.0", "rss-parser": "^3.11.0", "shortid": "^2.2.15", - "typescript": "~4.1.5", - "watch": "^1.0.2" + "typescript": "~4.1.5" }, "devDependencies": { "@babel/core": "^7.12.16", @@ -105,6 +104,7 @@ "vue-template-compiler": "^2.6.14", "vue-timeago": "^5.1.3", "vue-virtual-scroller": "^1.0.10", + "watch": "^1.0.2", "xterm": "~4.10.0", "xterm-addon-fit": "^0.5.0", "xterm-addon-web-links": "^0.4.0" From 8d0cb0b99fffc1659410280e28d7c5d07ea6aa38 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Fri, 13 Aug 2021 15:15:19 +0800 Subject: [PATCH 2/2] refactor: replace `watch` with `chokidar` --- packages/@vue/cli-ui/apollo-server/connectors/locales.js | 4 ++-- packages/@vue/cli-ui/package.json | 2 +- yarn.lock | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/@vue/cli-ui/apollo-server/connectors/locales.js b/packages/@vue/cli-ui/apollo-server/connectors/locales.js index 0d34ea35a8..da8beb206e 100644 --- a/packages/@vue/cli-ui/apollo-server/connectors/locales.js +++ b/packages/@vue/cli-ui/apollo-server/connectors/locales.js @@ -49,8 +49,8 @@ function loadFolder (root, context) { const folder = path.join(root, './locales') if (process.env.VUE_APP_CLI_UI_DEV && !watchedTrees.get(root) && fs.existsSync(folder)) { watchedTrees.set(root, true) - const watch = require('watch') - watch.watchTree(folder, () => { + const chokidar = require('chokidar') + chokidar.watch(folder).on('all', () => { _loadFolder(root, context) log('Locales reloaded', root) }) diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json index afd9293c8d..1c8da062ba 100644 --- a/packages/@vue/cli-ui/package.json +++ b/packages/@vue/cli-ui/package.json @@ -74,6 +74,7 @@ "ansi_up": "^5.0.0", "apollo-client": "^2.6.10", "apollo-link": "^1.2.14", + "chokidar": "^3.5.2", "core-js": "^3.8.3", "cross-env": "^7.0.3", "date-fns": "^2.17.0", @@ -104,7 +105,6 @@ "vue-template-compiler": "^2.6.14", "vue-timeago": "^5.1.3", "vue-virtual-scroller": "^1.0.10", - "watch": "^1.0.2", "xterm": "~4.10.0", "xterm-addon-fit": "^0.5.0", "xterm-addon-web-links": "^0.4.0" diff --git a/yarn.lock b/yarn.lock index 51da8cf58a..2e70b1ca63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7128,7 +7128,7 @@ chokidar@3.5.1: optionalDependencies: fsevents "~2.3.1" -chokidar@3.5.2, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.2.2, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.1: +chokidar@3.5.2, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.2.2, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.1, chokidar@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==