Initial pass at support -- deps still need to be updated

Author: brentvatne

react-native-scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-scripts",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Configuration and scripts for Create React Native App.",
   "license": "BSD-3-Clause",
   "keywords": [
@@ -24,20 +24,21 @@
     "build": "taskr build"
   },
   "dependencies": {
+    "@expo/bunyan": "1.8.10",
     "babel-runtime": "^6.9.2",
     "chalk": "^2.0.1",
     "cross-spawn": "^5.0.1",
     "fs-extra": "^3.0.1",
     "indent-string": "^3.0.0",
     "inquirer": "^3.0.1",
+    "lodash": "^4.17.4",
     "match-require": "^2.0.0",
     "minimist": "^1.2.0",
     "path-exists": "^3.0.0",
     "progress": "^2.0.0",
     "qrcode-terminal": "^0.11.0",
     "rimraf": "^2.6.1",
-    "xdl": "44.0.0",
-    "@expo/bunyan": "1.8.10"
+    "xdl": "45.0.0-alpha.0"
   },
   "devDependencies": {
     "@taskr/babel": "^1.0.6",

react-native-scripts/src/scripts/init.js

@@ -10,9 +10,9 @@ import install from '../util/install';
 
 // UPDATE DEPENDENCY VERSIONS HERE
 const DEFAULT_DEPENDENCIES = {
-  expo: '^20.0.0',
+  expo: '^21.0.0-rc.5',
   react: '16.0.0-alpha.12',
-  'react-native': '^0.47.0',
+  'react-native': '^0.48.3',
 };
 
 // TODO figure out how this interacts with ejection

react-native-scripts/src/util/packager.js

@@ -7,6 +7,7 @@ import {
   ProjectUtils,
 } from 'xdl';
 
+import _ from 'lodash';
 import spawn from 'cross-spawn';
 import ProgressBar from 'progress';
 import bunyan from '@expo/bunyan';
@@ -62,7 +63,11 @@ function shouldIgnoreMsg(msg) {
     msg.indexOf('Warning: PropTypes has been moved to a separate package') >= 0;
 }
 
-function run(onReady: () => ?any, options: Object = {}, isInteractive = false) {
+function run(
+  onReady: () => ?any,
+  options: Object = {},
+  isInteractive?: boolean = false
+) {
   let packagerReady = false;
   let needsClear = false;
   let logBuffer = '';
@@ -142,13 +147,9 @@ ${chalk.cyan(`  sudo sysctl -w kern.maxfiles=5242880
 
     if (packagerReady) {
       const message = `${chunk.msg.trim()}\n`;
-      if (chunk.level <= bunyan.INFO) {
-        log.withTimestamp(message);
-      } else if (chunk.level === bunyan.WARN) {
-        log.withTimestamp(chalk.yellow(message));
-      } else {
-        log.withTimestamp(chalk.red(message));
+      logWithLevel(chunk);
 
+      if (chunk.level === bunyan.ERROR) {
         // if you run into a syntax error then we should clear log output on reload
         needsClear = message.indexOf('SyntaxError') >= 0;
       }
@@ -248,4 +249,84 @@ ${chalk.cyan(`  sudo sysctl -w kern.maxfiles=5242880
   );
 }
 
+const logStackTrace = (chunk, logFn, nestedLogFn, colorFn) => {
+  let traceInfo;
+  try {
+    traceInfo = JSON.parse(chunk.msg);
+  } catch (e) {
+    return logFn(colorFn(chunk.msg));
+  }
+
+  let { message, stack } = traceInfo;
+  logFn(colorFn(chalk.bold(message)));
+
+  const isLibraryFrame = line => {
+    return line.startsWith('node_modules');
+  };
+
+  let stackFrames = _.compact(stack.split('\n'));
+  let lastAppCodeFrameIndex = _.findLastIndex(stackFrames, line => {
+    return !isLibraryFrame(line);
+  });
+  let lastFrameIndexToLog = Math.min(
+    stackFrames.length - 1,
+    lastAppCodeFrameIndex + 2 // show max two more frames after last app code frame
+  );
+  let unloggedFrames = stackFrames.length - lastFrameIndexToLog;
+
+  // If we're only going to exclude one frame, just log them all
+  if (unloggedFrames === 1) {
+    lastFrameIndexToLog = stackFrames.length - 1;
+    unloggedFrames = 0;
+  }
+
+  for (let i = 0; i <= lastFrameIndexToLog; i++) {
+    let line = stackFrames[i];
+    if (!line) {
+      continue;
+    } else if (line.match(/react-native\/.*YellowBox.js/)) {
+      continue;
+    }
+
+    if (line.startsWith('node_modules')) {
+      nestedLogFn(colorFn('- ' + line));
+    } else {
+      nestedLogFn(colorFn('* ' + line));
+    }
+  }
+
+  if (unloggedFrames > 0) {
+    nestedLogFn(
+      colorFn(
+        `- ... ${unloggedFrames} more stack frames from framework internals`
+      )
+    );
+  }
+};
+
+const logWithLevel = chunk => {
+  if (!chunk.msg) {
+    return;
+  }
+
+  let colorFn = (str) => str;
+  if (chunk.level === bunyan.WARN) {
+    colorFn = chalk.yellow;
+  } else if (chunk.level === bunyan.ERROR) {
+    colorFn = chalk.red;
+  }
+
+  if (chunk.includesStack) {
+    logStackTrace(chunk, log.withTimestamp, log, colorFn);
+  } else {
+    logLines(chunk.msg, log.withTimestamp, colorFn);
+  }
+};
+
+const logLines = (msg, logFn, colorFn) => {
+  for (let line of msg.split('\n')) {
+    logFn(colorFn(line));
+  }
+};
+
 export default { run };

react-native-scripts/template/app.json

@@ -1,5 +1,5 @@
 {
   "expo": {
-    "sdkVersion": "20.0.0"
+    "sdkVersion": "21.0.0"
   }
 }

react-native-scripts/yarn.lock

@@ -26,9 +26,9 @@
     babel-runtime "^6.23.0"
     exec-async "^2.2.0"
 
-"@expo/schemer@^1.0.28":
-  version "1.0.43"
-  resolved "https://registry.yarnpkg.com/@expo/schemer/-/schemer-1.0.43.tgz#e5129f904c192b79dc88e952d8ce5e6bfa158eb6"
+"@expo/[email protected].44":
+  version "1.0.44"
+  resolved "https://registry.yarnpkg.com/@expo/schemer/-/schemer-1.0.44.tgz#d74a94ba0217f160c1a86ce1c6a42f581485a542"
   dependencies:
     ajv "^5.2.2"
     babel-polyfill "^6.23.0"
@@ -1774,10 +1774,6 @@ invariant@^2.0.0, invariant@^2.2.0:
   dependencies:
     loose-envify "^1.0.0"
 
-ip@^1.1.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-
 [email protected]:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
@@ -3342,14 +3338,14 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
-xdl@44.0.0:
-  version "44.0.0"
-  resolved "https://registry.yarnpkg.com/xdl/-/xdl-44.0.0.tgz#72ef1231c12d88348141814076c96c54ad0903a0"
+xdl@45.0.0-alpha.0:
+  version "45.0.0-alpha.0"
+  resolved "https://registry.yarnpkg.com/xdl/-/xdl-45.0.0-alpha.0.tgz#f9877e9a91b2319c054a22b763e754d3d3ee628f"
   dependencies:
     "@expo/bunyan" "^1.8.10"
     "@expo/json-file" "^5.3.0"
     "@expo/osascript" "^1.8.0"
-    "@expo/schemer" "^1.0.28"
+    "@expo/schemer" "1.0.44"
     "@expo/spawn-async" "^1.2.8"
     analytics-node "^2.1.0"
     auth0 "^2.7.0"
@@ -3369,7 +3365,6 @@ [email protected]:
     home-dir "^1.0.0"
     indent-string "^3.1.0"
     instapromise "2.0.7-rc.1"
-    ip "^1.1.3"
     joi "^10.0.2"
     jsonfile "^2.3.1"
     jsonschema "^1.1.0"