From e6ea50f47835df420ab66c7be0490f85e79fa420 Mon Sep 17 00:00:00 2001
From: Tmk <i@tmk.im>
Date: Sun, 10 Oct 2021 18:54:10 +0800
Subject: [PATCH 1/4] fix: replace new package name (#130)

---
 plugins/community/animations.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/community/animations.md b/plugins/community/animations.md
index ed36073e..4d3de8ce 100644
--- a/plugins/community/animations.md
+++ b/plugins/community/animations.md
@@ -5,7 +5,7 @@ Add [Animate CSS](https://github.com/animate-css/animate.css) as [Windi CSS](htt
 ## Installation
 
 ```bash
-npm install --save-dev @windicss/animations
+npm install --save-dev @windicss/plugin-animations
 ```
 
 ## Usage
@@ -17,7 +17,7 @@ export default {
   },
   plugins: [
     // Other plugins
-    require('@windicss/animations')({
+    require('@windicss/plugin-animations')({
       settings: {
         animatedSpeed: 1000,
         heartBeatSpeed: 1000,

From b7dc3e2fa804109a46d4cd7f6047578d125fa040 Mon Sep 17 00:00:00 2001
From: Erik Ostrom <code@erikostrom.com>
Date: Sun, 10 Oct 2021 16:49:58 -0500
Subject: [PATCH 2/4] docs: support TypeScript in Next.js example (#131)

---
 integrations/webpack.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integrations/webpack.md b/integrations/webpack.md
index 24f3603e..33d5c9c2 100644
--- a/integrations/webpack.md
+++ b/integrations/webpack.md
@@ -212,7 +212,7 @@ import { defineConfig } from 'windicss/helpers'
 
 export default defineConfig({
   extract: {
-    include: ['**/*.{jsx,css}'],
+    include: ['**/*.{jsx,tsx,css}'],
     exclude: ['node_modules', '.git', '.next'],
   },
 })

From 5d715aec835ce49c42335f0f65bda9739b76ffec Mon Sep 17 00:00:00 2001
From: Nicholas Berlette <nick@berlette.com>
Date: Mon, 11 Oct 2021 05:45:04 -0700
Subject: [PATCH 3/4] Update animations.md (#132)

---
 plugins/community/animations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/community/animations.md b/plugins/community/animations.md
index 4d3de8ce..f7e79ced 100644
--- a/plugins/community/animations.md
+++ b/plugins/community/animations.md
@@ -10,7 +10,7 @@ npm install --save-dev @windicss/plugin-animations
 
 ## Usage
 
-```js tailwind.config.js
+```js windi.config.js
 export default {
   theme: {
     // ...

From 432eefc49d02427892dfbacda59177d05ace5200 Mon Sep 17 00:00:00 2001
From: QC-L <github@liqichang.com>
Date: Thu, 14 Oct 2021 21:31:58 +0800
Subject: [PATCH 4/4] docs(cn): fix conflicts

---
 plugins/community/animations.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/plugins/community/animations.md b/plugins/community/animations.md
index 66fa9d1c..b5eaf261 100644
--- a/plugins/community/animations.md
+++ b/plugins/community/animations.md
@@ -16,13 +16,8 @@ export default {
     // ...
   },
   plugins: [
-<<<<<<< HEAD
     // 其他插件
-    require('@windicss/animations')({
-=======
-    // Other plugins
     require('@windicss/plugin-animations')({
->>>>>>> 5d715aec835ce49c42335f0f65bda9739b76ffec
       settings: {
         animatedSpeed: 1000,
         heartBeatSpeed: 1000,