@hybridly/vite 0.6.0 → 0.7.0

package/dist/index.cjs

@@ -51,7 +51,7 @@ function determineDevelopmentEnvironmentConfigPath() {
 function resolveDevelopmentEnvironmentHost(configPath) {
   const configFile = path__default.resolve(configPath, "config.json");
   if (!fs__default.existsSync(configFile)) {
-    throw new Error(`Unable to find the configuration file [${configFile}]. You will need to manually specify the host in the \`detectTls\` configuration option.`);
+    return;
   }
   const config = JSON.parse(fs__default.readFileSync(configFile, "utf-8"));
   return `${path__default.basename(process.cwd())}.${config.tld}`;
@@ -59,6 +59,9 @@ function resolveDevelopmentEnvironmentHost(configPath) {
 function resolveDevelopmentEnvironmentServerConfig() {
   const configPath = determineDevelopmentEnvironmentConfigPath();
   const host = resolveDevelopmentEnvironmentHost(configPath);
+  if (!host) {
+    return;
+  }
   const keyPath = path__default.resolve(configPath, "Certificates", `${host}.key`);
   const certPath = path__default.resolve(configPath, "Certificates", `${host}.crt`);
   if (!fs__default.existsSync(keyPath) || !fs__default.existsSync(certPath)) {
@@ -172,7 +175,7 @@ function laravel(options, hybridlyConfig) {
           let registered = `${colors__default.bold(hybridlyConfig.components.views.length)} ${colors__default.dim("views")}, `;
           registered += `${colors__default.bold(hybridlyConfig.components.components.length)} ${colors__default.dim("components")}, `;
           registered += `${colors__default.bold(hybridlyConfig.components.layouts.length)} ${colors__default.dim("layouts")}, `;
-          registered += `${colors__default.bold(hybridlyConfig.components.directories.length)} ${colors__default.dim("directories")}`;
+          registered += `${colors__default.bold(hybridlyConfig.components.files.length)} ${colors__default.dim("files")}`;
           const latest = hybridlyConfig.versions.is_latest ? "" : colors__default.dim(`(${colors__default.yellow(`${hybridlyConfig.versions.latest} is available`)})`);
           let version = `${colors__default.yellow(`v${hybridlyConfig.versions.composer}`)} ${colors__default.dim("(composer)")}, `;
           version += `${colors__default.yellow(`v${hybridlyConfig.versions.npm}`)} ${colors__default.dim("(npm)")}`;
@@ -342,6 +345,16 @@ function generateLaravelIdeaHelper(config) {
             parameters: [1]
           }
         ]
+      },
+      {
+        complete: "routeName",
+        condition: [
+          {
+            classFqn: ["Hybridly\\Hybridly"],
+            methodNames: ["base"],
+            parameters: [1]
+          }
+        ]
       }
     ]
   };
@@ -389,9 +402,9 @@ function write(data, filename) {
   });
 }
 
