arcway 0.4.15 → 0.4.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.4.15",
+  "version": "0.4.17",
   "description": "A convention-based framework for building modular monoliths with strict domain boundaries.",
   "license": "MIT",
   "type": "module",

package/server/bin/commands/start.js

@@ -1,4 +1,3 @@
-import boot from '#server/boot.js';
 import { loadEnvFiles } from '#server/env.js';
 
 async function startServer(mode) {
@@ -11,6 +10,11 @@ async function startServer(mode) {
   // dotenv never overrides already-set variables.
   loadEnvFiles(process.cwd(), mode);
 
+  // Importing the application boot graph loads React-backed page modules.
+  // Production mode must be established first so React and react-dom/server
+  // select matching builds. A static import here can cache development React
+  // before `arcway start` gets a chance to set NODE_ENV.
+  const { default: boot } = await import('#server/boot.js');
   const app = await boot({ mode, rootDir: process.cwd() });
   app.logger.info('Arcway framework ready', { mode, port: app.port });
 

package/server/config/modules/pages.js

@@ -72,6 +72,13 @@ function resolve(config, { rootDir } = {}) {
       ...(hmr ? { hmr } : {}),
     },
   };
+  if (
+    pages.language != null &&
+    (typeof pages.language !== 'string' ||
+      !/^[A-Za-z]{2,3}(?:-[A-Za-z0-9]{2,8})*$/.test(pages.language))
+  ) {
+    throw new TypeError('Invalid config: pages.language must be a valid language tag');
+  }
   if (pages.rewrite != null) {
     if (
       typeof pages.rewrite !== 'object' ||

package/server/mail/index.js

@@ -95,13 +95,9 @@ function registerSendJob(driver, queue, throughput) {
       handler: async () => {
         if (!queue) return;
         const items = await queue.pop(MAIL_TOPIC, 10);
-        const ids = [];
         for (const item of items) {
           await driver.send(item.data);
-          ids.push(item.id);
-        }
-        if (ids.length > 0) {
-          await queue.remove(ids);
+          await queue.remove([item.id]);
         }
       },
       throughput,

package/server/pages/handler.js

@@ -35,6 +35,7 @@ function createPagesHandler(options) {
   let manifestPath = path.join(outDir, 'pages-manifest.json');
   const sessionConfig = options.session;
   const appContext = options.appContext ?? null;
+  const documentLanguage = options.documentLanguage;
   const rewrite = options.rewrite ?? null;
   const mode = options.mode ?? 'production';
   const devMode = mode === 'development';
@@ -141,6 +142,7 @@ function createPagesHandler(options) {
         manifest,
         cacheVersion,
         projectReact,
+        documentLanguage,
       );
     } else if (!res.headersSent) {
       res.writeHead(500, getHtmlHeaders());
@@ -225,6 +227,7 @@ function createPagesHandler(options) {
           componentCache,
           cacheVersion,
           projectReact,
+          documentLanguage,
         );
         return true;
       }
@@ -315,6 +318,7 @@ function createPagesHandler(options) {
           status: loaderResult?.status,
           headers: loaderResult?.headers,
         },
+        documentLanguage,
       );
     } catch (err) {
       await renderRuntimeError(err, res);
@@ -333,6 +337,7 @@ function createPagesHandler(options) {
           manifest,
           cacheVersion,
           projectReact,
+          documentLanguage,
         );
       } else {
         res.writeHead(404, getHtmlHeaders());
@@ -363,6 +368,7 @@ async function renderDevBuildError(
   componentCache,
   cacheVersion,
   projectReact,
+  documentLanguage,
 ) {
   const errorMessage = err instanceof Error ? err.stack || err.message : String(err);
   if (manifest.errorBundle && !res.headersSent) {
@@ -376,6 +382,7 @@ async function renderDevBuildError(
       manifest,
       cacheVersion,
       projectReact,
+      documentLanguage,
     );
     return;
   }

package/server/pages/pages-router.js

@@ -55,6 +55,7 @@ class PagesRouter {
       ...(isDev ? { outDir } : { resolveOutDir }),
       session: config.session,
       appContext: this.appContext,
+      documentLanguage: config.pages?.language,
       rewrite: config.pages?.rewrite,
       mode,
       viteDev,

package/server/pages/ssr.js

@@ -130,10 +130,18 @@ window.__vite_plugin_react_preamble_installed__ = true;
     `<script type="module" src="${route.clientBundle}"></script>`,
   ].join('\n');
 }
-function buildHtmlShell({ headHtml, fontPreloadTags, cssLinkTag, bodysuffix }) {
+function buildHtmlShell({
+  headHtml,
+  fontPreloadTags,
+  cssLinkTag,
+  bodysuffix,
+  documentLanguage,
+}) {
+  const languageAttribute = documentLanguage ? ` lang="${documentLanguage}"` : '';
+
   return {
     head: `<!DOCTYPE html>
-<html>
+<html${languageAttribute}>
 <head>
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
@@ -165,6 +173,7 @@ async function renderPage(
   onRenderFailure = null,
   pageProps = params,
   response = {},
+  documentLanguage,
 ) {
   const { createElement, renderToPipeableStream } = react;
   const bundlePath = path.join(outDir, route.serverBundle);
@@ -243,6 +252,7 @@ async function renderPage(
 ${hmrTag}
 ${scriptTags}
 ${liveReloadTag}`,
+        documentLanguage,
       });
       res.write(shell.head);
       pass = new PassThrough();
@@ -310,6 +320,7 @@ async function renderErrorPage(
   manifest,
   cacheVersion,
   react,
+  documentLanguage,
 ) {
   const { createElement, renderToPipeableStream } = react;
   const fullPath = path.join(outDir, bundlePath);
@@ -349,7 +360,12 @@ async function renderErrorPage(
       if (res.headersSent || closed) return;
       const headHtml = renderHeadToString(headData);
       res.writeHead(statusCode, getHtmlHeaders());
-      const shell = buildHtmlShell({ headHtml, fontPreloadTags, cssLinkTag });
+      const shell = buildHtmlShell({
+        headHtml,
+        fontPreloadTags,
+        cssLinkTag,
+        documentLanguage,
+      });
       res.write(shell.head);
       pass = new PassThrough();
       pass.on('data', (chunk) => {