Add hot key to reload content layer

packages/astro/src/content/sync.ts → packages/astro/src/content/content-layer.ts

@@ -56,7 +56,6 @@ export class ContentLayer {
 				ctx.status === 'loaded' &&
 				ctx.config.digest !== this.#lastConfigDigest
 			) {
-				this.#lastConfigDigest = ctx.config.digest;
 				this.sync();
 			}
 		});
@@ -128,9 +127,10 @@ export class ContentLayer {
 			logger.debug('Content config not loaded, skipping sync');
 			return;
 		}
+		const { digest: currentConfigDigest } = contentConfig.config;
+		this.#lastConfigDigest = currentConfigDigest;
 
 		const previousConfigDigest = await this.#store.metaStore().get('config-digest');
-		const { digest: currentConfigDigest } = contentConfig.config;
 		if (currentConfigDigest && previousConfigDigest !== currentConfigDigest) {
 			logger.info('Content config changed, clearing cache');
 			this.#store.clearAll();

packages/astro/src/core/dev/dev.ts

@@ -7,9 +7,9 @@ import { gt, major, minor, patch } from 'semver';
 import type * as vite from 'vite';
 import type { AstroInlineConfig } from '../../@types/astro.js';
 import { DATA_STORE_FILE } from '../../content/consts.js';
+import { globalContentLayer } from '../../content/content-layer.js';
 import { DataStore, globalDataStore } from '../../content/data-store.js';
 import { attachContentServerListeners } from '../../content/index.js';
-import { globalContentLayer } from '../../content/sync.js';
 import { globalContentConfigObserver } from '../../content/utils.js';
 import { telemetry } from '../../events/index.js';
 import * as msg from '../messages.js';

packages/astro/src/core/dev/restart.ts

@@ -2,6 +2,7 @@ import type nodeFs from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import * as vite from 'vite';
 import type { AstroInlineConfig, AstroSettings } from '../../@types/astro.js';
+import { globalContentLayer } from '../../content/content-layer.js';
 import { eventCliSession, telemetry } from '../../events/index.js';
 import { createNodeLogger, createSettings, resolveConfig } from '../config/index.js';
 import { collectErrorMetadata } from '../errors/dev/utils.js';
@@ -169,11 +170,19 @@ export async function createContainerWithAutomaticRestart({
 		// Ignore the `forceOptimize` parameter for now.
 		restart.container.viteServer.restart = () => handleServerRestart();
 
-		// Set up shortcuts, overriding Vite's default shortcuts so it works for Astro
+		// Set up shortcuts
 		restart.container.viteServer.bindCLIShortcuts({
 			customShortcuts: [
-				// Disable Vite's builtin "r" (restart server), "u" (print server urls) and "c" (clear console) shortcuts
-				{ key: 'r', description: '' },
+				{
+					key: 'r',
+					description: 'reload content layer',
+					action: () => {
+						if (globalContentLayer.initialized()) {
+							globalContentLayer.get().sync();
+						}
+					},
+				},
+				// Disable default Vite shortcuts that don't work well with Astro
 				{ key: 'u', description: '' },
 				{ key: 'c', description: '' },
 			],

packages/astro/src/core/messages.ts

@@ -99,6 +99,8 @@ export function serverStart({
 		...localUrlMessages,
 		...networkUrlMessages,
 		'',
+		`${dim('Press')} ${bold('h + enter')} ${dim('to')} ${bold('show hot keys')}`,
+		''
 	];
 	return messages.filter((msg) => typeof msg === 'string').join('\n');
 }

packages/astro/src/core/sync/index.ts

@@ -6,9 +6,9 @@ import { type HMRPayload, createServer } from 'vite';
 import type { AstroConfig, AstroInlineConfig, AstroSettings } from '../../@types/astro.js';
 import { getPackage } from '../../cli/install-package.js';
 import { DATA_STORE_FILE } from '../../content/consts.js';
+import { globalContentLayer } from '../../content/content-layer.js';
 import { DataStore, globalDataStore } from '../../content/data-store.js';
 import { createContentTypesGenerator } from '../../content/index.js';
-import { globalContentLayer } from '../../content/sync.js';
 import { globalContentConfigObserver } from '../../content/utils.js';
 import { syncAstroEnv } from '../../env/sync.js';
 import { telemetry } from '../../events/index.js';