chore: optimize useAdmateAdapter.js

cloydlau · Aug 12, 2024 · a0db34b · a0db34b
1 parent 1acf123
commit a0db34b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 34 deletions.
diff --git a/demo/utils/useAdmateAdapter.js b/demo/utils/useAdmateAdapter.js
@@ -1,10 +1,14 @@
-import { computed, getCurrentInstance, onMounted, reactive, ref, toRefs, watch } from 'vue'
+import { computed, getCurrentInstance, onMounted, reactive, ref, toRefs, watch } from 'vue-demi'
 import { FaMessageBox } from 'faim'
 import { cloneDeep, merge, mergeWith } from 'lodash-es'
 import qs from 'qs'
+// import VueCompositionAPI from '@vue/composition-api'
 import useAdmate from '../../src'
 import http from '@/utils/http'
 
+// Vue@2.6 or earlier only
+// Vue.use(VueCompositionAPI)
+
 export default (
   admateConfig,
   {

diff --git a/demo/vue2.7/index.vue b/demo/vue2.7/index.vue
@@ -12,7 +12,6 @@ export default {
 
 <template>
   <div>
-    Vue 2 UI Framework demo:
     <span
       v-for="({ path }, i) of routes"
       :key="i"

diff --git a/vite.config.ts b/vite.config.ts
@@ -50,37 +50,28 @@ export default {
       },
     },
   },
-  plugins: [
-    {
-      name: 'html-transform',
-      transformIndexHtml(html: string) {
-        return html.replace(/\{\{ NAME \}\}/, name).replace(/\{\{ VUE_VERSION \}\}/g, String(major === 3 ? major : `${major}.${minor}`))
-      },
+  plugins: [{
+    name: 'html-transform',
+    transformIndexHtml(html: string) {
+      return html.replace(/\{\{ NAME \}\}/, name).replace(/\{\{ VUE_VERSION \}\}/g, String(major === 3 ? major : `${major}.${minor}`))
     },
-    dts({ rollupTypes: true }),
-    AutoImport({
-    // targets to transform
-      include: [
-        /\.[tj]sx?$/, // .ts, .tsx, .js, .jsx
-        /\.vue$/,
-        /\.vue\?vue/, // .vue
-        /\.md$/, // .md
-      ],
-      // global imports to register
-      imports: [
-      // presets
-        (major === 3 || (major === 2 && minor >= 7)) ? 'vue' : '@vue/composition-api',
-      ],
-    }),
-    UnoCSS({
-      presets: [
-        presetAttributify(),
-        presetUno(),
-      ],
-    }),
-    Components(),
-    viteMockServe(),
-    { ...visualizer(), apply: 'build' },
-    vue(),
-  ],
+  }, dts({ rollupTypes: true }), AutoImport({
+  // targets to transform
+    include: [
+      /\.[tj]sx?$/, // .ts, .tsx, .js, .jsx
+      /\.vue$/,
+      /\.vue\?vue/, // .vue
+      /\.md$/, // .md
+    ],
+    // global imports to register
+    imports: [
+    // presets
+      (major === 3 || (major === 2 && minor >= 7)) ? 'vue' : '@vue/composition-api',
+    ],
+  }), UnoCSS({
+    presets: [
+      presetAttributify(),
+      presetUno(),
+    ],
+  }), Components(), viteMockServe(), { ...visualizer(), apply: 'build' }, vue()],
 }