@vixt/core 0.0.5 → 0.0.7

package/dist/index.d.mts

@@ -1,8 +1,9 @@
 import * as vite from 'vite';
-import { PluginOption, UserConfig, TransformResult, ProxyOptions } from 'vite';
+import { PluginOption, UserConfig, TransformResult } from 'vite';
 import * as c12 from 'c12';
 import { ConfigLayer, LoadConfigOptions } from 'c12';
 import { TSConfig } from 'pkg-types';
+import Checker from 'vite-plugin-checker';
 
 declare const alias: VixtModule<ModuleOptions>;
 
@@ -30,6 +31,10 @@ interface VixtModule<T extends ModuleOptions = ModuleOptions> {
 }
 
 interface VixtOptions extends Record<string, any> {
+    /**
+     * @default process.cwd()
+     */
+    rootDir?: string;
     /**
      * @default '.vixt'
      */
@@ -90,27 +95,6 @@ declare const app: VixtModule<AppOptions>;
 
 declare const config: VixtModule<ModuleOptions>;
 
-declare module '@vixt/core' {
-    interface VixtOptions {
-        devProxy?: DevProxyOptions;
-    }
-}
-interface DevProxyOptions {
-    /**
-     * 环境变量的 key
-     * @default 'VITE_PROXY'
-     */
-    key?: string;
-}
-/**
- * @param list [prefix,target,rewrite?][]
- */
-declare function transformProxy(list: string): {
-    [k: string]: ProxyOptions;
-};
-/** 为 vite 开发服务添加代理配置 */
-declare const devProxy: VixtModule<DevProxyOptions>;
-
 declare module '@vixt/core' {
     interface VixtOptions {
         typescript?: TypescriptOptions;
@@ -122,28 +106,13 @@ interface TypescriptOptions {
         content?: string;
     })[];
     tsConfig?: TSConfig;
+    /** https://github.com/fi3ework/vite-plugin-checker */
+    typeCheck?: Parameters<typeof Checker>[0];
 }
 declare const typescript: VixtModule<TypescriptOptions>;
 
-declare module '@vixt/core' {
-    interface VixtOptions {
-        warmup?: WarmupOptions;
-    }
-}
-interface WarmupOptions {
-    enabled?: boolean;
-    /**
-     * The files to be transformed and used on the client-side. Supports glob patterns.
-     */
-    clientFiles?: string[];
-    /**
-     * The files to be transformed and used in SSR. Supports glob patterns.
-     */
-    ssrFiles?: string[];
-}
-declare const warmup: VixtModule<WarmupOptions>;
-
 declare function defineVixtConfig(input: VixtOptions): VixtOptions;
+declare const rootDir: string;
 declare const buildDir = ".vixt";
 declare const buildTypesDir = ".vixt/types";
 declare function loadVixtConfig(opts?: LoadConfigOptions<VixtOptions>): Promise<c12.ResolvedConfig<VixtOptions, c12.ConfigLayerMeta>>;
@@ -157,4 +126,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 DevProxyOptions, type ModuleDefinition, type ModuleMeta, type ModuleOptions, type PluginOptions, type TypescriptOptions, type Vixt, type VixtConfigLayer, type VixtModule, type VixtOptions, type WarmupOptions, alias, app, applyLayerModules, buildDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, devProxy, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, transformProxy, typescript, warmup };
+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 };

package/dist/index.d.ts

@@ -1,8 +1,9 @@
 import * as vite from 'vite';
-import { PluginOption, UserConfig, TransformResult, ProxyOptions } from 'vite';
+import { PluginOption, UserConfig, TransformResult } from 'vite';
 import * as c12 from 'c12';
 import { ConfigLayer, LoadConfigOptions } from 'c12';
 import { TSConfig } from 'pkg-types';
+import Checker from 'vite-plugin-checker';
 
 declare const alias: VixtModule<ModuleOptions>;
 
