From c1feaa81b00a1515f327b5a265a1f8ffd8cf0bdd Mon Sep 17 00:00:00 2001 From: Tero Piirainen Date: Sat, 24 Feb 2024 06:09:26 +0200 Subject: [PATCH] Nuekit: Show Nuekit version in the "generator" meta tag. Closes #219 --- packages/nuekit/src/cli.js | 9 ++++++--- packages/nuekit/src/layout.js | 9 +++------ packages/nuekit/src/site.js | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/nuekit/src/cli.js b/packages/nuekit/src/cli.js index 3d8ca7ac..66a541ec 100755 --- a/packages/nuekit/src/cli.js +++ b/packages/nuekit/src/cli.js @@ -84,14 +84,17 @@ async function printHelp() { } async function printVersion() { - log(`Nue ${await getVersion()} ${colors.green('•')} ${getEngine()}`) + const v = await getVersion() + log(`Nue ${v} ${colors.green('•')} ${getEngine()}`) + return v } async function runCommand(args) { const { createKit } = await import('./nuekit.js') - const nue = await createKit(args) console.info('') - await printVersion() + + args.nuekit_version = await printVersion() + const nue = await createKit(args) // build const { cmd='serve' } = args diff --git a/packages/nuekit/src/layout.js b/packages/nuekit/src/layout.js index 333f3d09..09e625d2 100644 --- a/packages/nuekit/src/layout.js +++ b/packages/nuekit/src/layout.js @@ -3,8 +3,8 @@ import { TYPES } from './nueserver.js' export function renderHead(data, is_prod) { const { + generator = `Nue v${data.nuekit_version} (nuejs.org)`, viewport = 'width=device-width,initial-scale=1', - generator = 'Nue (nuejs.org)', charset = 'utf-8', title_template = '%s', scripts = [], @@ -25,11 +25,8 @@ export function renderHead(data, is_prod) { // meta const pushMeta = (key, val) => val && head.push(``) - if (is_prod) { - pushMeta('generator', generator) - pushMeta('date.updated', new Date().toISOString()) - } - + pushMeta('generator', generator) + pushMeta('date.updated', new Date().toISOString()) pushMeta('viewport', viewport) pushMeta('description', data.description) pushMeta('author', data.author) diff --git a/packages/nuekit/src/site.js b/packages/nuekit/src/site.js index 1620718d..8aa1e22e 100644 --- a/packages/nuekit/src/site.js +++ b/packages/nuekit/src/site.js @@ -15,7 +15,7 @@ const ENOENT = -4058 export async function createSite(args) { - const { root, is_prod, env } = args + const { root, is_prod, env, nuekit_version } = args const { is_bulk = args.cmd == 'build' } = args const cache = {} @@ -149,7 +149,7 @@ export async function createSite(args) { } self.getData = async function (pagedir) { - const data = { ...site_data } + const data = { nuekit_version, ...site_data } for (const dir of getDirs(pagedir)) { Object.assign(data, await readData(`${dir}/app.yaml`)) }