@vixt/core 0.1.14 → 0.1.16

package/dist/client/index.d.mts

@@ -1,7 +1,7 @@
 import { App, Plugin } from 'vue';
 import { Router, RouteRecord } from 'vue-router';
 import { Pinia } from 'pinia';
-import { f as VixtAppConfig } from '../shared/core.a9343bb9.mjs';
+import { f as VixtAppConfig } from '../shared/core.3b42a3cd.mjs';
 import 'vite';
 import 'c12';
 

package/dist/client/index.d.ts

@@ -1,7 +1,7 @@
 import { App, Plugin } from 'vue';
 import { Router, RouteRecord } from 'vue-router';
 import { Pinia } from 'pinia';
-import { f as VixtAppConfig } from '../shared/core.a9343bb9.js';
+import { f as VixtAppConfig } from '../shared/core.3b42a3cd.js';
 import 'vite';
 import 'c12';
 

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { V as VixtModule, M as ModuleOptions, a as Vixt, b as VixtOptions, c as VixtConfigLayer, d as ModuleDefinition } from './shared/core.a9343bb9.mjs';
-export { g as ModuleMeta, P as PluginOptions, f as VixtAppConfig, e as VixtConfigLayerMeta } from './shared/core.a9343bb9.mjs';
+import { V as Vixt, a as VixtModule, M as ModuleOptions, b as VixtOptions, c as VixtConfigLayer, d as VixtConfigLayerMeta, e as ModuleDefinition } from './shared/core.3b42a3cd.mjs';
+export { g as ModuleMeta, P as PluginOptions, f as VixtAppConfig } from './shared/core.3b42a3cd.mjs';
 import { TSConfig } from 'pkg-types';
 import { RawVueCompilerOptions } from '@vue/language-core';
 import Checker from 'vite-plugin-checker';
@@ -8,8 +8,6 @@ import { LoadConfigOptions } from 'c12';
 import * as vite from 'vite';
 import { PluginOption } from 'vite';
 
