Merged interaction-tracking package into react-scheduler

React UMD bundles inlines the new react-scheduler package and exposes the API via the SECRET_INTERNALS object. UMD bundles of e.g. ReactDOM access the API this way. This avoids breaking backwards compat for UMD bundles (since it avoids requiring a new <script> tag).

react CJS bundles to not inline the react-scheduler package. Instead, react-dom and other renderers import the shared NPM module. A hard NPM depedency has been added to react-dom and other renderers on the new react-scheduler package so that upgrades will not require any additional npm-install steps.

A UMD bundle of the new react-scheduler also exists which defines the same public API but lazily forwards method calls to the React SECRET_INTERNALS inlined version. This allows the new API to be used in e.g. Code Pens if people want to.

Author: Brian Vaughn

fixtures/packaging/browserify/dev/package.json

@@ -3,9 +3,9 @@
   "name": "browserify-dev-fixture",
   "dependencies": {
     "browserify": "^13.3.0",
-    "interaction-tracking": "link:../../../../build/node_modules/interaction-tracking",
     "react": "link:../../../../build/node_modules/react",
-    "react-dom": "link:../../../../build/node_modules/react-dom"
+    "react-dom": "link:../../../../build/node_modules/react-dom",
+    "react-scheduler": "link:../../../../build/node_modules/react-scheduler"
   },
   "scripts": {
     "build": "rm -f output.js && browserify ./input.js -o output.js"

fixtures/packaging/browserify/dev/yarn.lock

@@ -471,10 +471,6 @@ insert-module-globals@^7.0.0:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-"interaction-tracking@link:../../../../build/node_modules/interaction-tracking":
-  version "0.0.0"
-  uid ""
-
 is-buffer@^1.1.0:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
@@ -487,6 +483,10 @@ isarray@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
+"js-tokens@^3.0.0 || ^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+
 json-stable-stringify@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45"
@@ -519,6 +519,12 @@ lodash.memoize@~3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
 
+loose-envify@^1.1.0, loose-envify@^1.3.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
@@ -571,6 +577,10 @@ module-deps@^4.0.8:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
+object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -635,6 +645,13 @@ process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
+prop-types@^15.6.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  dependencies:
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 public-encrypt@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
@@ -671,6 +688,14 @@ randombytes@^2.0.0, randombytes@^2.0.1:
   version "0.0.0"
   uid ""
 
+react-scheduler@^0.1.0-alpha-1:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/react-scheduler/-/react-scheduler-0.1.0.tgz#d16c0ee90d2895ff1941e0d681293dbe4f4b4f38"
+
+"react-scheduler@link:../../../../build/node_modules/react-scheduler":
+  version "0.0.0"
+  uid ""
+
 "react@link:../../../../build/node_modules/react":
   version "0.0.0"
   uid ""

fixtures/packaging/browserify/prod/package.json

@@ -3,9 +3,9 @@
   "name": "browserify-prod-fixture",
   "dependencies": {
     "browserify": "^13.3.0",
-    "interaction-tracking": "link:../../../../build/node_modules/interaction-tracking",
     "react": "link:../../../../build/node_modules/react",
-    "react-dom": "link:../../../../build/node_modules/react-dom"
+    "react-dom": "link:../../../../build/node_modules/react-dom",
+    "react-scheduler": "link:../../../../build/node_modules/react-scheduler"
   },
   "scripts": {
     "build": "rm -f output.js && browserify ./input.js -g [envify --NODE_ENV 'production'] -o output.js"

fixtures/packaging/browserify/prod/yarn.lock

@@ -482,10 +482,6 @@ insert-module-globals@^7.0.0:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-"interaction-tracking@link:../../../../build/node_modules/interaction-tracking":
-  version "0.0.0"
-  uid ""
-
 is-buffer@^1.1.0:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
@@ -498,6 +494,10 @@ isarray@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
+"js-tokens@^3.0.0 || ^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+
 json-stable-stringify@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45"
@@ -530,6 +530,12 @@ lodash.memoize@~3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
 
+loose-envify@^1.1.0, loose-envify@^1.3.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
@@ -582,6 +588,10 @@ module-deps@^4.0.8:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
+object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -646,6 +656,13 @@ process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
+prop-types@^15.6.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  dependencies:
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 public-encrypt@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
@@ -682,6 +699,14 @@ randombytes@^2.0.0, randombytes@^2.0.1:
   version "0.0.0"
   uid ""
 
+react-scheduler@^0.1.0-alpha-1:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/react-scheduler/-/react-scheduler-0.1.0.tgz#d16c0ee90d2895ff1941e0d681293dbe4f4b4f38"
+
+"react-scheduler@link:../../../../build/node_modules/react-scheduler":
+  version "0.0.0"
+  uid ""
+
 "react@link:../../../../build/node_modules/react":
   version "0.0.0"
   uid ""

fixtures/packaging/brunch/dev/package.json

@@ -4,9 +4,9 @@
   "devDependencies": {
     "brunch": "^2.9.1",
     "javascript-brunch": "^2.0.0",
-    "interaction-tracking": "link:../../../../build/node_modules/interaction-tracking",
     "react": "link:../../../../build/node_modules/react",
-    "react-dom": "link:../../../../build/node_modules/react-dom"
+    "react-dom": "link:../../../../build/node_modules/react-dom",
+    "react-scheduler": "link:../../../../build/node_modules/react-scheduler"
   },
   "scripts": {
     "build": "rm -rf public && brunch build"

fixtures/packaging/brunch/dev/yarn.lock

@@ -1044,14 +1044,6 @@ init-skeleton@~1.0:
     ncp "^2.0.0"
     normalize-git-url "~3.0.1"
 
-interaction-tracking@16.4.3-alpha.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/interaction-tracking/-/interaction-tracking-0.0.1.tgz#08877accb2ec479f2af83d7de7a9ae60b80e8dc5"
-
-"interaction-tracking@link:../../../../build/node_modules/interaction-tracking":
-  version "0.0.0"
-  uid ""
-
 ipaddr.js@1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
@@ -1665,6 +1657,14 @@ rc@^1.1.7:
   version "0.0.0"
   uid ""
 
+react-scheduler@^0.1.0-alpha-1:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/react-scheduler/-/react-scheduler-0.1.0.tgz#d16c0ee90d2895ff1941e0d681293dbe4f4b4f38"
+
+"react-scheduler@link:../../../../build/node_modules/react-scheduler":
+  version "0.0.0"
+  uid ""
+
 "react@link:../../../../build/node_modules/react":
   version "0.0.0"
   uid ""

fixtures/packaging/brunch/prod/package.json

@@ -4,9 +4,9 @@
   "devDependencies": {
     "brunch": "^2.9.1",
     "javascript-brunch": "^2.0.0",
-    "interaction-tracking": "link:../../../../build/node_modules/interaction-tracking",
     "react": "link:../../../../build/node_modules/react",
-    "react-dom": "link:../../../../build/node_modules/react-dom"
+    "react-dom": "link:../../../../build/node_modules/react-dom",
+    "react-scheduler": "link:../../../../build/node_modules/react-scheduler"
   },
   "scripts": {
     "build": "rm -rf public && brunch build -p"

fixtures/packaging/brunch/prod/yarn.lock

@@ -1044,14 +1044,6 @@ init-skeleton@~1.0:
     ncp "^2.0.0"
     normalize-git-url "~3.0.1"
 
-interaction-tracking@16.4.3-alpha.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/interaction-tracking/-/interaction-tracking-0.0.1.tgz#08877accb2ec479f2af83d7de7a9ae60b80e8dc5"
-
-"interaction-tracking@link:../../../../build/node_modules/interaction-tracking":
-  version "0.0.0"
-  uid ""
-
 ipaddr.js@1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
@@ -1665,6 +1657,14 @@ rc@^1.1.7:
   version "0.0.0"
   uid ""
 
+react-scheduler@^0.1.0-alpha-1:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/react-scheduler/-/react-scheduler-0.1.0.tgz#d16c0ee90d2895ff1941e0d681293dbe4f4b4f38"
+
+"react-scheduler@link:../../../../build/node_modules/react-scheduler":
+  version "0.0.0"
+  uid ""
+
 "react@link:../../../../build/node_modules/react":
   version "0.0.0"
   uid ""

fixtures/packaging/rjs/dev/config.js

@@ -4,9 +4,8 @@ module.exports = {
   out: 'output.js',
   optimize: 'none',
   paths: {
-    'interaction-tracking':
-      '../../../../build/dist/interaction-tracking.development',
     react: '../../../../build/dist/react.development',
     'react-dom': '../../../../build/dist/react-dom.development',
+    'react-scheduler': '../../../../build/dist/react-scheduler.development',
   },
 };

fixtures/packaging/rjs/prod/config.js

@@ -4,9 +4,8 @@ module.exports = {
   out: 'output.js',
   optimize: 'none',
   paths: {
-    'interaction-tracking':
-      '../../../../build/dist/interaction-tracking.production.min',
     react: '../../../../build/dist/react.production.min',
     'react-dom': '../../../../build/dist/react-dom.production.min',
+    'react-scheduler': '../../../../build/dist/react-scheduler.development',
   },
 };

fixtures/packaging/systemjs-builder/dev/config.js

@@ -1,8 +1,7 @@
 System.config({
   paths: {
-    'interaction-tracking':
-      '../../../../build/dist/interaction-tracking.development.js',
     react: '../../../../build/dist/react.development.js',
     'react-dom': '../../../../build/dist/react-dom.development.js',
+    'react-scheduler': '../../../../build/dist/react-scheduler.development',
   },
 });

fixtures/packaging/systemjs-builder/prod/config.js

@@ -1,8 +1,7 @@
 System.config({
   paths: {
-    'interaction-tracking':
-      '../../../../build/dist/interaction-tracking.production.min.js',
     react: '../../../../build/dist/react.production.min.js',
     'react-dom': '../../../../build/dist/react-dom.production.min.js',
+    'react-scheduler': '../../../../build/dist/react-scheduler.development',
   },
 });

fixtures/schedule/index.html

@@ -92,7 +92,11 @@ <h2>Tests:</h2>
     <script src="../../build/dist/react-scheduler.development.js"></script>
     <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
     <script type="text/babel">
-const {scheduleWork, cancelWork, now} = ReactScheduler;
+const {
+  unstable_scheduleWork: scheduleWork,
+  unstable_cancelWork: cancelWork,
+  unstable_now: now
+} = ReactScheduler;
 function displayTestResult(testNumber) {
   const expectationNode = document.getElementById('test-' + testNumber + '-expected');
   const resultNode = document.getElementById('test-' + testNumber);