Merge pull request #6338 from sebmarkbage/reactnative2

Move React Core Integration and Injection to the Core Repo

.babelrc

@@ -4,6 +4,7 @@
  "plugins": [
  "fbjs-scripts/babel-6/dev-expression",
  "syntax-trailing-function-commas",
+ "babel-plugin-transform-object-rest-spread",
  "transform-es2015-template-literals",
  "transform-es2015-literals",
  "transform-es2015-arrow-functions",

.travis.yml

@@ -58,6 +58,7 @@ script:
  -F "react-dom-server.min=@build/react-dom-server.min.js" \
  -F "npm-react=@build/packages/react.tgz" \
  -F "npm-react-dom=@build/packages/react-dom.tgz" \
+ -F "npm-react-native=@build/packages/react-native-renderer.tgz" \
  -F "commit=$TRAVIS_COMMIT" \
  -F "date=`git log --format='%ct' -1`" \
  -F "pull_request=$TRAVIS_PULL_REQUEST" \

Gruntfile.js

@@ -74,6 +74,10 @@ module.exports = function(grunt) {
  grunt.registerTask('npm-react-dom:release', npmReactDOMTasks.buildRelease);
  grunt.registerTask('npm-react-dom:pack', npmReactDOMTasks.packRelease);
 
+ var npmReactNativeTasks = require('./grunt/tasks/npm-react-native');
+ grunt.registerTask('npm-react-native:release', npmReactNativeTasks.buildRelease);
+ grunt.registerTask('npm-react-native:pack', npmReactNativeTasks.packRelease);
+
  var npmReactAddonsTasks = require('./grunt/tasks/npm-react-addons');
  grunt.registerTask('npm-react-addons:release', npmReactAddonsTasks.buildReleases);
  grunt.registerTask('npm-react-addons:pack', npmReactAddonsTasks.packReleases);
@@ -127,6 +131,8 @@ module.exports = function(grunt) {
  'npm-react:pack',
  'npm-react-dom:release',
  'npm-react-dom:pack',
+ 'npm-react-native:release',
+ 'npm-react-native:pack',
  'npm-react-addons:release',
  'npm-react-addons:pack',
  'compare_size',

grunt/tasks/npm-react-native.js

@@ -0,0 +1,46 @@
+'use strict';
+
+var fs = require('fs');
+var grunt = require('grunt');
+
+var src = 'packages/react-native-renderer/';
+var dest = 'build/packages/react-native-renderer/';
+
+function buildRelease() {
+ if (grunt.file.exists(dest)) {
+ grunt.file.delete(dest);
+ }
+
+ // Copy to build/packages/react-native-renderer
+ var mappings = [].concat(
+ grunt.file.expandMapping('**/*', dest, {cwd: src}),
+ grunt.file.expandMapping('{LICENSE,PATENTS}', dest)
+ );
+ mappings.forEach(function(mapping) {
+ var mappingSrc = mapping.src[0];
+ var mappingDest = mapping.dest;
+ if (grunt.file.isDir(mappingSrc)) {
+ grunt.file.mkdir(mappingDest);
+ } else {
+ grunt.file.copy(mappingSrc, mappingDest);
+ }
+ });
+}
+
+function packRelease() {
+ var done = this.async();
+ var spawnCmd = {
+ cmd: 'npm',
+ args: ['pack', 'packages/react-native-renderer'],
+ };
+ grunt.util.spawn(spawnCmd, function() {
+ var buildSrc = 'react-native-renderer-' + grunt.config.data.pkg.version + '.tgz';
+ var buildDest = 'build/packages/react-native-renderer.tgz';
+ fs.rename(buildSrc, buildDest, done);
+ });
+}
+
+module.exports = {
+ buildRelease: buildRelease,
+ packRelease: packRelease,
+};

grunt/tasks/version-check.js

@@ -11,6 +11,8 @@ module.exports = function() {
  grunt.file.readJSON('./packages/react/package.json').version,
  'packages/react-dom/package.json':
  grunt.file.readJSON('./packages/react-dom/package.json').version,
+ 'packages/react-native-renderer/package.json':
+ grunt.file.readJSON('./packages/react-native-renderer/package.json').version,
  'packages/react-addons/package.json (version)': addonsData.version,
  // Get the "version" without the range bit
  'packages/react-addons/package.json (react dependency)': addonsData.peerDependencies.react.slice(1),

gulpfile.js

@@ -20,6 +20,7 @@ var paths = {
  react: {
  src: [
  'src/**/*.js',
+ '!src/**/__benchmarks__/**/*.js',
  '!src/**/__tests__/**/*.js',
  '!src/**/__mocks__/**/*.js',
  '!src/shared/vendor/**/*.js',
@@ -28,17 +29,36 @@ var paths = {
  },
 };
 
+var fbjsModuleMap = require('fbjs/module-map');
+var moduleMap = {};
+for (var key in fbjsModuleMap) {
+ moduleMap[key] = fbjsModuleMap[key];
+}
+var whiteListNames = [
+ 'deepDiffer',
+ 'deepFreezeAndThrowOnMutationInDev',
+ 'flattenStyle',
+ 'InitializeJavaScriptAppEngine',
+ 'InteractionManager',
+ 'JSTimersExecution',
+ 'merge',
+ 'Platform',
+ 'RCTEventEmitter',
+ 'RCTLog',
+ 'TextInputState',
+ 'UIManager',
+ 'View',
+];
+
+whiteListNames.forEach(function(name) {
+ moduleMap[name] = name;
+});
+
+moduleMap['object-assign'] = 'object-assign';
+
 var babelOpts = {
  plugins: [
- [babelPluginModules, {
- map: Object.assign(
- {},
- require('fbjs/module-map'),
- {
- 'object-assign': 'object-assign',
- }
- ),
- }],
+ [babelPluginModules, { map: moduleMap }],
  ],
 };
 

package.json

@@ -25,6 +25,7 @@
  "babel-plugin-transform-es2015-template-literals": "^6.5.2",
  "babel-plugin-transform-es3-member-expression-literals": "^6.5.0",
  "babel-plugin-transform-es3-property-literals": "^6.5.0",
+ "babel-plugin-transform-object-rest-spread": "^6.6.5",
  "babel-preset-react": "^6.5.0",
  "browserify": "^13.0.0",
  "bundle-collapser": "^1.1.1",

packages/react-native-renderer/README.md

@@ -0,0 +1,5 @@
+# `react-native-renderer`
+
+This package is the renderer that is used by the react-native package.
+It is intended to be used inside the react-native environment. It is not
+intended to be used stand alone.

packages/react-native-renderer/index.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('react/lib/ReactNative');

packages/react-native-renderer/package.json

@@ -0,0 +1,23 @@
+{
+ "name": "react-native-renderer",
+ "version": "16.0.0-alpha",
+ "description": "React package for use inside react-native.",
+ "main": "index.js",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/facebook/react.git"
+ },
+ "keywords": [
+ "react",
+ "react-native"
+ ],
+ "license": "BSD-3-Clause",
+ "bugs": {
+ "url": "https://github.com/facebook/react/issues"
+ },
+ "homepage": "https://facebook.github.io/react-native/",
+ "dependencies": {
+ "fbjs": "^0.8.0",
+ "react": "^16.0.0-alpha"
+ }
+}

src/renderers/native/ReactIOS/IOSDefaultEventPluginOrder.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2015-present, 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.
+ *
+ * @providesModule IOSDefaultEventPluginOrder
+ * @flow
+ */
+'use strict';
+
+var IOSDefaultEventPluginOrder = [
+ 'ResponderEventPlugin',
+ 'IOSNativeBridgeEventPlugin',
+];
+
+module.exports = IOSDefaultEventPluginOrder;

src/renderers/native/ReactIOS/IOSNativeBridgeEventPlugin.js

@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2015-present, 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.
+ *
+ * @providesModule IOSNativeBridgeEventPlugin
+ * @flow
+ */
+'use strict';
+
+var EventPropagators = require('EventPropagators');
+var SyntheticEvent = require('SyntheticEvent');
+var UIManager = require('UIManager');
+
+var merge = require('merge');
+var warning = require('warning');
+
+var customBubblingEventTypes = UIManager.customBubblingEventTypes;
+var customDirectEventTypes = UIManager.customDirectEventTypes;
+
+var allTypesByEventName = {};
+
+for (var bubblingTypeName in customBubblingEventTypes) {
+ allTypesByEventName[bubblingTypeName] = customBubblingEventTypes[bubblingTypeName];
+}
+
+for (var directTypeName in customDirectEventTypes) {
+ warning(
+ !customBubblingEventTypes[directTypeName],
+ 'Event cannot be both direct and bubbling: %s',
+ directTypeName
+ );
+ allTypesByEventName[directTypeName] = customDirectEventTypes[directTypeName];
+}
+
+var IOSNativeBridgeEventPlugin = {
+
+ eventTypes: merge(customBubblingEventTypes, customDirectEventTypes),
+
+ /**
+ * @see {EventPluginHub.extractEvents}
+ */
+ extractEvents: function(
+ topLevelType,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget
+ ): ?Object {
+ var bubbleDispatchConfig = customBubblingEventTypes[topLevelType];
+ var directDispatchConfig = customDirectEventTypes[topLevelType];
+ var event = SyntheticEvent.getPooled(
+ bubbleDispatchConfig || directDispatchConfig,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget
+ );
+ if (bubbleDispatchConfig) {
+ EventPropagators.accumulateTwoPhaseDispatches(event);
+ } else if (directDispatchConfig) {
+ EventPropagators.accumulateDirectDispatches(event);
+ } else {
+ return null;
+ }
+ return event;
+ },
+};
+
+module.exports = IOSNativeBridgeEventPlugin;