Merge branch 'master' into branch3

RubyLouvre · Oct 11, 2019 · 4e2a32c · 4e2a32c
2 parents 75b5048 + 4e3d91c
commit 4e2a32c
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 122 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,49 +1,38 @@
+# Javascript Node CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-javascript/ for more details
+#
 version: 2
-
-defaults: &defaults
- working_directory: ~/anu
- docker:
- - image: circleci/node:8.10.0
- branches:
- only:
- - branch3
-
 jobs:
  build:
- <<: *defaults
+ docker:
+ # specify the version you desire here
+ - image: circleci/node:10
+
+ # Specify service dependencies here if necessary
+ # CircleCI maintains a library of pre-built images
+ # documented at https://circleci.com/docs/2.0/circleci-images/
+ # - image: circleci/mongo:3.4.4
+
+ working_directory: ~/repo
+
  steps:
  - checkout
+
+ # Download and cache dependencies
  - restore_cache:
  keys:
  - v1-dependencies-{{ checksum "package.json" }}
+ # fallback to using the latest cache if no exact match is found
  - v1-dependencies-
- - run:
-  name: install anu deps
- command: npm install
+
+ - run: yarn install
+
  - save_cache:
  paths:
  - node_modules
  key: v1-dependencies-{{ checksum "package.json" }}
- - run:
-  name: test react runtime
-  command: npm run test
+  
+ # run tests!
+ - run: yarn test
 
- - restore_cache:
- keys:
- - v2-dependencies-{{ checksum "package.json" }}
- - v2-dependencies- 
- - run:
- name: install cli deps
- command: |
- cd ./packages/cli
- npm install
- - save_cache:
- paths:
- - packages/cli/node_modules
- key: v2-dependencies-{{ checksum "package.json" }}
- - run:
- name: test cli
- command: |
- cd ./packages/cli
- npm run test
- 
diff --git a/.npmignore b/.npmignore
@@ -7,6 +7,7 @@
 package-lock.json
 node_modules/
 .CACHE/*
+*/__tests__/*
 index*.html
 version.md
 .travis.yml

diff --git a/dist/React.js b/dist/React.js
@@ -3232,7 +3232,7 @@
  findDOMNode: findDOMNode,
  unmountComponentAtNode: unmountComponentAtNode,
  unstable_renderSubtreeIntoContainer: unstable_renderSubtreeIntoContainer,
- version: '1.5.10',
+ version: '1.6.0',
  render: render$1,
  hydrate: render$1,
  unstable_batchedUpdates: DOMRenderer.batchedUpdates,

diff --git a/dist/ReactIE.js b/dist/ReactIE.js
@@ -3357,7 +3357,7 @@
  unmountComponentAtNode: unmountComponentAtNode,
  unstable_renderSubtreeIntoContainer: unstable_renderSubtreeIntoContainer,
  miniCreateClass: miniCreateClass,
- version: '1.5.10',
+ version: '1.6.0',
  render: render$1,
  hydrate: render$1,
  unstable_batchedUpdates: DOMRenderer.batchedUpdates,

diff --git a/index.html b/index.html
@@ -66,4 +66,4 @@
  </script>
 
 
-</html>
+</html>
diff --git a/index1.html b/index1.html
@@ -1,87 +1,69 @@
 <!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="UTF-8" />
- <title>Document</title>
- <!--<script src="https://unpkg.com/[email protected]/dist/React.js"></script>-->
- <script src="./dist/ReactIE.js"></script>
- <script>
- function countSort2(arr) {
- var len = arr.length;
- var max = arr[0],
- min = arr[0];
+<html>
 
- for (var i = 1; i < len; i++) {
- if (arr[i] > max) max = arr[i];
- if (arr[i] < min) min = arr[i];
- }
- var size = max - min + 1;
- var count = new Array(size);
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width">
+<!--
+ <script src="https://cdn.bootcss.com/react/16.9.0/umd/react.development.js"></script>
+ <script src="https://cdn.bootcss.com/react-dom/16.9.0/umd/react-dom.development.js" ></script>
+-->
+<script src="./dist/React.js"></script> 
 
- for (var i = 0; i < len; i++) {
- var j = arr[i] - min;
- if (count[j]) {
- count[j]++;
- } else {
- count[j] = 1;
- }
- }
- console.log(count);
- /*
- for (var i = 1; i < size; i++) count[i] += count[i - 1];
- int* psort = (int*)malloc(sizeof(int)*len);
- memset(psort, 0, sizeof(int)*len);
- for (int i = len - 1; i >= 0; i--) { 
- count[arr[i] - min]--;//要先把自己减去
- psort[count[arr[i] - min]] = arr[i];
- }
- for (int i = 0; i < len; i++) {
- arr[i] = psort[i];
- }
- free(count);
- free(psort);
- count = NULL;
- psort = NULL;
-*/
- }
+ <script type='text/javascript' src="./lib/babel.js"></script>
 
