erudit 4.0.0-dev.5 → 4.0.1

package/app/composables/analytics.ts

@@ -1,102 +1,102 @@
-import type {
-  GoogleAnalytics,
-  YandexAnalytics,
-} from '@erudit-js/core/eruditConfig/analytics';
-
-export function initAnalytics() {
-  const analytics = ERUDIT.config.analytics;
-
-  const analyticsEnabled = (() => {
-    const debugValue = ERUDIT.config.debug.analytics;
-
-    if (typeof debugValue === 'boolean') {
-      return debugValue;
-    }
-
-    return ERUDIT.config.mode === 'static' ? true : false;
-  })();
-
-  if (!analytics || !analyticsEnabled) {
-    return;
-  }
-
-  if (analytics.google) {
-    googleAnalytics(analytics.google);
-  }
-
-  if (analytics.yandex) {
-    yandexAnalytics(analytics.yandex);
-  }
-}
-
-function googleAnalytics(analytics: GoogleAnalytics) {
-  if (analytics.gtag) {
-    useHead({
-      script: [
-        {
-          key: 'google-analytics-script',
-          src: `https://www.googletagmanager.com/gtag/js?id=${analytics.gtag}`,
-          async: true,
-        },
-        {
-          key: 'google-analytics-inline-script',
-          innerHTML: `
-window.dataLayer = window.dataLayer || [];
-function gtag(){dataLayer.push(arguments);}
-gtag('js', new Date());
-gtag('config', '${analytics.gtag}');
-                    `.trim(),
-        },
-      ],
-    });
-  }
-
-  if (analytics.verification) {
-    useHead({
-      meta: [
-        {
-          name: 'google-site-verification',
-          content: analytics.verification,
-        },
-      ],
-    });
-  }
-}
-
-function yandexAnalytics(analytics: YandexAnalytics) {
-  if (analytics.metricsId) {
-    useHead({
-      script: [
-        {
-          key: 'yandex-metrica-script',
-          innerHTML: `
-(function(m,e,t,r,i,k,a){
-    m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
-    m[i].l=1*new Date();
-    k=e.createElement(t),a=e.getElementsByTagName(t)[0],
-    k.async=1,k.src=r,a.parentNode.insertBefore(k,a)
-})(window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
-
-ym(${analytics.metricsId}, "init", {
-    clickmap:true,
-    trackLinks:true,
-    accurateTrackBounce:true,
-    webvisor:true
-});
-                    `.trim(),
-        },
-      ],
-    });
-  }
-
-  if (analytics.verification) {
-    useHead({
-      meta: [
-        {
-          name: 'yandex-verification',
-          content: analytics.verification,
-        },
-      ],
-    });
-  }
-}
+import type {
+  GoogleAnalytics,
+  YandexAnalytics,
+} from '@erudit-js/core/eruditConfig/analytics';
+
+export function initAnalytics() {
+  const analytics = ERUDIT.config.analytics;
+
+  const analyticsEnabled = (() => {
+    const debugValue = ERUDIT.config.debug.analytics;
+
+    if (typeof debugValue === 'boolean') {
+      return debugValue;
+    }
+
+    return ERUDIT.config.mode === 'static' ? true : false;
+  })();
+
+  if (!analytics || !analyticsEnabled) {
+    return;
+  }
+
+  if (analytics.google) {
+    googleAnalytics(analytics.google);
+  }
+
+  if (analytics.yandex) {
+    yandexAnalytics(analytics.yandex);
+  }
+}
+
+function googleAnalytics(analytics: GoogleAnalytics) {
+  if (analytics.gtag) {
+    useHead({
+      script: [
+        {
+          key: 'google-analytics-script',
+          src: `https://www.googletagmanager.com/gtag/js?id=${analytics.gtag}`,
+          async: true,
+        },
+        {
+          key: 'google-analytics-inline-script',
+          innerHTML: `
+window.dataLayer = window.dataLayer || [];
+function gtag(){dataLayer.push(arguments);}
+gtag('js', new Date());
+gtag('config', '${analytics.gtag}');
+                    `.trim(),
+        },
+      ],
+    });
+  }
+
+  if (analytics.verification) {
+    useHead({
+      meta: [
+        {
+          name: 'google-site-verification',
+          content: analytics.verification,
+        },
+      ],
+    });
+  }
+}
+
+function yandexAnalytics(analytics: YandexAnalytics) {
+  if (analytics.metricsId) {
+    useHead({
+      script: [
+        {
+          key: 'yandex-metrica-script',
+          innerHTML: `
+(function(m,e,t,r,i,k,a){
+    m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
+    m[i].l=1*new Date();
+    k=e.createElement(t),a=e.getElementsByTagName(t)[0],
+    k.async=1,k.src=r,a.parentNode.insertBefore(k,a)
+})(window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
+
+ym(${analytics.metricsId}, "init", {
+    clickmap:true,
+    trackLinks:true,
+    accurateTrackBounce:true,
+    webvisor:true
+});
+                    `.trim(),
+        },
+      ],
+    });
+  }
+
+  if (analytics.verification) {
+    useHead({
+      meta: [
+        {
+          name: 'yandex-verification',
+          content: analytics.verification,
+        },
+      ],
+    });
+  }
+}

