@jungvonmatt/cssg-plugin-hugo 1.4.9 → 1.4.12

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.12](https://github.com/jungvonmatt/contentful-ssg/compare/v1.4.11...v1.4.12) (2022-02-23)
+
+
+### Bug Fixes
+
+* fix syntax error ([53ac989](https://github.com/jungvonmatt/contentful-ssg/commit/53ac989b9ba92b5c8ccd8759c77b17cf6dcebd22))
+
+
+
+
+
+## [1.4.11](https://github.com/jungvonmatt/contentful-ssg/compare/v1.4.10...v1.4.11) (2022-02-23)
+
+
+### Bug Fixes
+
+* **hugo-menu:** makes menu roots configurable ([ac10c2f](https://github.com/jungvonmatt/contentful-ssg/commit/ac10c2f73646016d3ac69fd96f8a2ebca2247043))
+
+
+
+
+
+## [1.4.10](https://github.com/jungvonmatt/contentful-ssg/compare/v1.4.9...v1.4.10) (2022-02-22)
+
+
+### Bug Fixes
+
+* **hugo-locales:** Lowercase ISO locale codes to work with hugo ([088cb0b](https://github.com/jungvonmatt/contentful-ssg/commit/088cb0b871e3d93fb75641a5c031e61011838cda))
+
+
+
+
+
 ## [1.4.9](https://github.com/jungvonmatt/contentful-ssg/compare/v1.4.8...v1.4.9) (2022-02-11)
 
 **Note:** Version bump only for package @jungvonmatt/cssg-plugin-hugo

package/index.js

@@ -26,11 +26,19 @@ const defaultOptions = {
   fieldIdMenuEntries: 'entries',
   fieldIdMenuHide: 'hide_in_menu',
   fieldIdMenuPos: 'menu_pos',
+  menuRootTypes: ['page', 'folder', 'x-folder'],
   typeConfig: {
     [TYPE_CONTENT]: ['page'],
   },
 };
 
+// Currently Hugo language internals lowercase language codes,
+// which can cause conflicts with settings like defaultContentLanguage
+// which are not lowercased
+// See https://github.com/gohugoio/hugo/issues/7344
+// https://gohugo.io/content-management/multilingual/#configure-languages
+const hugoLocaleCode = (locale) => locale.code.toLowerCase();
+
 export default (args) => {
   const options = { ...defaultOptions, ...(args || {}) };
 
@@ -88,7 +96,7 @@ export default (args) => {
       const node = entryMap.get(id);
       const contentType = node?.sys?.contentType?.sys?.id ?? '';
       const pageId = node?.fields?.link_to_entry?.sys?.id;
-      if (contentType === 'page') {
+      if (options.menuRootTypes.includes(contentType)) {
         return node;
       }
 
@@ -215,15 +223,25 @@ export default (args) => {
       // Write config yaml according to locale settings in contentful
       if (options.languageConfig) {
         const rootDir = runtimeContext?.config?.rootDir ?? process.cwd();
+        const mainConfigFile = path.join(rootDir, 'config/_default/config.yaml');
+        const mainConfig = converter.yaml.parse(await readFile(mainConfigFile));
+        const defaultLocale = locales.find((locale) => locale.default);
+        if (defaultLocale && mainConfig.languageCode) {
+          mainConfig.languageCode = hugoLocaleCode(defaultLocale);
+        }
+
+        if (defaultLocale && mainConfig.defaultContentLanguage) {
+          mainConfig.defaultContentLanguage = hugoLocaleCode(defaultLocale);
+        }
+
+        await outputFile(mainConfigFile, converter.yaml.stringify(mainConfig));
+
         const dst = path.join(rootDir, 'config/_default/languages.yaml');
         const languageConfig = Object.fromEntries(
           locales.map((locale) => {
             const { code, name: languageName } = locale;
-            // Currently Hugo language internals lowercase language codes,
-            // which can cause conflicts with settings like defaultContentLanguage
-            // which are not lowercased
-            // https://github.com/gohugoio/hugo/issues/7344
-            const languageCode = code.toLowerCase();
+
+            const languageCode = code;
             const [languageNameShort] = languageCode.split('-');
 
             const localeConfig = {
@@ -234,9 +252,9 @@ export default (args) => {
             };
 
             return [
-              code,
+              hugoLocaleCode(locale),
               options.translationStrategy === 'directory'
-                ? { contentDir: `content/${languageCode}`, ...localeConfig }
+                ? { contentDir: `content/${hugoLocaleCode(locale)}`, ...localeConfig }
                 : localeConfig,
             ];
           })
@@ -260,8 +278,8 @@ export default (args) => {
         })
       );
 
-      const i18n = Object.fromEntries(locales.map((locale) => [locale.code, {}]));
-      const menus = Object.fromEntries(locales.map((locale) => [locale.code, {}]));
+      const i18n = Object.fromEntries(locales.map((locale) => [hugoLocaleCode(locale), {}]));
+      const menus = Object.fromEntries(locales.map((locale) => [hugoLocaleCode(locale), {}]));
 
       return { ...runtimeContext, helper, localized: enhancedLocalized, i18n, menus };
     },
@@ -289,12 +307,12 @@ export default (args) => {
       const type = getEntryType(transformContext);
 
       if (type === TYPE_CONTENT) {
-        return options.translationStrategy === STRATEGY_FILENAME ? '' : locale.code;
+        return options.translationStrategy === STRATEGY_FILENAME ? '' : hugoLocaleCode(locale);
       }
 
       return options.translationStrategy === STRATEGY_FILENAME
         ? path.join('../data', contentTypeId)
-        : path.join('../data', locale.code, contentTypeId);
+        : path.join('../data', hugoLocaleCode(locale), contentTypeId);
     },
 
     /**
@@ -323,13 +341,13 @@ export default (args) => {
 
       if (homeId && entry?.sys?.id === homeId) {
         return options.translationStrategy === STRATEGY_FILENAME
-          ? `/_index.${locale.code}.md`
+          ? `/_index.${hugoLocaleCode(locale)}.md`
           : `/_index.md`;
       }
 
       if (contentTypeId === options.typeIdSettings) {
         return options.translationStrategy === STRATEGY_FILENAME
-          ? `../settings.${locale.code}.yaml`
+          ? `../settings.${hugoLocaleCode(locale)}.yaml`
           : '../settings.yaml';
       }
 
@@ -340,7 +358,7 @@ export default (args) => {
           entryMap: collectEntryMap,
         });
         return options.translationStrategy === STRATEGY_FILENAME
-          ? path.join(...(slugs || []).filter((v) => v), `_index.${locale.code}.md`)
+          ? path.join(...(slugs || []).filter((v) => v), `_index.${hugoLocaleCode(locale)}.md`)
           : path.join(...(slugs || []).filter((v) => v), `_index.md`);
       }
 
@@ -354,7 +372,9 @@ export default (args) => {
         return options.translationStrategy === STRATEGY_FILENAME
           ? path.join(
               ...(slugs || []).filter((v) => v),
-              `${collectEntry?.fields?.[options.fieldIdSlug] ?? 'unknown'}.${locale.code}.md`
+              `${collectEntry?.fields?.[options.fieldIdSlug] ?? 'unknown'}.${hugoLocaleCode(
+                locale
+              )}.md`
             )
           : path.join(
               ...(slugs || []).filter((v) => v),
@@ -363,7 +383,7 @@ export default (args) => {
       }
 
       return options.translationStrategy === STRATEGY_FILENAME
-        ? `${id}.${locale.code}.yaml`
+        ? `${id}.${hugoLocaleCode(locale)}.yaml`
         : `${id}.yaml`;
     },
 
@@ -378,7 +398,7 @@ export default (args) => {
         const { key, other, one } = content;
         const translations = one ? { one, other } : { other };
 
-        runtimeContext.i18n[locale.code][key] = translations;
+        runtimeContext.i18n[hugoLocaleCode(locale)][key] = translations;
 
         // Dont't write i-18n objects to the content folder
         return undefined;
@@ -390,7 +410,7 @@ export default (args) => {
         const { name = 'main' } = entry.fields;
         const menu = await buildMenu(transformContext, options.menuDepth);
 
-        runtimeContext.menus[locale.code][name] = menu;
+        runtimeContext.menus[hugoLocaleCode(locale)][name] = menu;
       }
 
       if (type === TYPE_CONTENT) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jungvonmatt/cssg-plugin-hugo",
-  "version": "1.4.9",
+  "version": "1.4.12",
   "description": "",
   "main": "index.js",
   "typings": "./index.d.ts",
@@ -30,5 +30,5 @@
     "fs-extra": "^10.0.0",
     "micromatch": "^4.0.4"
   },
-  "gitHead": "17ccdcf1aedc0eea54740aa71279e5bd1cb77699"
+  "gitHead": "c8949e1d9836e6b1b9310c54e85c66da9e0169f9"
 }