facebook · grabbou · Jan 17, 2019 · Jan 17, 2019 · Jan 17, 2019 · Jan 17, 2019
diff --git a/.flowconfig b/.flowconfig
@@ -26,6 +26,10 @@
 ; require from fbjs/lib instead: require('fbjs/lib/warning')
 .*/node_modules/warning/.*
 
+[untyped]
+.*/node_modules/@react-native-community/cli/.*/.*
+
+
 [include]
 
 [libs]

diff --git a/.flowconfig.android b/.flowconfig.android
@@ -26,6 +26,9 @@
 ; require from fbjs/lib instead: require('fbjs/lib/warning')
 .*/node_modules/warning/.*
 
+[untyped]
+.*/node_modules/@react-native-community/cli/.*/.*
+
 [include]
 
 [libs]

diff --git a/cli.js b/cli.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-var cli = require('react-native-local-cli');
+var cli = require('@react-native-community/cli');
 
 if (require.main === module) {
   cli.run();

diff --git a/jest/hasteImpl.js b/jest/hasteImpl.js
@@ -24,10 +24,11 @@ if (REACT_NATIVE_CI) {
 
 function getPlugins() {
   try {
-    const findPlugins = require('react-native-local-cli/core/findPlugins');
+    // @todo do not rely on private files
+    const findPlugins = require('@react-native-community/cli/build/core/findPlugins');
 
-    return findPlugins([path.resolve(__dirname, pluginsPath)]);
-  } catch (_) {
+    return findPlugins(path.resolve(__dirname, pluginsPath));
+  } catch (e) {
     return {
       haste: {
         providesModuleNodeModules: [],

diff --git a/jest/preprocessor.js b/jest/preprocessor.js
@@ -25,7 +25,7 @@ const generate = require('@babel/generator').default;
 
 const nodeFiles = new RegExp(
   [
-    '/metro(?:-[^/]*)?/', // metro, metro-core, metro-source-map, metro-etc
+    '/metro(?:-[^/]*)?/', // metro, metro-core, metro-source-map, metro-etc.
   ].join('|'),
 );
 const nodeOptions = babelRegisterOnly.config([nodeFiles]);

diff --git a/local-cli/cli.js b/local-cli/cli.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-var cli = require('react-native-local-cli');
+var cli = require('@react-native-community/cli');
 
 if (require.main === module) {
   cli.run();

@@ -199,7 +199,7 @@
     "prop-types": "^15.5.8",
     "react-clone-referenced-element": "^1.0.1",
     "react-devtools-core": "^3.6.0",
-    "react-native-local-cli": "1.0.0-alpha.4",
+    "@react-native-community/cli": "^1.1.0",
     "regenerator-runtime": "^0.11.0",
     "rimraf": "^2.5.4",
     "semver": "^5.0.3",

diff --git a/react-native-git-upgrade/cliEntry.js b/react-native-git-upgrade/cliEntry.js
@@ -298,7 +298,7 @@ async function run(requestedVersion, cliArgs) {
   const generatorDir = path.resolve(
     process.cwd(),
     'node_modules',
-    'react-native-local-cli',
+    '@react-native-community/cli',
     'generator',
   );
   let projectBackupCreated = false;

diff --git a/rn-cli.config.js b/rn-cli.config.js
@@ -19,5 +19,16 @@ module.exports = {
   extraNodeModules: {
     'react-native': __dirname,
   },
-  getPolyfills,
+  serializer: {
+    getModulesRunBeforeMainModule: () => [
+      require.resolve('./Libraries/Core/InitializeCore'),
+    ],
+    getPolyfills,
+  },
+  resolver: {
+    hasteImplModulePath: require.resolve('./jest/hasteImpl'),
+  },
+  transformer: {
+    assetRegistryPath: require.resolve('./Libraries/Image/AssetRegistry'),
+  },
 };
diff --git a/yarn.lock b/yarn.lock