@@ -30,6 +31,10 @@ interface VixtModule<T extends ModuleOptions = ModuleOptions> {
 }
 
 interface VixtOptions extends Record<string, any> {
+    /**
+     * @default process.cwd()
+     */
+    rootDir?: string;
     /**
      * @default '.vixt'
      */
@@ -90,27 +95,6 @@ declare const app: VixtModule<AppOptions>;
 
 declare const config: VixtModule<ModuleOptions>;
 
-declare module '@vixt/core' {
-    interface VixtOptions {
-        devProxy?: DevProxyOptions;
-    }
-}
-interface DevProxyOptions {
-    /**
-     * 环境变量的 key
-     * @default 'VITE_PROXY'
-     */
-    key?: string;
-}
-/**
- * @param list [prefix,target,rewrite?][]
- */
-declare function transformProxy(list: string): {
-    [k: string]: ProxyOptions;
-};
-/** 为 vite 开发服务添加代理配置 */
-declare const devProxy: VixtModule<DevProxyOptions>;
-
 declare module '@vixt/core' {
     interface VixtOptions {
         typescript?: TypescriptOptions;
@@ -122,28 +106,13 @@ interface TypescriptOptions {
         content?: string;
     })[];
     tsConfig?: TSConfig;
+    /** https://github.com/fi3ework/vite-plugin-checker */
+    typeCheck?: Parameters<typeof Checker>[0];
 }
 declare const typescript: VixtModule<TypescriptOptions>;
 
-declare module '@vixt/core' {
-    interface VixtOptions {
-        warmup?: WarmupOptions;
-    }
-}
-interface WarmupOptions {
-    enabled?: boolean;
-    /**
-     * The files to be transformed and used on the client-side. Supports glob patterns.
-     */
-    clientFiles?: string[];
-    /**
-     * The files to be transformed and used in SSR. Supports glob patterns.
-     */
-    ssrFiles?: string[];
-}
-declare const warmup: VixtModule<WarmupOptions>;
-
 declare function defineVixtConfig(input: VixtOptions): VixtOptions;
+declare const rootDir: string;
 declare const buildDir = ".vixt";
 declare const buildTypesDir = ".vixt/types";
 declare function loadVixtConfig(opts?: LoadConfigOptions<VixtOptions>): Promise<c12.ResolvedConfig<VixtOptions, c12.ConfigLayerMeta>>;
@@ -157,4 +126,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 DevProxyOptions, type ModuleDefinition, type ModuleMeta, type ModuleOptions, type PluginOptions, type TypescriptOptions, type Vixt, type VixtConfigLayer, type VixtModule, type VixtOptions, type WarmupOptions, alias, app, applyLayerModules, buildDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, devProxy, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, transformProxy, typescript, warmup };
+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 };

package/dist/index.mjs

@@ -5,15 +5,17 @@ import 'tsx/esm';
 import { pathToFileURL } from 'mlly';
 import defu from 'defu';
 import { loadConfig } from 'c12';
+import Checker from 'vite-plugin-checker';
 
