@hybridly/vite 0.1.0-alpha.0 → 0.1.0-alpha.2

package/dist/index.cjs

@@ -12,6 +12,7 @@ const throttleDebounce = require('throttle-debounce');
 const node_child_process = require('node:child_process');
 const node_util = require('node:util');
 const run = require('vite-plugin-run');
+const utils = require('@hybridly/utils');
 const autoimport = require('unplugin-auto-import/vite');
 const vueComponents = require('unplugin-vue-components/vite');
 const iconsResolver = require('unplugin-icons/resolver');
@@ -305,81 +306,90 @@ function getLaravelOptions(options, config) {
   };
 }
 
+const HybridlyImports = {
+  "hybridly/vue": [
+    "useProperty",
+    "useTypedProperty",
+    "useProperties",
+    "useBackForward",
+    "useContext",
+    "useForm",
+    "useDialog",
+    "useHistoryState",
+    "usePaginator",
+    "defineLayout",
+    "defineLayoutProperties",
+    "registerHook"
+  ],
+  "hybridly": [
+    "router",
+    "route",
+    "current",
+    "can"
+  ]
+};
 function getAutoImportsOptions(options, config) {
   if (options.autoImports === false) {
     return;
   }
+  return utils.merge(
+    {
+      vueTemplate: true,
+      dts: ".hybridly/auto-imports.d.ts",
+      dirs: [
+        `${config.root}/utils`,
+        `${config.root}/composables`
+      ],
+      imports: [
+        "vue",
+        "vue/macros",
+        "@vueuse/core",
+        "@vueuse/head",
+        HybridlyImports
+      ]
+    },
+    options.autoImports ?? {},
+    { overwriteArray: false }
+  );
+}
+
+function HybridlyResolver(linkName = "RouterLink") {
   return {
-    vueTemplate: true,
-    dts: ".hybridly/auto-imports.d.ts",
-    dirs: [
-      `${config.root}/utils`,
-      `${config.root}/composables`,
-      ...options.autoImports?.dirs ?? []
-    ],
-    imports: [
-      "vue",
-      "vue/macros",
-      "@vueuse/core",
-      "@vueuse/head",
-      {
-        "hybridly/vue": [
-          "useProperty",
-          "useTypedProperty",
-          "useProperties",
-          "useBackForward",
-          "useContext",
-          "useForm",
-          "useDialog",
-          "useHistoryState",
-          "usePaginator",
-          "defineLayout",
-          "defineLayoutProperties",
-          "registerHook"
-        ],
-        "hybridly": [
-          "router",
-          "route",
-          "current",
-          "can"
-        ]
+    type: "component",
+    resolve: (name) => {
+      if (name === linkName) {
+        return {
+          from: "hybridly/vue",
+          name: "RouterLink",
+          as: linkName
+        };
       }
-    ],
-    ...options.autoImports
+    }
   };
 }
-
 function getVueComponentsOptions(options, config) {
   if (options.vueComponents === false) {
     return {};
   }
-  const linkName = options.vueComponents?.linkName ?? "RouterLink";
   const hasIcons = options?.icons !== false;
   const customCollections = Array.isArray(options.customIcons) ? options.customIcons : options.customIcons?.collections ?? [];
   const customResolvers = options.customResolvers ? Array.isArray(options.customResolvers) ? options.customResolvers : [options.customResolvers] : [];
-  return {
-    globs: [
-      `${config.root}/components/**/*.vue`,
-      ...config.domains ? [`${config.root}/${config.domains}/**/components/**/*.vue`] : []
-    ],
-    dts: ".hybridly/components.d.ts",
-    resolvers: [
-      ...hasIcons ? [iconsResolver__default({ customCollections })] : [],
-      {
-        type: "component",
-        resolve: (name) => {
-          if (name === linkName) {
-            return {
-              from: "hybridly/vue",
-              name: "RouterLink",
-              as: linkName
-            };
-          }
-        }
-      },
-      ...customResolvers
-    ]
-  };
+  return utils.merge(
+    {
+      globs: [
+        `${config.root}/components/**/*.vue`,
+        ...config.domains ? [`${config.root}/${config.domains}/**/components/**/*.vue`] : []
+      ],
+      dts: ".hybridly/components.d.ts",
+      resolvers: [
+        ...hasIcons ? [iconsResolver__default({ customCollections })] : [],
+        HybridlyResolver(options.vueComponents?.linkName),
+        ...customResolvers
+      ]
+    },
+    options.vueComponents ?? {},
+    { overwriteArray: false }
+  );
 }
 
 function getIconsOptions(options, config) {
@@ -403,15 +413,18 @@ function getVueOptions(options) {
   if (options.vue === false) {
     return;
   }
-  return {
-    template: {
-      transformAssetUrls: {
-        base: null,
-        includeAbsolute: false
+  return utils.merge(
+    {
+      template: {
+        transformAssetUrls: {
+          base: null,
+          includeAbsolute: false
+        }
       }
     },
-    ...options.vue
-  };
+    options.vue ?? {},
+    { overwriteArray: false }
+  );
 }
 
 function generateTsConfig(options, config) {
@@ -498,6 +511,8 @@ async function plugin(options = {}) {
   ];
 }
 
+exports.HybridlyImports = HybridlyImports;
+exports.HybridlyResolver = HybridlyResolver;
 exports["default"] = plugin;
 exports.layout = layout;
 exports.router = router;

package/dist/index.d.ts

@@ -9,6 +9,10 @@ import vueComponents from 'unplugin-vue-components/vite';
 import { ComponentResolver } from 'unplugin-vue-components/types';
 
 type AutoImportOptions = Parameters<typeof autoimport>[0];
+declare const HybridlyImports: {
+    'hybridly/vue': string[];
+    hybridly: string[];
+};
 
 type IconsOptions = Parameters<typeof icons>[0];
 type CustomIconOptions = string[] | {
@@ -27,7 +31,15 @@ type VueComponentsOptions = Parameters<typeof vueComponents>[0] & {
     linkName?: string;
 };
 type CustomResolvers = ComponentResolver | ComponentResolver[];
-type CustomComponentsOptions = VueComponentsOptions;
+type CustomComponentsOptions = Omit<VueComponentsOptions, 'dirs'>;
+declare function HybridlyResolver(linkName?: string): {
+    type: "component";
+    resolve: (name: string) => {
+        from: string;
+        name: string;
+        as: string;
+    } | undefined;
+};
 
 interface ViteOptions {
     /** Options for the layout plugin. */
@@ -74,4 +86,4 @@ declare const _default: (options: ViteOptions, config: HybridlyConfig) => Plugin
 
 declare function plugin(options?: ViteOptions): Promise<any[]>;
 
-export { ViteOptions as Options, plugin as default, _default$1 as layout, _default as router };
+export { HybridlyImports, HybridlyResolver, ViteOptions as Options, plugin as default, _default$1 as layout, _default as router };

package/dist/index.mjs

@@ -8,6 +8,7 @@ import { debounce } from 'throttle-debounce';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 import run from 'vite-plugin-run';
+import { merge } from '@hybridly/utils';
 import autoimport from 'unplugin-auto-import/vite';
 import vueComponents from 'unplugin-vue-components/vite';
 import iconsResolver from 'unplugin-icons/resolver';
@@ -288,81 +289,90 @@ function getLaravelOptions(options, config) {
   };
 }
 
+const HybridlyImports = {
+  "hybridly/vue": [
+    "useProperty",
+    "useTypedProperty",
+    "useProperties",
+    "useBackForward",
+    "useContext",
+    "useForm",
+    "useDialog",
+    "useHistoryState",
+    "usePaginator",
+    "defineLayout",
+    "defineLayoutProperties",
+    "registerHook"
+  ],
+  "hybridly": [
+    "router",
+    "route",
+    "current",
+    "can"
+  ]
+};
 function getAutoImportsOptions(options, config) {
   if (options.autoImports === false) {
     return;
   }
+  return merge(
+    {
+      vueTemplate: true,
+      dts: ".hybridly/auto-imports.d.ts",
+      dirs: [
+        `${config.root}/utils`,
+        `${config.root}/composables`
+      ],
+      imports: [
+        "vue",
+        "vue/macros",
+        "@vueuse/core",
+        "@vueuse/head",
+        HybridlyImports
+      ]
+    },
+    options.autoImports ?? {},
+    { overwriteArray: false }
+  );
+}
+
+function HybridlyResolver(linkName = "RouterLink") {
   return {
-    vueTemplate: true,
-    dts: ".hybridly/auto-imports.d.ts",
-    dirs: [
-      `${config.root}/utils`,
-      `${config.root}/composables`,
-      ...options.autoImports?.dirs ?? []
-    ],
-    imports: [
-      "vue",
-      "vue/macros",
-      "@vueuse/core",
-      "@vueuse/head",
-      {
-        "hybridly/vue": [
-          "useProperty",
-          "useTypedProperty",
-          "useProperties",
-          "useBackForward",
-          "useContext",
-          "useForm",
-          "useDialog",
-          "useHistoryState",
-          "usePaginator",
-          "defineLayout",
-          "defineLayoutProperties",
-          "registerHook"
-        ],
-        "hybridly": [
-          "router",
-          "route",
-          "current",
-          "can"
-        ]
+    type: "component",
+    resolve: (name) => {
+      if (name === linkName) {
+        return {
+          from: "hybridly/vue",
+          name: "RouterLink",
+          as: linkName
+        };
       }
-    ],
-    ...options.autoImports
+    }
   };
 }
-
 function getVueComponentsOptions(options, config) {
   if (options.vueComponents === false) {
     return {};
   }
-  const linkName = options.vueComponents?.linkName ?? "RouterLink";
   const hasIcons = options?.icons !== false;
   const customCollections = Array.isArray(options.customIcons) ? options.customIcons : options.customIcons?.collections ?? [];
   const customResolvers = options.customResolvers ? Array.isArray(options.customResolvers) ? options.customResolvers : [options.customResolvers] : [];
-  return {
-    globs: [
-      `${config.root}/components/**/*.vue`,
-      ...config.domains ? [`${config.root}/${config.domains}/**/components/**/*.vue`] : []
-    ],
-    dts: ".hybridly/components.d.ts",
-    resolvers: [
-      ...hasIcons ? [iconsResolver({ customCollections })] : [],
-      {
-        type: "component",
-        resolve: (name) => {
-          if (name === linkName) {
-            return {
-              from: "hybridly/vue",
-              name: "RouterLink",
-              as: linkName
-            };
-          }
-        }
-      },
-      ...customResolvers
-    ]
-  };
+  return merge(
+    {
+      globs: [
+        `${config.root}/components/**/*.vue`,
+        ...config.domains ? [`${config.root}/${config.domains}/**/components/**/*.vue`] : []
+      ],
+      dts: ".hybridly/components.d.ts",
+      resolvers: [
+        ...hasIcons ? [iconsResolver({ customCollections })] : [],
+        HybridlyResolver(options.vueComponents?.linkName),
+        ...customResolvers
+      ]
+    },
+    options.vueComponents ?? {},
+    { overwriteArray: false }
+  );
 }
 
 function getIconsOptions(options, config) {
@@ -386,15 +396,18 @@ function getVueOptions(options) {
   if (options.vue === false) {
     return;
   }
-  return {
-    template: {
-      transformAssetUrls: {
-        base: null,
-        includeAbsolute: false
+  return merge(
+    {
+      template: {
+        transformAssetUrls: {
+          base: null,
+          includeAbsolute: false
+        }
       }
     },
-    ...options.vue
-  };
+    options.vue ?? {},
+    { overwriteArray: false }
+  );
 }
 
 function generateTsConfig(options, config) {
@@ -481,4 +494,4 @@ async function plugin(options = {}) {
   ];
 }
 
-export { plugin as default, layout, router };
+export { HybridlyImports, HybridlyResolver, plugin as default, layout, router };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hybridly/vite",
-  "version": "0.1.0-alpha.0",
+  "version": "0.1.0-alpha.2",
   "description": "Vite plugin for Hybridly",
   "keywords": [
     "hybridly",
@@ -39,19 +39,19 @@
     "vue": "^3.2.45"
   },
   "dependencies": {
-    "@iconify/json": "^2.2.24",
     "@vitejs/plugin-vue": "^4.0.0",
     "laravel-vite-plugin": "^0.7.4",
     "throttle-debounce": "^5.0.0",
-    "unplugin-auto-import": "^0.14.3",
+    "unplugin-auto-import": "^0.15.0",
     "unplugin-icons": "^0.15.3",
     "unplugin-vue-components": "^0.24.0",
-    "vite-plugin-run": "^0.3.2",
-    "@hybridly/core": "0.1.0-alpha.0"
+    "vite-plugin-run": "^0.4.0",
+    "@hybridly/core": "0.1.0-alpha.2"
   },
   "devDependencies": {
-    "rollup": "^3.17.1",
-    "vite": "^4.1.2",
+    "@iconify/json": "^2.2.24",
+    "rollup": "^3.17.3",
+    "vite": "^4.1.4",
     "vue": "^3.2.47"
   },
   "scripts": {