package/app/composables/appElements.ts

@@ -1,40 +1,40 @@
-import type { AppElement } from '@erudit-js/prose/app';
-import { appElements as _appElements } from '#erudit/prose/app';
-
-export const appElements: Record<string, AppElement> = { ..._appElements };
-
-export async function initAppElements() {
-  for (const [name, element] of Object.entries(appElements)) {
-    const languageCode = ERUDIT.config.language.current;
-    if (!element.languages[languageCode]) {
-      throw createError({
-        statusCode: 500,
-        statusMessage: `App element "${name}" does not support the current project language "${languageCode}"!`,
-      });
-    }
-  }
-}
-
-export async function getElementIcon(elementName: string) {
-  const appElement = getAppElement(elementName);
-  return await appElement.icon();
-}
-
-export async function getElementPhrase(elementName: string) {
-  const appElement = getAppElement(elementName);
-  const languageCode = ERUDIT.config.language.current;
-  return await appElement.languages[languageCode]!();
-}
-
-function getAppElement(elementName: string) {
-  const appElement = appElements[elementName];
-
-  if (!appElement) {
-    throw createError({
-      statusCode: 500,
-      statusMessage: `App element "${elementName}" not found! Make sure it is installed and configured correctly!`,
-    });
-  }
-
-  return appElement;
-}
+import type { AppElement } from '@erudit-js/prose/app';
+import { appElements as _appElements } from '#erudit/prose/app';
+
+export const appElements: Record<string, AppElement> = { ..._appElements };
+
+export async function initAppElements() {
+  for (const [name, element] of Object.entries(appElements)) {
+    const languageCode = ERUDIT.config.language.current;
+    if (!element.languages[languageCode]) {
+      throw createError({
+        statusCode: 500,
+        statusMessage: `App element "${name}" does not support the current project language "${languageCode}"!`,
+      });
+    }
+  }
+}
+
+export async function getElementIcon(elementName: string) {
+  const appElement = getAppElement(elementName);
+  return await appElement.icon();
+}
+
+export async function getElementPhrase(elementName: string) {
+  const appElement = getAppElement(elementName);
+  const languageCode = ERUDIT.config.language.current;
+  return await appElement.languages[languageCode]!();
+}
+
+function getAppElement(elementName: string) {
+  const appElement = appElements[elementName];
+
+  if (!appElement) {
+    throw createError({
+      statusCode: 500,
+      statusMessage: `App element "${elementName}" not found! Make sure it is installed and configured correctly!`,
+    });
+  }
+
+  return appElement;
+}

package/app/composables/aside.ts

