refactor(indiekit): provide entire package to app locals

getindiekit · Nov 26, 2024 · 73de2f1 · 73de2f1
1 parent c38c945
commit 73de2f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/packages/indiekit/lib/middleware/locals.js b/packages/indiekit/lib/middleware/locals.js
@@ -38,9 +38,8 @@ export const locals = (Indiekit) =>
       // Application locale
       application.localeUsed = response.locals.getLocale();
 
-      // Application meta
-      application.repository = Indiekit.package.repository;
-      application.version = Indiekit.package.version;
+      // Application package
+      application.package = Indiekit.package;
 
       // Application URL
       application.url = application.url || getUrl(request);

diff --git a/packages/indiekit/lib/utils.js b/packages/indiekit/lib/utils.js
@@ -51,7 +51,7 @@ export const getServiceWorker = async (application) => {
     const filePath = require.resolve("@indiekit/frontend/lib/serviceworker.js");
     let serviceworker = await readFile(filePath, { encoding: "utf8" });
     serviceworker = serviceworker
-      .replace("APP_VERSION", application.version)
+      .replace("APP_VERSION", application.package.version)
       .replace("APP_CSS_PATH", application.cssPath)
       .replace("APP_JS_PATH", application.jsPath);
     return serviceworker;

diff --git a/packages/indiekit/views/status.njk b/packages/indiekit/views/status.njk
@@ -35,8 +35,8 @@
 {% endmacro -%}
 
 {%- set versionHtml %}
-  <a href="{{ application.repository.url | replace(".git", "") + "/releases/tag/v" + application.version }}">
-    {{ "v" + application.version }}
+  <a href="{{ application.package.repository.url | replace(".git", "") + "/releases/tag/v" + application.package.version }}">
+    {{- "v" + application.package.version -}}
   </a>
 {% endset -%}