Fix resource loader importing components

components-web-app · May 8, 2023 · d77ac94 · d77ac94
1 parent d2fcd56
commit d77ac94
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 69 deletions.
diff --git a/playground/cwa/components/Nailing it with Nuxt b/playground/cwa/components/Nailing it with Nuxt
diff --git a/src/module.ts b/src/module.ts
@@ -112,11 +112,13 @@ export const options:CwaModuleOptions = ${JSON.stringify(options, undefined, 2)}
       // component dirs to be configured by application
       dirs.unshift({
         path: resolve(join(nuxt.options.srcDir, 'cwa', 'pages')),
-        prefix: 'CwaPages'
+        prefix: 'CwaPages',
+        global: true
       })
       dirs.unshift({
         path: resolve(join(nuxt.options.srcDir, 'cwa', 'components')),
-        prefix: 'CwaComponents'
+        prefix: 'CwaComponents',
+        global: true
       })
     })
   }

diff --git a/src/runtime/templates/components/core/ResourceLoader.vue b/src/runtime/templates/components/core/ResourceLoader.vue
@@ -20,11 +20,10 @@
 </template>
 
 <script setup>
-import { computed, onMounted, watch } from 'vue'
+import { computed, onMounted, watch, getCurrentInstance } from 'vue'
 import { useNuxtApp } from '#app'
 import { CwaResourceApiStatuses } from '../../../storage/stores/resources/state'
 import { CwaAuthStatus } from '../../../api/auth'
-import * as components from '#components'
 
 const { $cwa } = useNuxtApp()
 
@@ -74,11 +73,13 @@ const resolvedComponent = computed(() => {
     return props.uiComponent
   }
 
-  if (!Object.keys(components).includes(uiComponent.value)) {
+  const instance = getCurrentInstance()
+
+  if (typeof instance?.appContext.components !== 'object' || !(uiComponent.value in instance.appContext.components)) {
     return
   }
-  // eslint-disable-next-line import/namespace
-  return components[uiComponent.value]
+
+  return uiComponent.value
 })
 
 onMounted(() => {