Merge pull request #2 from alibaba/master

merge source
alibaba · Aug 7, 2020 · 9afb64d · 9afb64d
2 parents 5c14221 + 2ac1967
commit 9afb64d
Show file tree

Hide file tree

Showing 63 changed files with 3,600 additions and 2,418 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,12 +4,22 @@ module.exports = {
   ...fabric.default,
   rules: {
     ...fabric.default.rules,
-    "no-restricted-syntax": "off",
-    "no-plusplus": "off",
-    "no-underscore-dangle": "off",
-    "consistent-return": "off",
-    "@typescript-eslint/ban-ts-ignore": "off",
-    "@typescript-eslint/no-object-literal-type-assertion": "off",
-    "consistent-return": "off",
+    'no-restricted-syntax': 'off',
+    'no-plusplus': 'off',
+    'no-underscore-dangle': 'off',
+    'consistent-return': 'off',
+    '@typescript-eslint/ban-ts-ignore': 'off',
+    '@typescript-eslint/no-object-literal-type-assertion': 'off',
+    'consistent-return': 'off',
+  },
+  plugins: [...fabric.default.plugins, 'react-hooks'],
+  rules: {
+    ...fabric.default.rules,
+    'react-hooks/rules-of-hooks': 'error',
+    'react-hooks/exhaustive-deps': 'warn',
+  },
+  parserOptions: {
+    ...fabric.default.parserOptions,
+    project: './packages/**/tsconfig.json',
   }
 };
diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,13 @@
+language: node_js
+node_js:
+  - 'lts/*'
+install:
+  - npm install
+  - npm run bootstrap
+  - npm install -g surge
+script:
+  - npm run build:doc
+  - surge ./dist ahooks-$(git rev-parse --short HEAD).surge.sh
+cache:
+  directories:
+    - 'node_modules'
diff --git a/.umirc.js b/.umirc.js
@@ -1,5 +1,5 @@
 export default {
-  ssr: {},
+  // ssr: {},
   exportStatic: {},
   nodeModulesTransform: {
     type: 'none',
@@ -19,7 +19,7 @@ export default {
       'babel-plugin-import',
       {
         libraryName: '@alifd/next',
-        style: true,
+        style: false,
       },
       'fusion',
     ],
@@ -35,7 +35,13 @@ export default {
   resolve: {
     includes: ['docs', 'packages/hooks/src', 'packages/use-request'],
   },
-  links: [{ rel: 'stylesheet', href: '/style.css' }],
+  links: [
+    {
+      rel: 'stylesheet',
+      href: 'https://unpkg.com/@alifd/[email protected]/dist/next.min.css',
+    },
+    { rel: 'stylesheet', href: '/style.css' },
+  ],
   navs: {
     'zh-CN': [
       null,

diff --git a/README.md b/README.md
@@ -30,7 +30,48 @@ npm i ahooks --save
 import { useRequest } from 'ahooks';
 ```
 
-## 🖥 Development
+## Core Team
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center">
+        <a target="_blank" href="https://github.com/alibaba/ice">
+          <img
+            width="32"
+            src="https://img.alicdn.com/tfs/TB1Jd.tb79l0K4jSZFKXXXFjpXa-482-264.png"
+          />
+          <br>
+          <strong>ice</strong>
+        </a>
+      </td>
+      <td align="center">
+        <a target="_blank" href="https://github.com/umijs/umi">
+          <img
+            width="32"
+            style="vertical-align: -0.32em; margin-right: 8px;"
+            src="https://img.alicdn.com/tfs/TB1fhqaLAT2gK0jSZFkXXcIQFXa-132-130.png"
+          />
+          <br>
+          <strong>umi</strong>
+        </a>
+      </td>
+       <td align="center">
+        <a target="_blank" href="https://www.alisports.com/">
+          <img
+            width="32"
+            style="vertical-align: -0.32em; margin-right: 8px;"
+            src="https://gw.alicdn.com/tfs/TB13XKjLuL2gK0jSZFmXXc7iXXa-205-59.png"
+          />
+          <br>
+          <strong>Alisports</strong>
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+## 🤝 Contributing
 
 ```
 $ git clone [email protected]:alibaba/hooks.git
@@ -40,8 +81,6 @@ $ npm start
 ```
 Open your browser and visit http://127.0.0.1:8001 , see more at Development.
 
-## 🤝 Contributing
-
 We welcome all contributions, please read our [CONTRIBUTING.MD](https://github.com/alibaba/hooks/blob/master/CONTRIBUTING.MD) first, let's build a better hooks library together.
 
 ## 👥 Discuss

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -30,7 +30,48 @@ npm i ahooks --save
 import { useRequest } from 'ahooks';
 ```
 
-## 🖥 开发
+## 开发团队
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center">
+        <a target="_blank" href="https://github.com/alibaba/ice">
+          <img
+            width="32"
+            src="https://img.alicdn.com/tfs/TB1Jd.tb79l0K4jSZFKXXXFjpXa-482-264.png"
+          />
+          <br>
+          <strong>icejs</strong>
+        </a>
+      </td>
+      <td align="center">
+        <a target="_blank" href="https://github.com/umijs/umi">
+          <img
+            width="32"
+            style="vertical-align: -0.32em; margin-right: 8px;"
+            src="https://img.alicdn.com/tfs/TB1fhqaLAT2gK0jSZFkXXcIQFXa-132-130.png"
+          />
+          <br>
+          <strong>UmiJS</strong>
+        </a>
+      </td>
+       <td align="center">
+        <a target="_blank" href="https://www.alisports.com/">
+          <img
+            width="32"
+            style="vertical-align: -0.32em; margin-right: 8px;"
+            src="https://gw.alicdn.com/tfs/TB13XKjLuL2gK0jSZFmXXc7iXXa-205-59.png"
+          />
+          <br>
+          <strong>阿里体育</strong>
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+## 🤝 参与贡献
 
 ```
 $ git clone [email protected]:alibaba/hooks.git
@@ -40,11 +81,9 @@ $ npm start
 ```
 打开浏览器访问 http://127.0.0.1:8001
 
-## 🤝 贡献
-
 我们欢迎所有人参与共建，请参考[CONTRIBUTING.MD](https://github.com/alibaba/hooks/blob/master/CONTRIBUTING.MD)
 
-## 👥 讨论
+## 👥 交流讨论
 
 <img src="https://raw.githubusercontent.com/umijs/hooks/master/dingtalk.jpg" width="300" />
 

diff --git a/docs/index.en-US.md b/docs/index.en-US.md
@@ -29,7 +29,7 @@ npm i ahooks --save
 import { useRequest } from 'ahooks';
 ```
 
-## Who is using ahooks
+## Core Team
 
 <table>
   <tbody>
@@ -41,7 +41,7 @@ import { useRequest } from 'ahooks';
             src="https://img.alicdn.com/tfs/TB1Jd.tb79l0K4jSZFKXXXFjpXa-482-264.png"
           />
           <br>
-          <strong>icejs</strong>
+          <strong>ice</strong>
         </a>
       </td>
       <td align="center">
@@ -52,7 +52,7 @@ import { useRequest } from 'ahooks';
             src="https://img.alicdn.com/tfs/TB1fhqaLAT2gK0jSZFkXXcIQFXa-132-130.png"
           />
           <br>
-          <strong>UmiJS</strong>
+          <strong>umi</strong>
         </a>
       </td>
        <td align="center">

diff --git a/docs/index.zh-CN.md b/docs/index.zh-CN.md
@@ -29,7 +29,7 @@ npm i ahooks --save
 import { useRequest } from 'ahooks';
 ```
 
-## 谁在使用
+## 开发团队
 
 <table>
   <tbody>
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ npm i ahooks --save @@
     import { useRequest } from 'ahooks';
     ```
-    ## 谁在使用
+    ## 开发团队
     <table>
       <tbody>
@@ Expand Down @@