@vixt/core 0.0.7 → 0.0.9

package/dist/index.mjs

@@ -202,49 +202,46 @@ const config = defineVixtModule({
   }
 });
 
-function generateDts(options, vixt, config) {
-  const { root } = config;
-  const { buildDir } = vixt.options;
-  const vixtDts = options.references?.map((reference) => {
+function generateVixtDts(options, vixt) {
+  const { buildDir, rootDir } = vixt.options;
+  const codePath = path.resolve(rootDir, buildDir, "vixt.d.ts");
+  const code = options.references?.map((reference) => {
     if (typeof reference === "string") {
       return `/// <reference path="${reference}" />`;
     } else if (typeof reference === "object" && reference.path && reference.content) {
-      fs.outputFileSync(path.resolve(root, buildDir), reference.content ?? "");
+      fs.outputFileSync(path.resolve(rootDir, buildDir), reference.content ?? "");
       return `/// <reference path="${reference.path}" />`;
     } else {
       return "";
     }
   }).concat("export {}").join("\n");
-  const vixtDtsPath = path.resolve(root, buildDir, "vixt.d.ts");
-  fs.outputFileSync(vixtDtsPath, vixtDts);
+  code && fs.outputFileSync(codePath, code);
 }
-function generateTsConfig(options, vixt, config) {
-  const { root } = config;
-  const { buildDir } = vixt.options;
-  const tsConfigPath = path.resolve(root, buildDir, "tsconfig.json");
+function generateTsConfig(options, vixt) {
+  const { buildDir, rootDir } = vixt.options;
+  const codePath = path.resolve(rootDir, buildDir, "tsconfig.json");
   const layersDirs = vixt._layers.map((e) => e.cwd);
   const tsConfig = defu(options.tsConfig, { include: layersDirs });
-  fs.outputFileSync(tsConfigPath, JSON.stringify(tsConfig, null, 2));
+  const code = JSON.stringify(tsConfig, null, 2);
+  fs.outputFileSync(codePath, code);
 }
-function generateEnvDts(options, vixt, config) {
-  const { env, root } = config;
-  const { buildDir } = vixt.options;
+function generateEnvDts(options, vixt, env) {
+  const { buildTypesDir, rootDir } = vixt.options;
+  const codePath = path.resolve(rootDir, buildTypesDir, "vite-env.d.ts");
   const values = Object.entries(env).map(([key, value]) => `/** ${key}=${value} */
   ${key}: ${typeof value}`).join("\n  ");
-  const envDts = `interface ImportMeta {
+  const code = `interface ImportMeta {
   readonly env: ImportMetaEnv
 }
 interface ImportMetaEnv {
   ${values}
 }
 `;
-  const envDtsPath = path.resolve(root, buildDir, "types", "vite-env.d.ts");
-  fs.outputFileSync(envDtsPath, envDts);
+  fs.outputFileSync(codePath, code);
 }
-function genarateShims(options, vixt, config) {
-  const { root } = config;
-  const { buildDir } = vixt.options;
-  const shimsDts = `
+function genarateShims(options, vixt) {
+  const { buildTypesDir, rootDir } = vixt.options;
+  const code = `
 declare module '*.vue' {
   import type { DefineComponent } from 'vue'
 
@@ -252,12 +249,24 @@ declare module '*.vue' {
   export default component
 }
 `;
-  const shimsDtsPath = path.resolve(root, buildDir, "types", "shims.d.ts");
-  fs.outputFileSync(shimsDtsPath, shimsDts);
+  const codePath = path.resolve(rootDir, buildTypesDir, "shims.d.ts");
+  fs.outputFileSync(codePath, code);
+}
+function genarateGlobalComponents(options, vixt) {
+  const { buildTypesDir, rootDir } = vixt.options;
+  const codePath = path.resolve(rootDir, buildTypesDir, "global-components.d.ts");
+  const code = `
+import type { GlobalComponents as _GlobalComponents } from '@vue/runtime-core'
+
+declare module 'vue'{
+  interface GlobalComponents extends _GlobalComponents {}
+}
+`;
+  fs.outputFileSync(codePath, code);
 }
 const name = "vixt:typescript";
 const defaults = {
-  references: ["./types/vite-env.d.ts", "./types/shims.d.ts"],
+  // references: ['types/vite-env.d.ts', 'types/shims.d.ts', 'types/global-components.d.ts'],
   tsConfig: {
     extends: "@vue/tsconfig/tsconfig.dom.json",
     compilerOptions: {
@@ -283,10 +292,11 @@ const typescript = defineVixtModule({
       {
         name,
         configResolved(config) {
-          generateDts(options, vixt, config);
-          generateTsConfig(options, vixt, config);
-          generateEnvDts(options, vixt, config);
-          genarateShims(options, vixt, config);
+          generateVixtDts(options, vixt);
+          generateTsConfig(options, vixt);
+          generateEnvDts(options, vixt, config.env);
+          genarateShims(options, vixt);
+          genarateGlobalComponents(options, vixt);
         }
       },
       Checker(options.typeCheck ?? {})

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/core",
   "type": "module",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://github.com/SoulLyoko/vixt#readme",
@@ -25,7 +25,7 @@
     "fs-extra": "^11.2.0",
     "mlly": "1.7.1",
     "pathe": "^1.1.2",
-    "pkg-types": "^1.1.2",
+    "pkg-types": "^1.1.3",
     "tsx": "^4.16.0",
     "vite": "^5.3.2",
     "vite-plugin-checker": "^0.7.0",