- // countSort([-1, -5, -6, -2, 1, 2, 8, 2, 1, 8]);
+</head>
 
- function countSort(arr) {
- var max = arr[0],
- min = arr[0],
- n = arr.length;
- for (var i = 0; i < n; i++) {
- if (arr[i] > max) {
- max = arr[i];
- }
- if (arr[i] < min) {
- min = arr[i];
+<body>
+ <div id='root' class="root">
+
+ </div>
+ <script type='text/babel'>
+
+var { lazy, Suspense } = React;
+var OtherComponent = lazy(() => {
+ return new Promise(resolve =>
+ setTimeout(
+ () =>
+ resolve({
+ default: function render(props) {
+ //export default
+ return <div>Hello,{props.name}</div>;
  }
- }
- var size = max - min + 1;
- var buckets = new Array(size).fill(0);
- //遍历所有桶
- for (var i = 0; i < n; i++) {
- var j = arr[i] - min; //减去最小值，确保索引大于负数
- buckets[j]++; //包含了自己
- }
- for (var i = 1; i < size; i++) {
- //求前缀和
- buckets[i] += buckets[i - 1];
- }
- var res = [];//逆向遍历源数组（保证稳定性）
- for (var i = n - 1; i >= 0; i--) {
- var index = --buckets[arr[i] - min] //去掉自己
- res[index] = arr[i];
- }
- return res;
- }
- var arr = countSort([-1, -5, -6, -2, 1, 2, 8, 2, 1, 8]);
- console.log(arr);
- </script>
- </head>
- <body>
- <div id="root"></div>
- </body>
-</html>
+ }),
+ 3000
+ )
+ );
+});
+var valueRef = React.createRef()
+class App extends React.Component {
+ constructor(props){
+ super(props)
+ this.state = {
+ name: "ruby"
+ }
+ }
+ updateName(){
+ var name = valueRef.current.value;
+ this.setState({name})
+ }
+ render() {
+ return (
+ <div>
+ <p><input ref={valueRef} onChange={this.updateName.bind(this)} value={this.state.name} />{new Date-0}</p>
+
+ <Suspense fallback={<div>loading...</div>}>
+ <OtherComponent name={this.state.name} />
+ </Suspense>
+ </div>
+ );
+ }
+}
+
+ReactDOM.render(<App />, document.getElementById("root"));
+
+
+ </script>
+
+
+</html>
diff --git a/index2.html b/index2.html
@@ -4,6 +4,14 @@
 <head>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width">
+ <script type='text/javascript' src="./dist/React.js"></script>
+ <!-- <script type='text/javascript' src="./lib/ReactTestUtils.js"></script>
+ <script type='text/javascript' src="./dist/ReactDOMServer.js"></script>-->
+
+ <script type='text/javascript' src="./test/react.development.js"></script>
+ <script type='text/javascript' src="./test/react-dom.development.js"></script>
+
+ <script type='text/javascript' src="./lib/babel.js"></script>
 
 
 </head>

diff --git a/lib/ReduxIE.js b/lib/ReduxIE.js
@@ -625,7 +625,7 @@ function applyMiddleware() {
  */
 function isCrushed() {}
 
-if ( (typeof window !== "undefined" && window.VBArray && isCrushed.name !== 'isCrushed') {
+if ( typeof window !== "undefined" && window.VBArray && isCrushed.name !== 'isCrushed') {
  warning("You are currently using minified code outside of NODE_ENV === 'production'. " + 'This means that you are running a slower development build of Redux. ' + 'You can use loose-envify (https://github.com/zertosh/loose-envify) for browserify ' + 'or DefinePlugin for webpack (https://stackoverflow.com/questions/30030031) ' + 'to ensure you have the correct code for your production build.');
 }
 
@@ -638,4 +638,4 @@ exports.__DO_NOT_USE__ActionTypes = ActionTypes;
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+})));
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "anujs",
- "version": "1.5.10",
+ "version": "1.6.0",
  "description": "a React16-compact mini framework",
  "main": "dist/React.js",
  "scripts": {