Merge pull request #95 from skevy/rn-0.18-compat

RN 0.18 Compatibility changes

Author: yungsters

gulpfile.js

@@ -9,7 +9,8 @@ var runSequence = require('run-sequence');
 
 var babelPluginDEV = require('fbjs-scripts/babel/dev-expression');
 var babelDefaultOptions = require('fbjs-scripts/babel/default-options');
-var gulpModuleMap = require('fbjs-scripts/gulp/module-map.js');
+var gulpModuleMap = require('fbjs-scripts/gulp/module-map');
+var gulpStripProvidesModule = require('fbjs-scripts/gulp/strip-provides-module');
 
 var paths = {
   lib: {
@@ -50,6 +51,7 @@ gulp.task('lib', function() {
   var libTask = gulp
     .src(paths.lib.src)
     .pipe(gulpModuleMap(moduleMapOpts))
+    .pipe(gulpStripProvidesModule())
     .pipe(babel(babelOpts))
     .pipe(flatten())
     .pipe(gulp.dest(paths.lib.dest));

package.json

@@ -63,9 +63,9 @@
   "dependencies": {
     "core-js": "^1.0.0",
     "loose-envify": "^1.0.0",
+    "isomorphic-fetch": "^2.1.1",
     "promise": "^7.0.3",
-    "ua-parser-js": "^0.7.9",
-    "whatwg-fetch": "^0.9.0"
+    "ua-parser-js": "^0.7.9"
   },
   "devEngines": {
     "node": ">=3",

scripts/babel/default-options.js

@@ -43,8 +43,10 @@ module.exports = {
   plugins: plugins,
   _moduleMap: {
     'core-js/library/es6/map': 'core-js/library/es6/map',
+    'isomorphic-fetch': 'isomorphic-fetch',
     'promise': 'promise',
+    'promise/setimmediate/done': 'promise/setimmediate/done',
+    'promise/setimmediate/es6-extensions': 'promise/setimmediate/es6-extensions',
     'ua-parser-js': 'ua-parser-js',
-    'whatwg-fetch': 'whatwg-fetch',
   },
 };

scripts/gulp/module-map.js

@@ -14,7 +14,7 @@ var through = require('through2');
 var fs = require('fs');
 var path = require('path');
 
-var PM_REGEXP = /\r?\n \* \@providesModule (\S+)\r?\n/;
+var PM_REGEXP = require('./shared/provides-module').regexp;
 
 var PLUGIN_NAME = 'module-map';
 

scripts/gulp/shared/provides-module.js

@@ -0,0 +1,14 @@
+/**
+ * Copyright 2013-2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+module.exports = {
+  regexp: /\r?\n \* \@providesModule (\S+)(?=\r?\n)/,
+};

scripts/gulp/strip-provides-module.js

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2013-2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+var gutil = require('gulp-util');
+var through = require('through2');
+var PM_REGEXP = require('./shared/provides-module').regexp;
+
+module.exports = function(opts) {
+  function transform(file, enc, cb) {
+    if (file.isNull()) {
+      cb(null, file);
+      return;
+    }
+
+    if (file.isStream()) {
+      cb(new gutil.PluginError('module-map', 'Streaming not supported'));
+      return;
+    }
+
+    // Get the @providesModule piece out of the file and save that.
+    var contents = file.contents.toString().replace(PM_REGEXP, '');
+    file.contents = new Buffer(contents);
+    this.push(file);
+    cb();
+  }
+
+  return through.obj(transform);
+};

src/__forks__/Promise.native.js

@@ -0,0 +1,26 @@
+/**
+ *
+ * Copyright 2013-2016 Facebook, Inc.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This module wraps and augments the minimally ES6-compliant Promise
+ * implementation provided by the promise npm package.
+ *
+ */
+
+'use strict';
+
+var Promise = require('promise/setimmediate/es6-extensions');
+require('promise/setimmediate/done');
+
+/**
+ * Handle either fulfillment or rejection with the same callback.
+ */
+Promise.prototype.finally = function(onSettled) {
+  return this.then(onSettled, onSettled);
+};
+
+module.exports = Promise;

src/__forks__/fetch.js

@@ -11,5 +11,11 @@
 
 'use strict';
 
-require('whatwg-fetch');
-module.exports = self.fetch.bind(self);
+// This hopefully supports the React Native case, which is already bringing along
+// its own fetch polyfill. That should exist on `global`. If that doesn't exist
+// then we'll try to polyfill, which might not work correctly in all environments.
+if (global.fetch) {
+  module.exports = global.fetch.bind(global);
+} else {
+  module.exports = require('isomorphic-fetch');
+}

src/stubs/ErrorUtils.js

@@ -11,13 +11,17 @@
 
 /* jslint unused:false */
 
-var ErrorUtils = {
-  applyWithGuard(callback, context, args, onError, name) {
-    return callback.apply(context, args);
-  },
-  guard(callback, name) {
-    return callback;
-  },
-};
+if (global.ErrorUtils) {
+  module.exports = global.ErrorUtils;
+} else {
+  var ErrorUtils = {
+    applyWithGuard(callback, context, args, onError, name) {
+      return callback.apply(context, args);
+    },
+    guard(callback, name) {
+      return callback;
+    },
+  };
 
-module.exports = ErrorUtils;
+  module.exports = ErrorUtils;
+}