{"files":[{"status":"M","path":"Gruntfile.js"},{"status":"M","path":"bin\/jsx-internal"},{"status":"M","path":"grunt\/config\/browserify.js"},{"status":"M","path":"grunt\/tasks\/browserify.js"},{"status":"A","path":"grunt\/tasks\/jest.js"},{"status":"A","path":"gulpfile.js"},{"status":"D","path":"jest\/preprocessor.js"},{"status":"M","path":"package.json"},{"status":"M","path":"packages\/react-dom\/package.json"},{"status":"M","path":"packages\/react\/package.json"},{"previousPath":"jest\/environment.js","status":"R100","path":"scripts\/jest\/environment.js"},{"previousPath":"jest\/jest.d.ts","status":"R100","path":"scripts\/jest\/jest.d.ts"},{"status":"A","path":"scripts\/jest\/preprocessor.js"},{"previousPath":"jest\/ts-preprocessor.js","status":"R100","path":"scripts\/jest\/ts-preprocessor.js"},{"status":"M","path":"src\/isomorphic\/deprecated\/__tests__\/cloneWithProps-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/__tests__\/ReactBrowserEventEmitter-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js"},{"status":"M","path":"src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js"},{"status":"D","path":"src\/shared\/vendor\/README.md"},{"status":"D","path":"src\/shared\/vendor\/core\/CSSCore.js"},{"status":"D","path":"src\/shared\/vendor\/core\/ExecutionEnvironment.js"},{"status":"D","path":"src\/shared\/vendor\/core\/TouchEventUtils.js"},{"status":"D","path":"src\/shared\/vendor\/core\/camelize.js"},{"status":"D","path":"src\/shared\/vendor\/core\/camelizeStyleName.js"},{"status":"D","path":"src\/shared\/vendor\/core\/createArrayFromMixed.js"},{"status":"D","path":"src\/shared\/vendor\/core\/createNodesFromMarkup.js"},{"status":"D","path":"src\/shared\/vendor\/core\/dom\/containsNode.js"},{"status":"D","path":"src\/shared\/vendor\/core\/dom\/focusNode.js"},{"status":"D","path":"src\/shared\/vendor\/core\/dom\/getActiveElement.js"},{"status":"D","path":"src\/shared\/vendor\/core\/dom\/getUnboundedScrollPosition.js"},{"status":"D","path":"src\/shared\/vendor\/core\/dom\/isNode.js"},{"status":"D","path":"src\/shared\/vendor\/core\/dom\/isTextNode.js"},{"status":"D","path":"src\/shared\/vendor\/core\/emptyFunction.js"},{"status":"D","path":"src\/shared\/vendor\/core\/emptyObject.js"},{"status":"D","path":"src\/shared\/vendor\/core\/getMarkupWrap.js"},{"status":"D","path":"src\/shared\/vendor\/core\/hyphenate.js"},{"status":"D","path":"src\/shared\/vendor\/core\/hyphenateStyleName.js"},{"status":"D","path":"src\/shared\/vendor\/core\/invariant.js"},{"status":"D","path":"src\/shared\/vendor\/core\/mapObject.js"},{"status":"D","path":"src\/shared\/vendor\/core\/monitorCodeUse.js"},{"status":"D","path":"src\/shared\/vendor\/core\/nativeRequestAnimationFrame.js"},{"status":"D","path":"src\/shared\/vendor\/core\/requestAnimationFrame.js"},{"status":"D","path":"src\/shared\/vendor\/core\/toArray.js"},{"status":"D","path":"src\/shared\/vendor\/core\/warning.js"},{"status":"D","path":"src\/shared\/vendor\/key-mirror\/__tests__\/keyMirror-test.js"},{"status":"D","path":"src\/shared\/vendor\/key-mirror\/keyMirror.js"},{"status":"D","path":"src\/shared\/vendor\/key-mirror\/keyOf.js"},{"status":"D","path":"src\/shared\/vendor\/performance\/performance.js"},{"status":"D","path":"src\/shared\/vendor\/performance\/performanceNow.js"},{"status":"D","path":"src\/shared\/vendor\/stubs\/EventListener.js"},{"status":"D","path":"vendor\/constants.js"}],"patch":"diff --git a\/Gruntfile.js b\/Gruntfile.js\nindex 4e616b4e54..05cc02e311 100644\n--- a\/Gruntfile.js\n+++ b\/Gruntfile.js\n@@ -1,5 +1,8 @@\n 'use strict';\n \n+var assign = require('object-assign');\n+var path = require('path');\n+\n module.exports = function(grunt) {\n \n grunt.initConfig({\n@@ -21,6 +24,21 @@ module.exports = function(grunt) {\n \n grunt.config.set('compress', require('.\/grunt\/config\/compress'));\n \n+ function spawnGulp(args, opts, done) {\n+ grunt.util.spawn({\n+ \/\/ This could be more flexible (require.resolve & lookup bin in package)\n+ \/\/ but if it breaks we'll fix it then.\n+ cmd: path.join('node_modules', '.bin', 'gulpp'),\n+ args: args,\n+ opts: assign({stdio: 'inherit'}, opts),\n+ }, function(err, result, code) {\n+ if (err) {\n+ grunt.fail.fatal('Something went wrong running gulp: ', result);\n+ }\n+ done(code === 0);\n+ });\n+ }\n+\n Object.keys(grunt.file.readJSON('package.json').devDependencies)\n .filter(function(npmTaskName) {\n return npmTaskName.indexOf('grunt-') === 0;\n@@ -37,9 +55,8 @@ module.exports = function(grunt) {\n grunt.registerTask('lint', ['eslint']);\n \n grunt.registerTask('delete-build-modules', function() {\n- if (grunt.file.exists('build\/modules')) {\n- grunt.file.delete('build\/modules');\n- }\n+ \/\/ Use gulp here\n+ spawnGulp(['react:clean'], null, this.async());\n });\n \n \/\/ Register jsx:normal and :release tasks.\n@@ -68,30 +85,30 @@ module.exports = function(grunt) {\n grunt.registerTask('version-check', require('.\/grunt\/tasks\/version-check'));\n \n grunt.registerTask('build:basic', [\n- 'jsx:normal',\n+ 'build-modules',\n 'version-check',\n 'browserify:basic',\n ]);\n grunt.registerTask('build:addons', [\n- 'jsx:normal',\n+ 'build-modules',\n 'browserify:addons',\n ]);\n grunt.registerTask('build:transformer', [\n- 'jsx:normal',\n+ 'build-modules',\n 'browserify:transformer',\n ]);\n grunt.registerTask('build:min', [\n- 'jsx:normal',\n+ 'build-modules',\n 'version-check',\n 'browserify:min',\n ]);\n grunt.registerTask('build:addons-min', [\n- 'jsx:normal',\n+ 'build-modules',\n 'browserify:addonsMin',\n ]);\n grunt.registerTask('build:npm-react', [\n 'version-check',\n- 'jsx:normal',\n+ 'build-modules',\n 'npm-react:release',\n ]);\n \n@@ -101,11 +118,13 @@ module.exports = function(grunt) {\n grunt.registerTask('test', ['jest']);\n grunt.registerTask('npm:test', ['build', 'npm:pack']);\n \n+ grunt.registerTask('jest', require('.\/grunt\/tasks\/jest'));\n+\n \/\/ Optimized build task that does all of our builds. The subtasks will be run\n- \/\/ in order so we can take advantage of that and only run jsx:normal once.\n+ \/\/ in order so we can take advantage of that and only run build-modules once.\n grunt.registerTask('build', [\n 'delete-build-modules',\n- 'jsx:normal',\n+ 'build-modules',\n 'version-check',\n 'browserify:basic',\n 'browserify:transformer',\n@@ -141,6 +160,10 @@ module.exports = function(grunt) {\n 'release:msg',\n ]);\n \n+ grunt.registerTask('build-modules', function() {\n+ spawnGulp(['react:modules'], null, this.async());\n+ });\n+\n \/\/ The default task - build - to keep setup easy.\n grunt.registerTask('default', ['build']);\n };\ndiff --git a\/bin\/jsx-internal b\/bin\/jsx-internal\nindex 836e602f0f..0eb2a73ba7 100755\n--- a\/bin\/jsx-internal\n+++ b\/bin\/jsx-internal\n@@ -1,16 +1,17 @@\n #!\/usr\/bin\/env node\n \/\/ -*- mode: js -*-\n \/\/ vim: set ft=javascript :\n-\"use strict\";\n+\n+'use strict';\n \n var babel = require('babel');\n \n-var constants = require('..\/vendor\/constants')(babel);\n+var devExpressionPlugin = require('fbjs\/scripts\/babel\/dev-expression');\n \n var TRANSFORM_IGNORE_RE = \/^WebComponents$\/;\n \n-require(\"commoner\").version(\n- require(\"..\/package.json\").version\n+require('commoner').version(\n+ require('..\/package.json').version\n ).resolve(function(id) {\n var context = this;\n \n@@ -38,8 +39,8 @@ require(\"commoner\").version(\n \/\/ This is where JSX, ES6, etc. desugaring happens.\n source = babel.transform(source, {\n blacklist: ['spec.functionName', 'validation.react'],\n- plugins: [constants],\n- filename: id\n+ plugins: [devExpressionPlugin],\n+ filename: id,\n }).code;\n }\n \ndiff --git a\/grunt\/config\/browserify.js b\/grunt\/config\/browserify.js\nindex 9fc8ca88b9..59c9fe7bd1 100644\n--- a\/grunt\/config\/browserify.js\n+++ b\/grunt\/config\/browserify.js\n@@ -9,6 +9,9 @@ var uglifyify = require('uglifyify');\n var derequire = require('derequire');\n var collapser = require('bundle-collapser\/plugin');\n \n+var envifyDev = envify({NODE_ENV: process.env.NODE_ENV || 'development'});\n+var envifyProd = envify({NODE_ENV: process.env.NODE_ENV || 'production'});\n+\n var SIMPLE_TEMPLATE =\n '\/**\\n\\\n * @PACKAGE@ v@VERSION@\\n\\\n@@ -56,7 +59,8 @@ var basic = {\n outfile: '.\/build\/react.js',\n debug: false,\n standalone: 'React',\n- transforms: [envify({NODE_ENV: process.env.NODE_ENV || 'development'})],\n+ \/\/ Apply as global transform so that we also envify fbjs and any other deps\n+ globalTransforms: [envifyDev],\n plugins: [collapser],\n after: [derequire, simpleBannerify],\n };\n@@ -68,7 +72,10 @@ var min = {\n outfile: '.\/build\/react.min.js',\n debug: false,\n standalone: 'React',\n- transforms: [envify({NODE_ENV: process.env.NODE_ENV || 'production'}), uglifyify],\n+ \/\/ Envify twice. The first ensures that when we uglifyify, we have the right\n+ \/\/ conditions to exclude requires. The global transform runs on deps.\n+ transforms: [envifyProd, uglifyify],\n+ globalTransforms: [envifyProd],\n plugins: [collapser],\n \/\/ No need to derequire because the minifier will mangle\n \/\/ the \"require\" calls.\n@@ -100,7 +107,7 @@ var addons = {\n debug: false,\n standalone: 'React',\n packageName: 'React (with addons)',\n- transforms: [envify({NODE_ENV: process.env.NODE_ENV || 'development'})],\n+ globalTransforms: [envifyDev],\n plugins: [collapser],\n after: [derequire, simpleBannerify],\n };\n@@ -113,7 +120,8 @@ var addonsMin = {\n debug: false,\n standalone: 'React',\n packageName: 'React (with addons)',\n- transforms: [envify({NODE_ENV: process.env.NODE_ENV || 'production'}), uglifyify],\n+ transforms: [envifyProd, uglifyify],\n+ globalTransforms: [envifyProd],\n plugins: [collapser],\n \/\/ No need to derequire because the minifier will mangle\n \/\/ the \"require\" calls.\ndiff --git a\/grunt\/tasks\/browserify.js b\/grunt\/tasks\/browserify.js\nindex 8102791d7d..6ae1b8dfc4 100644\n--- a\/grunt\/tasks\/browserify.js\n+++ b\/grunt\/tasks\/browserify.js\n@@ -13,17 +13,21 @@ module.exports = function() {\n \/\/ grunt.config.requires('outfile');\n \/\/ grunt.config.requires('entries');\n config.transforms = config.transforms || [];\n+ config.globalTransforms = config.globalTransforms || [];\n config.plugins = config.plugins || [];\n config.after = config.after || [];\n+ config.paths = config.paths || [];\n \n \/\/ create the bundle we'll work with\n var entries = grunt.file.expand(config.entries);\n+ var paths = grunt.file.expand(config.paths);\n \n \/\/ Extract other options\n var options = {\n entries: entries,\n debug: config.debug, \/\/ sourcemaps\n standalone: config.standalone, \/\/ global\n+ paths: paths,\n };\n \n var bundle = browserify(options);\n@@ -32,6 +36,10 @@ module.exports = function() {\n bundle.transform({}, transform);\n });\n \n+ config.globalTransforms.forEach(function(transform) {\n+ bundle.transform({global: true}, transform);\n+ });\n+\n config.plugins.forEach(bundle.plugin, bundle);\n \n \/\/ Actually bundle it up\ndiff --git a\/grunt\/tasks\/jest.js b\/grunt\/tasks\/jest.js\nnew file mode 100644\nindex 0000000000..d964a8c03c\n--- \/dev\/null\n+++ b\/grunt\/tasks\/jest.js\n@@ -0,0 +1,30 @@\n+\/\/ We run our own grunt task instead of using grunt-jest so that we can have\n+\/\/ more control. Specifically we want to set NODE_ENV and make sure stdio is\n+\/\/ inherited. We also run with --harmony directly so that we don't have to\n+\/\/ respawn immediately. We should be able to reduce some of this complexity\n+\/\/ when jest 0.5 is run on top of iojs.\n+\n+'use strict';\n+\n+var grunt = require('grunt');\n+var path = require('path');\n+\n+module.exports = function() {\n+ var done = this.async();\n+ grunt.log.writeln('running jest (this may take a while)');\n+ grunt.util.spawn({\n+ cmd: 'node',\n+ args: ['--harmony', path.join('node_modules', 'jest-cli', 'bin', 'jest')],\n+ opts: {stdio: 'inherit', env: {NODE_ENV: 'test'}},\n+ }, function(err, result, code) {\n+ if (err) {\n+ grunt.log.error('jest failed');\n+ grunt.log.error(err);\n+ } else {\n+ grunt.log.ok('jest passed');\n+ }\n+ grunt.log.writeln(result.stdout);\n+\n+ done(code === 0);\n+ });\n+};\ndiff --git a\/gulpfile.js b\/gulpfile.js\nnew file mode 100644\nindex 0000000000..8f5eed35b9\n--- \/dev\/null\n+++ b\/gulpfile.js\n@@ -0,0 +1,56 @@\n+\/**\n+ * Copyright 2013-2015, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\/\n+\n+'use strict';\n+\n+var gulp = require('gulp');\n+var babel = require('gulp-babel');\n+var flatten = require('gulp-flatten');\n+var del = require('del');\n+\n+var babelPluginDEV = require('fbjs\/scripts\/babel\/dev-expression');\n+var babelPluginRequires = require('fbjs\/scripts\/babel\/rewrite-requires');\n+\n+var paths = {\n+ react: {\n+ src: [\n+ 'src\/**\/*.js',\n+ '!src\/**\/__tests__\/**\/*.js',\n+ '!src\/**\/__mocks__\/**\/*.js',\n+ ],\n+ lib: 'build\/modules',\n+ },\n+};\n+\n+var babelOpts = {\n+ nonStandard: true,\n+ blacklist: [\n+ 'spec.functionName',\n+ ],\n+ optional: [\n+ 'es7.trailingFunctionCommas',\n+ ],\n+ plugins: [babelPluginDEV, babelPluginRequires],\n+ ignore: ['third_party'],\n+ _moduleMap: require('fbjs\/module-map'),\n+};\n+\n+gulp.task('react:clean', function(cb) {\n+ del([paths.react.lib], cb);\n+});\n+\n+gulp.task('react:modules', function() {\n+ return gulp\n+ .src(paths.react.src)\n+ .pipe(babel(babelOpts))\n+ .pipe(flatten())\n+ .pipe(gulp.dest(paths.react.lib));\n+});\n+\n+gulp.task('default', ['react:modules']);\ndiff --git a\/jest\/preprocessor.js b\/jest\/preprocessor.js\ndeleted file mode 100644\nindex f4b087ef64..0000000000\n--- a\/jest\/preprocessor.js\n+++ \/dev\/null\n@@ -1,32 +0,0 @@\n-'use strict';\n-\n-var babel = require('babel');\n-var coffee = require('coffee-script');\n-\n-var tsPreprocessor = require('.\/ts-preprocessor');\n-\n-var defaultLibraries = [\n- require.resolve('.\/jest.d.ts'),\n- require.resolve('..\/src\/isomorphic\/modern\/class\/React.d.ts'),\n-];\n-\n-var ts = tsPreprocessor(defaultLibraries);\n-\n-module.exports = {\n- process: function(src, path) {\n- if (path.match(\/\\.coffee$\/)) {\n- return coffee.compile(src, {'bare': true});\n- }\n- if (path.match(\/\\.ts$\/) && !path.match(\/\\.d\\.ts$\/)) {\n- return ts.compile(src, path);\n- }\n- if (!path.match(\/\\\/node_modules\\\/\/) && !path.match(\/\\\/third_party\\\/\/)) {\n- return babel.transform(src, {\n- blacklist: ['spec.functionName', 'validation.react'],\n- filename: path,\n- retainLines: true,\n- }).code;\n- }\n- return src;\n- },\n-};\ndiff --git a\/package.json b\/package.json\nindex 6568b123a3..6583271138 100644\n--- a\/package.json\n+++ b\/package.json\n@@ -35,23 +35,30 @@\n \"browserify\": \"^9.0.3\",\n \"bundle-collapser\": \"^1.1.1\",\n \"coffee-script\": \"^1.8.0\",\n+ \"del\": \"^1.2.0\",\n \"derequire\": \"^2.0.0\",\n \"envify\": \"^3.0.0\",\n \"eslint\": \"^0.24.1\",\n \"eslint-plugin-react\": \"^2.5.0\",\n \"eslint-plugin-react-internal\": \"file:eslint-rules\",\n \"eslint-tester\": \"^0.7.0\",\n+ \"fbjs\": \"^0.1.0-alpha.0\",\n \"grunt\": \"^0.4.5\",\n \"grunt-cli\": \"^0.1.13\",\n \"grunt-compare-size\": \"^0.4.0\",\n \"grunt-contrib-clean\": \"^0.6.0\",\n \"grunt-contrib-compress\": \"^0.13.0\",\n- \"grunt-jest\": \"^0.1.3\",\n+ \"gulp\": \"^3.9.0\",\n+ \"gulp-babel\": \"^5.1.0\",\n+ \"gulp-flatten\": \"^0.1.0\",\n+ \"gulp-util\": \"^3.0.5\",\n \"gzip-js\": \"~0.3.2\",\n \"jest-cli\": \"^0.4.13\",\n \"object-assign\": \"^3.0.0\",\n \"optimist\": \"^0.6.1\",\n \"platform\": \"^1.1.0\",\n+ \"run-sequence\": \"^1.1.0\",\n+ \"through2\": \"^2.0.0\",\n \"tmp\": \"~0.0.18\",\n \"typescript\": \"~1.4.0\",\n \"uglify-js\": \"^2.4.23\",\n@@ -66,21 +73,20 @@\n },\n \"scripts\": {\n \"build\": \"grunt build\",\n- \"jest\": \"jest\",\n+ \"jest\": \"test\",\n \"linc\": \"git diff --name-only --diff-filter=ACMRTUB `git merge-base HEAD master` | grep '\\\\.js$' | xargs eslint --\",\n \"lint\": \"grunt lint\",\n- \"test\": \"jest\"\n+ \"test\": \"NODE_ENV=test jest\"\n },\n \"jest\": {\n \"modulePathIgnorePatterns\": [\n \"\/.module-cache\/\",\n- \"\/node_modules\/\",\n \"\/react\/build\/\"\n ],\n \"persistModuleRegistryBetweenSpecs\": true,\n \"rootDir\": \"\",\n- \"scriptPreprocessor\": \"jest\/preprocessor.js\",\n- \"setupEnvScriptFile\": \"jest\/environment.js\",\n+ \"scriptPreprocessor\": \"scripts\/jest\/preprocessor.js\",\n+ \"setupEnvScriptFile\": \"scripts\/jest\/environment.js\",\n \"testFileExtensions\": [\n \"coffee\",\n \"js\",\n@@ -88,7 +94,8 @@\n ],\n \"testPathDirs\": [\n \"\/eslint-rules\",\n- \"\/src\"\n+ \"\/src\",\n+ \"node_modules\/fbjs\"\n ],\n \"unmockedModulePathPatterns\": [\n \"\"\ndiff --git a\/packages\/react-dom\/package.json b\/packages\/react-dom\/package.json\nindex 6cd1d1d671..b648facdbf 100644\n--- a\/packages\/react-dom\/package.json\n+++ b\/packages\/react-dom\/package.json\n@@ -16,6 +16,7 @@\n },\n \"homepage\": \"https:\/\/github.com\/facebook\/react\/tree\/master\/npm-react-dom\",\n \"dependencies\": {\n+ \"fbjs\": \"0.1.0-alpha.0\",\n \"react\": \"^0.14.0-beta1\"\n }\n }\ndiff --git a\/packages\/react\/package.json b\/packages\/react\/package.json\nindex c816c9e40c..15afb92cbd 100644\n--- a\/packages\/react\/package.json\n+++ b\/packages\/react\/package.json\n@@ -24,7 +24,8 @@\n \"node\": \">=0.10.0\"\n },\n \"dependencies\": {\n- \"envify\": \"^3.0.0\"\n+ \"envify\": \"^3.0.0\",\n+ \"fbjs\": \"0.1.0-alpha.0\"\n },\n \"browserify\": {\n \"transform\": [\ndiff --git a\/jest\/environment.js b\/scripts\/jest\/environment.js\nsimilarity index 100%\nrename from jest\/environment.js\nrename to scripts\/jest\/environment.js\ndiff --git a\/jest\/jest.d.ts b\/scripts\/jest\/jest.d.ts\nsimilarity index 100%\nrename from jest\/jest.d.ts\nrename to scripts\/jest\/jest.d.ts\ndiff --git a\/scripts\/jest\/preprocessor.js b\/scripts\/jest\/preprocessor.js\nnew file mode 100644\nindex 0000000000..38810e156a\n--- \/dev\/null\n+++ b\/scripts\/jest\/preprocessor.js\n@@ -0,0 +1,50 @@\n+'use strict';\n+\n+var babel = require('babel');\n+var coffee = require('coffee-script');\n+\n+var tsPreprocessor = require('.\/ts-preprocessor');\n+\n+var defaultLibraries = [\n+ require.resolve('.\/jest.d.ts'),\n+ require.resolve('..\/..\/src\/isomorphic\/modern\/class\/React.d.ts'),\n+];\n+\n+var ts = tsPreprocessor(defaultLibraries);\n+\n+\/\/ This assumes the module map has been built. This might not be safe.\n+\/\/ We should consider consuming this from a built fbjs module from npm.\n+var moduleMap = require('fbjs\/module-map');\n+var babelPluginDEV = require('fbjs\/scripts\/babel\/dev-expression');\n+var babelPluginRequires = require('fbjs\/scripts\/babel\/rewrite-requires');\n+\n+module.exports = {\n+ process: function(src, path) {\n+ if (path.match(\/\\.coffee$\/)) {\n+ return coffee.compile(src, {'bare': true});\n+ }\n+ if (path.match(\/\\.ts$\/) && !path.match(\/\\.d\\.ts$\/)) {\n+ return ts.compile(src, path);\n+ }\n+ \/\/ TODO: make sure this stays in sync with gulpfile\n+ if (!path.match(\/\\\/node_modules\\\/\/) && !path.match(\/\\\/third_party\\\/\/)) {\n+ var rv = babel.transform(src, {\n+ nonStandard: true,\n+ blacklist: [\n+ 'spec.functionName',\n+ 'validation.react',\n+ ],\n+ optional: [\n+ 'es7.trailingFunctionCommas',\n+ ],\n+ plugins: [babelPluginDEV, babelPluginRequires],\n+ ignore: ['third_party'],\n+ filename: path,\n+ retainLines: true,\n+ _moduleMap: moduleMap,\n+ }).code;\n+ return rv;\n+ }\n+ return src;\n+ },\n+};\ndiff --git a\/jest\/ts-preprocessor.js b\/scripts\/jest\/ts-preprocessor.js\nsimilarity index 100%\nrename from jest\/ts-preprocessor.js\nrename to scripts\/jest\/ts-preprocessor.js\ndiff --git a\/src\/isomorphic\/deprecated\/__tests__\/cloneWithProps-test.js b\/src\/isomorphic\/deprecated\/__tests__\/cloneWithProps-test.js\nindex 06a004dc25..b8c4343bb2 100644\n--- a\/src\/isomorphic\/deprecated\/__tests__\/cloneWithProps-test.js\n+++ b\/src\/isomorphic\/deprecated\/__tests__\/cloneWithProps-test.js\n@@ -11,10 +11,6 @@\n \n 'use strict';\n \n-require('mock-modules')\n- .dontMock('cloneWithProps')\n- .dontMock('emptyObject');\n-\n var React;\n var ReactTestUtils;\n \ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactBrowserEventEmitter-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactBrowserEventEmitter-test.js\nindex 453e7b2e90..ee360b77f3 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactBrowserEventEmitter-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactBrowserEventEmitter-test.js\n@@ -11,17 +11,6 @@\n \n 'use strict';\n \n-require('mock-modules')\n- .dontMock('EventPluginHub')\n- .dontMock('ReactMount')\n- .dontMock('ReactBrowserEventEmitter')\n- .dontMock('ReactInstanceHandles')\n- .dontMock('EventPluginHub')\n- .dontMock('TapEventPlugin')\n- .dontMock('TouchEventUtils')\n- .dontMock('keyOf');\n-\n-\n var keyOf = require('keyOf');\n var mocks = require('mocks');\n \ndiff --git a\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js b\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js\nindex ce201525b6..1ca9c9bacf 100644\n--- a\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js\n+++ b\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js\n@@ -11,17 +11,12 @@\n \n 'use strict';\n \n-var mockModules = require('mock-modules');\n-mockModules.mock('getActiveElement');\n-\n var EventConstants;\n var React;\n var ReactMount;\n var ReactTestUtils;\n var SelectEventPlugin;\n \n-var getActiveElement;\n-\n var topLevelTypes;\n \n describe('SelectEventPlugin', function() {\n@@ -36,16 +31,12 @@ describe('SelectEventPlugin', function() {\n }\n \n beforeEach(function() {\n- mockModules.dumpCache();\n-\n EventConstants = require('EventConstants');\n React = require('React');\n ReactMount = require('ReactMount');\n ReactTestUtils = require('ReactTestUtils');\n SelectEventPlugin = require('SelectEventPlugin');\n \n- getActiveElement = require('getActiveElement');\n-\n topLevelTypes = EventConstants.topLevelTypes;\n });\n \n@@ -58,7 +49,7 @@ describe('SelectEventPlugin', function() {\n \n var rendered = ReactTestUtils.renderIntoDocument();\n var node = React.findDOMNode(rendered);\n- getActiveElement.mockReturnValue(node);\n+ node.focus();\n \n var mousedown = extract(node, topLevelTypes.topMouseDown);\n expect(mousedown).toBe(null);\n@@ -85,7 +76,7 @@ describe('SelectEventPlugin', function() {\n \n node.selectionStart = 0;\n node.selectionEnd = 0;\n- getActiveElement.mockReturnValue(node);\n+ node.focus();\n \n var focus = extract(node, topLevelTypes.topFocus);\n expect(focus).toBe(null);\ndiff --git a\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js b\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\nindex 7db9bfcc9d..2e91a5b0e5 100644\n--- a\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\n+++ b\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\n@@ -11,13 +11,6 @@\n \n 'use strict';\n \n-require('mock-modules')\n- .dontMock('ExecutionEnvironment')\n- .dontMock('React')\n- .dontMock('ReactServerRendering')\n- .dontMock('ReactTestUtils')\n- .dontMock('ReactMarkupChecksum');\n-\n var mocks = require('mocks');\n \n var ExecutionEnvironment;\ndiff --git a\/src\/shared\/vendor\/README.md b\/src\/shared\/vendor\/README.md\ndeleted file mode 100644\nindex 624820d343..0000000000\n--- a\/src\/shared\/vendor\/README.md\n+++ \/dev\/null\n@@ -1 +0,0 @@\n-The files in this directory are not related to React's core functionality. They are shared utility modules that are also used in other parts of Facebook's front-end. Changes to these files need more consideration than changes to React itself.\ndiff --git a\/src\/shared\/vendor\/core\/CSSCore.js b\/src\/shared\/vendor\/core\/CSSCore.js\ndeleted file mode 100644\nindex 41f35a0272..0000000000\n--- a\/src\/shared\/vendor\/core\/CSSCore.js\n+++ \/dev\/null\n@@ -1,108 +0,0 @@\n-\/**\n- * Copyright 2013-2015, Facebook, Inc.\n- * All rights reserved.\n- *\n- * This source code is licensed under the BSD-style license found in the\n- * LICENSE file in the root directory of this source tree. An additional grant\n- * of patent rights can be found in the PATENTS file in the same directory.\n- *\n- * @providesModule CSSCore\n- * @typechecks\n- *\/\n-\n-var invariant = require('invariant');\n-\n-\/**\n- * The CSSCore module specifies the API (and implements most of the methods)\n- * that should be used when dealing with the display of elements (via their\n- * CSS classes and visibility on screen. It is an API focused on mutating the\n- * display and not reading it as no logical state should be encoded in the\n- * display of elements.\n- *\/\n-\n-var CSSCore = {\n-\n- \/**\n- * Adds the class passed in to the element if it doesn't already have it.\n- *\n- * @param {DOMElement} element the element to set the class on\n- * @param {string} className the CSS className\n- * @return {DOMElement} the element passed in\n- *\/\n- addClass: function(element, className) {\n- invariant(\n- !\/\\s\/.test(className),\n- 'CSSCore.addClass takes only a single class name. \"%s\" contains ' +\n- 'multiple classes.', className\n- );\n-\n- if (className) {\n- if (element.classList) {\n- element.classList.add(className);\n- } else if (!CSSCore.hasClass(element, className)) {\n- element.className = element.className + ' ' + className;\n- }\n- }\n- return element;\n- },\n-\n- \/**\n- * Removes the class passed in from the element\n- *\n- * @param {DOMElement} element the element to set the class on\n- * @param {string} className the CSS className\n- * @return {DOMElement} the element passed in\n- *\/\n- removeClass: function(element, className) {\n- invariant(\n- !\/\\s\/.test(className),\n- 'CSSCore.removeClass takes only a single class name. \"%s\" contains ' +\n- 'multiple classes.', className\n- );\n-\n- if (className) {\n- if (element.classList) {\n- element.classList.remove(className);\n- } else if (CSSCore.hasClass(element, className)) {\n- element.className = element.className\n- .replace(new RegExp('(^|\\\\s)' + className + '(?:\\\\s|$)', 'g'), '$1')\n- .replace(\/\\s+\/g, ' ') \/\/ multiple spaces to one\n- .replace(\/^\\s*|\\s*$\/g, ''); \/\/ trim the ends\n- }\n- }\n- return element;\n- },\n-\n- \/**\n- * Helper to add or remove a class from an element based on a condition.\n- *\n- * @param {DOMElement} element the element to set the class on\n- * @param {string} className the CSS className\n- * @param {*} bool condition to whether to add or remove the class\n- * @return {DOMElement} the element passed in\n- *\/\n- conditionClass: function(element, className, bool) {\n- return (bool ? CSSCore.addClass : CSSCore.removeClass)(element, className);\n- },\n-\n- \/**\n- * Tests whether the element has the class specified.\n- *\n- * @param {DOMNode|DOMWindow} element the element to set the class on\n- * @param {string} className the CSS className\n- * @return {boolean} true if the element has the class, false if not\n- *\/\n- hasClass: function(element, className) {\n- invariant(\n- !\/\\s\/.test(className),\n- 'CSS.hasClass takes only a single class name.'\n- );\n- if (element.classList) {\n- return !!className && element.classList.contains(className);\n- }\n- return (' ' + element.className + ' ').indexOf(' ' + className + ' ') > -1;\n- }\n-\n-};\n-\n-module.exports = CSSCore;\ndiff --git a\/src\/shared\/vendor\/core\/ExecutionEnvironment.js b\/src\/shared\/vendor\/core\/ExecutionEnvironment.js\ndeleted file mode 100644\nindex 05399c199d..0000000000\n--- a\/src\/shared\/vendor\/core\/ExecutionEnvironment.js\n+++ \/dev\/null\n@@ -1,43 +0,0 @@\n-\/**\n- * Copyright 2013-2015, Facebook, Inc.\n- * All rights reserved.\n- *\n- * This source code is licensed under the BSD-style license found in the\n- * LICENSE file in the root directory of this source tree. An additional grant\n- * of patent rights can be found in the PATENTS file in the same directory.\n- *\n- * @providesModule ExecutionEnvironment\n- *\/\n-\n-\/*jslint evil: true *\/\n-\n-\"use strict\";\n-\n-var canUseDOM = !!(\n- typeof window !== 'undefined' &&\n- window.document &&\n- window.document.createElement\n-);\n-\n-\/**\n- * Simple, lightweight module assisting with the detection and context of\n- * Worker. Helps avoid circular dependencies and allows code to reason about\n- * whether or not they are in a Worker, even if they never include the main\n- * `ReactWorker` dependency.\n- *\/\n-var ExecutionEnvironment = {\n-\n- canUseDOM: canUseDOM,\n-\n- canUseWorkers: typeof Worker !== 'undefined',\n-\n- canUseEventListeners:\n- canUseDOM && !!(window.addEventListener || window.attachEvent),\n-\n- canUseViewport: canUseDOM && !!window.screen,\n-\n- isInWorker: !canUseDOM \/\/ For now, this is true - might change in the future.\n-\n-};\n-\n-module.exports = ExecutionEnvironment;\ndiff --git a\/src\/shared\/vendor\/core\/TouchEventUtils.js b\/src\/shared\/vendor\/core\/TouchEventUtils.js\ndeleted file mode 100644\nindex f91f8705a2..0000000000\n--- a\/src\/shared\/vendor\/core\/TouchEventUtils.js\n+++ \/dev\/null\n@@ -1,35 +0,0 @@\n-\/**\n- * Copyright 2013-2015, Facebook, Inc.\n- * All rights reserved.\n- *\n- * This source code is licensed under the BSD-style license found in the\n- * LICENSE file in the root directory of this source tree. An additional grant\n- * of patent rights can be found in the PATENTS file in the same directory.\n- *\n- * @providesModule TouchEventUtils\n- *\/\n-\n-var TouchEventUtils = {\n- \/**\n- * Utility function for common case of extracting out the primary touch from a\n- * touch event.\n- * - `touchEnd` events usually do not have the `touches` property.\n- * http:\/\/stackoverflow.com\/questions\/3666929\/\n- * mobile-sarai-touchend-event-not-firing-when-last-touch-is-removed\n- *\n- * @param {Event} nativeEvent Native event that may or may not be a touch.\n- * @return {TouchesObject?} an object with pageX and pageY or null.\n- *\/\n- extractSingleTouch: function(nativeEvent) {\n- var touches = nativeEvent.touches;\n- var changedTouches = nativeEvent.changedTouches;\n- var hasTouches = touches && touches.length > 0;\n- var hasChangedTouches = changedTouches && changedTouches.length > 0;\n-\n- return !hasTouches && hasChangedTouches ? changedTouches[0] :\n- hasTouches ? touches[0] :\n- nativeEvent;\n- }\n-};\n-\n-module.exports = TouchEventUtils;\ndiff --git a\/src\/shared\/vendor\/core\/camelize.js b\/src\/shared\/vendor\/core\/camelize.js\ndeleted file mode 100644\nindex 8ebaf3c095..0000000000\n--- a\/src\/shared\/vendor\/core\/camelize.js\n+++ \/dev\/null\n@@ -1,30 +0,0 @@\n-\/**\n- * Copyright 2013-2015, Facebook, Inc.\n- * All rights reserved.\n- *\n- * This source code is licensed under the BSD-style license found in the\n- * LICENSE file in the root directory of this source tree. An additional grant\n- * of patent rights can be found in the PATENTS file in the same directory.\n- *\n- * @providesModule camelize\n- * @typechecks\n- *\/\n-\n-var _hyphenPattern = \/-(.)\/g;\n-\n-\/**\n- * Camelcases a hyphenated string, for example:\n- *\n- * > camelize('background-color')\n- * < \"backgroundColor\"\n- *\n- * @param {string} string\n- * @return {string}\n- *\/\n-function camelize(string) {\n- return string.replace(_hyphenPattern, function(_, character) {\n- return character.toUpperCase();\n- });\n-}\n-\n-module.exports = camelize;\ndiff --git a\/src\/shared\/vendor\/core\/camelizeStyleName.js b\/src\/shared\/vendor\/core\/camelizeStyleName.js\ndeleted file mode 100644\nindex c7e0486847..0000000000\n--- a\/src\/shared\/vendor\/core\/camelizeStyleName.js\n+++ \/dev\/null\n@@ -1,40 +0,0 @@\n-\/**\n- * Copyright 2014-2015, Facebook, Inc.\n- * All rights reserved.\n- *\n- * This source code is licensed under the BSD-style license found in the\n- * LICENSE file in the root directory of this source tree. An additional grant\n- * of patent rights can be found in the PATENTS file in the same directory.\n- *\n- * @providesModule camelizeStyleName\n- * @typechecks\n- *\/\n-\n-\"use strict\";\n-\n-var camelize = require('camelize');\n-\n-var msPattern = \/^-ms-\/;\n-\n-\/**\n- * Camelcases a hyphenated CSS property name, for example:\n- *\n- * > camelizeStyleName('background-color')\n- * < \"backgroundColor\"\n- * > camelizeStyleName('-moz-transition')\n- * < \"MozTransition\"\n- * > camelizeStyleName('-ms-transition')\n- * < \"msTransition\"\n- *\n- * As Andi Smith suggests\n- * (http:\/\/www.andismith.com\/blog\/2012\/02\/modernizr-prefixed\/), an `-ms` prefix\n- * is converted to lowercase `ms`.\n- *\n- * @param {string} string\n- * @return {string}\n- *\/\n-function camelizeStyleName(string) {\n- return camelize(string.replace(msPattern, 'ms-'));\n-}\n-\n-module.exports = camelizeStyleName;\ndiff --git a\/src\/shared\/vendor\/core\/createArrayFromMixed.js b\/src\/shared\/vendor\/core\/createArrayFromMixed.js\ndeleted file mode 100644\nindex 41c364731d..0000000000\n--- a\/src\/shared\/vendor\/core\/createArrayFromMixed.js\n+++ \/dev\/null\n@@ -1,85 +0,0 @@\n-\/**\n- * Copyright 2013-2015, Facebook, Inc.\n- * All rights reserved.\n- *\n- * This source code is licensed under the BSD-style license found in the\n- * LICENSE file in the root directory of this source tree. An additional grant\n- * of patent rights can be found in the PATENTS file in the same directory.\n- *\n- * @providesModule createArrayFromMixed\n- * @typechecks\n- *\/\n-\n-var toArray = require('toArray');\n-\n-\/**\n- * Perform a heuristic test to determine if an object is \"array-like\".\n- *\n- * A monk asked Joshu, a Zen master, \"Has a dog Buddha nature?\"\n- * Joshu replied: \"Mu.\"\n- *\n- * This function determines if its argument has \"array nature\": it returns\n- * true if the argument is an actual array, an `arguments' object, or an\n- * HTMLCollection (e.g. node.childNodes or node.getElementsByTagName()).\n- *\n- * It will return false for other array-like objects like Filelist.\n- *\n- * @param {*} obj\n- * @return {boolean}\n- *\/\n-function hasArrayNature(obj) {\n- return (\n- \/\/ not null\/false\n- !!obj &&\n- \/\/ arrays are objects, NodeLists are functions in Safari\n- (typeof obj == 'object' || typeof obj == 'function') &&\n- \/\/ quacks like an array\n- ('length' in obj) &&\n- \/\/ not window\n- !('setInterval' in obj) &&\n- \/\/ no DOM node should be considered an array-like\n- \/\/ a 'select' element has 'length' and 'item' properties on IE8\n- (typeof obj.nodeType != 'number') &&\n- (\n- \/\/ a real array\n- Array.isArray(obj) ||\n- \/\/ arguments\n- ('callee' in obj) ||\n- \/\/ HTMLCollection\/NodeList\n- ('item' in obj)\n- )\n- );\n-}\n-\n-\/**\n- * Ensure that the argument is an array by wrapping it in an array if it is not.\n- * Creates a copy of the argument if it is already an array.\n- *\n- * This is mostly useful idiomatically:\n- *\n- * var createArrayFromMixed = require('createArrayFromMixed');\n- *\n- * function takesOneOrMoreThings(things) {\n- * things = createArrayFromMixed(things);\n- * ...\n- * }\n- *\n- * This allows you to treat `things' as an array, but accept scalars in the API.\n- *\n- * If you need to convert an array-like object, like `arguments`, into an array\n- * use toArray instead.\n- *\n- * @param {*} obj\n- * @return {array}\n- *\/\n-function createArrayFromMixed(obj) {\n- if (!hasArrayNature(obj)) {\n- return [obj];\n- } else if (Array.isArray(obj)) {\n- return obj.slice();\n- } else {\n- return toArray(obj);\n- }\n-}\n-\n-module.exports = createArrayFromMixed;\ndiff --git a\/src\/shared\/vendor\/core\/createNodesFromMarkup.js b\/src\/shared\/vendor\/core\/createNodesFromMarkup.js\ndeleted file mode 100644\nindex 90d1fd4d50..0000000000\n--- a\/src\/shared\/vendor\/core\/createNodesFromMarkup.js\n+++ \/dev\/null\n@@ -1,86 +0,0 @@\n-\/**\n- * Copyright 2013-2015, Facebook, Inc.\n- * All rights reserved.\n- *\n- * This source code is licensed under the BSD-style license found in the\n- * LICENSE file in the root directory of this source tree. An additional grant\n- * of patent rights can be found in the PATENTS file in the same directory.\n- *\n- * @providesModule createNodesFromMarkup\n- * @typechecks\n- *\/\n-\n-\/*jslint evil: true, sub: true *\/\n-\n-var ExecutionEnvironment = require('ExecutionEnvironment');\n-\n-var createArrayFromMixed = require('createArrayFromMixed');\n-var getMarkupWrap = require('getMarkupWrap');\n-var invariant = require('invariant');\n-\n-\/**\n- * Dummy container used to render all markup.\n- *\/\n-var dummyNode =\n- ExecutionEnvironment.canUseDOM ? document.createElement('div') : null;\n-\n-\/**\n- * Pattern used by `getNodeName`.\n- *\/\n-var nodeNamePattern = \/^\\s*<(\\w+)\/;\n-\n-\/**\n- * Extracts the `nodeName` of the first element in a string of markup.\n- *\n- * @param {string} markup String of markup.\n- * @return {?string} Node name of the supplied markup.\n- *\/\n-function getNodeName(markup) {\n- var nodeNameMatch = markup.match(nodeNamePattern);\n- return nodeNameMatch && nodeNameMatch[1].toLowerCase();\n-}\n-\n-\/**\n- * Creates an array containing the nodes rendered from the supplied markup. The\n- * optionally supplied `handleScript` function will be invoked once for each\n- *

dillon1000/react

Files changed