@vixt/uni 0.0.14 → 0.1.0

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import * as vite from 'vite';
 import * as _vixt_core from '@vixt/core';
-import { AppOptions, PluginOptions, VixtOptions } from '@vixt/core';
+import { PluginOptions, VixtOptions } from '@vixt/core';
 import Uni from '@dcloudio/vite-plugin-uni';
 import Pages from '@uni-helper/vite-plugin-uni-pages';
 import Layouts from '@uni-helper/vite-plugin-uni-layouts';
@@ -9,8 +9,6 @@ import AutoImport from 'unplugin-auto-import/vite';
 import UnoCSS from 'unocss/vite';
 import { ImportsMap } from 'unplugin-auto-import/types';
 
-declare const entryUni: _vixt_core.VixtModule<AppOptions>;
-
 declare module '@vixt/core' {
     interface VixtOptions {
         uni?: PluginOptions<typeof Uni>;
@@ -38,4 +36,4 @@ declare const useImports: () => ImportsMap;
 
 declare const _default: (options?: _vixt_core.VixtOptions | undefined) => vite.PluginOption;
 
-export { _default as default, entryUni, patchNormalizeNodeModules, presetUni, uniPatch, useImports, vueusePolyfill };
+export { _default as default, patchNormalizeNodeModules, presetUni, uniPatch, useImports, vueusePolyfill };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as vite from 'vite';
 import * as _vixt_core from '@vixt/core';
-import { AppOptions, PluginOptions, VixtOptions } from '@vixt/core';
+import { PluginOptions, VixtOptions } from '@vixt/core';
 import Uni from '@dcloudio/vite-plugin-uni';
 import Pages from '@uni-helper/vite-plugin-uni-pages';
 import Layouts from '@uni-helper/vite-plugin-uni-layouts';
@@ -9,8 +9,6 @@ import AutoImport from 'unplugin-auto-import/vite';
 import UnoCSS from 'unocss/vite';
 import { ImportsMap } from 'unplugin-auto-import/types';
 
-declare const entryUni: _vixt_core.VixtModule<AppOptions>;
-
 declare module '@vixt/core' {
     interface VixtOptions {
         uni?: PluginOptions<typeof Uni>;
@@ -38,4 +36,4 @@ declare const useImports: () => ImportsMap;
 
 declare const _default: (options?: _vixt_core.VixtOptions | undefined) => vite.PluginOption;
 
-export { _default as default, entryUni, patchNormalizeNodeModules, presetUni, uniPatch, useImports, vueusePolyfill };
+export { _default as default, patchNormalizeNodeModules, presetUni, uniPatch, useImports, vueusePolyfill };

package/dist/index.mjs

@@ -1,6 +1,4 @@
 import { defineVixtModule, resolveLayersDirs, defineVitePlugin, createVixtPlugin } from '@vixt/core';
-import path from 'pathe';
-import fs from 'fs-extra';
 import defu from 'defu';
 import Uni from '@dcloudio/vite-plugin-uni';
 import Pages from '@uni-helper/vite-plugin-uni-pages';
@@ -9,74 +7,12 @@ import Components from '@uni-helper/vite-plugin-uni-components';
 import AutoImport from 'unplugin-auto-import/vite';
 import UnoCSS from 'unocss/vite';
 import { resolvePathSync } from 'mlly';
+import fs from 'fs-extra';
 import { readFileSync } from 'node:fs';
 import process from 'node:process';
 import { resolveModule } from 'local-pkg';
 import { uniuseAutoImports } from '@uni-helper/uni-use';
 
-function resolveLayersPlugins(layers, from) {
-  const { plugins = [] } = resolveLayersDirs(layers);
-  return plugins.map((pluginPath) => {
-    let pluginsDir = path.relative(from, pluginPath);
-    if (!pluginPath.startsWith(".") && !pluginPath.startsWith("/")) {
-      pluginsDir = `./${pluginsDir}`;
-    }
-    return `${pluginsDir}/*.ts`;
-  });
-}
-function generateMainTs(options, vixt) {
-  const { buildDir, rootDir } = vixt.options;
-  const layersPluginsPath = resolveLayersPlugins(vixt._layers, path.resolve(rootDir, "src"));
-  const cssTemplate = options?.css?.map((e) => `import '${e}'`).join("\n");
-  const code = `/** Generated by Vixt */
-// @ts-nocheck
-import { createSSRApp } from 'vue'
-import * as Pinia from 'pinia'
-import { createUnistorage } from 'pinia-plugin-unistorage'
-import { pages } from 'virtual:uni-pages'
-
-import App from '@/App.vue'
-${cssTemplate}
-
-export function createApp() {
-  const app = createSSRApp(App)
-  const pinia = Pinia.createPinia()
-  pinia.use(createUnistorage())
-  app.use(pinia)
-
-  // install all plugins under 'plugins/'
-  const plugins = import.meta.glob(${JSON.stringify(layersPluginsPath)}, { import: 'default', eager: true })
-  // @ts-ignore
-  Object.values(plugins).forEach((plugin) => typeof plugin === 'function' && plugin({ app, routes: pages, pinia }))
-  return { app, Pinia }
-}
-`;
-  fs.outputFileSync(path.resolve(rootDir, buildDir, "main.ts"), code);
-  return code;
-}
-const name$1 = "vixt:entry-uni";
-const entryUni = defineVixtModule({
-  meta: { name: name$1, configKey: "app" },
-  defaults: {
-    css: ["virtual:uno.css"]
-  },
-  setup(options, vixt) {
-    generateMainTs(options, vixt);
-    return {
-      name: "vixt:entry-uni",
-      enforce: "pre",
-      transform(code, id) {
-        const { buildDir, rootDir } = vixt.options;
-        const mainPath = path.resolve(rootDir, options.main);
-        if (id !== mainPath)
-          return;
-        code = fs.readFileSync(path.resolve(rootDir, buildDir, "main.ts"), "utf-8");
-        return code;
-      }
-    };
-  }
-});
-
 const name = "vixt:preset-uni";
 const presetUni = defineVixtModule({
   meta: { name },
@@ -181,12 +117,32 @@ const useImports = () => {
 };
 
 const defaults = {
-  modules: [entryUni, presetUni],
+  modules: [presetUni],
   app: {
     head: {
       link: [{ rel: "icon", href: "/static/favicon.ico" }]
     },
-    main: "src/main.ts"
+    css: ["virtual:uno.css"],
+    transformMain(code) {
+      code += `
+import { createSSRApp } from 'vue'
+import * as Pinia from 'pinia'
+import { createUnistorage } from 'pinia-plugin-unistorage'
+import { pages as routes } from 'virtual:uni-pages'
+
+export function createApp() {
+  const app = createSSRApp(App)
+  const pinia = Pinia.createPinia()
+  pinia.use(createUnistorage())
+  app.use(pinia)
+
+  Object.values(plugins).forEach((plugin) => typeof plugin === 'function' && plugin({ app, routes, pinia, appConfig }))
+  
+  return { app, Pinia }
+}
+`;
+      return code;
+    }
   },
   typescript: {
     // references: ['types/uni-pages.d.ts', 'types/components.d.ts', 'types/auto-imports.d.ts'],
@@ -203,4 +159,4 @@ const defaults = {
 };
 const index = createVixtPlugin({ defaults });
 
-export { index as default, entryUni, patchNormalizeNodeModules, presetUni, uniPatch, useImports, vueusePolyfill };
+export { index as default, patchNormalizeNodeModules, presetUni, uniPatch, useImports, vueusePolyfill };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/uni",
   "type": "module",
-  "version": "0.0.14",
+  "version": "0.1.0",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://github.com/SoulLyoko/vixt#readme",
@@ -29,10 +29,10 @@
     "@vueuse/core": "^10.11.0",
     "pinia": "^2.1.7",
     "pinia-plugin-unistorage": "^0.0.19",
-    "unocss": "^0.61.0",
+    "unocss": "^0.61.3",
     "unplugin-auto-import": "^0.17.6",
     "vue": "^3.4.31",
-    "@vixt/core": "0.0.14"
+    "@vixt/core": "0.1.0"
   },
   "scripts": {
     "build": "unbuild"