@@ -1,28 +1,28 @@
-export enum AsideType {
-  Major = 'major',
-  Minor = 'minor',
-}
-
-export interface AsideState {
-  opened: AsideType | undefined;
-  scrolledUp: boolean;
-}
-
-export const asideTypeSymbol = Symbol() as InjectionKey<AsideType>;
-
-export const useAsideState = () => {
-  return useState<AsideState>('aside-state', () => ({
-    opened: undefined,
-    scrolledUp: true,
-  }));
-};
-
-export const useCanShowAsideSwitches = () => {
-  const asideState = useAsideState();
-  const { previewState } = usePreview();
-  return computed(() => {
-    const noOpenedAsides = !asideState.value.opened;
-    const scrolledUp = asideState.value.scrolledUp;
-    return noOpenedAsides && scrolledUp && !previewState.value.opened;
-  });
-};
+export enum AsideType {
+  Major = 'major',
+  Minor = 'minor',
+}
+
+export interface AsideState {
+  opened: AsideType | undefined;
+  scrolledUp: boolean;
+}
+
+export const asideTypeSymbol = Symbol() as InjectionKey<AsideType>;
+
+export const useAsideState = () => {
+  return useState<AsideState>('aside-state', () => ({
+    opened: undefined,
+    scrolledUp: true,
+  }));
+};
+
+export const useCanShowAsideSwitches = () => {
+  const asideState = useAsideState();
+  const { previewState } = usePreview();
+  return computed(() => {
+    const noOpenedAsides = !asideState.value.opened;
+    const scrolledUp = asideState.value.scrolledUp;
+    return noOpenedAsides && scrolledUp && !previewState.value.opened;
+  });
+};

package/app/composables/asideMajorPane.ts

