From 9eb4d756fc4e5d593b91737027481d220b30bfb9 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Thu, 15 Oct 2020 14:10:17 +0200
Subject: [PATCH] Revert "start new auto-registration system"

This reverts commit 5cdb506899341b31ca07301d5d82d39d282d3344.
---
 zero.Web.UI/app.js                  | 14 ++++++--------
 zero.Web.UI/config/router.config.js |  2 ++
 zero.Web.UI/directives/register.js  | 30 ++++++++++++++---------------
 zero.Web.UI/package.json            |  3 +--
 zero.Web.UI/vite.config.js          |  2 +-
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/zero.Web.UI/app.js b/zero.Web.UI/app.js
index 1a8f5912..f7882839 100644
--- a/zero.Web.UI/app.js
+++ b/zero.Web.UI/app.js
@@ -5,21 +5,19 @@ zero.apps = {
   shared: true
 };
 
+import Router from '@zero/config/router.config.js';
+import registerComponents from '@zero/components/register.js';
 import registerDirectives from '@zero/directives/register.js';
-//import Router from '@zero/config/router.config.js';
-//import registerComponents from '@zero/components/register.js';
-//import registerRenderers from '@zero/renderers/register.js';
+import registerRenderers from '@zero/renderers/register.js';
 
 //import '@zero/config/zero.plugins.js';
 //import ZeroPlugin from '@zero/plugin.js';
 
 const app = createApp(App);
-//app.use(Router);
+app.use(Router);
 
 registerDirectives(app);
-//registerComponents(app);
-//registerRenderers(app);
-
-console.info(app);
+registerComponents(app);
+registerRenderers(app);
 
 app.mount('#app');
\ No newline at end of file
diff --git a/zero.Web.UI/config/router.config.js b/zero.Web.UI/config/router.config.js
index b834319a..4df255e0 100644
--- a/zero.Web.UI/config/router.config.js
+++ b/zero.Web.UI/config/router.config.js
@@ -186,6 +186,8 @@ const beforeEach = (to, from, next) =>
   }
 };
 
+
+
 // create the router with history mode
 export default createRouter({
   history: createWebHistory(zero.path),
diff --git a/zero.Web.UI/directives/register.js b/zero.Web.UI/directives/register.js
index 77255fb0..a636392f 100644
--- a/zero.Web.UI/directives/register.js
+++ b/zero.Web.UI/directives/register.js
@@ -1,22 +1,22 @@
 
-let imports = [
-  () => import('./clickoutside.js'),
-  () => import('./currency.js'),
-  () => import('./date.js'),
-  () => import('./filesize.js'),
-  () => import('./localize.js'),
-  () => import('./resizable.js'),
-  () => import('./sortable.js')
-];
-
 export default function (app)
 {
-  imports.forEach(path =>
+  const requireComponent = require.context('.', true, /[\w-]+\.js/);
+
+  requireComponent.keys().forEach(path =>
   {
-    path().then(resolved =>
+    let pathParts = path.split('/');
+    let fileName = pathParts[pathParts.length - 1].split('.')[0];
+
+    if (fileName === 'register')
     {
-      const config = resolved.default || resolved;
-      app.directive(config.name, config);
-    });
+      return;
+    }
+
+    const componentConfig = requireComponent(path);
+    const config = componentConfig.default || componentConfig;
+    const name = config.name || fileName;
+
+    app.directive(name, config);
   });
 };
\ No newline at end of file
diff --git a/zero.Web.UI/package.json b/zero.Web.UI/package.json
index 645538e8..69aa09c2 100644
--- a/zero.Web.UI/package.json
+++ b/zero.Web.UI/package.json
@@ -22,14 +22,13 @@
     "vue-router": "4.0.0-beta.13"
   },
   "devDependencies": {
+    "vite": "1.0.0-rc.4",
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-plugin-router": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
     "@vue/compiler-sfc": "3.0.0",
-    "glob": "^7.1.6",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
-    "vite": "1.0.0-rc.4",
     "vue-template-compiler": "^2.6.11"
   }
 }
diff --git a/zero.Web.UI/vite.config.js b/zero.Web.UI/vite.config.js
index d6ccfa30..e3dc0be4 100644
--- a/zero.Web.UI/vite.config.js
+++ b/zero.Web.UI/vite.config.js
@@ -24,6 +24,6 @@ export default {
   }],
 
   optimizeDeps: {
-    include: ['qs'],
+    include: ["qs"],
   },
 };
\ No newline at end of file