@vixt/core 0.0.9 → 0.0.11

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as vite from 'vite';
-import { PluginOption, UserConfig, TransformResult } from 'vite';
+import { PluginOption, ResolvedConfig, TransformResult } from 'vite';
 import * as c12 from 'c12';
 import { ConfigLayer, LoadConfigOptions } from 'c12';
 import { TSConfig } from 'pkg-types';
@@ -47,7 +47,8 @@ interface VixtOptions extends Record<string, any> {
     extends?: string[];
     /** modules */
     modules?: VixtModule[];
-    vite?: UserConfig;
+    /** use on configResolved */
+    vite?: ResolvedConfig;
 }
 interface VixtConfigLayer extends ConfigLayer<VixtOptions> {
 }
@@ -115,6 +116,7 @@ declare function defineVixtConfig(input: VixtOptions): VixtOptions;
 declare const rootDir: string;
 declare const buildDir = ".vixt";
 declare const buildTypesDir = ".vixt/types";
+declare const buildLayersDir = ".vixt/layers";
 declare function loadVixtConfig(opts?: LoadConfigOptions<VixtOptions>): Promise<c12.ResolvedConfig<VixtOptions, c12.ConfigLayerMeta>>;
 declare function resolveLayersDirs(layers?: VixtConfigLayer[]): Record<string, string[] | undefined>;
 
@@ -126,4 +128,4 @@ declare function applyLayerModules(layers?: VixtConfigLayer[]): Promise<VixtModu
 declare function loadVixt(opts?: LoadConfigOptions<VixtOptions>): Promise<Vixt>;
 declare function createVixtPlugin(loadOptions: LoadConfigOptions<VixtOptions>): (options?: VixtOptions | undefined) => vite.PluginOption;
 
-export { type AppHead, type AppOptions, type ModuleDefinition, type ModuleMeta, type ModuleOptions, type PluginOptions, type TypescriptOptions, type Vixt, type VixtConfigLayer, type VixtModule, type VixtOptions, alias, app, applyLayerModules, buildDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };
+export { type AppHead, type AppOptions, type ModuleDefinition, type ModuleMeta, type ModuleOptions, type PluginOptions, type TypescriptOptions, type Vixt, type VixtConfigLayer, type VixtModule, type VixtOptions, alias, app, applyLayerModules, buildDir, buildLayersDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as vite from 'vite';
-import { PluginOption, UserConfig, TransformResult } from 'vite';
+import { PluginOption, ResolvedConfig, TransformResult } from 'vite';
 import * as c12 from 'c12';
 import { ConfigLayer, LoadConfigOptions } from 'c12';
 import { TSConfig } from 'pkg-types';
@@ -47,7 +47,8 @@ interface VixtOptions extends Record<string, any> {
     extends?: string[];
     /** modules */
     modules?: VixtModule[];
-    vite?: UserConfig;
+    /** use on configResolved */
+    vite?: ResolvedConfig;
 }
 interface VixtConfigLayer extends ConfigLayer<VixtOptions> {
 }
@@ -115,6 +116,7 @@ declare function defineVixtConfig(input: VixtOptions): VixtOptions;
 declare const rootDir: string;
 declare const buildDir = ".vixt";
 declare const buildTypesDir = ".vixt/types";
+declare const buildLayersDir = ".vixt/layers";
 declare function loadVixtConfig(opts?: LoadConfigOptions<VixtOptions>): Promise<c12.ResolvedConfig<VixtOptions, c12.ConfigLayerMeta>>;
 declare function resolveLayersDirs(layers?: VixtConfigLayer[]): Record<string, string[] | undefined>;
 
@@ -126,4 +128,4 @@ declare function applyLayerModules(layers?: VixtConfigLayer[]): Promise<VixtModu
 declare function loadVixt(opts?: LoadConfigOptions<VixtOptions>): Promise<Vixt>;
 declare function createVixtPlugin(loadOptions: LoadConfigOptions<VixtOptions>): (options?: VixtOptions | undefined) => vite.PluginOption;
 
-export { type AppHead, type AppOptions, type ModuleDefinition, type ModuleMeta, type ModuleOptions, type PluginOptions, type TypescriptOptions, type Vixt, type VixtConfigLayer, type VixtModule, type VixtOptions, alias, app, applyLayerModules, buildDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };
+export { type AppHead, type AppOptions, type ModuleDefinition, type ModuleMeta, type ModuleOptions, type PluginOptions, type TypescriptOptions, type Vixt, type VixtConfigLayer, type VixtModule, type VixtOptions, alias, app, applyLayerModules, buildDir, buildLayersDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };

package/dist/index.mjs

@@ -33,9 +33,10 @@ const alias = defineVixtModule({
 function defineVixtConfig(input) {
   return input;
 }
-const rootDir = cwd();
+const rootDir = path.resolve(cwd());
 const buildDir = ".vixt";
 const buildTypesDir = `${buildDir}/types`;
+const buildLayersDir = `${buildDir}/layers`;
 async function loadVixtConfig(opts) {
   const result = await loadConfig({
     name: "vixt",
@@ -48,7 +49,14 @@ async function loadVixtConfig(opts) {
       ...opts?.defaults
     }
   });
-  result.layers = result.layers?.filter((e) => e.cwd);
+  result.layers = result.layers?.filter((e) => e.cwd).map((e) => {
+    if (e.cwd !== rootDir) {
+      const newCwd = path.resolve(rootDir, buildLayersDir, e.cwd.split("/").pop());
+      fs.copySync(e.cwd, newCwd, { filter: (src) => !/node_modules|tsconfig/.test(src) });
+      return { ...e, relatedCwd: e.cwd, cwd: newCwd };
+    }
+    return e;
+  });
   return result;
 }
 function resolveLayersDirs(layers = []) {
@@ -188,13 +196,10 @@ const app = defineVixtModule({
 const name$1 = "vixt:config";
 const config = defineVixtModule({
   meta: { name: name$1 },
-  setup(options, vixt) {
+  setup(_, vixt) {
     return {
       name: name$1,
       enforce: "pre",
-      config(config2) {
-        vixt.options.vite = config2;
-      },
       configResolved(config2) {
         vixt.options.vite = config2;
       }
@@ -326,4 +331,4 @@ function createVixtPlugin(loadOptions) {
   });
 }
 
-export { alias, app, applyLayerModules, buildDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };
+export { alias, app, applyLayerModules, buildDir, buildLayersDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/core",
   "type": "module",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://github.com/SoulLyoko/vixt#readme",
@@ -26,8 +26,8 @@
     "mlly": "1.7.1",
     "pathe": "^1.1.2",
     "pkg-types": "^1.1.3",
-    "tsx": "^4.16.0",
-    "vite": "^5.3.2",
+    "tsx": "^4.16.2",
+    "vite": "^5.3.3",
     "vite-plugin-checker": "^0.7.0",
     "vue-tsc": "^2.0.24"
   },