Merge remote-tracking branch 'origin/main' into 3

README.en-US.md

@@ -122,22 +122,27 @@ Please leave a message at [**here**](https://github.com/actions-cool/issues-help
     </a>
   </td>
   <td align="center" width="180">
-    <a href="https://github.com/umijs/umi">
-      <img src="https://avatars1.githubusercontent.com/u/33895495?s=200&v=4" width="46"/>
+    <a href="https://github.com/antvis/S2">
+      <img src="https://gw.alipayobjects.com/mdn/rms_56cbb2/afts/img/A*TI8XSK3W0EkAAAAAAAAAAAAAARQnAQ" width="46"/>
     </a>
   </td>
   <td align="center" width="180">
-    <a href="https://github.com/vitejs/vite">
-      <img src="https://avatars.githubusercontent.com/u/65625612?s=200&v=4" width="46"/>
+    <a href="https://github.com/umijs/umi">
+      <img src="https://avatars1.githubusercontent.com/u/33895495?s=200&v=4" width="46"/>
     </a>
   </td>
 </tr>
 <tr>
   <td align="center" width="180"><a href="https://github.com/react-component">react-component</a></td>
   <td align="center" width="180"><a href="https://github.com/lijinke666/react-music-player">react-music-player</a></td>
+  <td align="center" width="180"><a href="https://github.com/antvis/S2">S2</a></td>
   <td align="center" width="180"><a href="https://github.com/umijs/umi">umi</a></td>
-  <td align="center" width="180"><a href="https://github.com/vitejs/vite">vite</a></td>
 </tr><tr>
+  <td align="center" width="180">
+    <a href="https://github.com/vitejs/vite">
+      <img src="https://avatars.githubusercontent.com/u/65625612?s=200&v=4" width="46"/>
+    </a>
+  </td>
   <td align="center" width="180">
     <a href="https://github.com/AttoJS/vue-request">
       <img src="https://user-images.githubusercontent.com/29775873/129506134-55044c85-24cd-47d3-81ef-dba842214d71.png" width="46"/>
@@ -153,13 +158,12 @@ Please leave a message at [**here**](https://github.com/actions-cool/issues-help
       <img src="https://avatars1.githubusercontent.com/u/70757173?s=200&v=4" width="46"/>
     </a>
   </td>
-  <td align="center" width="180"></td>
 </tr>
 <tr>
+  <td align="center" width="180"><a href="https://github.com/vitejs/vite">vite</a></td>
   <td align="center" width="180"><a href="https://github.com/AttoJS/vue-request">vue-request</a></td>
   <td align="center" width="180"><a href="https://github.com/vuepress/vuepress-next">vuepress-next</a></td>
   <td align="center" width="180"><a href="https://github.com/zoo-js/zoo">zoo</a></td>
-  <td align="center" width="180"></td>
 </tr>
 </table>
 

README.md

@@ -122,22 +122,27 @@
     </a>
   </td>
   <td align="center" width="180">
-    <a href="https://github.com/umijs/umi">
-      <img src="https://avatars1.githubusercontent.com/u/33895495?s=200&v=4" width="46"/>
+    <a href="https://github.com/antvis/S2">
+      <img src="https://gw.alipayobjects.com/mdn/rms_56cbb2/afts/img/A*TI8XSK3W0EkAAAAAAAAAAAAAARQnAQ" width="46"/>
     </a>
   </td>
   <td align="center" width="180">
-    <a href="https://github.com/vitejs/vite">
-      <img src="https://avatars.githubusercontent.com/u/65625612?s=200&v=4" width="46"/>
+    <a href="https://github.com/umijs/umi">
+      <img src="https://avatars1.githubusercontent.com/u/33895495?s=200&v=4" width="46"/>
     </a>
   </td>
 </tr>
 <tr>
   <td align="center" width="180"><a href="https://github.com/react-component">react-component</a></td>
   <td align="center" width="180"><a href="https://github.com/lijinke666/react-music-player">react-music-player</a></td>
+  <td align="center" width="180"><a href="https://github.com/antvis/S2">S2</a></td>
   <td align="center" width="180"><a href="https://github.com/umijs/umi">umi</a></td>
-  <td align="center" width="180"><a href="https://github.com/vitejs/vite">vite</a></td>
 </tr><tr>
+  <td align="center" width="180">
+    <a href="https://github.com/vitejs/vite">
+      <img src="https://avatars.githubusercontent.com/u/65625612?s=200&v=4" width="46"/>
+    </a>
+  </td>
   <td align="center" width="180">
     <a href="https://github.com/AttoJS/vue-request">
       <img src="https://user-images.githubusercontent.com/29775873/129506134-55044c85-24cd-47d3-81ef-dba842214d71.png" width="46"/>
@@ -153,13 +158,12 @@
       <img src="https://avatars1.githubusercontent.com/u/70757173?s=200&v=4" width="46"/>
     </a>
   </td>
-  <td align="center" width="180"></td>
 </tr>
 <tr>
+  <td align="center" width="180"><a href="https://github.com/vitejs/vite">vite</a></td>
   <td align="center" width="180"><a href="https://github.com/AttoJS/vue-request">vue-request</a></td>
   <td align="center" width="180"><a href="https://github.com/vuepress/vuepress-next">vuepress-next</a></td>
   <td align="center" width="180"><a href="https://github.com/zoo-js/zoo">zoo</a></td>
-  <td align="center" width="180"></td>
 </tr>
 </table>
 

USERS.js

@@ -1,5 +1,6 @@
 // **************************************************************************
-// Add to end
+// step1: add to end
+// step2: npm run users
 
 /**
  * @param {string} url        github地址
@@ -85,6 +86,10 @@ const users = [
     url: 'https://github.com/element-plus/element-plus',
     logo: 'https://avatars.githubusercontent.com/u/68583457',
   },
+  {
+    url: 'https://github.com/antvis/S2',
+    logo: 'https://gw.alipayobjects.com/mdn/rms_56cbb2/afts/img/A*TI8XSK3W0EkAAAAAAAAAAAAAARQnAQ',
+  },
 ];
 
 // **************************************************************************

package.json

@@ -45,7 +45,7 @@
     "@typescript-eslint/parser": "^4.15.2",
     "@umijs/fabric": "^2.5.6",
     "@vercel/ncc": "^0.27.0",
-    "common-tags": "^1.8.0",
+    "common-tags": "^1.8.2",
     "dumi": "^1.1.26",
     "eslint": "^7.18.0",
     "eslint-plugin-github": "^4.1.1",