-async function loadConfiguration(options) {
+async function loadConfiguration() {
   try {
-    const php = options.php ?? process.env.PHP_EXECUTABLE_PATH ?? "php";
+    const php = process.env.PHP_EXECUTABLE_PATH ?? "php";
     const stdout = node_child_process.execSync(`${php} artisan hybridly:config`);
     return JSON.parse(stdout.toString("utf-8"));
   } catch (e) {
@@ -454,7 +467,7 @@ const initialize = (options, config) => {
           return await forceRestart("Routing changed");
         }
         if (/.*\.vue$/.test(file)) {
-          const updatedConfig = await loadConfiguration(options);
+          const updatedConfig = await loadConfiguration();
           const viewsOrLayoutsChanged = didViewsOrLayoutsChange(updatedConfig, config);
           if (viewsOrLayoutsChanged) {
             return await forceRestart("View or layout changed");
@@ -491,7 +504,7 @@ function didViewsOrLayoutsChange(updatedConfig, previousConfig) {
 }
 
 const TEMPLATE_LAYOUT_REGEX = /<template +layout(?: *= *['"]((?:[\w\/\-_,:](?:,\ )?)+)['"] *)?>/;
-const TYPESCRIPT_REGEX = /lang=['"]ts['"]/;
+const LANG_REGEX = /lang=['"](\w+)['"]/;
 const layout = (options, config) => {
   const defaultLayoutName = options?.layout?.defaultLayoutName?.replace(".vue", "") ?? "default";
   const templateRegExp = options?.layout?.templateRegExp ?? TEMPLATE_LAYOUT_REGEX;
@@ -507,7 +520,7 @@ const layout = (options, config) => {
       }
       const source = new MagicString__default(code);
       const updatedCode = source.replace(templateRegExp, (_, layoutName) => {
-        const isTypeScript = TYPESCRIPT_REGEX.test(code);
+        const [hasLang, lang] = code.match(LANG_REGEX) ?? [];
         const layouts = layoutName?.toString()?.replaceAll(" ", "").split(",") ?? [defaultLayoutName];
         const importName = (i) => `__hybridly_layout_${i}`;
         const exports = layouts.map((_2, i) => importName(i));
@@ -521,7 +534,7 @@ const layout = (options, config) => {
           imports
         });
         return `
-					<script${isTypeScript ? ' lang="ts"' : ""}>
+					<script${hasLang ? ` lang="${lang}"` : ""}>
 					${imports}
 					export default { layout: [${exports.join(", ")}] }
 					<\/script>
@@ -547,10 +560,11 @@ function getRunOptions(options) {
   if (options.run === false) {
     return [];
   }
+  const php = process.env.PHP_EXECUTABLE_PATH ?? "php";
   return [
     {
       name: "Generate TypeScript types",
-      run: ["php", "artisan", "hybridly:types"],
+      run: [php, "artisan", "hybridly:types"],
       pattern: [
         "+(app|src)/**/*Data.php",
         "+(app|src)/**/Enums/*.php",
@@ -559,7 +573,7 @@ function getRunOptions(options) {
     },
     {
       name: "Generate i18n",
-      run: ["php", "artisan", "hybridly:i18n"],
+      run: [php, "artisan", "hybridly:i18n"],
       pattern: "lang/**/*.php"
     },
     ...options.run ?? []
@@ -580,8 +594,6 @@ const HybridlyImports = {
     "useDialog",
     "useHistoryState",
     "usePaginator",
-    "defineLayout",
-    "defineLayoutProperties",
     "registerHook",
     "useRoute",
     "useQueryParameters"
@@ -589,7 +601,8 @@ const HybridlyImports = {
   "hybridly": [
     "router",
     "route",
-    "can"
+    "can",
+    "getRouterContext"
   ]
 };
 function getAutoImportsOptions(options, config) {
@@ -616,9 +629,9 @@ function getAutoImportsOptions(options, config) {
       dirs: [
         `${config.architecture.root_directory}/utils`,
         `${config.architecture.root_directory}/composables`,
-        ...config.components.directories.map((directory) => `${directory}/**/*.ts`)
+        ...config.components.files
       ],
-      imports: [
+      imports: options.autoImportsMap ?? [
         "vue",
         "vue/macros",
         ...presets.filter((pkg) => isPackageInstalled(pkg)),
@@ -638,8 +651,8 @@ async function getVueComponentsOptions(options, config) {
   const hasIcons = options?.icons !== false;
   const customCollections = Array.isArray(options.customIcons) ? options.customIcons : options.customIcons?.collections ?? [];
   const overrideResolvers = options.overrideResolvers ? Array.isArray(options.overrideResolvers) ? options.overrideResolvers : [options.overrideResolvers] : false;
-  const hasHeadlessUI = isPackageInstalled("@headlessui/vue");
-  const hasRadix = isPackageInstalled("radix-vue");
+  const shouldImportHeadlessUi = isPackageInstalled("@headlessui/vue") && options.vueComponents?.headlessUiPrefix !== false;
+  const shouldImportRadix = isPackageInstalled("radix-vue") && options.vueComponents?.radixPrefix !== false;
   return utils.merge(
     {
       dirs: [
@@ -649,21 +662,27 @@ async function getVueComponentsOptions(options, config) {
       dts: ".hybridly/components.d.ts",
       resolvers: overrideResolvers || [
         ...hasIcons ? [iconsResolver__default({ customCollections })] : [],
-        ...hasHeadlessUI ? [resolvers.HeadlessUiResolver({ prefix: options?.vueComponents?.headlessUiPrefix ?? "Headless" })] : [],
-        ...hasRadix ? [await RadixResolver(options?.vueComponents?.radixPrefix)] : [],
+        ...shouldImportHeadlessUi ? [resolvers.HeadlessUiResolver({ prefix: options?.vueComponents?.headlessUiPrefix || "Headless" })] : [],
+        ...shouldImportRadix ? [await RadixResolver(options?.vueComponents?.radixPrefix || "Radix")] : [],
         ProvidedComponentListResolver(config),
-        HybridlyResolver(options.vueComponents?.linkName)
+        HybridlyResolver(options, config)
       ]
     },
     options.vueComponents ?? {},
     { overwriteArray: false }
   );
 }
-async function RadixResolver(prefix = "Radix") {
+async function RadixResolver(prefix) {
   const radix = await importPackage("radix-vue/resolver");
   return radix.default({ prefix });
 }
-function HybridlyResolver(linkName = "RouterLink") {
+function HybridlyResolver(options, config) {
+  return [
+    HybridlyLinkResolver(options?.vueComponents === false ? void 0 : options?.vueComponents?.linkName),
+    ProvidedComponentListResolver(config)
+  ];
+}
+function HybridlyLinkResolver(linkName = "RouterLink") {
   return {
     type: "component",
     resolve: (name) => {
@@ -869,22 +888,25 @@ import '${LOCAL_BUILD_VIRTUAL_ID}'`;
 }
 
 async function plugin(options = {}) {
-  const config = await loadConfiguration(options);
+  const config = await loadConfiguration();
+  const resolvedOptions = typeof options === "function" ? await options(config) : options;
   return [
-    initialize(options, config),
-    layout(options, config),
-    options.laravel !== false && laravel(options, config),
-    options.run !== false && run__default(getRunOptions(options)),
-    options.vueComponents !== false && vueComponents__default(await getVueComponentsOptions(options, config)),
-    options.autoImports !== false && autoimport__default(getAutoImportsOptions(options, config)),
-    options.icons !== false && icons__default(getIconsOptions(options, config)),
-    options.vue !== false && vue__default(getVueOptions(options)),
-    options.killSwitch !== false && killSwitch(),
-    options.warnOnLocalBuilds !== false && warnOnLocalBuilds()
+    initialize(resolvedOptions, config),
+    layout(resolvedOptions, config),
+    resolvedOptions.laravel !== false && laravel(resolvedOptions, config),
+    resolvedOptions.run !== false && run__default(getRunOptions(resolvedOptions)),
+    resolvedOptions.vueComponents !== false && vueComponents__default(await getVueComponentsOptions(resolvedOptions, config)),
+    resolvedOptions.autoImports !== false && autoimport__default(getAutoImportsOptions(resolvedOptions, config)),
+    resolvedOptions.icons !== false && icons__default(getIconsOptions(resolvedOptions, config)),
+    resolvedOptions.vue !== false && vue__default(getVueOptions(resolvedOptions)),
+    resolvedOptions.killSwitch !== false && killSwitch(),
+    resolvedOptions.warnOnLocalBuilds !== false && warnOnLocalBuilds()
   ];
 }
 
 exports.HybridlyImports = HybridlyImports;
+exports.HybridlyLinkResolver = HybridlyLinkResolver;
 exports.HybridlyResolver = HybridlyResolver;
+exports.ProvidedComponentListResolver = ProvidedComponentListResolver;
 exports.default = plugin;
 exports.layout = layout;

package/dist/index.d.cts

@@ -1,5 +1,6 @@
-import { Plugin } from 'vite';
 import { DynamicConfiguration } from '@hybridly/core';
+import { Plugin } from 'vite';
+import { ImportsMap, PresetName } from 'unplugin-auto-import/types';
 import autoimport from 'unplugin-auto-import/vite';
 import icons from 'unplugin-icons/vite';
 import { Runner } from 'vite-plugin-run';
@@ -26,25 +27,18 @@ type VueOptions = Parameters<typeof vue>[0];
 type VueComponentsOptions = Parameters<typeof vueComponents>[0] & {
     /** Name of the Link component. */
     linkName?: string;
-    /** Custom prefix for Headless UI components. */
-    headlessUiPrefix?: string;
-    /** Custom prefix for Radix components. */
-    radixPrefix?: string;
+    /** Specify the prefix for the Headless UI integration, or disable it. */
+    headlessUiPrefix?: string | false;
+    /** Specify the prefix for the Radix integration, or disable it. */
+    radixPrefix?: string | false;
 };
 type CustomResolvers = ComponentResolver | ComponentResolver[];
 type CustomComponentsOptions = VueComponentsOptions;
-declare function HybridlyResolver(linkName?: string): {
-    type: "component";
-    resolve: (name: string) => {
-        from: string;
-        name: string;
-        as: string;
-    } | undefined;
-};
+declare function HybridlyResolver(options: ViteOptions, config: DynamicConfiguration): ComponentResolver[];
+declare function HybridlyLinkResolver(linkName?: string): ComponentResolver;
+declare function ProvidedComponentListResolver(config: DynamicConfiguration): ComponentResolver;
 
 interface ViteOptions {
-    /** Path to the PHP executable. */
-    php?: string;
     /** Disables the Laravel integration. Useful if you prefer to use the official one. */
     laravel?: false;
     /** Options for the layout plugin. */
@@ -55,6 +49,8 @@ interface ViteOptions {
     run?: false | Runner[];
     /** Options for `unplugin-auto-import`. Set to `false` to disable. */
     autoImports?: false | AutoImportOptions;
+    /** Import map for `unplugin-auto-import`. */
+    autoImportsMap?: Array<ImportsMap | PresetName>;
     /** Options for `unplugin-vue-components`. Set to `false` to disable. */
     vueComponents?: false | CustomComponentsOptions;
     /** Options for `unplugin-icons`. Set to `false` to disable. */
@@ -89,6 +85,7 @@ interface TsConfigOptions {
 
 declare const _default: (options: ViteOptions, config: DynamicConfiguration) => Plugin;
 
-declare function plugin(options?: ViteOptions): Promise<any[]>;
+type Options = ViteOptions | ((config: DynamicConfiguration) => (ViteOptions | Promise<ViteOptions>));
+declare function plugin(options?: Options): Promise<any[]>;
 
-export { HybridlyImports, HybridlyResolver, type ViteOptions as Options, plugin as default, _default as layout };
+export { HybridlyImports, HybridlyLinkResolver, HybridlyResolver, type ViteOptions as Options, ProvidedComponentListResolver, plugin as default, _default as layout };

package/dist/index.d.mts

@@ -1,5 +1,6 @@
-import { Plugin } from 'vite';
 import { DynamicConfiguration } from '@hybridly/core';
+import { Plugin } from 'vite';
+import { ImportsMap, PresetName } from 'unplugin-auto-import/types';
 import autoimport from 'unplugin-auto-import/vite';
 import icons from 'unplugin-icons/vite';
 import { Runner } from 'vite-plugin-run';
@@ -26,25 +27,18 @@ type VueOptions = Parameters<typeof vue>[0];
 type VueComponentsOptions = Parameters<typeof vueComponents>[0] & {
     /** Name of the Link component. */
     linkName?: string;
-    /** Custom prefix for Headless UI components. */
-    headlessUiPrefix?: string;
-    /** Custom prefix for Radix components. */
-    radixPrefix?: string;
+    /** Specify the prefix for the Headless UI integration, or disable it. */
+    headlessUiPrefix?: string | false;
+    /** Specify the prefix for the Radix integration, or disable it. */
+    radixPrefix?: string | false;
 };
 type CustomResolvers = ComponentResolver | ComponentResolver[];
 type CustomComponentsOptions = VueComponentsOptions;
-declare function HybridlyResolver(linkName?: string): {
-    type: "component";
-    resolve: (name: string) => {
-        from: string;
-        name: string;
-        as: string;
-    } | undefined;
-};
+declare function HybridlyResolver(options: ViteOptions, config: DynamicConfiguration): ComponentResolver[];
+declare function HybridlyLinkResolver(linkName?: string): ComponentResolver;
+declare function ProvidedComponentListResolver(config: DynamicConfiguration): ComponentResolver;
 
 interface ViteOptions {
-    /** Path to the PHP executable. */
-    php?: string;
     /** Disables the Laravel integration. Useful if you prefer to use the official one. */
     laravel?: false;
     /** Options for the layout plugin. */
@@ -55,6 +49,8 @@ interface ViteOptions {
     run?: false | Runner[];
     /** Options for `unplugin-auto-import`. Set to `false` to disable. */
     autoImports?: false | AutoImportOptions;
+    /** Import map for `unplugin-auto-import`. */
+    autoImportsMap?: Array<ImportsMap | PresetName>;
     /** Options for `unplugin-vue-components`. Set to `false` to disable. */
     vueComponents?: false | CustomComponentsOptions;
     /** Options for `unplugin-icons`. Set to `false` to disable. */
@@ -89,6 +85,7 @@ interface TsConfigOptions {
 
 declare const _default: (options: ViteOptions, config: DynamicConfiguration) => Plugin;
 
-declare function plugin(options?: ViteOptions): Promise<any[]>;
+type Options = ViteOptions | ((config: DynamicConfiguration) => (ViteOptions | Promise<ViteOptions>));
+declare function plugin(options?: Options): Promise<any[]>;
 
-export { HybridlyImports, HybridlyResolver, type ViteOptions as Options, plugin as default, _default as layout };
+export { HybridlyImports, HybridlyLinkResolver, HybridlyResolver, type ViteOptions as Options, ProvidedComponentListResolver, plugin as default, _default as layout };

package/dist/index.d.ts

@@ -1,5 +1,6 @@
-import { Plugin } from 'vite';
 import { DynamicConfiguration } from '@hybridly/core';
+import { Plugin } from 'vite';
+import { ImportsMap, PresetName } from 'unplugin-auto-import/types';
 import autoimport from 'unplugin-auto-import/vite';
 import icons from 'unplugin-icons/vite';
 import { Runner } from 'vite-plugin-run';
@@ -26,25 +27,18 @@ type VueOptions = Parameters<typeof vue>[0];
 type VueComponentsOptions = Parameters<typeof vueComponents>[0] & {
     /** Name of the Link component. */
     linkName?: string;
-    /** Custom prefix for Headless UI components. */
-    headlessUiPrefix?: string;
-    /** Custom prefix for Radix components. */
-    radixPrefix?: string;
+    /** Specify the prefix for the Headless UI integration, or disable it. */
+    headlessUiPrefix?: string | false;
+    /** Specify the prefix for the Radix integration, or disable it. */
+    radixPrefix?: string | false;
 };
 type CustomResolvers = ComponentResolver | ComponentResolver[];
 type CustomComponentsOptions = VueComponentsOptions;
-declare function HybridlyResolver(linkName?: string): {
-    type: "component";
-    resolve: (name: string) => {
-        from: string;
-        name: string;
-        as: string;
-    } | undefined;
-};
+declare function HybridlyResolver(options: ViteOptions, config: DynamicConfiguration): ComponentResolver[];
+declare function HybridlyLinkResolver(linkName?: string): ComponentResolver;
+declare function ProvidedComponentListResolver(config: DynamicConfiguration): ComponentResolver;
 
 interface ViteOptions {
-    /** Path to the PHP executable. */
-    php?: string;
     /** Disables the Laravel integration. Useful if you prefer to use the official one. */
     laravel?: false;
     /** Options for the layout plugin. */
@@ -55,6 +49,8 @@ interface ViteOptions {
     run?: false | Runner[];
     /** Options for `unplugin-auto-import`. Set to `false` to disable. */
     autoImports?: false | AutoImportOptions;
+    /** Import map for `unplugin-auto-import`. */
+    autoImportsMap?: Array<ImportsMap | PresetName>;
     /** Options for `unplugin-vue-components`. Set to `false` to disable. */
     vueComponents?: false | CustomComponentsOptions;
     /** Options for `unplugin-icons`. Set to `false` to disable. */
@@ -89,6 +85,7 @@ interface TsConfigOptions {
 
 declare const _default: (options: ViteOptions, config: DynamicConfiguration) => Plugin;
 
-declare function plugin(options?: ViteOptions): Promise<any[]>;
+type Options = ViteOptions | ((config: DynamicConfiguration) => (ViteOptions | Promise<ViteOptions>));
+declare function plugin(options?: Options): Promise<any[]>;
 
-export { HybridlyImports, HybridlyResolver, type ViteOptions as Options, plugin as default, _default as layout };
+export { HybridlyImports, HybridlyLinkResolver, HybridlyResolver, type ViteOptions as Options, ProvidedComponentListResolver, plugin as default, _default as layout };

package/dist/index.mjs

@@ -32,7 +32,7 @@ function determineDevelopmentEnvironmentConfigPath() {
 function resolveDevelopmentEnvironmentHost(configPath) {
   const configFile = path.resolve(configPath, "config.json");
   if (!fs.existsSync(configFile)) {
-    throw new Error(`Unable to find the configuration file [${configFile}]. You will need to manually specify the host in the \`detectTls\` configuration option.`);
+    return;
   }
   const config = JSON.parse(fs.readFileSync(configFile, "utf-8"));
   return `${path.basename(process.cwd())}.${config.tld}`;
@@ -40,6 +40,9 @@ function resolveDevelopmentEnvironmentHost(configPath) {
 function resolveDevelopmentEnvironmentServerConfig() {
   const configPath = determineDevelopmentEnvironmentConfigPath();
   const host = resolveDevelopmentEnvironmentHost(configPath);
+  if (!host) {
+    return;
+  }
   const keyPath = path.resolve(configPath, "Certificates", `${host}.key`);
   const certPath = path.resolve(configPath, "Certificates", `${host}.crt`);
   if (!fs.existsSync(keyPath) || !fs.existsSync(certPath)) {
@@ -153,7 +156,7 @@ function laravel(options, hybridlyConfig) {
           let registered = `${colors.bold(hybridlyConfig.components.views.length)} ${colors.dim("views")}, `;
           registered += `${colors.bold(hybridlyConfig.components.components.length)} ${colors.dim("components")}, `;
           registered += `${colors.bold(hybridlyConfig.components.layouts.length)} ${colors.dim("layouts")}, `;
-          registered += `${colors.bold(hybridlyConfig.components.directories.length)} ${colors.dim("directories")}`;
+          registered += `${colors.bold(hybridlyConfig.components.files.length)} ${colors.dim("files")}`;
           const latest = hybridlyConfig.versions.is_latest ? "" : colors.dim(`(${colors.yellow(`${hybridlyConfig.versions.latest} is available`)})`);
           let version = `${colors.yellow(`v${hybridlyConfig.versions.composer}`)} ${colors.dim("(composer)")}, `;
           version += `${colors.yellow(`v${hybridlyConfig.versions.npm}`)} ${colors.dim("(npm)")}`;
@@ -323,6 +326,16 @@ function generateLaravelIdeaHelper(config) {
             parameters: [1]
           }
         ]
+      },
+      {
+        complete: "routeName",
+        condition: [
+          {
+            classFqn: ["Hybridly\\Hybridly"],
+            methodNames: ["base"],
+            parameters: [1]
+          }
+        ]
       }
     ]
   };
@@ -370,9 +383,9 @@ function write(data, filename) {
   });
 }
 
-async function loadConfiguration(options) {
+async function loadConfiguration() {
   try {
-    const php = options.php ?? process.env.PHP_EXECUTABLE_PATH ?? "php";
+    const php = process.env.PHP_EXECUTABLE_PATH ?? "php";
     const stdout = execSync(`${php} artisan hybridly:config`);
     return JSON.parse(stdout.toString("utf-8"));
   } catch (e) {
@@ -435,7 +448,7 @@ const initialize = (options, config) => {
           return await forceRestart("Routing changed");
         }
         if (/.*\.vue$/.test(file)) {
-          const updatedConfig = await loadConfiguration(options);
+          const updatedConfig = await loadConfiguration();
           const viewsOrLayoutsChanged = didViewsOrLayoutsChange(updatedConfig, config);
           if (viewsOrLayoutsChanged) {
             return await forceRestart("View or layout changed");
@@ -472,7 +485,7 @@ function didViewsOrLayoutsChange(updatedConfig, previousConfig) {
 }
 
 const TEMPLATE_LAYOUT_REGEX = /<template +layout(?: *= *['"]((?:[\w\/\-_,:](?:,\ )?)+)['"] *)?>/;
-const TYPESCRIPT_REGEX = /lang=['"]ts['"]/;
+const LANG_REGEX = /lang=['"](\w+)['"]/;
 const layout = (options, config) => {
   const defaultLayoutName = options?.layout?.defaultLayoutName?.replace(".vue", "") ?? "default";
   const templateRegExp = options?.layout?.templateRegExp ?? TEMPLATE_LAYOUT_REGEX;
@@ -488,7 +501,7 @@ const layout = (options, config) => {
       }
       const source = new MagicString(code);
       const updatedCode = source.replace(templateRegExp, (_, layoutName) => {
-        const isTypeScript = TYPESCRIPT_REGEX.test(code);
+        const [hasLang, lang] = code.match(LANG_REGEX) ?? [];
         const layouts = layoutName?.toString()?.replaceAll(" ", "").split(",") ?? [defaultLayoutName];
         const importName = (i) => `__hybridly_layout_${i}`;
         const exports = layouts.map((_2, i) => importName(i));
@@ -502,7 +515,7 @@ const layout = (options, config) => {
           imports
         });
         return `
-					<script${isTypeScript ? ' lang="ts"' : ""}>
+					<script${hasLang ? ` lang="${lang}"` : ""}>
 					${imports}
 					export default { layout: [${exports.join(", ")}] }
 					<\/script>
@@ -528,10 +541,11 @@ function getRunOptions(options) {
   if (options.run === false) {
     return [];
   }
+  const php = process.env.PHP_EXECUTABLE_PATH ?? "php";
   return [
     {
       name: "Generate TypeScript types",
-      run: ["php", "artisan", "hybridly:types"],
+      run: [php, "artisan", "hybridly:types"],
       pattern: [
         "+(app|src)/**/*Data.php",
         "+(app|src)/**/Enums/*.php",
@@ -540,7 +554,7 @@ function getRunOptions(options) {
     },
     {
       name: "Generate i18n",
-      run: ["php", "artisan", "hybridly:i18n"],
+      run: [php, "artisan", "hybridly:i18n"],
       pattern: "lang/**/*.php"
     },
     ...options.run ?? []
@@ -561,8 +575,6 @@ const HybridlyImports = {
     "useDialog",
     "useHistoryState",
     "usePaginator",
-    "defineLayout",
-    "defineLayoutProperties",
     "registerHook",
     "useRoute",
     "useQueryParameters"
@@ -570,7 +582,8 @@ const HybridlyImports = {
   "hybridly": [
     "router",
     "route",
-    "can"
+    "can",
+    "getRouterContext"
   ]
 };
 function getAutoImportsOptions(options, config) {
@@ -597,9 +610,9 @@ function getAutoImportsOptions(options, config) {
       dirs: [
         `${config.architecture.root_directory}/utils`,
         `${config.architecture.root_directory}/composables`,
-        ...config.components.directories.map((directory) => `${directory}/**/*.ts`)
+        ...config.components.files
       ],
-      imports: [
+      imports: options.autoImportsMap ?? [
         "vue",
         "vue/macros",
         ...presets.filter((pkg) => isPackageInstalled(pkg)),
@@ -619,8 +632,8 @@ async function getVueComponentsOptions(options, config) {
   const hasIcons = options?.icons !== false;
   const customCollections = Array.isArray(options.customIcons) ? options.customIcons : options.customIcons?.collections ?? [];
   const overrideResolvers = options.overrideResolvers ? Array.isArray(options.overrideResolvers) ? options.overrideResolvers : [options.overrideResolvers] : false;
-  const hasHeadlessUI = isPackageInstalled("@headlessui/vue");
-  const hasRadix = isPackageInstalled("radix-vue");
+  const shouldImportHeadlessUi = isPackageInstalled("@headlessui/vue") && options.vueComponents?.headlessUiPrefix !== false;
+  const shouldImportRadix = isPackageInstalled("radix-vue") && options.vueComponents?.radixPrefix !== false;
   return merge(
     {
       dirs: [
@@ -630,21 +643,27 @@ async function getVueComponentsOptions(options, config) {
       dts: ".hybridly/components.d.ts",
       resolvers: overrideResolvers || [
         ...hasIcons ? [iconsResolver({ customCollections })] : [],
-        ...hasHeadlessUI ? [HeadlessUiResolver({ prefix: options?.vueComponents?.headlessUiPrefix ?? "Headless" })] : [],
-        ...hasRadix ? [await RadixResolver(options?.vueComponents?.radixPrefix)] : [],
+        ...shouldImportHeadlessUi ? [HeadlessUiResolver({ prefix: options?.vueComponents?.headlessUiPrefix || "Headless" })] : [],
+        ...shouldImportRadix ? [await RadixResolver(options?.vueComponents?.radixPrefix || "Radix")] : [],
         ProvidedComponentListResolver(config),
-        HybridlyResolver(options.vueComponents?.linkName)
+        HybridlyResolver(options, config)
       ]
     },
     options.vueComponents ?? {},
     { overwriteArray: false }
   );
 }
-async function RadixResolver(prefix = "Radix") {
+async function RadixResolver(prefix) {
   const radix = await importPackage("radix-vue/resolver");
   return radix.default({ prefix });
 }
-function HybridlyResolver(linkName = "RouterLink") {
+function HybridlyResolver(options, config) {
+  return [
+    HybridlyLinkResolver(options?.vueComponents === false ? void 0 : options?.vueComponents?.linkName),
+    ProvidedComponentListResolver(config)
+  ];
+}
+function HybridlyLinkResolver(linkName = "RouterLink") {
   return {
     type: "component",
     resolve: (name) => {
@@ -850,19 +869,20 @@ import '${LOCAL_BUILD_VIRTUAL_ID}'`;
 }
 
 async function plugin(options = {}) {
-  const config = await loadConfiguration(options);
+  const config = await loadConfiguration();
+  const resolvedOptions = typeof options === "function" ? await options(config) : options;
   return [
-    initialize(options, config),
-    layout(options, config),
-    options.laravel !== false && laravel(options, config),
-    options.run !== false && run(getRunOptions(options)),
-    options.vueComponents !== false && vueComponents(await getVueComponentsOptions(options, config)),
-    options.autoImports !== false && autoimport(getAutoImportsOptions(options, config)),
-    options.icons !== false && icons(getIconsOptions(options, config)),
-    options.vue !== false && vue(getVueOptions(options)),
-    options.killSwitch !== false && killSwitch(),
-    options.warnOnLocalBuilds !== false && warnOnLocalBuilds()
+    initialize(resolvedOptions, config),
+    layout(resolvedOptions, config),
+    resolvedOptions.laravel !== false && laravel(resolvedOptions, config),
+    resolvedOptions.run !== false && run(getRunOptions(resolvedOptions)),
+    resolvedOptions.vueComponents !== false && vueComponents(await getVueComponentsOptions(resolvedOptions, config)),
+    resolvedOptions.autoImports !== false && autoimport(getAutoImportsOptions(resolvedOptions, config)),
+    resolvedOptions.icons !== false && icons(getIconsOptions(resolvedOptions, config)),
+    resolvedOptions.vue !== false && vue(getVueOptions(resolvedOptions)),
+    resolvedOptions.killSwitch !== false && killSwitch(),
+    resolvedOptions.warnOnLocalBuilds !== false && warnOnLocalBuilds()
   ];
 }
 
-export { HybridlyImports, HybridlyResolver, plugin as default, layout };
+export { HybridlyImports, HybridlyLinkResolver, HybridlyResolver, ProvidedComponentListResolver, plugin as default, layout };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hybridly/vite",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Vite plugin for Hybridly",
   "keywords": [
     "hybridly",
@@ -41,23 +41,23 @@
     "vue": "^3.2.45"
   },
   "dependencies": {
-    "@vitejs/plugin-vue": "^4.6.2",
+    "@vitejs/plugin-vue": "^5.0.4",
     "fast-glob": "^3.3.2",
     "local-pkg": "^0.5.0",
-    "magic-string": "^0.30.5",
+    "magic-string": "^0.30.8",
     "picocolors": "^1.0.0",
     "throttle-debounce": "^5.0.0",
-    "unplugin-auto-import": "^0.17.3",
-    "unplugin-icons": "^0.18.1",
+    "unplugin-auto-import": "^0.17.5",
+    "unplugin-icons": "^0.18.5",
     "unplugin-vue-components": "^0.26.0",
     "vite-plugin-run": "^0.5.1",
-    "@hybridly/core": "0.6.0"
+    "@hybridly/core": "0.7.0"
   },
   "devDependencies": {
-    "@iconify/json": "^2.2.163",
-    "rollup": "^4.9.2",
-    "vite": "^5.0.10",
-    "vue": "^3.4.3"
+    "@iconify/json": "^2.2.191",
+    "rollup": "^4.13.0",
+    "vite": "^5.1.6",
+    "vue": "^3.4.21"
   },
   "scripts": {
     "build": "unbuild",