@vixt/core 0.1.29 → 0.1.30

package/dist/index.mjs

@@ -200,17 +200,7 @@ const config = defineVixtModule({
 function generateTsConfig(options, vixt) {
   const { buildDir } = vixt.options;
   const codePath = path.resolve(buildDir, "tsconfig.json");
-  const layersDirs = [];
-  const layersAlias = {};
-  for (const layer of vixt._layers) {
-    layersDirs.push(layer.cwd);
-    if (layer.meta?.alias) {
-      const layerRelativePath = `./${path.relative(buildDir, layer.cwd)}/*`;
-      layersAlias[`${layer.meta.alias}/*`] = [layerRelativePath];
-    }
-  }
-  const tsConfig = defu(options.tsConfig, { compilerOptions: { paths: layersAlias }, include: layersDirs });
-  const code = JSON.stringify(tsConfig, null, 2);
+  const code = JSON.stringify(options.tsConfig, null, 2);
   fs.outputFileSync(codePath, code);
 }
 function generateVixtDts(options, vixt) {
@@ -271,26 +261,39 @@ interface ImportMetaEnv {
   fs.outputFileSync(codePath, code);
 }
 const name = "vixt:typescript";
-const defaults = {
-  tsConfig: {
-    extends: "@vue/tsconfig/tsconfig.dom.json",
-    compilerOptions: {
-      paths: {
-        "@/*": ["../src/*"],
-        "~/*": ["../src/*"],
-        "#/*": ["./*"]
-      },
-      types: ["vite/client"]
-    },
-    include: [
-      "./**/*"
-    ]
-  },
-  typeCheck: { enableBuild: false, overlay: { initialIsOpen: false } }
-};
 const typescript = defineVixtModule({
   meta: { name, configKey: "typescript" },
-  defaults,
+  defaults(vixt) {
+    const { rootDir, srcDir } = vixt.options;
+    const rootAlias = {};
+    if (rootDir)
+      rootAlias["@@/*"] = rootAlias["~~/*"] = [`${rootDir}/*`];
+    const srcAlias = {};
+    if (srcDir)
+      srcAlias["@/*"] = srcAlias["~/*"] = [`${srcDir}/*`];
+    const layersDirs = [];
+    const layersAlias = {};
+    for (const layer of vixt._layers) {
+      layersDirs.push(layer.cwd);
+      if (layer.meta?.alias)
+        layersAlias[`${layer.meta.alias}/*`] = [`${layer.cwd}/*`];
+    }
+    return {
+      tsConfig: {
+        extends: "@vue/tsconfig/tsconfig.dom.json",
+        compilerOptions: {
+          baseUrl: rootDir,
+          paths: { "#/*": ["./*"], ...layersAlias, ...rootAlias, ...srcAlias },
+          types: ["vite/client"]
+        },
+        include: ["./**/*", ...layersDirs]
+      },
+      typeCheck: {
+        enableBuild: false,
+        overlay: { initialIsOpen: false }
+      }
+    };
+  },
   setup(options, vixt) {
     return [
       {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/core",
   "type": "module",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://github.com/SoulLyoko/vixt#readme",