@hybridly/vite 0.4.4 → 0.5.0

package/dist/index.cjs

@@ -7,7 +7,6 @@ const path = require('node:path');
 const fs = require('node:fs');
 const makeDebugger = require('debug');
 const localPkg = require('local-pkg');
-const node_util = require('node:util');
 const node_child_process = require('node:child_process');
 const run = require('vite-plugin-run');
 const utils = require('@hybridly/utils');
@@ -68,7 +67,7 @@ function generateTsConfig(options, config) {
       types: [
         "vite/client",
         "hybridly/client",
-        ...options.icons !== false && isPackageInstalled("unplugin-icons") ? ["unplugin-icons/types/vue"] : []
+        ...options.icons !== false ? ["unplugin-icons/types/vue"] : []
       ],
       baseUrl: "..",
       paths: {
@@ -166,12 +165,11 @@ function write(data, filename) {
   });
 }
 
-const shell = node_util.promisify(node_child_process.exec);
 async function loadConfiguration(options) {
   try {
     const php = options.php ?? process.env.PHP_EXECUTABLE_PATH ?? "php";
-    const { stdout } = await shell(`${php} artisan hybridly:config`);
-    return JSON.parse(stdout);
+    const stdout = node_child_process.execSync(`${php} artisan hybridly:config`);
+    return JSON.parse(stdout.toString("utf-8"));
   } catch (e) {
     console.error("Could not load configuration from [php artisan].");
     throw e;
@@ -233,9 +231,9 @@ const initialize = (options, config) => {
         }
         if (/.*\.vue$/.test(file)) {
           const updatedConfig = await loadConfiguration(options);
-          const pagesOrLayoutsChanged = didPagesOrLayoutsChange(updatedConfig, config);
-          if (pagesOrLayoutsChanged) {
-            return await forceRestart("Page or layout changed");
+          const viewsOrLayoutsChanged = didViewsOrLayoutsChange(updatedConfig, config);
+          if (viewsOrLayoutsChanged) {
+            return await forceRestart("View or layout changed");
           }
         }
       }
@@ -261,7 +259,7 @@ const initialize = (options, config) => {
     }
   };
 };
