From f55c51cd6c13738fc4c63f2a3e3337c18a6dcb37 Mon Sep 17 00:00:00 2001
From: jlpereira <pepelui@outlook.com>
Date: Fri, 1 Sep 2023 12:30:04 -0300
Subject: [PATCH] Add user components loader

---
 .gitignore                                   |  1 +
 src/components/clientComponents.js           | 12 ++++++++----
 src/components/globalComponents.js           | 12 ++++++++----
 src/modules/otus/constants/overviewLayout.js | 11 +++++++----
 vite.config.js                               |  2 +-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index d4979d1..9acf0a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ dist
 dist-ssr
 config
 pages
+components
 public
 README.md
 *.local
diff --git a/src/components/clientComponents.js b/src/components/clientComponents.js
index eb68cdb..5694cfb 100644
--- a/src/components/clientComponents.js
+++ b/src/components/clientComponents.js
@@ -1,7 +1,11 @@
 export function registerOnlyClientComponents(app) {
-  const files = import.meta.glob(['@/components/**/*.client.vue'], {
-    eager: true
-  })
+  const files = import.meta.glob(
+    ['@/components/**/*.client.vue', '#/components/**/*.client.vue'],
+    {
+      eager: true,
+      import: 'default'
+    }
+  )
 
   setGlobalComponents(app, files)
 }
@@ -15,6 +19,6 @@ function setGlobalComponents(app, files) {
       .pop()
       .replace(/\.client.\w+$/, '')
 
-    app.component(componentName, definition.default)
+    app.component(componentName, definition)
   })
 }
diff --git a/src/components/globalComponents.js b/src/components/globalComponents.js
index 15cab72..d8aaf81 100644
--- a/src/components/globalComponents.js
+++ b/src/components/globalComponents.js
@@ -1,7 +1,11 @@
 export function registerGlobalComponents(app) {
-  const files = import.meta.glob(['@/components/**/*.global.vue'], {
-    eager: true
-  })
+  const files = import.meta.glob(
+    ['@/components/**/*.global.vue', '#/components/**/*.global.vue'],
+    {
+      eager: true,
+      import: 'default'
+    }
+  )
 
   setGlobalComponents(app, files)
 }
@@ -16,6 +20,6 @@ function setGlobalComponents(app, files) {
       .replace(/\.client.global.\w+$/, '')
       .replace(/\.global.\w+$/, '')
 
-    app.component(componentName, definition.default)
+    app.component(componentName, definition)
   })
 }
diff --git a/src/modules/otus/constants/overviewLayout.js b/src/modules/otus/constants/overviewLayout.js
index bc557d3..36e0abc 100644
--- a/src/modules/otus/constants/overviewLayout.js
+++ b/src/modules/otus/constants/overviewLayout.js
@@ -1,8 +1,11 @@
 const panelEntries = Object.values(
-  import.meta.glob('../components/Panel/*/main.js', {
-    eager: true,
-    import: 'default'
-  })
+  import.meta.glob(
+    ['../components/Panel/*/main.js', '#/taxa/overview/panels/*/main.js'],
+    {
+      eager: true,
+      import: 'default'
+    }
+  )
 )
 
 const { taxa_page_overview } = __APP_ENV__
diff --git a/vite.config.js b/vite.config.js
index 2bec802..789f04f 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,7 +23,7 @@ export default () => {
     resolve: {
       alias: {
         '@': path.resolve(__dirname, './src'),
-        '#': path.resolve(__dirname)
+        '#': path.resolve(__dirname, '/')
       }
     },
     plugins: [