refactor: export all from common

vue-macros · Aug 21, 2023 · 7128dd5 · 7128dd5
1 parent a3b8817
commit 7128dd5
Show file tree

Hide file tree

Showing 11 changed files with 318 additions and 369 deletions.
diff --git a/.changeset/nasty-shoes-whisper.md b/.changeset/nasty-shoes-whisper.md
@@ -0,0 +1,6 @@
+---
+'@vue-macros/common': patch
+'@vue-macros/api': patch
+---
+
+export all from common
diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
@@ -1,4 +1,4 @@
-export { MagicString } from '@vue-macros/common'
+export * from '@vue-macros/common'
 
 export * from './vue'
 export * from './resolve'

diff --git a/packages/api/src/ts/create.ts b/packages/api/src/ts/create.ts
diff --git a/packages/api/src/ts/index.ts b/packages/api/src/ts/index.ts
@@ -1,4 +1,3 @@
-export * from './create'
 export * from './is'
 export * from './namespace'
 export * from './property'

diff --git a/packages/api/src/ts/resolve.ts b/packages/api/src/ts/resolve.ts
@@ -1,4 +1,9 @@
-import { resolveLiteral, resolveObjectKey } from '@vue-macros/common'
+import {
+  createStringLiteral,
+  createTSUnionType,
+  resolveLiteral,
+  resolveObjectKey,
+} from '@vue-macros/common'
 import {
   type BigIntLiteral,
   type BooleanLiteral,
@@ -18,7 +23,6 @@ import {
   type TemplateElement,
   type TemplateLiteral,
 } from '@babel/types'
-import { createStringLiteral, createUnionType } from './create'
 import { isTSNamespace } from './namespace'
 import {
   type TSProperties,
@@ -200,7 +204,7 @@ export async function resolveTSIndexedAccessType(
       return undefined
     }
 
-    return { type: createUnionType(types), scope }
+    return { type: createTSUnionType(types), scope }
   } else if (
     objectType.type !== 'TSInterfaceDeclaration' &&
     objectType.type !== 'TSTypeLiteral' &&
@@ -268,7 +272,7 @@ export async function resolveTSIndexedAccessType(
   if (indexes.length === 0) return undefined
   if (optional) indexes.push({ type: 'TSUndefinedKeyword' })
 
-  return { type: createUnionType(indexes), scope }
+  return { type: createTSUnionType(indexes), scope }
 }
 
 export async function resolveTSTypeOperator(

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -55,7 +55,7 @@
     "unplugin-vue-macros": "workspace:*"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^4.3.1",
+    "@vitejs/plugin-vue": "^4.3.2",
     "astro": "^2.10.12"
   },
   "engines": {

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -56,7 +56,7 @@
     "@babel/types": "^7.22.10",
     "@rollup/pluginutils": "^5.0.3",
     "@vue/compiler-sfc": "^3.3.4",
-    "ast-kit": "^0.9.5",
+    "ast-kit": "^0.10.0",
     "local-pkg": "^0.4.3",
     "magic-string-ast": "^0.3.0"
   },

diff --git a/packages/devtools/package.json b/packages/devtools/package.json
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "@unocss/reset": "^0.55.2",
-    "@vitejs/plugin-vue": "^4.3.1",
+    "@vitejs/plugin-vue": "^4.3.2",
     "get-port": "^7.0.0",
     "unocss": "^0.55.2",
     "vite": "^4.4.9"

diff --git a/packages/reactivity-transform/package.json b/packages/reactivity-transform/package.json
@@ -87,7 +87,7 @@
     "@vue-macros/common": "workspace:*",
     "@vue/compiler-core": "^3.3.4",
     "@vue/shared": "^3.3.4",
-    "magic-string": "^0.30.2",
+    "magic-string": "^0.30.3",
     "unplugin": "^1.4.0"
   },
   "devDependencies": {

diff --git a/playground/vue3/package.json b/playground/vue3/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-node-resolve": "^15.2.0",
-    "@vitejs/plugin-vue": "^4.3.1",
+    "@vitejs/plugin-vue": "^4.3.2",
     "@vitejs/plugin-vue-jsx": "^3.0.2",
     "@vue-macros/boolean-prop": "workspace:*",
     "@vue-macros/short-vmodel": "workspace:*",