Remove watch parameter from config

Reviewed By: mjesun Differential Revision: D10033101 fbshipit-source-id: 0976e3b676b404ade46fe9e0b1680adfc39bc844
facebook · Sep 27, 2018 · 0d6c135 · 0d6c135
1 parent 9116b35
commit 0d6c135
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 10 deletions.
diff --git a/packages/metro-config/src/__tests__/__snapshots__/loadConfig-test.js.snap b/packages/metro-config/src/__tests__/__snapshots__/loadConfig-test.js.snap
@@ -95,7 +95,6 @@ Object {
     "workerPath": "metro/src/DeltaBundler/Worker",
   },
   "transformerPath": "",
-  "watch": false,
   "watchFolders": Array [
     "/",
   ],
@@ -197,7 +196,6 @@ Object {
     "workerPath": "metro/src/DeltaBundler/Worker",
   },
   "transformerPath": "",
-  "watch": false,
   "watchFolders": Array [
     "/",
   ],

diff --git a/packages/metro-config/src/__tests__/convertConfig-test.js b/packages/metro-config/src/__tests__/convertConfig-test.js
@@ -47,7 +47,6 @@ describe('convertConfig', () => {
       minifierPath: DEFAULT_METRO_MINIFIER_PATH,
       port: 8080,
       reporter: new TerminalReporter(new Terminal(process.stdout)),
-      watch: false,
     });
 
     expect(prettyFormat(convertedConfig)).toEqual(prettyFormat(defaultConfig));

diff --git a/packages/metro-config/src/configTypes.flow.js b/packages/metro-config/src/configTypes.flow.js
@@ -146,7 +146,6 @@ type MetalConfigT = {
   transformerPath: string,
   reporter: Reporter,
   resetCache: boolean,
-  watch: boolean,
   watchFolders: Array<string>,
 };
 

diff --git a/packages/metro-config/src/convertConfig.js b/packages/metro-config/src/convertConfig.js
@@ -158,7 +158,6 @@ async function convertOldToNew({
     watchFolders,
     transformerPath: defaultConfig.transformerPath,
     resetCache,
-    watch,
     maxWorkers,
   };
 }

diff --git a/packages/metro-config/src/defaults/index.js b/packages/metro-config/src/defaults/index.js
@@ -90,7 +90,6 @@ const getDefaultValues = (projectRoot: ?string): IntermediateConfigT => ({
   // node_modules/metro/
   projectRoot: projectRoot || path.resolve(__dirname, '../../..'),
   watchFolders: [],
-  watch: false,
   transformerPath: require.resolve('metro/src/JSTransformer/worker.js'),
   maxWorkers: getMaxWorkers(),
   resetCache: false,

diff --git a/packages/metro/src/DeltaBundler/Transformer/__tests__/Transformer-test.js b/packages/metro/src/DeltaBundler/Transformer/__tests__/Transformer-test.js
@@ -46,7 +46,6 @@ describe('Transformer', function() {
       projectRoot: '/root',
       resetCache: false,
       transformerPath: '/path/to/transformer.js',
-      watch: false,
       watchFolders: ['/root'],
     };
 

diff --git a/packages/metro/src/Server.js b/packages/metro/src/Server.js
@@ -100,8 +100,7 @@ class Server {
 
   constructor(config: ConfigT) {
     this._config = config;
-    // TODO(ives): Add config as a CLI param instead
-    this._config.watch = true;
+
     if (this._config.resetCache) {
       this._config.cacheStores.forEach(store => store.clear());
       this._config.reporter.update({type: 'transform_cache_reset'});

diff --git a/packages/metro/src/node-haste/DependencyGraph.js b/packages/metro/src/node-haste/DependencyGraph.js
@@ -96,7 +96,7 @@ class DependencyGraph extends EventEmitter {
       roots: config.watchFolders,
       throwOnModuleCollision: true,
       useWatchman: config.resolver.useWatchman,
-      watch: config.watch,
+      watch: true,
     });
   }