Merge remote-tracking branch 'upstream/master'

.circleci/config.yml

@@ -44,4 +44,10 @@ jobs:
           path: ./node_modules.tgz
 
       - store_artifacts:
-          path: ./scripts/error-codes/codes.json
+          path: ./build.tgz
+
+      - store_artifacts:
+          path: ./scripts/rollup/results.json
+
+      - store_artifacts:
+          path: ./scripts/error-codes/codes.json

dangerfile.js

@@ -25,7 +25,7 @@
 //
 // `DANGER_GITHUB_API_TOKEN=[ENV_ABOVE] yarn danger pr https://github.com/facebook/react/pull/11865
 
-const {markdown, danger} = require('danger');
+const {markdown, danger, warn} = require('danger');
 const fetch = require('node-fetch');
 
 const {generateResultsArray} = require('./scripts/rollup/stats');
@@ -108,18 +108,69 @@ function git(args) {
   // Use git locally to grab the commit which represents the place
   // where the branches differ
   const upstreamRepo = danger.github.pr.base.repo.full_name;
+  if (upstreamRepo !== 'facebook/react') {
+    // Exit unless we're running in the main repo
+    return;
+  }
+
   const upstreamRef = danger.github.pr.base.ref;
-  await git(`remote add upstream https://github.com/${upstreamRepo}.git`);
+  await git(`remote add upstream https://github.com/facebook/react.git`);
   await git('fetch upstream');
-  const mergeBaseCommit = await git(`merge-base HEAD upstream/${upstreamRef}`);
+  const baseCommit = await git(`merge-base HEAD upstream/${upstreamRef}`);
+
+  let resultsResponse = null;
+  try {
+    let baseCIBuildId = null;
+    const statusesResponse = await fetch(
+      `https://api.github.com/repos/facebook/react/commits/${baseCommit}/statuses`
+    );
+    const statuses = await statusesResponse.json();
+    for (let i = 0; i < statuses.length; i++) {
+      const status = statuses[i];
+      if (status.context === 'ci/circleci') {
+        if (status.state === 'success') {
+          baseCIBuildId = /\/facebook\/react\/([0-9]+)/.exec(
+            status.target_url
+          )[1];
+          break;
+        }
+        if (status.state === 'failure') {
+          warn(`Base commit is broken: ${baseCommit}`);
+          return;
+        }
+      }
+    }
+
+    if (baseCIBuildId === null) {
+      warn(`Could not find build artifacts for base commit: ${baseCommit}`);
+      return;
+    }
 
-  const commitURL = sha =>
-    `http://react.zpao.com/builds/master/_commits/${sha}/results.json`;
-  const response = await fetch(commitURL(mergeBaseCommit));
+    const baseArtifactsInfoResponse = await fetch(
+      `https://circleci.com/api/v1.1/project/github/facebook/react/${baseCIBuildId}/artifacts`
+    );
+    const baseArtifactsInfo = await baseArtifactsInfoResponse.json();
+
+    for (let i = 0; i < baseArtifactsInfo.length; i++) {
+      const info = baseArtifactsInfo[i];
+      if (info.path === 'home/circleci/project/scripts/rollup/results.json') {
+        resultsResponse = await fetch(info.url);
+        break;
+      }
+    }
+  } catch (error) {
+    warn(`Failed to fetch build artifacts for base commit: ${baseCommit}`);
+    return;
+  }
+
+  if (resultsResponse === null) {
+    warn(`Could not find build artifacts for base commit: ${baseCommit}`);
+    return;
+  }
 
   // Take the JSON of the build response and
   // make an array comparing the results for printing
-  const previousBuildResults = await response.json();
+  const previousBuildResults = await resultsResponse.json();
   const results = generateResultsArray(
     currentBuildResults,
     previousBuildResults
@@ -212,7 +263,7 @@ function git(args) {
   <details>
   <summary>Details of bundled changes.</summary>
 
-  <p>Comparing: ${mergeBaseCommit}...${danger.github.pr.head.sha}</p>
+  <p>Comparing: ${baseCommit}...${danger.github.pr.head.sha}</p>
 
 
   ${allTables.join('\n')}

package.json

@@ -57,7 +57,7 @@
     "flow-bin": "^0.72.0",
     "glob": "^6.0.4",
     "glob-stream": "^6.1.0",
-    "google-closure-compiler": "20190106.0.0",
+    "google-closure-compiler": "20190301.0.0",
     "gzip-size": "^3.0.0",
     "jasmine-check": "^1.0.0-rc.0",
     "jest": "^23.1.0",
@@ -102,7 +102,6 @@
     "test": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.source.js",
     "test-persistent": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.source-persistent.js",
     "test-fire": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.source-fire.js",
-    "test-new-scheduler": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.source-new-scheduler.js",
     "test-prod": "cross-env NODE_ENV=production jest --config ./scripts/jest/config.source.js",
     "test-fire-prod": "cross-env NODE_ENV=production jest --config ./scripts/jest/config.source-fire.js",
     "test-prod-build": "yarn test-build-prod",

packages/react-art/src/ReactARTHostConfig.js

@@ -11,6 +11,7 @@ import * as Scheduler from 'scheduler';
 import invariant from 'shared/invariant';
 
 import {TYPES, EVENT_TYPES, childrenAsString} from './ReactARTInternals';
+import type {ReactEventComponentInstance} from 'shared/ReactTypes';
 
 // Intentionally not named imports because Rollup would
 // use dynamic dispatch for CommonJS interop named imports.
@@ -439,19 +440,45 @@ export function unhideTextInstance(textInstance, text): void {
   // Noop
 }
 
-export function handleEventComponent(
-  eventResponder: ReactEventResponder,
-  rootContainerInstance: Container,
-  internalInstanceHandle: Object,
+export function mountEventComponent(
+  eventComponentInstance: ReactEventComponentInstance,
+) {
+  throw new Error('Not yet implemented.');
+}
+
+export function updateEventComponent(
+  eventComponentInstance: ReactEventComponentInstance,
 ) {
-  // TODO: add handleEventComponent implementation
+  throw new Error('Not yet implemented.');
+}
+
+export function unmountEventComponent(
+  eventComponentInstance: ReactEventComponentInstance,
+): void {
+  throw new Error('Not yet implemented.');
+}
+
+export function getEventTargetChildElement(
+  type: Symbol | number,
+  props: Props,
+): null {
+  throw new Error('Not yet implemented.');
 }
 
 export function handleEventTarget(
   type: Symbol | number,
   props: Props,
-  parentInstance: Container,
+  rootContainerInstance: Container,
   internalInstanceHandle: Object,
-) {
-  // TODO: add handleEventTarget implementation
+): boolean {
+  throw new Error('Not yet implemented.');
+}
+
+export function commitEventTarget(
+  type: Symbol | number,
+  props: Props,
+  instance: Instance,
+  parentInstance: Instance,
+): void {
+  throw new Error('Not yet implemented.');
 }

packages/react-debug-tools/src/__tests__/ReactDevToolsHooksIntegration-test.js

@@ -14,13 +14,18 @@ describe('React hooks DevTools integration', () => {
   let React;
   let ReactDebugTools;
   let ReactTestRenderer;
+  let Scheduler;
   let act;
   let overrideHookState;
+  let scheduleUpdate;
+  let setSuspenseHandler;
 
   beforeEach(() => {
     global.__REACT_DEVTOOLS_GLOBAL_HOOK__ = {
       inject: injected => {
         overrideHookState = injected.overrideHookState;
+        scheduleUpdate = injected.scheduleUpdate;
+        setSuspenseHandler = injected.setSuspenseHandler;
       },
       supportsFiber: true,
       onCommitFiberRoot: () => {},
@@ -32,6 +37,7 @@ describe('React hooks DevTools integration', () => {
     React = require('react');
     ReactDebugTools = require('react-debug-tools');
     ReactTestRenderer = require('react-test-renderer');
+    Scheduler = require('scheduler');
 
     act = ReactTestRenderer.act;
   });
@@ -173,4 +179,115 @@ describe('React hooks DevTools integration', () => {
       });
     }
   });
+
+  it('should support overriding suspense in sync mode', () => {
+    if (__DEV__) {
+      // Lock the first render
+      setSuspenseHandler(() => true);
+    }
+
+    function MyComponent() {
+      return 'Done';
+    }
+
+    const renderer = ReactTestRenderer.create(
+      <div>
+        <React.Suspense fallback={'Loading'}>
+          <MyComponent />
+        </React.Suspense>
+      </div>,
+    );
+    const fiber = renderer.root._currentFiber().child;
+    if (__DEV__) {
+      // First render was locked
+      expect(renderer.toJSON().children).toEqual(['Loading']);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Loading']);
+
+      // Release the lock
+      setSuspenseHandler(() => false);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Done']);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Done']);
+
+      // Lock again
+      setSuspenseHandler(() => true);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Loading']);
+
+      // Release the lock again
+      setSuspenseHandler(() => false);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Done']);
+
+      // Ensure it checks specific fibers.
+      setSuspenseHandler(f => f === fiber || f === fiber.alternate);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Loading']);
+      setSuspenseHandler(f => f !== fiber && f !== fiber.alternate);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Done']);
+    } else {
+      expect(renderer.toJSON().children).toEqual(['Done']);
+    }
+  });
+
+  it('should support overriding suspense in concurrent mode', () => {
+    if (__DEV__) {
+      // Lock the first render
+      setSuspenseHandler(() => true);
+    }
+
+    function MyComponent() {
+      return 'Done';
+    }
+
+    const renderer = ReactTestRenderer.create(
+      <div>
+        <React.Suspense fallback={'Loading'}>
+          <MyComponent />
+        </React.Suspense>
+      </div>,
+      {unstable_isConcurrent: true},
+    );
+
+    expect(Scheduler).toFlushAndYield([]);
+    // Ensure we timeout any suspense time.
+    jest.advanceTimersByTime(1000);
+    const fiber = renderer.root._currentFiber().child;
+    if (__DEV__) {
+      // First render was locked
+      expect(renderer.toJSON().children).toEqual(['Loading']);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Loading']);
+
+      // Release the lock
+      setSuspenseHandler(() => false);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Done']);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Done']);
+
+      // Lock again
+      setSuspenseHandler(() => true);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Loading']);
+
+      // Release the lock again
+      setSuspenseHandler(() => false);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Done']);
+
+      // Ensure it checks specific fibers.
+      setSuspenseHandler(f => f === fiber || f === fiber.alternate);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Loading']);
+      setSuspenseHandler(f => f !== fiber && f !== fiber.alternate);
+      scheduleUpdate(fiber); // Re-render
+      expect(renderer.toJSON().children).toEqual(['Done']);
+    } else {
+      expect(renderer.toJSON().children).toEqual(['Done']);
+    }
+  });
 });