release v2.1.1

Author: roland-reed

build/ReactSelection.js

@@ -1,15 +1,15 @@
-import { options } from "../src/util";
+import { options, Fragment } from "../src/util";
 import { Children } from "../src/Children";
 import * as eventSystem from "../src/event";
 import { PropTypes } from "../src/PropTypes";
 import { Component } from "../src/Component";
-import { win as window, inBrowser, document } from "../src/browser";
+import { win as window, contains as containsNode } from "../src/browser";
 import { createClass } from "../src/createClass";
 import { cloneElement } from "../src/cloneElement";
 import { PureComponent } from "../src/PureComponent";
 import { createElement } from "../src/createElement";
+import { createContext } from "../src/createContext";
 import { createPortal } from "../src/createPortal";
-
 import {
   render,
   findDOMNode,
@@ -18,49 +18,45 @@ import {
   unstable_renderSubtreeIntoContainer
 } from "../src/diff";
 
-var React = {
-  version: "VERSION",
-  render,
-  hydrate: render,
-  options,
-  PropTypes,
-  createPortal,
-  Children,
-  Component,
-  eventSystem,
-  findDOMNode,
-  createClass,
-  createElement,
-  cloneElement,
-  PureComponent,
-  isValidElement,
-  unmountComponentAtNode,
-  unstable_renderSubtreeIntoContainer,
-
-  createFactory(type) {
-    console.warn("createFactory is deprecated"); // eslint-disable-line
-    var factory = createElement.bind(null, type);
-    factory.type = type;
-    return factory;
-  }
-};
+var React;
+if (window.React && window.React.options) {
+  React = window.React; //解决引入多个
+} else {
+  React = window.React = window.ReactDOM = {
+    version: "VERSION",
+    render,
+    hydrate: render,
+    options,
+    Fragment,
+    PropTypes,
+    Children,
+    createPortal,
+    createContext,
+    Component,
+    eventSystem,
+    findDOMNode,
+    createClass,
+    createElement,
+    cloneElement,
+    PureComponent,
+    isValidElement,
+    unmountComponentAtNode,
+    unstable_renderSubtreeIntoContainer,
+    createFactory(type) {
+      console.warn("createFactory is deprecated"); // eslint-disable-line
+      var factory = createElement.bind(null, type);
+      factory.type = type;
+      return factory;
+    }
+  };
+}
 
 function isInDocument(node) {
   if (!inBrowser) {
     return false;
   }
   return containsNode(document.documentElement, node);
 }
-function containsNode(a, b) {
-  if (b) {
-    while ((b = b.parentNode)) {
-      if (b === a) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
 
 function focusNode(node) {
   //如果此元素不可见，IE8会抛错

build/rollup.ie.js

@@ -1,6 +1,7 @@
 import babel from "rollup-plugin-babel";
 import replace from "rollup-plugin-re";
 import filesize from "rollup-plugin-filesize";
+import cleanup from "rollup-plugin-cleanup";
 
 const license = require("rollup-plugin-license");
 const json = require("../package.json");
@@ -30,7 +31,7 @@ export default {
         new Date()
       ).replace(/T.*|"/g, "")}`
     }),
-
+    cleanup(),
     replace({
       patterns: [
         {

build/rollup.js

@@ -1,6 +1,7 @@
 import babel from "rollup-plugin-babel";
 import replace from "rollup-plugin-re";
 import filesize from "rollup-plugin-filesize";
+import cleanup from "rollup-plugin-cleanup";
 
 const license = require("rollup-plugin-license");
 const json = require("../package.json");
@@ -33,7 +34,7 @@ export default {
       IE9+
       `
     }),
-
+    cleanup(),
     replace({
       // ... do replace before commonjs
       patterns: [

build/rollup.selection.js

@@ -1,6 +1,7 @@
 import babel from "rollup-plugin-babel";
 import replace from "rollup-plugin-re";
 import filesize from "rollup-plugin-filesize";
+import cleanup from "rollup-plugin-cleanup";
 
 const license = require("rollup-plugin-license");
 const json = require("../package.json");
@@ -31,7 +32,7 @@ export default {
       IE9+
       `
     }),
-
+    cleanup(),
     replace({
       // ... do replace before commonjs
       patterns: [

build/rollup.shim.js

@@ -1,6 +1,7 @@
 import babel from "rollup-plugin-babel";
 import replace from "rollup-plugin-re";
 import filesize from "rollup-plugin-filesize";
+import cleanup from "rollup-plugin-cleanup";
 
 const license = require("rollup-plugin-license");
 const json = require("../package.json");
@@ -24,7 +25,7 @@ export default {
         ]
       ]
     }),
-
+    cleanup(),
     license({
       banner: `此版本要求浏览器没有createClass, createFactory, PropTypes, isValidElement,
         unmountComponentAtNode,unstable_renderSubtreeIntoContainer

build/rollup.ssr.js

@@ -1,4 +1,5 @@
 import babel from "rollup-plugin-babel";
+import cleanup from "rollup-plugin-cleanup";
 //import builtins from "rollup-plugin-node-builtins";
 
 export default {
@@ -17,7 +18,8 @@ export default {
           }
         ]
       ]
-    })
+    }),
+    cleanup()
   ],
   moduleName: "ReactDOMServer",
   useStrict: false