@vixt/core 0.7.0 → 0.7.2

package/dist/node/index.d.mts

@@ -1,5 +1,4 @@
-import * as c120 from "c12";
-import { ConfigLayer, ConfigLayerMeta, LoadConfigOptions } from "c12";
+import { ConfigLayer, ConfigLayerMeta, LoadConfigOptions, ResolvedConfig } from "c12";
 import * as vite0 from "vite";
 import { HtmlTagDescriptor, InlineConfig, LogLevel, PluginOption, ServerOptions, UserConfig } from "vite";
 import Legacy from "@vitejs/plugin-legacy";
@@ -38,7 +37,10 @@ interface VixtModule<T extends ModuleOptions = ModuleOptions> {
 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>;
 declare function installModule<T extends ModuleOptions = ModuleOptions>(module: VixtModule<T>, inlineOptions: any, vixt: Vixt): PluginOption;
-declare function applyLayerModules(layers: VixtConfigLayer[]): Promise<VixtModule[]>;
+declare function applyLayerModules({
+  config,
+  layers
+}: ResolvedVixtConfig): Promise<VixtModule[]>;
 //#endregion
 //#region src/node/config.d.ts
 interface VixtOptions {
@@ -137,6 +139,12 @@ interface VixtOptions {
   plugins?: string[];
   /** typescript */
   typescript?: TypescriptOptions;
+  /**
+   * Whether to copy layers from `node_modules` to `.vixt/layers`
+   * @default true
+   * @experimental
+   */
+  copyLayers?: boolean;
   /** custom options */
   [key: string]: any;
 }
@@ -251,9 +259,14 @@ interface VixtConfigLayer extends ConfigLayer<VixtOptions, VixtConfigLayerMeta>
   /** when layer is in node_modules, layer will copy to `<buildLayersDir>/<layerName>`, and change cwd */
   cwd?: string;
 }
+interface LoadVixtConfigOptions extends LoadConfigOptions<VixtOptions, VixtConfigLayerMeta> {}
+interface ResolvedVixtConfig extends ResolvedConfig<VixtOptions, VixtConfigLayerMeta> {}
 declare function defineVixtConfig(input: VixtOptions): VixtOptions;
-declare function loadVixtConfig(opts?: LoadConfigOptions<VixtOptions>): Promise<c120.ResolvedConfig<VixtOptions, ConfigLayerMeta>>;
-declare function applyLayers(layers: VixtConfigLayer[], config: VixtOptions): VixtConfigLayer[];
+declare function loadVixtConfig(opts?: LoadVixtConfigOptions): Promise<ResolvedVixtConfig>;
+declare function applyLayers({
+  config,
+  layers
+}: ResolvedVixtConfig): VixtConfigLayer[];
 declare function isSamePath(a: string, b: string): boolean;
 declare function resolveLayersDirs(layers?: VixtConfigLayer[]): Record<string, string[] | undefined>;
 declare const VixtClientAutoImports: Record<string, string[]>;
@@ -301,4 +314,4 @@ declare const virtualModuleIds: {
 };
 declare const builtinModules: (VixtModule<ModuleOptions> | VixtModule<AliasOptions> | VixtModule<AppOptions> | VixtModule<BuildOptions> | VixtModule<DevServerOptions> | VixtModule<TypescriptOptions>)[];
 //#endregion
-export { AliasOptions, AppHead, AppHeadAttrs, AppOptions, BuildOptions, DevServerOptions, ExtractPluginOptions, GlobalCLIOptions, ModuleDefinition, ModuleMeta, ModuleOptions, TypescriptOptions, Vixt, VixtClientAutoImports, VixtConfigLayer, VixtConfigLayerMeta, VixtModule, VixtOptions, applyLayerModules, applyLayers, builtinModules, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, findUpWorkspaceDir, installModule, isSamePath, loadCLIOptions, loadEnv, loadMode, loadVixt, loadVixtConfig, loadWorkspaceEnv, resolveLayersDirs, virtualModuleIds };
+export { AliasOptions, AppHead, AppHeadAttrs, AppOptions, BuildOptions, DevServerOptions, ExtractPluginOptions, GlobalCLIOptions, LoadVixtConfigOptions, ModuleDefinition, ModuleMeta, ModuleOptions, ResolvedVixtConfig, TypescriptOptions, Vixt, VixtClientAutoImports, VixtConfigLayer, VixtConfigLayerMeta, VixtModule, VixtOptions, applyLayerModules, applyLayers, builtinModules, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, findUpWorkspaceDir, installModule, isSamePath, loadCLIOptions, loadEnv, loadMode, loadVixt, loadVixtConfig, loadWorkspaceEnv, resolveLayersDirs, virtualModuleIds };

package/dist/node/index.mjs

@@ -1,7 +1,7 @@
 import { loadConfig } from "c12";
 import fs from "fs-extra";
 import path, { normalize, resolve } from "pathe";
-import process, { cwd, env } from "node:process";
+import { cwd, env } from "node:process";
 import { cac } from "cac";
 import { findUpSync } from "find-up";
 import { loadEnv as loadEnv$1, mergeConfig, parseAst } from "vite";
@@ -73,14 +73,24 @@ async function loadVixtConfig(opts) {
 	config.pluginsDir ??= resolve(config.srcDir, "plugins");
 	return result;
 }
-function applyLayers(layers, config) {
-	const { rootDir } = config;
+function applyLayers({ config, layers = [] }) {
+	const { rootDir, buildLayersDir, copyLayers = true } = config;
 	return layers.filter((e) => e.cwd).map((layer) => {
 		layer.config ??= {};
 		layer.config.meta ??= {};
 		const meta = layer.config.meta;
 		const layerName = meta.name || layer.cwd.split("/").pop();
 		if (!isSamePath(layer.cwd, resolve(rootDir))) meta.alias = `#/layers/${layerName}`;
+		if (copyLayers && layer.cwd?.includes("node_modules")) {
+			const newCwd = resolve(buildLayersDir, layerName);
+			fs.removeSync(newCwd);
+			fs.copySync(layer.cwd, newCwd, { filter: (src) => {
+				const nodeModulesPath = resolve(layer.cwd, "node_modules");
+				const tsConfigPath = resolve(layer.cwd, "tsconfig.json");
+				return !isSamePath(src, nodeModulesPath) && !isSamePath(src, tsConfigPath);
+			} });
+			layer.cwd = newCwd;
+		}
 		layer.config.rootDir ??= layer.cwd;
 		layer.config.srcDir ??= resolve(layer.config.rootDir, "src");
 		layer.config.modulesDir ??= resolve(layer.config.srcDir, "modules");
@@ -141,10 +151,10 @@ function defineVixtModule(definition) {
 function installModule(module, inlineOptions, vixt) {
 	return module(inlineOptions, vixt);
 }
-async function applyLayerModules(layers) {
+async function applyLayerModules({ config, layers = [] }) {
 	const { modules: modulesDirs = [] } = resolveLayersDirs(layers);
 	const modules = [];
-	const jiti = createJiti(layers[0]?.cwd ?? process.cwd(), { moduleCache: false });
+	const jiti = createJiti(config.rootDir, { moduleCache: false });
 	for (const m of modulesDirs.reverse()) if (fs.existsSync(m)) {
 		const files = fs.readdirSync(m);
 		for (const f of files) try {
@@ -614,8 +624,8 @@ async function loadVixt(opts) {
 	cliOptions.force && fs.removeSync(result.config.buildDir);
 	result.config.debug = !!cliOptions.debug;
 	result.config.dev = env.NODE_ENV !== "production";
-	result.layers = applyLayers(result.layers ?? [], result.config);
-	const layerModules = await applyLayerModules(result.layers ?? []);
+	result.layers = applyLayers(result);
+	const layerModules = await applyLayerModules(result);
 	return {
 		options: result.config,
 		_layers: result.layers ?? [],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/core",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://soullyoko.github.io/vixt/",