From 31cb082270e061eef233186470754c3fae1c9389 Mon Sep 17 00:00:00 2001
From: Fritz Lin <uxfritz@163.com>
Date: Wed, 10 Aug 2022 22:26:50 +0800
Subject: [PATCH] drop `.common` suffix, update readme & vue2 tips

---
 .eslintignore |  3 ++-
 README.md     | 16 ++++++++--------
 package.json  | 14 +++++++++-----
 src/App.vue   | 15 ++++++++++++---
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index d5c947f..f20f937 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +1,2 @@
-./dist/
+/dist/
+/package/dist/
diff --git a/README.md b/README.md
index 0d78b5c..9c1bc59 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
 # vue-at
 
-<a href="https://github.com/fritx/vue-at/graphs/contributors"><img width="600" src="https://opencollective.com/vue-at/contributors.svg?width=890&button=false"></a><br>
-<a href="https://opencollective.com/vue-at#backers"><img src="https://opencollective.com/vue-at/backers.svg?width=890"></a>
-
-<a href="https://www.npmjs.com/package/vue-at"><img height="20" src="https://img.shields.io/npm/dm/vue-at.svg"></a>&nbsp;&nbsp;<a href="https://github.com/fritx/vue-at"><img width="90" height="20" src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" /></a>&nbsp;&nbsp;<a href="https://github.com/fritx/vue-at"><img width="84" height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
+<a href="https://www.npmjs.com/package/vue-at"><img height="20" src="https://img.shields.io/npm/dm/vue-at.svg"></a>&nbsp;&nbsp;<a href="https://github.com/fritx/vue-at"><img width="90" height="20" src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" /></a>&nbsp;&nbsp;<a href="https://github.com/fritx/vue-at"><img width="84" height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>&nbsp;&nbsp;<a href="https://gitter.im/fritx/vue-at?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"><img width="92" src="https://badges.gitter.im/fritx/vue-at.svg" alt="Join the chat at https://gitter.im/fritx/vue-at"></a>
 
 <img width="262" height="218" src="https://raw.githubusercontent.com/fritx/vue-at/master/WechatIMG1.jpeg">&nbsp;&nbsp;<img width="262" height="218" src="https://raw.githubusercontent.com/fritx/vue-at/master/WechatIMG2.jpeg">
 
@@ -15,9 +12,10 @@ Live Demo & Documentation: https://fritx.github.io/vue-at
 - [x] Plain-text based, no jQuery, no extra nodes
 - [x] Content-Editable / Textarea
 - [x] Avatars, custom templates
-- [x] Vue2 / Vue1
-- [x] Vuetify / Element-UI / Element Plus
-- [ ] Vue-CLI 3 migration
+- [x] Vue3 / Vue2 / Vue1
+- [x] Vuetify / Element UI / Element Plus
+- [x] Vue-CLI migration
+- [ ] Vite migration
 
 See also: [react-at](https://github.com/fritx/react-at)
 
@@ -31,8 +29,10 @@ See also: [react-at](https://github.com/fritx/react-at)
 
 Finally I ended up creating this.
 
+for Vue2, read [this one](https://github.com/fritx/vue-at/tree/vue2#readme) instead.
+
 ```plain
-npm i vue-at@3.0.0-alpha.0  # for Vue3 (🚧 Working in Progress...)
+npm i vue-at@next  # for Vue3 (branch wip-vue3)
 
 npm i vue-at@2.x  # for Vue2  <----
 npm i vue-at@1.x  # for Vue1 (branch vue1-legacy)
diff --git a/package.json b/package.json
index 9e961bf..2a9a492 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,16 @@
     "lint": "vue-cli-service lint --no-fix",
     "dev:dist": "vue-cli-service serve --skip-plugins eslint",
     "dev": "vue-cli-service serve",
-    "build:at": "vue-cli-service build ./src/At.vue --target lib --name vue-at",
-    "build:at-ta": "vue-cli-service build ./src/AtTextarea.vue --target lib --name vue-at-textarea",
-    "build": "rimraf dist && run-p build:at build:at-ta && rimraf dist/demo.html",
+    "demo": "vue-cli-service build",
+    "build:at": "vue-cli-service build ./src/At.vue --target lib --name vue-at && shx mv dist/vue-at.common.js dist/vue-at.js",
+    "build:at-ta": "vue-cli-service build ./src/AtTextarea.vue --target lib --name vue-at-textarea && shx mv dist/vue-at-textarea.common.js dist/vue-at-textarea.js",
+    "build": "shx rm -rf dist && run-p build:at build:at-ta && shx rm dist/demo.html",
     "prepublish": "npm run build"
   },
-  "main": "dist/vue-at.common.js",
+  "main": "dist/vue-at.js",
+  "files": [
+    "dist"
+  ],
   "engines": {
     "node": ">= 14.x"
   },
@@ -35,9 +39,9 @@
     "eslint": "^8.21.0",
     "eslint-plugin-vue": "^9.3.0",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^3.0.2",
     "sass": "^1.53.0",
     "sass-loader": "^13.0.2",
+    "shx": "^0.3.4",
     "vue": "^3.1.0",
     "vue-loader": "^16.0.0",
     "webpack": "^5.73.0"
diff --git a/src/App.vue b/src/App.vue
index b67a613..508f419 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -78,12 +78,21 @@
 </template>
 
 <script>
-// import At from 'vue-at'
-// import At from '../dist/vue-at.common'
-// import AtTa from '../dist/vue-at-textarea.common'
 import At from './At.vue'
 import AtTa from './AtTextarea.vue'
 
+// testing dist
+// import At from '../dist/vue-at'
+// import AtTa from '../dist/vue-at-textarea'
+
+// testing npm_pack
+// import At from '../package/'
+// import AtTa from '../package/dist/vue-at-textarea'
+
+// testing node_modules
+// import At from 'vue-at'
+// import AtTa from 'vue-at/dist/vue-at-textarea'
+
 let members = [
   /* eslint-disable */
   "Roxie Miles","grace.carroll",