diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js index 31244f8f75..a68c0db0ac 100644 --- a/tools/cli/commands-packages.js +++ b/tools/cli/commands-packages.js @@ -28,7 +28,6 @@ import { newPluginId, splitPluginsAndPackages, } from '../cordova/index.js'; -import { disableNativeWatcher } from '../fs/safe-watcher'; import { updateMeteorToolSymlink } from "../packaging/updater.js"; // For each release (or package), we store a meta-record with its name, @@ -96,7 +95,6 @@ main.registerCommand({ 'allow-incompatible-update': { type: Boolean } } }, function (options) { - disableNativeWatcher(); // If we're in an app, make sure that we can build the current app. Otherwise // just make sure that we can build some fake app. @@ -1160,8 +1158,6 @@ main.registerCommand({ }, catalogRefresh: new catalog.Refresh.OnceAtStart({ ignoreErrors: true }) }, function (options) { - disableNativeWatcher(); - var projectContext = new projectContextModule.ProjectContext({ projectDir: options.appDir, allowIncompatibleUpdate: options['allow-incompatible-update'] @@ -1773,8 +1769,6 @@ main.registerCommand({ maxArgs: Infinity, catalogRefresh: new catalog.Refresh.OnceAtStart({ ignoreErrors: true }) }, function (options) { - disableNativeWatcher(); - // If you are specifying packages individually, you probably don't want to // update the release. if (options.args.length > 0) { @@ -2137,8 +2131,6 @@ main.registerCommand({ requiresApp: true, catalogRefresh: new catalog.Refresh.OnceAtStart({ ignoreErrors: true }) }, function (options) { - disableNativeWatcher(); - var projectContext = new projectContextModule.ProjectContext({ projectDir: options.appDir, allowIncompatibleUpdate: options["allow-incompatible-update"] @@ -2347,8 +2339,6 @@ main.registerCommand({ requiresApp: true, catalogRefresh: new catalog.Refresh.Never() }, function (options) { - disableNativeWatcher(); - var projectContext = new projectContextModule.ProjectContext({ projectDir: options.appDir, allowIncompatibleUpdate: options["allow-incompatible-update"] diff --git a/tools/cli/commands.js b/tools/cli/commands.js index 8b3b0e2aea..c97d007c84 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -17,7 +17,6 @@ var release = require('../packaging/release.js'); const { Profile } = require("../tool-env/profile"); -import { disableNativeWatcher } from '../fs/safe-watcher'; import { ensureDevBundleDependencies } from '../cordova/index.js'; import { CordovaRunner } from '../cordova/runner.js'; import { iOSRunTarget, AndroidRunTarget } from '../cordova/run-targets.js'; @@ -537,8 +536,6 @@ main.registerCommand({ }, catalogRefresh: new catalog.Refresh.Never() }, function (options) { - disableNativeWatcher(); - // Creating a package is much easier than creating an app, so if that's what // we are doing, do that first. (For example, we don't springboard to the // latest release to create a package if we are inside an app) @@ -944,7 +941,6 @@ main.registerCommand({ name: "build", ...buildCommands, }, async function (options) { - disableNativeWatcher(); return Profile.run( "meteor build", () => Promise.await(buildCommand(options)) diff --git a/tools/fs/safe-watcher.ts b/tools/fs/safe-watcher.ts index e52cf636b8..467127acaa 100644 --- a/tools/fs/safe-watcher.ts +++ b/tools/fs/safe-watcher.ts @@ -468,10 +468,3 @@ export function addWatchRoot(absPath: string) { watcher.start() }); } - -// On Windows, pathwatcher can sometimes cause Meteor to get stuck. If we -// don't need native watching for a command, we can disable it. -// This is a temporary fix until pathwatcher is fixed or we replace it. -export function disableNativeWatcher () { - watcherEnabled = false; -}