@hybridly/vite 0.7.2 → 0.7.4

package/dist/index.cjs

@@ -11,6 +11,7 @@ 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 MagicString = require('magic-string');
 const run = require('vite-plugin-run');
 const utils = require('@hybridly/utils');
@@ -317,7 +318,7 @@ function generateTsConfig(options, config) {
       "../app/**/*",
       "../src/**/*",
       "./php-types.d.ts",
-      "./global-types.d.ts",
+      "./global-properties.d.ts",
       "./routes.d.ts",
       "./components.d.ts",
       "./auto-imports.d.ts",
@@ -402,11 +403,13 @@ function write(data, filename) {
   });
 }
 
+const execSync = node_util.promisify(node_child_process.exec);
 async function loadConfiguration() {
   try {
-    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"));
+    const env = { ...process.env, ...vite.loadEnv("mock", process.cwd(), "") };
+    const php = env.PHP_EXECUTABLE_PATH ?? "php";
+    const { stdout } = await execSync(`${php} artisan hybridly:config`);
+    return JSON.parse(stdout);
   } catch (e) {
     console.error("Could not load configuration from [php artisan].");
     throw e;
@@ -467,11 +470,11 @@ const initialize = (options, config) => {
           return await forceRestart("Routing changed");
         }
         if (/.*\.vue$/.test(file)) {
-          const updatedConfig = await loadConfiguration();
-          const viewsOrLayoutsChanged = didViewsOrLayoutsChange(updatedConfig, config);
-          if (viewsOrLayoutsChanged) {
-            return await forceRestart("View or layout changed");
-          }
+          loadConfiguration().then((updatedConfig) => {
+            if (didViewsOrLayoutsChange(updatedConfig, config)) {
+              forceRestart("View or layout changed");
+            }
+          });
         }
       }
       server.watcher.on("add", handleFileChange);

package/dist/index.mjs

@@ -6,7 +6,8 @@ import 'node:url';
 import os from 'node:os';
 import makeDebugger from 'debug';
 import { isPackageExists, resolveModule, importModule } from 'local-pkg';
-import { execSync } from 'node:child_process';
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
 import MagicString from 'magic-string';
 import run from 'vite-plugin-run';
 import { merge } from '@hybridly/utils';
@@ -298,7 +299,7 @@ function generateTsConfig(options, config) {
       "../app/**/*",
       "../src/**/*",
       "./php-types.d.ts",
-      "./global-types.d.ts",
+      "./global-properties.d.ts",
       "./routes.d.ts",
       "./components.d.ts",
       "./auto-imports.d.ts",
@@ -383,11 +384,13 @@ function write(data, filename) {
   });
 }
 
+const execSync = promisify(exec);
 async function loadConfiguration() {
   try {
-    const php = process.env.PHP_EXECUTABLE_PATH ?? "php";
-    const stdout = execSync(`${php} artisan hybridly:config`);
-    return JSON.parse(stdout.toString("utf-8"));
+    const env = { ...process.env, ...loadEnv("mock", process.cwd(), "") };
+    const php = env.PHP_EXECUTABLE_PATH ?? "php";
+    const { stdout } = await execSync(`${php} artisan hybridly:config`);
+    return JSON.parse(stdout);
   } catch (e) {
     console.error("Could not load configuration from [php artisan].");
     throw e;
@@ -448,11 +451,11 @@ const initialize = (options, config) => {
           return await forceRestart("Routing changed");
         }
         if (/.*\.vue$/.test(file)) {
-          const updatedConfig = await loadConfiguration();
-          const viewsOrLayoutsChanged = didViewsOrLayoutsChange(updatedConfig, config);
-          if (viewsOrLayoutsChanged) {
-            return await forceRestart("View or layout changed");
-          }
+          loadConfiguration().then((updatedConfig) => {
+            if (didViewsOrLayoutsChange(updatedConfig, config)) {
+              forceRestart("View or layout changed");
+            }
+          });
         }
       }
       server.watcher.on("add", handleFileChange);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hybridly/vite",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "description": "Vite plugin for Hybridly",
   "keywords": [
     "hybridly",
@@ -48,20 +48,20 @@
     "@vitejs/plugin-vue": "^5.0.4",
     "fast-glob": "^3.3.2",
     "local-pkg": "^0.5.0",
-    "magic-string": "^0.30.8",
+    "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.2"
+    "@hybridly/core": "0.7.4"
   },
   "devDependencies": {
-    "@iconify/json": "^2.2.191",
-    "rollup": "^4.13.0",
-    "vite": "^5.1.6",
-    "vue": "^3.4.21"
+    "@iconify/json": "^2.2.203",
+    "rollup": "^4.16.1",
+    "vite": "^5.2.10",
+    "vue": "^3.4.23"
   },
   "scripts": {
     "build": "unbuild",