refactor(indiekit): remove application from Indiekit instance

Author: paulrobertlloyd

packages/indiekit/config/express.js

@@ -42,7 +42,7 @@ export const expressConfig = (Indiekit) => {
   // Session
   app.use(
     cookieSession({
-      name: Indiekit.application.name,
+      name: Indiekit.config.application.name,
       secret: crypto.randomUUID(),
       maxAge: 7 * 24 * 60 * 60 * 1000, // 7 days,
     }),

packages/indiekit/index.js

@@ -26,16 +26,16 @@ export const Indiekit = class {
    */
   constructor(config) {
     this.config = config;
-    this.application = this.config.application;
     this.package = package_;
-    this.publication = this.config.publication;
 
     this.collections = new Map();
     this.endpoints = new Set();
     this.installedPlugins = new Set();
+    this.locale = config.application?.locale;
     this.locales = locales;
-    this.mongodbUrl = config.application.mongodbUrl;
+    this.mongodbUrl = config.application?.mongodbUrl;
     this.postTypes = new Map();
+    this.publication = this.config.publication;
     this.stores = new Set();
     this.validationSchemas = new Map();
   }

packages/indiekit/lib/categories.js

@@ -7,7 +7,7 @@ import { getCachedResponse } from "./cache.js";
  * @returns {Promise<Array>} Array of categories
  */
 export const getCategories = async (Indiekit) => {
-  const { application, cache, publication } = Indiekit;
+  const { cache, config, publication } = Indiekit;
   const { categories } = publication;
 
   let categoryList = [];
@@ -17,7 +17,11 @@ export const getCategories = async (Indiekit) => {
   }
 
   if (categories && URL.canParse(categories)) {
-    categoryList = await getCachedResponse(cache, application.ttl, categories);
+    categoryList = await getCachedResponse(
+      cache,
+      config.application.ttl,
+      categories,
+    );
   }
 
   if (categoryList) {

packages/indiekit/lib/middleware/internationalisation.js

@@ -8,7 +8,7 @@ import i18n from "i18n";
 export const internationalisation = (Indiekit) =>
   function (request, response, next) {
     try {
-      const { application, localeCatalog } = Indiekit;
+      const { locale, localeCatalog } = Indiekit;
 
       i18n.configure({
         cookie: "locale",
@@ -22,8 +22,8 @@ export const internationalisation = (Indiekit) =>
       i18n.init(request, response);
 
       // Override system locale with configured value
-      if (application.locale) {
-        response.locals.setLocale(application.locale);
+      if (locale) {
+        response.locals.setLocale(locale);
       }
 
       next();