fix: merge errors (#158)

client-app/app-runner.ts

@@ -5,6 +5,7 @@ import { config, context, menu } from "@core/plugins";
 import App from "./App.vue";
 import blocks from "./builder-preview/pages/blocks";
 import * as yup from "yup";
+import { loadMe } from "./shared/account/composables/useUser";
 
 /**
  * Global Styles
@@ -17,9 +18,9 @@ import routes from "./router";
 /**
  * Async application init
  */
-export default async (getPlugins: ((options: any) => { plugin: Plugin, options: any }[]) | null = null) => {
+export default async (getPlugins: ((options: any) => { plugin: Plugin; options: any }[]) | null = null) => {
   // Load and prepare app config and context
-  const [cfg, themeContext] = await Promise.all([initCfg(), initContext()]);
+  const [cfg, themeContext] = await Promise.all([initCfg(), initContext(), loadMe()]);
 
   const defaultLocale = themeContext.defaultLanguage?.twoLetterLanguageName || "en";
   const supportedLocales = themeContext.availLanguages?.map((x) => x.twoLetterLanguageName) || [defaultLocale];
@@ -54,7 +55,7 @@ export default async (getPlugins: ((options: any) => { plugin: Plugin, options:
 
   if (getPlugins) {
     const plugins = getPlugins({
-      router
+      router,
     });
 
     for (const plugin of plugins) {

client-app/core/api/graphql/types.ts

@@ -4025,7 +4025,7 @@ export type CategoriesQueryVariables = Exact<{
 }>;
 
 
-export type CategoriesQuery = { categories?: { totalCount?: number, items?: Array<{ id: string, name: string, code: string, slug?: string, path?: string, outline?: string, parent?: { id: string }, seoInfo?: { semanticUrl?: string } }> } };
+export type CategoriesQuery = { categories?: { totalCount?: number, items?: Array<{ id: string, name: string, code: string, slug?: string, outline?: string, parent?: { id: string }, seoInfo?: { semanticUrl?: string }, breadcrumbs?: Array<{ title: string, seoPath?: string }> }> } };
 
 export type SearchProductsQueryVariables = Exact<{
   storeId: Scalars['String'];

templates/index.liquid

@@ -1,3 +1,3 @@
 <div id="app"></div>
 <script src="{{ 'index.js' | asset_url }}" type="module"></script>
-{{ 'index.css' | asset_url | stylesheet_tag }}
+{{ 'app-runner.css' | asset_url | stylesheet_tag }}