@hybridly/vite 0.7.7 → 0.7.9

package/dist/index.cjs

@@ -8,10 +8,10 @@ const colors = require('picocolors');
 const vite = require('vite');
 require('node:url');
 const os = require('node:os');
-const makeDebugger = require('debug');
-const localPkg = require('local-pkg');
 const node_child_process = require('node:child_process');
 const node_util = require('node:util');
+const makeDebugger = require('debug');
+const localPkg = require('local-pkg');
 const MagicString = require('magic-string');
 const run = require('vite-plugin-run');
 const utils = require('@hybridly/utils');
@@ -38,6 +38,41 @@ const iconsResolver__default = /*#__PURE__*/_interopDefaultCompat(iconsResolver)
 const icons__default = /*#__PURE__*/_interopDefaultCompat(icons);
 const vue__default = /*#__PURE__*/_interopDefaultCompat(vue);
 
+let phpExecutable;
+let devEnvironment;
+function getEnv() {
+  return { ...process.env, ...vite.loadEnv("mock", process.cwd(), "") };
+}
+async function getPhpExecutable() {
+  if (phpExecutable) {
+    return phpExecutable;
+  }
+  const env = getEnv();
+  const php = (env.PHP_EXECUTABLE_PATH ?? "php").split(" ");
+  if (!env.PHP_EXECUTABLE_PATH) {
+    const devEnvironment2 = await determineDevEnvironment();
+    if (devEnvironment2 === "ddev") {
+      php.unshift("ddev");
+    } else if (devEnvironment2 === "lando") {
+      php.unshift("lando");
+    }
+  }
+  return phpExecutable = php;
+}
+async function determineDevEnvironment() {
+  if (devEnvironment) {
+    return devEnvironment;
+  }
+  if (fs__default.existsSync(`${process.cwd()}/.ddev`)) {
+    devEnvironment = "ddev";
+  } else if (fs__default.existsSync(`${process.cwd()}/.lando.yml`)) {
+    devEnvironment = "lando";
+  } else {
+    devEnvironment = "native";
+  }
+  return devEnvironment;
+}
+
 function isIpv6(address) {
   return address.family === "IPv6" || address.family === 6;
 }