@@ -1,135 +1,135 @@
-import { isTopicPart } from '@erudit-js/core/content/topic';
-import { isContentType } from '@erudit-js/core/content/type';
-
-export enum AsideMajorPane {
-  GlobalNav = 'global-nav',
-  BookNav = 'book-nav',
-  Pages = 'pages',
-  Search = 'search',
-  Settings = 'settings',
-  Languages = 'languages',
-}
-
-export const asideMajorPanes = Object.values(AsideMajorPane);
-
-export const useAsideMajorPane = () => {
-  return useState<AsideMajorPane>('aside-major-pane');
-};
-
-export const initAsideMajorPaneWatcher = () => {
-  const asideMajorPane = useAsideMajorPane();
-  const routePath = useRoutePath();
-  const { shortBookId } = useContentId();
-
-  asideMajorPane.value = getActivePane(
-    asideMajorPane.value,
-    routePath.value,
-    shortBookId.value,
-  );
-
-  watch([routePath, shortBookId], () => {
-    asideMajorPane.value = getActivePane(
-      asideMajorPane.value,
-      routePath.value,
-      shortBookId.value,
-    );
-  });
-};
-
-function getActivePane(
-  currentPane: AsideMajorPane,
-  path: string,
-  bookId: string | undefined,
-) {
-  if (currentPane === AsideMajorPane.Search) {
-    // The user might be clicking on search result so keep him in search pane!
-    return AsideMajorPane.Search;
-  }
-
-  if (bookId) {
-    return AsideMajorPane.BookNav;
-  }
-
-  if (path === PAGES.contributors) {
-    return AsideMajorPane.Pages;
-  }
-
-  if (path.startsWith(PAGES.contributor())) {
-    return AsideMajorPane.Pages;
-  }
-
-  if (path === PAGES.sponsors) {
-    return AsideMajorPane.Pages;
-  }
-
-  // Fallback to global nav
-  return AsideMajorPane.GlobalNav;
-}
-
-//
-// Content Nav
-//
-
-export let globalContentNav: FrontGlobalContentNav;
-
-export async function initGlobalContentNav() {
-  const nuxtApp = useNuxtApp();
-  const payloadKey = 'global-content-nav';
-  const payloadValue: FrontGlobalContentNav =
-    (nuxtApp.static.data[payloadKey] ||=
-    nuxtApp.payload.data[payloadKey] ||=
-      await $fetch('/api/aside/major/frontNav/global', {
-        responseType: 'json',
-      }));
-
-  globalContentNav = payloadValue;
-}
-
-export function useContentId() {
-  const routePath = useRoutePath();
-
-  const shortContentId = computed(() => {
-    const path = routePath.value;
-
-    const parts = path.split('/');
-    parts.pop(); // Remove trailing slash part
-    parts.shift(); // Remove leading slash part
-
-    const type = parts.shift();
-    if (isContentType(type) || isTopicPart(type)) {
-      return parts.join('/');
-    }
-
-    return undefined;
-  });
-
-  const shortBookId = computed(() => {
-    const shortId = shortContentId.value;
-
-    if (!shortId) {
-      return undefined;
-    }
-
-    let longestMatch = '';
-    for (const bookShortId of globalContentNav.bookShortIds) {
-      if (shortId.startsWith(bookShortId)) {
-        if (bookShortId.length > longestMatch.length) {
-          longestMatch = bookShortId;
-        }
-      }
-    }
-
-    return longestMatch || undefined;
-  });
-
-  return {
-    shortContentId,
-    shortBookId,
-  };
-}
-
-//
-// Pages
-//
-
-export const asideMajorPagesKey = 'aside-major-pages';
+import { isTopicPart } from '@erudit-js/core/content/topic';
+import { isContentType } from '@erudit-js/core/content/type';
+
+export enum AsideMajorPane {
+  GlobalNav = 'global-nav',
+  BookNav = 'book-nav',
+  Pages = 'pages',
+  Search = 'search',
+  Settings = 'settings',
+  Languages = 'languages',
+}
+
+export const asideMajorPanes = Object.values(AsideMajorPane);
+
+export const useAsideMajorPane = () => {
+  return useState<AsideMajorPane>('aside-major-pane');
+};
+
+export const initAsideMajorPaneWatcher = () => {
+  const asideMajorPane = useAsideMajorPane();
+  const routePath = useRoutePath();
+  const { shortBookId } = useContentId();
+
+  asideMajorPane.value = getActivePane(
+    asideMajorPane.value,
+    routePath.value,
+    shortBookId.value,
+  );
+
+  watch([routePath, shortBookId], () => {
+    asideMajorPane.value = getActivePane(
+      asideMajorPane.value,
+      routePath.value,
+      shortBookId.value,
+    );
+  });
+};
+
+function getActivePane(
+  currentPane: AsideMajorPane,
+  path: string,
+  bookId: string | undefined,
+) {
+  if (currentPane === AsideMajorPane.Search) {
+    // The user might be clicking on search result so keep him in search pane!
+    return AsideMajorPane.Search;
+  }
+
+  if (bookId) {
+    return AsideMajorPane.BookNav;
+  }
+
+  if (path === PAGES.contributors) {
+    return AsideMajorPane.Pages;
+  }
+
+  if (path.startsWith(PAGES.contributor())) {
+    return AsideMajorPane.Pages;
+  }
+
+  if (path === PAGES.sponsors) {
+    return AsideMajorPane.Pages;
+  }
+
+  // Fallback to global nav
+  return AsideMajorPane.GlobalNav;
+}
+
+//
+// Content Nav
+//
+
+export let globalContentNav: FrontGlobalContentNav;
+
+export async function initGlobalContentNav() {
+  const nuxtApp = useNuxtApp();
+  const payloadKey = 'global-content-nav';
+  const payloadValue: FrontGlobalContentNav =
+    (nuxtApp.static.data[payloadKey] ||=
+    nuxtApp.payload.data[payloadKey] ||=
+      await $fetch('/api/aside/major/frontNav/global', {
+        responseType: 'json',
+      }));
+
+  globalContentNav = payloadValue;
+}
+
+export function useContentId() {
+  const routePath = useRoutePath();
+
+  const shortContentId = computed(() => {
+    const path = routePath.value;
+
+    const parts = path.split('/');
+    parts.pop(); // Remove trailing slash part
+    parts.shift(); // Remove leading slash part
+
+    const type = parts.shift();
+    if (isContentType(type) || isTopicPart(type)) {
+      return parts.join('/');
+    }
+
+    return undefined;
+  });
+
+  const shortBookId = computed(() => {
+    const shortId = shortContentId.value;
+
+    if (!shortId) {
+      return undefined;
+    }
+
+    let longestMatch = '';
+    for (const bookShortId of globalContentNav.bookShortIds) {
+      if (shortId.startsWith(bookShortId)) {
+        if (bookShortId.length > longestMatch.length) {
+          longestMatch = bookShortId;
+        }
+      }
+    }
+
+    return longestMatch || undefined;
+  });
+
+  return {
+    shortContentId,
+    shortBookId,
+  };
+}
+
+//
+// Pages
+//
+
+export const asideMajorPagesKey = 'aside-major-pages';