-const name$5 = "vixt:alias";
+const name$3 = "vixt:alias";
 const alias = defineVixtModule({
-  meta: { name: name$5 },
-  setup() {
+  meta: { name: name$3 },
+  setup(_, vixt) {
     return {
-      name: name$5,
+      name: name$3,
       config() {
         return {
+          root: vixt.options.rootDir,
           resolve: {
             alias: {
               "@": `${path.resolve(cwd(), "src")}`,
@@ -28,6 +30,42 @@ const alias = defineVixtModule({
   }
 });
 
+function defineVixtConfig(input) {
+  return input;
+}
+const rootDir = cwd();
+const buildDir = ".vixt";
+const buildTypesDir = `${buildDir}/types`;
+async function loadVixtConfig(opts) {
+  const result = await loadConfig({
+    name: "vixt",
+    rcFile: false,
+    ...opts,
+    defaults: {
+      rootDir,
+      buildDir,
+      buildTypesDir,
+      ...opts?.defaults
+    }
+  });
+  result.layers = result.layers?.filter((e) => e.cwd);
+  return result;
+}
+function resolveLayersDirs(layers = []) {
+  const dirs = {};
+  for (const layer of layers) {
+    const contents = fs.readdirSync(path.resolve(layer.cwd, "src"));
+    for (const content of contents) {
+      const fileOrDirPath = path.resolve(layer.cwd, "src", content);
+      if (fs.statSync(fileOrDirPath).isDirectory()) {
+        dirs[content] ?? (dirs[content] = []);
+        dirs[content].push(fileOrDirPath);
+      }
+    }
+  }
+  return dirs;
+}
+
 function defineVitePlugin(pluginFn) {
   return pluginFn;
 }
@@ -70,49 +108,18 @@ async function applyLayerModules(layers) {
   return modules;
 }
 
-function defineVixtConfig(input) {
-  return input;
-}
-const buildDir = ".vixt";
-const buildTypesDir = `${buildDir}/types`;
-function loadVixtConfig(opts) {
-  return loadConfig({
-    name: "vixt",
-    ...opts,
-    defaults: {
-      buildDir,
-      buildTypesDir,
-      ...opts?.defaults
-    }
-  });
-}
-function resolveLayersDirs(layers) {
-  const dirs = {};
-  for (const layer of layers?.filter((e) => e.cwd) ?? []) {
-    const contents = fs.readdirSync(path.resolve(layer.cwd, "src"));
-    for (const content of contents) {
-      const fileOrDirPath = path.resolve(layer.cwd, "src", content);
-      if (fs.statSync(fileOrDirPath).isDirectory()) {
-        dirs[content] ?? (dirs[content] = []);
-        dirs[content].push(fileOrDirPath);
-      }
-    }
-  }
-  return dirs;
-}
-
 function resolveHeadTag(tag, attrs) {
   const attrsStr = Object.entries(attrs).filter(([k]) => k !== "children").map(([k, v]) => `${k}="${v}"`).join(" ");
   return attrs?.children ? `<${tag} ${attrsStr}>${attrs.children}</${tag}>` : `<${tag} ${attrsStr} />`;
 }
-function generateIndexHtml(options, vixt, config) {
-  const { buildDir: buildDir2 } = vixt.options;
+function generateIndexHtml(options, vixt) {
+  const { buildDir: buildDir2, rootDir } = vixt.options;
   const { head = {}, rootTag, rootId, main, loadingTemplate: loading = "" } = options || {};
   const headTemplate = Object.entries(head).filter(([k]) => k !== "noscript").map(([tag, attrs]) => attrs.map((e) => resolveHeadTag(tag, e))).flat().join("\n");
   const noscriptTemplate = Object.entries(head).filter(([k]) => k === "noscript").map(([tag, attrs]) => attrs.map((e) => resolveHeadTag(tag, e))).flat().join("\n");
   let loadingTemplate = "";
   if (/^\.|\//.test(loading)) {
-    const loadingTemplatePath = path.resolve(config.root, loading);
+    const loadingTemplatePath = path.resolve(rootDir, loading);
     if (fs.existsSync(loadingTemplatePath)) {
       loadingTemplate = fs.readFileSync(loadingTemplatePath, "utf-8");
     }
@@ -134,13 +141,14 @@ ${noscriptTemplate}
   </body>
 </html>
 `;
-  fs.outputFileSync(path.resolve(config.root, `${buildDir2}/index.html`), code);
+  fs.outputFileSync(path.resolve(rootDir, `${buildDir2}/index.html`), code);
   return code;
 }
-const name$4 = "vixt:app";
-const defaults$2 = {
+const name$2 = "vixt:app";
+const defaults$1 = {
   rootId: "app",
   rootTag: "div",
+  baseURL: "/",
   loadingTemplate: "./loading.html",
   main: `${buildDir}/main.ts`,
   head: {
@@ -152,14 +160,12 @@ const defaults$2 = {
   }
 };
 const app = defineVixtModule({
-  meta: { name: name$4, configKey: "app" },
-  defaults: defaults$2,
+  meta: { name: name$2, configKey: "app" },
+  defaults: defaults$1,
   setup(options, vixt) {
+    generateIndexHtml(options, vixt);
     return {
-      name: name$4,
-      configResolved(config) {
-        generateIndexHtml(options, vixt, config);
-      },
+      name: name$2,
       transformIndexHtml: {
         order: "pre",
         handler() {
@@ -179,12 +185,12 @@ const app = defineVixtModule({
   }
 });
 
-const name$3 = "vixt:config";
+const name$1 = "vixt:config";
 const config = defineVixtModule({
-  meta: { name: name$3 },
+  meta: { name: name$1 },
   setup(options, vixt) {
     return {
-      name: name$3,
+      name: name$1,
       enforce: "pre",
       config(config2) {
         vixt.options.vite = config2;
@@ -196,41 +202,6 @@ const config = defineVixtModule({
   }
 });
 
-function transformProxy(list) {
-  return Object.fromEntries(
-    JSON.parse(list).map(([prefix, target, rewrite]) => {
-      const option = {
-        target,
-        changeOrigin: true,
-        ws: true,
-        secure: /^https:\/\//.test(target)
-      };
-      if (rewrite)
-        option.rewrite = (path) => path.replace(new RegExp(`^${prefix}`), "");
-      return [prefix, option];
-    })
-  );
-}
-const name$2 = "vixt:dev-proxy";
-const devProxy = defineVixtModule({
-  meta: { name: name$2, configKey: "devProxy" },
-  defaults: { key: "VITE_PROXY" },
-  setup(options) {
-    return {
-      name: name$2,
-      configResolved(config) {
-        const { env } = config;
-        const proxyList = env[options.key];
-        if (proxyList) {
-          const proxy = transformProxy(proxyList);
-          config.server.proxy = defu(proxy, config.server.proxy);
-          config.preview.proxy = defu(proxy, config.server.proxy);
-        }
-      }
-    };
-  }
-});
-
 function generateDts(options, vixt, config) {
   const { root } = config;
   const { buildDir } = vixt.options;
@@ -251,7 +222,7 @@ function generateTsConfig(options, vixt, config) {
   const { root } = config;
   const { buildDir } = vixt.options;
   const tsConfigPath = path.resolve(root, buildDir, "tsconfig.json");
-  const layersDirs = vixt._layers.filter((e) => e.cwd).map((e) => e.cwd);
+  const layersDirs = vixt._layers.map((e) => e.cwd);
   const tsConfig = defu(options.tsConfig, { include: layersDirs });
   fs.outputFileSync(tsConfigPath, JSON.stringify(tsConfig, null, 2));
 }
@@ -284,8 +255,8 @@ declare module '*.vue' {
   const shimsDtsPath = path.resolve(root, buildDir, "types", "shims.d.ts");
   fs.outputFileSync(shimsDtsPath, shimsDts);
 }
-const name$1 = "vixt:typescript";
-const defaults$1 = {
+const name = "vixt:typescript";
+const defaults = {
   references: ["./types/vite-env.d.ts", "./types/shims.d.ts"],
   tsConfig: {
     extends: "@vue/tsconfig/tsconfig.dom.json",
@@ -301,57 +272,32 @@ const defaults$1 = {
     include: [
       "./**/*"
     ]
-  }
-  // typeCheck: { vueTsc: true, enableBuild: false, overlay: { initialIsOpen: false } },
+  },
+  typeCheck: { enableBuild: false, overlay: { initialIsOpen: false } }
 };
 const typescript = defineVixtModule({
-  meta: { name: name$1, configKey: "typescript" },
-  defaults: defaults$1,
+  meta: { name, configKey: "typescript" },
+  defaults,
   setup(options, vixt) {
     return [
       {
-        name: name$1,
+        name,
         configResolved(config) {
           generateDts(options, vixt, config);
           generateTsConfig(options, vixt, config);
           generateEnvDts(options, vixt, config);
           genarateShims(options, vixt, config);
         }
-      }
-      // options.typeCheck && Checker(options.typeCheck),
+      },
+      Checker(options.typeCheck ?? {})
     ];
   }
 });
 
-const defaults = {
-  enabled: true,
-  clientFiles: ["./index.html", "./src/**/*.vue", "./src/**/*.ts", "./src/**/*.tsx"],
-  ssrFiles: ["./index.html", "./src/**/*.vue", "./src/**/*.ts", "./src/**/*.tsx"]
-};
-const name = "vixt:warmup";
-const warmup = defineVixtModule({
-  meta: { name, configKey: "warmup" },
-  defaults,
-  setup(options) {
-    return {
-      name,
-      config() {
-        if (!options.enabled)
-          return;
-        return {
-          server: {
-            warmup: options
-          }
-        };
-      }
-    };
-  }
-});
-
 async function loadVixt(opts) {
   const result = await loadVixtConfig(defu(opts, {
     defaults: {
-      modules: [alias, app, config, devProxy, typescript, warmup]
+      modules: [alias, app, config, typescript]
     }
   }));
   const layerModules = await applyLayerModules(result.layers);
@@ -370,4 +316,4 @@ function createVixtPlugin(loadOptions) {
   });
 }
 
-export { alias, app, applyLayerModules, buildDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, devProxy, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, transformProxy, typescript, warmup };
+export { alias, app, applyLayerModules, buildDir, 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.5",
+  "version": "0.0.7",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://github.com/SoulLyoko/vixt#readme",
@@ -25,11 +25,11 @@
     "fs-extra": "^11.2.0",
     "mlly": "1.7.1",
     "pathe": "^1.1.2",
-    "pkg-types": "^1.1.1",
+    "pkg-types": "^1.1.2",
     "tsx": "^4.16.0",
     "vite": "^5.3.2",
-    "vite-plugin-checker": "^0.6.4",
-    "vue-tsc": "^1.8.27"
+    "vite-plugin-checker": "^0.7.0",
+    "vue-tsc": "^2.0.24"
   },
   "scripts": {
     "build": "unbuild"