@@ -139,7 +174,7 @@ function laravel(options, hybridlyConfig) {
           origin: userConfig.server?.origin ?? "__laravel_vite_placeholder__",
           ...process.env.LARAVEL_SAIL ? {
             host: userConfig.server?.host ?? "0.0.0.0",
-            port: userConfig.server?.port ?? (env.VITE_PORT ? parseInt(env.VITE_PORT) : 5173),
+            port: userConfig.server?.port ?? (env.VITE_PORT ? Number.parseInt(env.VITE_PORT) : 5173),
             strictPort: userConfig.server?.strictPort ?? true
           } : void 0,
           ...serverConfig ? {
@@ -164,12 +199,12 @@ function laravel(options, hybridlyConfig) {
     configureServer(server) {
       const envDir = resolvedConfig.envDir || process.cwd();
       const appUrl = vite.loadEnv(resolvedConfig.mode, envDir, "APP_URL").APP_URL ?? "undefined";
-      server.httpServer?.once("listening", () => {
+      server.httpServer?.once("listening", async () => {
         const address = server.httpServer?.address();
         const isAddressInfo = (x) => typeof x === "object";
         if (isAddressInfo(address)) {
           viteDevServerUrl = resolveDevServerUrl(address, server.config, userConfig);
-          fs__default.writeFileSync(hotFile, viteDevServerUrl);
+          fs__default.writeFileSync(hotFile, `${viteDevServerUrl}${server.config.base.replace(/\/$/, "")}`);
           if (!hybridlyConfig.versions) {
             return;
           }
@@ -181,12 +216,16 @@ function laravel(options, hybridlyConfig) {
           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)")}`;
           version += ` \u2014 ${colors__default.yellow("this may lead to undefined behavior")}`;
+          const devEnvironment = await determineDevEnvironment();
           setTimeout(() => {
             server.config.logger.info(`
   ${colors__default.magenta(`${colors__default.bold("HYBRIDLY")} v${hybridlyConfig.versions.composer}`)}  ${latest}`);
             server.config.logger.info("");
             server.config.logger.info(`  ${colors__default.green("\u279C")}  ${colors__default.bold("URL")}: ${colors__default.cyan(hybridlyConfig.routing.url)}`);
             server.config.logger.info(`  ${colors__default.green("\u279C")}  ${colors__default.bold("Registered")}: ${registered}`);
+            if (devEnvironment !== "native") {
+              server.config.logger.info(`  ${colors__default.green("\u279C")}  ${colors__default.bold("Development environment")}: ${colors__default.cyan(devEnvironment)}`);
+            }
             if (hybridlyConfig.versions.composer !== hybridlyConfig.versions.npm) {
               server.config.logger.info(`  ${colors__default.yellow("\u279C")}  ${colors__default.bold("Version mismatch")}: ${version}`);
             }
@@ -232,7 +271,7 @@ function ensureCommandShouldRunInEnvironment(command, env) {
     throw new TypeError("You should not run the Vite HMR server in CI environments. You should build your assets for production instead. To disable this ENV check you may set LARAVEL_BYPASS_ENV_CHECK=1");
   }
 }
-function resolveInput(userConfig, hybridlyConfig, ssr) {
+function resolveInput(userConfig, hybridlyConfig, _ssr) {
   return userConfig.build?.rollupOptions?.input ?? hybridlyConfig.architecture.application_main_path;
 }
 function resolveDevServerUrl(address, config, userConfig) {
@@ -255,6 +294,7 @@ const CONFIG_PLUGIN_NAME = "vite:hybridly:config";
 const CONFIG_VIRTUAL_MODULE_ID = "virtual:hybridly/config";
 const RESOLVED_CONFIG_VIRTUAL_MODULE_ID = `\0${CONFIG_VIRTUAL_MODULE_ID}`;
 
+const execSync = node_util.promisify(node_child_process.exec);
 const debug = {
   config: makeDebugger__default(CONFIG_PLUGIN_NAME),
   layout: makeDebugger__default(LAYOUT_PLUGIN_NAME)
@@ -403,15 +443,21 @@ function write(data, filename) {
   });
 }
 
-const execSync = node_util.promisify(node_child_process.exec);
 async function loadConfiguration() {
   try {
-    const env = { ...process.env, ...vite.loadEnv("mock", process.cwd(), "") };
-    const php = env.PHP_EXECUTABLE_PATH ?? "php";
+    const php = (await getPhpExecutable()).join(" ");
     const { stdout } = await execSync(`${php} artisan hybridly:config`);
     return JSON.parse(stdout);
   } catch (e) {
-    console.error("Could not load configuration from [php artisan].");
+    console.error("Could not load configuration from [php artisan hybridly:config].");
+    if (e.stdout) {
+      console.error(e.stdout);
+    }
+    if (await determineDevEnvironment() === "ddev") {
+      console.error("This is possibly caused by not starting ddev first.");
+    } else if (await determineDevEnvironment() === "lando") {
+      console.error("This is possibly caused by not starting lando first.");
+    }
     throw e;
   }
 }
@@ -474,7 +520,7 @@ const initialize = (options, config) => {
             if (didViewsOrLayoutsChange(updatedConfig, config)) {
               forceRestart("View or layout changed");
             }
-          });
+          }).catch();
         }
       }
       server.watcher.on("add", handleFileChange);
@@ -559,15 +605,15 @@ function resolveLayoutImportPath(name, config) {
   return `~/${path}`;
 }
 
-function getRunOptions(options) {
+async function getRunOptions(options) {
   if (options.run === false) {
     return [];
   }
-  const php = process.env.PHP_EXECUTABLE_PATH ?? "php";
+  const php = await getPhpExecutable();
   return [
     {
       name: "Generate TypeScript types",
-      run: [php, "artisan", "hybridly:types", options.allowTypeGenerationFailures !== false ? "--allow-failures" : ""].filter(Boolean),
+      run: [...php, "artisan", "hybridly:types", options.allowTypeGenerationFailures !== false ? "--allow-failures" : ""].filter(Boolean),
       pattern: [
         "+(app|src)/**/*Data.php",
         "+(app|src)/**/Enums/*.php",
@@ -576,7 +622,7 @@ function getRunOptions(options) {
     },
     {
       name: "Generate i18n",
-      run: [php, "artisan", "hybridly:i18n"],
+      run: [...php, "artisan", "hybridly:i18n"],
       pattern: "lang/**/*.php"
     },
     ...options.run ?? []
@@ -900,7 +946,7 @@ async function plugin(options = {}) {
     initialize(resolvedOptions, config),
     layout(resolvedOptions, config),
     resolvedOptions.laravel !== false && laravel(resolvedOptions, config),
-    resolvedOptions.run !== false && run__default(getRunOptions(resolvedOptions)),
+    resolvedOptions.run !== false && run__default(await 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)),

package/dist/index.mjs

@@ -4,10 +4,10 @@ import colors from 'picocolors';
 import { loadEnv } from 'vite';
 import 'node:url';
 import os from 'node:os';
-import makeDebugger from 'debug';
-import { isPackageExists, resolveModule, importModule } from 'local-pkg';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
+import makeDebugger from 'debug';
+import { isPackageExists, resolveModule, importModule } from 'local-pkg';
 import MagicString from 'magic-string';
 import run from 'vite-plugin-run';
 import { merge } from '@hybridly/utils';
@@ -19,6 +19,41 @@ import icons from 'unplugin-icons/vite';
 import { FileSystemIconLoader } from 'unplugin-icons/loaders';
 import vue from '@vitejs/plugin-vue';
 
+let phpExecutable;
+let devEnvironment;
+function getEnv() {
+  return { ...process.env, ...loadEnv("mock", process.cwd(), "") };
+}
+async function getPhpExecutable() {
+  if (phpExecutable) {
+    return phpExecutable;
+  }
+  const env = getEnv();
+  const php = (env.PHP_EXECUTABLE_PATH ?? "php").split(" ");
+  if (!env.PHP_EXECUTABLE_PATH) {
+    const devEnvironment2 = await determineDevEnvironment();
+    if (devEnvironment2 === "ddev") {
+      php.unshift("ddev");
+    } else if (devEnvironment2 === "lando") {
+      php.unshift("lando");
+    }
+  }
+  return phpExecutable = php;
+}
+async function determineDevEnvironment() {
+  if (devEnvironment) {
+    return devEnvironment;
+  }
+  if (fs.existsSync(`${process.cwd()}/.ddev`)) {
+    devEnvironment = "ddev";
+  } else if (fs.existsSync(`${process.cwd()}/.lando.yml`)) {
+    devEnvironment = "lando";
+  } else {
+    devEnvironment = "native";
+  }
+  return devEnvironment;
+}
+
 function isIpv6(address) {
   return address.family === "IPv6" || address.family === 6;
 }
@@ -120,7 +155,7 @@ function laravel(options, hybridlyConfig) {
           origin: userConfig.server?.origin ?? "__laravel_vite_placeholder__",
           ...process.env.LARAVEL_SAIL ? {
             host: userConfig.server?.host ?? "0.0.0.0",
-            port: userConfig.server?.port ?? (env.VITE_PORT ? parseInt(env.VITE_PORT) : 5173),
+            port: userConfig.server?.port ?? (env.VITE_PORT ? Number.parseInt(env.VITE_PORT) : 5173),
             strictPort: userConfig.server?.strictPort ?? true
           } : void 0,
           ...serverConfig ? {
@@ -145,12 +180,12 @@ function laravel(options, hybridlyConfig) {
     configureServer(server) {
       const envDir = resolvedConfig.envDir || process.cwd();
       const appUrl = loadEnv(resolvedConfig.mode, envDir, "APP_URL").APP_URL ?? "undefined";
-      server.httpServer?.once("listening", () => {
+      server.httpServer?.once("listening", async () => {
         const address = server.httpServer?.address();
         const isAddressInfo = (x) => typeof x === "object";
         if (isAddressInfo(address)) {
           viteDevServerUrl = resolveDevServerUrl(address, server.config, userConfig);
-          fs.writeFileSync(hotFile, viteDevServerUrl);
+          fs.writeFileSync(hotFile, `${viteDevServerUrl}${server.config.base.replace(/\/$/, "")}`);
           if (!hybridlyConfig.versions) {
             return;
           }
@@ -162,12 +197,16 @@ function laravel(options, hybridlyConfig) {
           let version = `${colors.yellow(`v${hybridlyConfig.versions.composer}`)} ${colors.dim("(composer)")}, `;
           version += `${colors.yellow(`v${hybridlyConfig.versions.npm}`)} ${colors.dim("(npm)")}`;
           version += ` \u2014 ${colors.yellow("this may lead to undefined behavior")}`;
+          const devEnvironment = await determineDevEnvironment();
           setTimeout(() => {
             server.config.logger.info(`
   ${colors.magenta(`${colors.bold("HYBRIDLY")} v${hybridlyConfig.versions.composer}`)}  ${latest}`);
             server.config.logger.info("");
             server.config.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("URL")}: ${colors.cyan(hybridlyConfig.routing.url)}`);
             server.config.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("Registered")}: ${registered}`);
+            if (devEnvironment !== "native") {
+              server.config.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("Development environment")}: ${colors.cyan(devEnvironment)}`);
+            }
             if (hybridlyConfig.versions.composer !== hybridlyConfig.versions.npm) {
               server.config.logger.info(`  ${colors.yellow("\u279C")}  ${colors.bold("Version mismatch")}: ${version}`);
             }
@@ -213,7 +252,7 @@ function ensureCommandShouldRunInEnvironment(command, env) {
     throw new TypeError("You should not run the Vite HMR server in CI environments. You should build your assets for production instead. To disable this ENV check you may set LARAVEL_BYPASS_ENV_CHECK=1");
   }
 }
-function resolveInput(userConfig, hybridlyConfig, ssr) {
+function resolveInput(userConfig, hybridlyConfig, _ssr) {
   return userConfig.build?.rollupOptions?.input ?? hybridlyConfig.architecture.application_main_path;
 }
 function resolveDevServerUrl(address, config, userConfig) {
@@ -236,6 +275,7 @@ const CONFIG_PLUGIN_NAME = "vite:hybridly:config";
 const CONFIG_VIRTUAL_MODULE_ID = "virtual:hybridly/config";
 const RESOLVED_CONFIG_VIRTUAL_MODULE_ID = `\0${CONFIG_VIRTUAL_MODULE_ID}`;
 
+const execSync = promisify(exec);
 const debug = {
   config: makeDebugger(CONFIG_PLUGIN_NAME),
   layout: makeDebugger(LAYOUT_PLUGIN_NAME)
@@ -384,15 +424,21 @@ function write(data, filename) {
   });
 }
 
-const execSync = promisify(exec);
 async function loadConfiguration() {
   try {
-    const env = { ...process.env, ...loadEnv("mock", process.cwd(), "") };
-    const php = env.PHP_EXECUTABLE_PATH ?? "php";
+    const php = (await getPhpExecutable()).join(" ");
     const { stdout } = await execSync(`${php} artisan hybridly:config`);
     return JSON.parse(stdout);
   } catch (e) {
-    console.error("Could not load configuration from [php artisan].");
+    console.error("Could not load configuration from [php artisan hybridly:config].");
+    if (e.stdout) {
+      console.error(e.stdout);
+    }
+    if (await determineDevEnvironment() === "ddev") {
+      console.error("This is possibly caused by not starting ddev first.");
+    } else if (await determineDevEnvironment() === "lando") {
+      console.error("This is possibly caused by not starting lando first.");
+    }
     throw e;
   }
 }
@@ -455,7 +501,7 @@ const initialize = (options, config) => {
             if (didViewsOrLayoutsChange(updatedConfig, config)) {
               forceRestart("View or layout changed");
             }
-          });
+          }).catch();
         }
       }
       server.watcher.on("add", handleFileChange);
@@ -540,15 +586,15 @@ function resolveLayoutImportPath(name, config) {
   return `~/${path}`;
 }
 
-function getRunOptions(options) {
+async function getRunOptions(options) {
   if (options.run === false) {
     return [];
   }
-  const php = process.env.PHP_EXECUTABLE_PATH ?? "php";
+  const php = await getPhpExecutable();
   return [
     {
       name: "Generate TypeScript types",
-      run: [php, "artisan", "hybridly:types", options.allowTypeGenerationFailures !== false ? "--allow-failures" : ""].filter(Boolean),
+      run: [...php, "artisan", "hybridly:types", options.allowTypeGenerationFailures !== false ? "--allow-failures" : ""].filter(Boolean),
       pattern: [
         "+(app|src)/**/*Data.php",
         "+(app|src)/**/Enums/*.php",
@@ -557,7 +603,7 @@ function getRunOptions(options) {
     },
     {
       name: "Generate i18n",
-      run: [php, "artisan", "hybridly:i18n"],
+      run: [...php, "artisan", "hybridly:i18n"],
       pattern: "lang/**/*.php"
     },
     ...options.run ?? []
@@ -881,7 +927,7 @@ async function plugin(options = {}) {
     initialize(resolvedOptions, config),
     layout(resolvedOptions, config),
     resolvedOptions.laravel !== false && laravel(resolvedOptions, config),
-    resolvedOptions.run !== false && run(getRunOptions(resolvedOptions)),
+    resolvedOptions.run !== false && run(await getRunOptions(resolvedOptions)),
     resolvedOptions.vueComponents !== false && vueComponents(await getVueComponentsOptions(resolvedOptions, config)),
     resolvedOptions.autoImports !== false && autoimport(getAutoImportsOptions(resolvedOptions, config)),
     resolvedOptions.icons !== false && icons(getIconsOptions(resolvedOptions, config)),

package/package.json

@@ -1,67 +1,66 @@
 {
   "name": "@hybridly/vite",
-  "version": "0.7.7",
+  "type": "module",
+  "version": "0.7.9",
   "description": "Vite plugin for Hybridly",
-  "keywords": [
-    "hybridly",
-    "inertiajs",
-    "vite",
-    "vite-plugin"
-  ],
+  "author": "Enzo Innocenzi <enzo@innocenzi.dev>",
   "license": "MIT",
+  "funding": "https://github.com/sponsors/innocenzi",
+  "homepage": "https://github.com/hybridly/hybridly/tree/main/packages/vite#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/hybridly/hybridly.git",
     "directory": "packages/vite"
   },
-  "funding": "https://github.com/sponsors/innocenzi",
-  "author": "Enzo Innocenzi <enzo@innocenzi.dev>",
-  "type": "module",
-  "homepage": "https://github.com/hybridly/hybridly/tree/main/packages/vite#readme",
   "bugs": {
     "url": "https://github.com/hybridly/hybridly/issues"
   },
+  "keywords": [
+    "hybridly",
+    "inertiajs",
+    "vite",
+    "vite-plugin"
+  ],
   "publishConfig": {
     "provenance": true,
     "access": "public"
   },
   "sideEffects": false,
-  "files": [
-    "dist",
-    "*.d.ts"
-  ],
   "exports": {
     ".": {
-      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.cjs"
     }
   },
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
+  "files": [
+    "*.d.ts",
+    "dist"
+  ],
   "peerDependencies": {
     "vite": "^5.0.8",
     "vue": "^3.2.45"
   },
   "dependencies": {
-    "@vitejs/plugin-vue": "^5.0.4",
+    "@vitejs/plugin-vue": "^5.0.5",
     "fast-glob": "^3.3.2",
     "local-pkg": "^0.5.0",
     "magic-string": "^0.30.10",
-    "picocolors": "^1.0.0",
-    "throttle-debounce": "^5.0.0",
-    "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.7.7"
+    "picocolors": "^1.0.1",
+    "unplugin-auto-import": "^0.17.6",
+    "unplugin-icons": "^0.19.0",
+    "unplugin-vue-components": "^0.27.2",
+    "vite-plugin-run": "^0.5.2",
+    "@hybridly/core": "0.7.9"
   },
   "devDependencies": {
-    "@iconify/json": "^2.2.203",
-    "rollup": "^4.16.1",
-    "vite": "^5.2.10",
-    "vue": "^3.4.23"
+    "@iconify/json": "^2.2.223",
+    "rollup": "^4.18.0",
+    "vite": "^5.3.2",
+    "vue": "^3.4.31"
   },
   "scripts": {
     "build": "unbuild",