-declare const alias: VixtModule<ModuleOptions>;
-
 declare module '@vixt/core' {
     interface VixtOptions {
         app?: AppOptions;
@@ -76,12 +74,25 @@ declare const typescript: VixtModule<TypescriptOptions>;
 
 declare function defineVixtConfig(input: VixtOptions): VixtOptions;
 declare function loadVixtConfig(opts?: LoadConfigOptions<VixtOptions>): Promise<c12.ResolvedConfig<VixtOptions, c12.ConfigLayerMeta>>;
+declare function applyLayers(layers: VixtConfigLayer[], config: VixtOptions): {
+    meta: VixtConfigLayerMeta;
+    cwd?: string;
+    config: VixtOptions | null;
+    source?: string;
+    sourceOptions?: c12.SourceOptions<VixtOptions, VixtConfigLayerMeta> | undefined;
+    configFile?: string;
+}[];
+declare function isSamePath(a: string, b: string): boolean;
 declare function resolveLayersDirs(layers: VixtConfigLayer[] | undefined, config: VixtOptions): Record<string, string[] | undefined>;
 
 /**
  * Load workspace and cwd env variables by default
  */
 declare function loadEnv(mode?: string, envDir?: string, prefixes?: string | string[]): ImportMeta["env"];
+/**
+ * Load workspace env variables
+ */
+declare function loadWorkspaceEnv(mode?: string, prefixes?: string | string[]): Record<string, string>;
 
 declare function defineVitePlugin<Options = any>(pluginFn: (options?: Options) => PluginOption): (options?: Options) => PluginOption;
 declare function defineVixtModule<T extends ModuleOptions>(definition: ModuleDefinition<T> | VixtModule<T>): VixtModule<T>;
@@ -91,4 +102,4 @@ declare function applyLayerModules(layers: VixtConfigLayer[], config: VixtOption
 declare function loadVixt(opts?: LoadConfigOptions<VixtOptions>): Promise<Vixt>;
 declare function createVixtPlugin(loadOptions: LoadConfigOptions<VixtOptions>): (options?: VixtOptions | undefined) => vite.PluginOption;
 
-export { type AppHead, type AppOptions, ModuleDefinition, ModuleOptions, type TypescriptOptions, Vixt, VixtConfigLayer, VixtModule, type VixtOptions, alias, app, applyLayerModules, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadEnv, loadVixt, loadVixtConfig, resolveLayersDirs, typescript };
+export { type AppHead, type AppOptions, ModuleDefinition, ModuleOptions, type TypescriptOptions, Vixt, VixtConfigLayer, VixtConfigLayerMeta, VixtModule, type VixtOptions, app, applyLayerModules, applyLayers, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, isSamePath, loadEnv, loadVixt, loadVixtConfig, loadWorkspaceEnv, resolveLayersDirs, typescript };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { V as VixtModule, M as ModuleOptions, a as Vixt, b as VixtOptions, c as VixtConfigLayer, d as ModuleDefinition } from './shared/core.a9343bb9.js';
-export { g as ModuleMeta, P as PluginOptions, f as VixtAppConfig, e as VixtConfigLayerMeta } from './shared/core.a9343bb9.js';
+import { V as Vixt, a as VixtModule, M as ModuleOptions, b as VixtOptions, c as VixtConfigLayer, d as VixtConfigLayerMeta, e as ModuleDefinition } from './shared/core.3b42a3cd.js';
+export { g as ModuleMeta, P as PluginOptions, f as VixtAppConfig } from './shared/core.3b42a3cd.js';
 import { TSConfig } from 'pkg-types';
 import { RawVueCompilerOptions } from '@vue/language-core';
 import Checker from 'vite-plugin-checker';
@@ -8,8 +8,6 @@ import { LoadConfigOptions } from 'c12';
 import * as vite from 'vite';
 import { PluginOption } from 'vite';
 
-declare const alias: VixtModule<ModuleOptions>;
-
 declare module '@vixt/core' {
     interface VixtOptions {
         app?: AppOptions;
@@ -76,12 +74,25 @@ declare const typescript: VixtModule<TypescriptOptions>;
 
 declare function defineVixtConfig(input: VixtOptions): VixtOptions;
 declare function loadVixtConfig(opts?: LoadConfigOptions<VixtOptions>): Promise<c12.ResolvedConfig<VixtOptions, c12.ConfigLayerMeta>>;
+declare function applyLayers(layers: VixtConfigLayer[], config: VixtOptions): {
+    meta: VixtConfigLayerMeta;
+    cwd?: string;
+    config: VixtOptions | null;
+    source?: string;
+    sourceOptions?: c12.SourceOptions<VixtOptions, VixtConfigLayerMeta> | undefined;
+    configFile?: string;
+}[];
+declare function isSamePath(a: string, b: string): boolean;
 declare function resolveLayersDirs(layers: VixtConfigLayer[] | undefined, config: VixtOptions): Record<string, string[] | undefined>;
 
 /**
  * Load workspace and cwd env variables by default
  */
 declare function loadEnv(mode?: string, envDir?: string, prefixes?: string | string[]): ImportMeta["env"];
+/**
+ * Load workspace env variables
+ */
+declare function loadWorkspaceEnv(mode?: string, prefixes?: string | string[]): Record<string, string>;
 
 declare function defineVitePlugin<Options = any>(pluginFn: (options?: Options) => PluginOption): (options?: Options) => PluginOption;
 declare function defineVixtModule<T extends ModuleOptions>(definition: ModuleDefinition<T> | VixtModule<T>): VixtModule<T>;
@@ -91,4 +102,4 @@ declare function applyLayerModules(layers: VixtConfigLayer[], config: VixtOption
 declare function loadVixt(opts?: LoadConfigOptions<VixtOptions>): Promise<Vixt>;
 declare function createVixtPlugin(loadOptions: LoadConfigOptions<VixtOptions>): (options?: VixtOptions | undefined) => vite.PluginOption;
 
-export { type AppHead, type AppOptions, ModuleDefinition, ModuleOptions, type TypescriptOptions, Vixt, VixtConfigLayer, VixtModule, type VixtOptions, alias, app, applyLayerModules, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadEnv, loadVixt, loadVixtConfig, resolveLayersDirs, typescript };
+export { type AppHead, type AppOptions, ModuleDefinition, ModuleOptions, type TypescriptOptions, Vixt, VixtConfigLayer, VixtConfigLayerMeta, VixtModule, type VixtOptions, app, applyLayerModules, applyLayers, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, isSamePath, loadEnv, loadVixt, loadVixtConfig, loadWorkspaceEnv, resolveLayersDirs, typescript };

package/dist/index.mjs

@@ -5,40 +5,10 @@ import { pathToFileURL } from 'mlly';
 import defu from 'defu';
 import { cwd, env } from 'node:process';
 import { loadConfig } from 'c12';
-import Checker from 'vite-plugin-checker';
-import { cac } from 'cac';
 import { loadEnv as loadEnv$1 } from 'vite';
-
-const name$3 = "vixt:alias";
-const alias = defineVixtModule({
-  meta: { name: name$3 },
-  setup(_, vixt) {
-    const { rootDir, buildDir, srcDir } = vixt.options;
-    const defaultAlias = {
-      "@": srcDir,
-      "~": srcDir,
-      "@@": rootDir,
-      "~~": rootDir
-    };
-    for (const layer of vixt._layers) {
-      if (layer.meta?.alias) {
-        defaultAlias[layer.meta.alias] = layer.cwd;
-      }
-    }
-    defaultAlias["#"] = buildDir;
-    return {
-      name: name$3,
-      config() {
-        return {
-          root: rootDir,
-          resolve: {
-            alias: defaultAlias
-          }
-        };
-      }
-    };
-  }
-});
+import { cac } from 'cac';
+import { findUpSync } from 'find-up';
+import Checker from 'vite-plugin-checker';
 
 function defineVixtConfig(input) {
   return input;
@@ -68,10 +38,9 @@ async function loadVixtConfig(opts) {
       ...opts?.defaults
     }
   });
-  result.layers = mapLayers(result.layers?.filter((e) => e.cwd) ?? [], result.config);
   return result;
 }
-function mapLayers(layers, config) {
+function applyLayers(layers, config) {
   const { rootDir, buildLayersDir } = config;
   return layers.map((layer) => {
     const meta = layer.config?.meta ?? {};
@@ -93,7 +62,7 @@ function mapLayers(layers, config) {
   });
 }
 function isSamePath(a, b) {
-  return path.resolve(a) === path.resolve(b);
+  return path.normalize(a) === path.normalize(b);
 }
 function resolveLayersDirs(layers = [], config) {
   const { srcDirName } = config;
@@ -330,6 +299,22 @@ const app = defineVixtModule({
   }
 });
 
+function loadEnv(mode, envDir, prefixes) {
+  const parsedArgv = cac().parse();
+  mode = mode || parsedArgv.options.mode || parsedArgv.options.m || env.NODE_ENV;
+  return {
+    MODE: mode,
+    DEV: env.NODE_ENV !== "production",
+    PROD: env.NODE_ENV === "production",
+    ...loadWorkspaceEnv(mode, prefixes),
+    ...loadEnv$1(mode, envDir || cwd(), prefixes)
+  };
+}
+function loadWorkspaceEnv(mode, prefixes) {
+  const workspaceManifestLocation = findUpSync(["pnpm-workspace.yaml", "pnpm-workspace.yml"]);
+  return workspaceManifestLocation ? loadEnv$1(mode, path.dirname(workspaceManifestLocation), prefixes) : {};
+}
+
 const name$1 = "vixt:config";
 const config = defineVixtModule({
   meta: { name: name$1 },
@@ -337,8 +322,43 @@ const config = defineVixtModule({
     return {
       name: name$1,
       enforce: "pre",
+      config(config2) {
+        const { rootDir, buildDir, srcDir } = vixt.options;
+        const defaultAlias = {
+          "@": srcDir,
+          "~": srcDir,
+          "@@": rootDir,
+          "~~": rootDir
+        };
+        for (const layer of vixt._layers) {
+          if (layer.meta?.alias) {
+            defaultAlias[layer.meta.alias] = layer.cwd;
+          }
+        }
+        defaultAlias["#"] = buildDir;
+        const env = loadEnv(config2.mode, config2.envDir, config2.envPrefix);
+        const defineEnv = Object.fromEntries(
+          Object.entries(env).filter(([k]) => !["MODE", "DEV", "PROD"].includes(k)).map(([k, v]) => [`import.meta.env.${k}`, JSON.stringify(v)])
+        );
+        return {
+          root: rootDir,
+          resolve: {
+            alias: defaultAlias
+          },
+          define: defineEnv
+        };
+      },
       configResolved(config2) {
         vixt.options.vite = config2;
+      },
+      configureServer(server) {
+        const configFiles = vixt._layers.map((layer) => path.resolve(layer.cwd, "vixt.config.ts"));
+        server.watcher.add(configFiles);
+        server.watcher.on("change", (file) => {
+          if (configFiles.includes(path.normalize(file))) {
+            server.restart();
+          }
+        });
       }
     };
   }
@@ -455,28 +475,10 @@ const typescript = defineVixtModule({
   }
 });
 
-function loadEnv(mode, envDir, prefixes) {
-  const parsedArgv = cac().parse();
-  mode = mode || parsedArgv.options.mode || parsedArgv.options.m || env.NODE_ENV;
-  const loadedEnv = {};
-  if (envDir) {
-    Object.assign(loadedEnv, loadEnv$1(mode, envDir, prefixes));
-  } else {
-    const workspaceDir = env.INIT_CWD;
-    Object.assign(loadedEnv, loadEnv$1(mode, workspaceDir, prefixes), loadEnv$1(mode, cwd(), prefixes));
-  }
-  return {
-    MODE: mode,
-    DEV: env.NODE_ENV !== "production",
-    PROD: env.NODE_ENV === "production",
-    ...loadedEnv
-  };
-}
-
 async function loadVixt(opts) {
   const result = await loadVixtConfig(defu(opts, {
     defaults: {
-      modules: [alias, app, config, typescript]
+      modules: [config, app, typescript]
     }
   }));
   const parsedArgv = cac().parse();
@@ -484,6 +486,7 @@ async function loadVixt(opts) {
   if (isForce) {
     fs.removeSync(result.config.buildDir);
   }
+  result.layers = applyLayers(result.layers?.filter((e) => e.cwd) ?? [], result.config);
   const layerModules = await applyLayerModules(result.layers ?? [], result.config);
   const vixt = {
     options: result.config,
@@ -500,4 +503,4 @@ function createVixtPlugin(loadOptions) {
   });
 }
 
-export { alias, app, applyLayerModules, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadEnv, loadVixt, loadVixtConfig, resolveLayersDirs, typescript };
+export { app, applyLayerModules, applyLayers, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, isSamePath, loadEnv, loadVixt, loadVixtConfig, loadWorkspaceEnv, resolveLayersDirs, typescript };

package/dist/shared/{core.a9343bb9.d.mts → core.3b42a3cd.d.mts}

@@ -78,4 +78,4 @@ interface VixtConfigLayer extends ConfigLayer<VixtOptions, VixtConfigLayerMeta>
 interface VixtAppConfig extends Record<string, any> {
 }
 
-export type { ModuleOptions as M, PluginOptions as P, VixtModule as V, Vixt as a, VixtOptions as b, VixtConfigLayer as c, ModuleDefinition as d, VixtConfigLayerMeta as e, VixtAppConfig as f, ModuleMeta as g };
+export type { ModuleOptions as M, PluginOptions as P, Vixt as V, VixtModule as a, VixtOptions as b, VixtConfigLayer as c, VixtConfigLayerMeta as d, ModuleDefinition as e, VixtAppConfig as f, ModuleMeta as g };

package/dist/shared/{core.a9343bb9.d.ts → core.3b42a3cd.d.ts}

@@ -78,4 +78,4 @@ interface VixtConfigLayer extends ConfigLayer<VixtOptions, VixtConfigLayerMeta>
 interface VixtAppConfig extends Record<string, any> {
 }
 
-export type { ModuleOptions as M, PluginOptions as P, VixtModule as V, Vixt as a, VixtOptions as b, VixtConfigLayer as c, ModuleDefinition as d, VixtConfigLayerMeta as e, VixtAppConfig as f, ModuleMeta as g };
+export type { ModuleOptions as M, PluginOptions as P, Vixt as V, VixtModule as a, VixtOptions as b, VixtConfigLayer as c, VixtConfigLayerMeta as d, ModuleDefinition as e, VixtAppConfig as f, ModuleMeta as g };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/core",
   "type": "module",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://github.com/SoulLyoko/vixt#readme",
@@ -27,15 +27,16 @@
   "dependencies": {
     "@types/fs-extra": "11.0.4",
     "@vue/tsconfig": "^0.5.1",
-    "c12": "^1.11.1",
+    "c12": "^1.11.2",
     "cac": "^6.7.14",
     "defu": "^6.1.4",
+    "find-up": "^7.0.0",
     "fs-extra": "^11.2.0",
     "mlly": "1.7.1",
     "pathe": "^1.1.2",
     "pkg-types": "^1.2.0",
     "tsx": "^4.19.0",
-    "vite": "^5.4.2",
+    "vite": "^5.4.3",
     "vite-plugin-checker": "^0.7.2",
     "vue-tsc": "2.0.26"
   },