-function didPagesOrLayoutsChange(updatedConfig, previousConfig) {
+function didViewsOrLayoutsChange(updatedConfig, previousConfig) {
   if (!previousConfig) {
     return false;
   }
@@ -351,6 +349,8 @@ const HybridlyImports = {
     "useProperty",
     "setProperty",
     "useRefinements",
+    "useTable",
+    "useBulkSelect",
     "useProperties",
     "useBackForward",
     "useContext",
@@ -374,6 +374,18 @@ function getAutoImportsOptions(options, config) {
     return;
   }
   const presets = ["@vueuse/core", "@vueuse/head", "vue-i18n"];
+  const custom = {
+    "@unhead/vue": [
+      "useHead",
+      "useSeoMeta"
+    ],
+    "@innocenzi/utils": [
+      "match",
+      "invoke",
+      "batchInvoke",
+      "asyncInvoke"
+    ]
+  };
   return utils.merge(
     {
       vueTemplate: true,
@@ -387,6 +399,7 @@ function getAutoImportsOptions(options, config) {
         "vue",
         "vue/macros",
         ...presets.filter((pkg) => isPackageInstalled(pkg)),
+        ...Object.entries(custom).filter(([pkg]) => isPackageInstalled(pkg)).map(([pkg, imports]) => ({ [pkg]: imports })),
         HybridlyImports
       ]
     },
@@ -496,6 +509,34 @@ function getVueOptions(options) {
   );
 }
 
+function killSwitch() {
+  let _enabled = false;
+  return {
+    name: "hybridly:build:kill-switch",
+    config: ({ mode }) => {
+      if (mode === "build") {
+        _enabled = true;
+      }
+    },
+    buildEnd: (error) => {
+      if (!_enabled) {
+        return;
+      }
+      if (error) {
+        console.error("Error when bundling");
+        console.error(error);
+        process.exit(1);
+      }
+    },
+    closeBundle: () => {
+      if (!_enabled) {
+        return;
+      }
+      process.exit(0);
+    }
+  };
+}
+
 async function plugin(options = {}) {
   const config = await loadConfiguration(options);
   return [
@@ -506,7 +547,8 @@ async function plugin(options = {}) {
     options.vueComponents !== false && vueComponents__default(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.vue !== false && vue__default(getVueOptions(options)),
+    options.killSwitch !== false && killSwitch()
   ];
 }
 

package/dist/index.d.cts

@@ -66,6 +66,8 @@ interface ViteOptions {
     overrideResolvers?: CustomResolvers;
     /** Whether to write shims. */
     shims?: boolean;
+    /** Enables or disable the kill-switch. */
+    killSwitch?: boolean;
 }
 interface LayoutOptions {
     /** Custom RegExp for parsing the template string. */

package/dist/index.d.mts

@@ -66,6 +66,8 @@ interface ViteOptions {
     overrideResolvers?: CustomResolvers;
     /** Whether to write shims. */
     shims?: boolean;
+    /** Enables or disable the kill-switch. */
+    killSwitch?: boolean;
 }
 interface LayoutOptions {
     /** Custom RegExp for parsing the template string. */

package/dist/index.d.ts

@@ -66,6 +66,8 @@ interface ViteOptions {
     overrideResolvers?: CustomResolvers;
     /** Whether to write shims. */
     shims?: boolean;
+    /** Enables or disable the kill-switch. */
+    killSwitch?: boolean;
 }
 interface LayoutOptions {
     /** Custom RegExp for parsing the template string. */

package/dist/index.mjs

@@ -3,8 +3,7 @@ import path from 'node:path';
 import fs from 'node:fs';
 import makeDebugger from 'debug';
 import { isPackageExists } from 'local-pkg';
-import { promisify } from 'node:util';
-import { exec } from 'node:child_process';
+import { execSync } from 'node:child_process';
 import run from 'vite-plugin-run';
 import { merge } from '@hybridly/utils';
 import autoimport from 'unplugin-auto-import/vite';
@@ -51,7 +50,7 @@ function generateTsConfig(options, config) {
       types: [
         "vite/client",
         "hybridly/client",
-        ...options.icons !== false && isPackageInstalled("unplugin-icons") ? ["unplugin-icons/types/vue"] : []
+        ...options.icons !== false ? ["unplugin-icons/types/vue"] : []
       ],
       baseUrl: "..",
       paths: {
@@ -149,12 +148,11 @@ function write(data, filename) {
   });
 }
 
-const shell = promisify(exec);
 async function loadConfiguration(options) {
   try {
     const php = options.php ?? process.env.PHP_EXECUTABLE_PATH ?? "php";
-    const { stdout } = await shell(`${php} artisan hybridly:config`);
-    return JSON.parse(stdout);
+    const stdout = execSync(`${php} artisan hybridly:config`);
+    return JSON.parse(stdout.toString("utf-8"));
   } catch (e) {
     console.error("Could not load configuration from [php artisan].");
     throw e;
@@ -216,9 +214,9 @@ const initialize = (options, config) => {
         }
         if (/.*\.vue$/.test(file)) {
           const updatedConfig = await loadConfiguration(options);
-          const pagesOrLayoutsChanged = didPagesOrLayoutsChange(updatedConfig, config);
-          if (pagesOrLayoutsChanged) {
-            return await forceRestart("Page or layout changed");
+          const viewsOrLayoutsChanged = didViewsOrLayoutsChange(updatedConfig, config);
+          if (viewsOrLayoutsChanged) {
+            return await forceRestart("View or layout changed");
           }
         }
       }
@@ -244,7 +242,7 @@ const initialize = (options, config) => {
     }
   };
 };
-function didPagesOrLayoutsChange(updatedConfig, previousConfig) {
+function didViewsOrLayoutsChange(updatedConfig, previousConfig) {
   if (!previousConfig) {
     return false;
   }
@@ -334,6 +332,8 @@ const HybridlyImports = {
     "useProperty",
     "setProperty",
     "useRefinements",
+    "useTable",
+    "useBulkSelect",
     "useProperties",
     "useBackForward",
     "useContext",
@@ -357,6 +357,18 @@ function getAutoImportsOptions(options, config) {
     return;
   }
   const presets = ["@vueuse/core", "@vueuse/head", "vue-i18n"];
+  const custom = {
+    "@unhead/vue": [
+      "useHead",
+      "useSeoMeta"
+    ],
+    "@innocenzi/utils": [
+      "match",
+      "invoke",
+      "batchInvoke",
+      "asyncInvoke"
+    ]
+  };
   return merge(
     {
       vueTemplate: true,
@@ -370,6 +382,7 @@ function getAutoImportsOptions(options, config) {
         "vue",
         "vue/macros",
         ...presets.filter((pkg) => isPackageInstalled(pkg)),
+        ...Object.entries(custom).filter(([pkg]) => isPackageInstalled(pkg)).map(([pkg, imports]) => ({ [pkg]: imports })),
         HybridlyImports
       ]
     },
@@ -479,6 +492,34 @@ function getVueOptions(options) {
   );
 }
 
+function killSwitch() {
+  let _enabled = false;
+  return {
+    name: "hybridly:build:kill-switch",
+    config: ({ mode }) => {
+      if (mode === "build") {
+        _enabled = true;
+      }
+    },
+    buildEnd: (error) => {
+      if (!_enabled) {
+        return;
+      }
+      if (error) {
+        console.error("Error when bundling");
+        console.error(error);
+        process.exit(1);
+      }
+    },
+    closeBundle: () => {
+      if (!_enabled) {
+        return;
+      }
+      process.exit(0);
+    }
+  };
+}
+
 async function plugin(options = {}) {
   const config = await loadConfiguration(options);
   return [
@@ -489,7 +530,8 @@ async function plugin(options = {}) {
     options.vueComponents !== false && vueComponents(getVueComponentsOptions(options, config)),
     options.autoImports !== false && autoimport(getAutoImportsOptions(options, config)),
     options.icons !== false && icons(getIconsOptions(options, config)),
-    options.vue !== false && vue(getVueOptions(options))
+    options.vue !== false && vue(getVueOptions(options)),
+    options.killSwitch !== false && killSwitch()
   ];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hybridly/vite",
-  "version": "0.4.4",
+  "version": "0.5.0",
   "description": "Vite plugin for Hybridly",
   "keywords": [
     "hybridly",
@@ -40,20 +40,20 @@
     "vue": "^3.2.45"
   },
   "dependencies": {
-    "@vitejs/plugin-vue": "^4.3.3",
+    "@vitejs/plugin-vue": "^4.3.4",
     "fast-glob": "^3.3.1",
-    "laravel-vite-plugin": "^0.8.0",
+    "laravel-vite-plugin": "^0.8.1",
     "local-pkg": "^0.4.3",
     "throttle-debounce": "^5.0.0",
     "unplugin-auto-import": "^0.16.6",
-    "unplugin-icons": "^0.16.6",
-    "unplugin-vue-components": "^0.25.1",
-    "vite-plugin-run": "^0.4.1",
-    "@hybridly/core": "0.4.4"
+    "unplugin-icons": "^0.17.0",
+    "unplugin-vue-components": "^0.25.2",
+    "vite-plugin-run": "^0.5.1",
+    "@hybridly/core": "0.5.0"
   },
   "devDependencies": {
-    "@iconify/json": "^2.2.107",
-    "rollup": "^3.28.1",
+    "@iconify/json": "^2.2.120",
+    "rollup": "^3.29.3",
     "vite": "^4.4.9",
     "vue": "^3.3.4"
   },