@meith/web 0.16.0 → 0.17.1

package/bin/forum-web.mjs

@@ -47,7 +47,15 @@
  * through real `dependencies` entries a hoisted `node_modules` would need.
  */
 import { spawn } from 'node:child_process'
-import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import {
+  cpSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  realpathSync,
+  rmSync,
+  writeFileSync,
+} from 'node:fs'
 import { createRequire } from 'node:module'
 import { dirname, join, relative, resolve, sep } from 'node:path'
 import { fileURLToPath } from 'node:url'
@@ -92,6 +100,24 @@ function toPosixRelative(from, to) {
   return rel.startsWith('.') ? rel : `./${rel}`
 }
 
+export function rebaseGlobalsCssSources(css, cssDir, workspaceRootOverride) {
+  return css.replace(/@source "((?:\.\.\/)+)([^"]+)";/g, (_match, _dots, tail) => {
+    const target = join(workspaceRootOverride, ...tail.split('/'))
+    return `@source "${toPosixRelative(cssDir, target)}";`
+  })
+}
+
+function rewriteGlobalsCssSourcePaths() {
+  const workspaceRootOverride = process.env.FORUM_WORKSPACE_ROOT
+  if (!workspaceRootOverride) return
+
+  const cssPath = join(appDir, 'src', 'styles', 'globals.css')
+  if (!existsSync(cssPath)) return
+
+  const css = readFileSync(cssPath, 'utf8')
+  writeFileSync(cssPath, rebaseGlobalsCssSources(css, dirname(cssPath), workspaceRootOverride))
+}
+
 /**
  * A board outside this monorepo has a hoisted `node_modules` (see the module
  * comment), so plain bare-specifier resolution reaches every `@meith/*`
@@ -156,6 +182,8 @@ function materialize() {
     cpSync(source, target, { recursive: true })
   }
 
+  rewriteGlobalsCssSourcePaths()
+
   const tsconfig = {
     compilerOptions: {
       target: 'ES2022',
@@ -213,29 +241,31 @@ function run(executable, args, cwd) {
   child.on('error', (error) => fail(error.message))
 }
 
-const [, , command, ...rest] = process.argv
+if (process.argv[1] && realpathSync(process.argv[1]) === fileURLToPath(import.meta.url)) {
+  const [, , command, ...rest] = process.argv
 
-if (!['dev', 'build', 'start'].includes(command ?? '')) {
-  console.error('Usage: forum-web <dev|build|start> [next arguments]')
-  process.exit(1)
-}
+  if (!['dev', 'build', 'start'].includes(command ?? '')) {
+    console.error('Usage: forum-web <dev|build|start> [next arguments]')
+    process.exit(1)
+  }
+
+  materialize()
 
-materialize()
-
-if (command === 'start') {
-  // `next.config.mjs` sets `output: 'standalone'`, and a standalone build is
-  // run from its own traced server.js, not `next start` (see docker/Dockerfile
-  // and docker/entrypoint.sh, which run the image's board the same way). The
-  // tracing root is the workspace root (see the module comment on why
-  // `.meith/app` sits exactly two levels below it), so the standalone bundle
-  // preserves that same relative path down to the app directory.
-  const standaloneRoot = join(appDir, '.next', 'standalone')
-  const serverScript = join(standaloneRoot, relative(workspaceRoot, appDir), 'server.js')
-  if (!existsSync(serverScript)) {
-    fail(`no standalone build at ${serverScript} — run "forum-web build" first.`)
+  if (command === 'start') {
+    // `next.config.mjs` sets `output: 'standalone'`, and a standalone build is
+    // run from its own traced server.js, not `next start` (see docker/Dockerfile
+    // and docker/entrypoint.sh, which run the image's board the same way). The
+    // tracing root is the workspace root (see the module comment on why
+    // `.meith/app` sits exactly two levels below it), so the standalone bundle
+    // preserves that same relative path down to the app directory.
+    const standaloneRoot = join(appDir, '.next', 'standalone')
+    const serverScript = join(standaloneRoot, relative(workspaceRoot, appDir), 'server.js')
+    if (!existsSync(serverScript)) {
+      fail(`no standalone build at ${serverScript} — run "forum-web build" first.`)
+    }
+    run(process.execPath, [serverScript, ...rest], standaloneRoot)
+  } else {
+    const nextBin = resolveNextBin()
+    run(process.execPath, [nextBin, command, ...rest], appDir)
   }
-  run(process.execPath, [serverScript, ...rest], standaloneRoot)
-} else {
-  const nextBin = resolveNextBin()
-  run(process.execPath, [nextBin, command, ...rest], appDir)
 }

package/bin/forum-web.test.ts

@@ -0,0 +1,37 @@
+import { describe, expect, it } from 'vitest'
+
+// @ts-expect-error forum-web.mjs ships untyped, imported directly for its pure export
+import { rebaseGlobalsCssSources } from './forum-web.mjs'
+
+describe('rebaseGlobalsCssSources', () => {
+  it('rebases every @source line against the real workspace root', () => {
+    const css = [
+      '@import "tailwindcss";',
+      '',
+      '@source "../../../../themes";',
+      '@source "../../../../plugins";',
+      '@source "../../../../examples";',
+      '@source "../../../../packages/ui/src";',
+      '',
+      '.foo { color: red; }',
+    ].join('\n')
+
+    const cssDir = '/repo/boards/stock/.meith/app/src/styles'
+    const workspaceRoot = '/repo'
+
+    const rewritten = rebaseGlobalsCssSources(css, cssDir, workspaceRoot)
+
+    expect(rewritten).toContain('@source "../../../../../../themes";')
+    expect(rewritten).toContain('@source "../../../../../../plugins";')
+    expect(rewritten).toContain('@source "../../../../../../examples";')
+    expect(rewritten).toContain('@source "../../../../../../packages/ui/src";')
+    expect(rewritten).toContain('.foo { color: red; }')
+  })
+
+  it('is a no-op for a file with no @source lines', () => {
+    const css = '@import "tailwindcss";\n.foo { color: red; }\n'
+    expect(rebaseGlobalsCssSources(css, '/repo/boards/stock/.meith/app/src/styles', '/repo')).toBe(
+      css,
+    )
+  })
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/web",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "description": "The board itself: the Next.js app, and the forum-web bin that materializes it into an external board workspace.",
   "license": "LGPL-3.0-or-later",
   "repository": {
@@ -42,52 +42,52 @@
     "typescript": "7.0.2",
     "@types/react": "^19",
     "@types/react-dom": "^19",
-    "@meith/accounts": "0.16.0",
-    "@meith/antispam": "0.16.0",
-    "@meith/authorization": "0.16.0",
-    "@meith/attachments": "0.16.0",
-    "@meith/api": "0.16.0",
-    "@meith/admin": "0.16.0",
-    "@meith/avatars": "0.16.0",
-    "@meith/db": "0.16.0",
-    "@meith/drivers": "0.16.0",
-    "@meith/events": "0.16.0",
-    "@meith/drafts": "0.16.0",
-    "@meith/forums": "0.16.0",
-    "@meith/groups": "0.16.0",
-    "@meith/core": "0.16.0",
-    "@meith/demo": "0.16.0",
-    "@meith/mail": "0.16.0",
-    "@meith/install": "0.16.0",
-    "@meith/import": "0.16.0",
-    "@meith/markdown": "0.16.0",
-    "@meith/marketplace": "0.16.0",
-    "@meith/moderation": "0.16.0",
-    "@meith/notifications": "0.16.0",
-    "@meith/profile-fields": "0.16.0",
-    "@meith/plugin-kit": "0.16.0",
-    "@meith/posts": "0.16.0",
-    "@meith/polls": "0.16.0",
-    "@meith/i18n": "0.16.0",
-    "@meith/reputation": "0.16.0",
-    "@meith/search": "0.16.0",
-    "@meith/signatures": "0.16.0",
-    "@meith/settings": "0.16.0",
-    "@meith/subscriptions": "0.16.0",
-    "@meith/theme-clubhouse": "0.16.0",
-    "@meith/relations": "0.16.0",
-    "@meith/messages": "0.16.0",
-    "@meith/runtime": "0.16.0",
-    "@meith/plugin-dues": "0.16.0",
-    "@meith/theme-kit": "0.16.0",
-    "@meith/tasks": "0.16.0",
-    "@meith/theme-midnight": "0.16.0",
-    "@meith/theme-default": "0.16.0",
-    "@meith/theme-phasebook": "0.16.0",
-    "@meith/theme-raidframe": "0.16.0",
-    "@meith/threads": "0.16.0",
-    "@meith/upgrade": "0.16.0",
-    "@meith/ui": "0.16.0"
+    "@meith/accounts": "0.17.1",
+    "@meith/admin": "0.17.1",
+    "@meith/antispam": "0.17.1",
+    "@meith/api": "0.17.1",
+    "@meith/attachments": "0.17.1",
+    "@meith/authorization": "0.17.1",
+    "@meith/avatars": "0.17.1",
+    "@meith/core": "0.17.1",
+    "@meith/db": "0.17.1",
+    "@meith/demo": "0.17.1",
+    "@meith/drafts": "0.17.1",
+    "@meith/groups": "0.17.1",
+    "@meith/events": "0.17.1",
+    "@meith/drivers": "0.17.1",
+    "@meith/forums": "0.17.1",
+    "@meith/i18n": "0.17.1",
+    "@meith/install": "0.17.1",
+    "@meith/mail": "0.17.1",
+    "@meith/markdown": "0.17.1",
+    "@meith/import": "0.17.1",
+    "@meith/messages": "0.17.1",
+    "@meith/marketplace": "0.17.1",
+    "@meith/notifications": "0.17.1",
+    "@meith/moderation": "0.17.1",
+    "@meith/plugin-dues": "0.17.1",
+    "@meith/plugin-kit": "0.17.1",
+    "@meith/posts": "0.17.1",
+    "@meith/profile-fields": "0.17.1",
+    "@meith/polls": "0.17.1",
+    "@meith/relations": "0.17.1",
+    "@meith/search": "0.17.1",
+    "@meith/reputation": "0.17.1",
+    "@meith/runtime": "0.17.1",
+    "@meith/settings": "0.17.1",
+    "@meith/signatures": "0.17.1",
+    "@meith/subscriptions": "0.17.1",
+    "@meith/tasks": "0.17.1",
+    "@meith/theme-clubhouse": "0.17.1",
+    "@meith/theme-kit": "0.17.1",
+    "@meith/theme-default": "0.17.1",
+    "@meith/theme-midnight": "0.17.1",
+    "@meith/theme-phasebook": "0.17.1",
+    "@meith/theme-raidframe": "0.17.1",
+    "@meith/ui": "0.17.1",
+    "@meith/threads": "0.17.1",
+    "@meith/upgrade": "0.17.1"
   },
   "scripts": {
     "dev": "next dev",

package/src/components/admin/theme-forms.tsx

@@ -385,7 +385,7 @@ export function ThemeEditorForm({
               <fieldset
                 key={group.titleKey}
                 hidden={hydrated && matches === 0}
-                className="flex flex-col gap-2 rounded-md border border-border p-3"
+                className="flex min-w-0 flex-col gap-2 rounded-md border border-border p-3"
               >
                 <legend className="flex flex-wrap items-baseline gap-x-3 gap-y-1 px-1">
                   <span className="text-sm font-medium">{copy[group.titleKey]}</span>

package/src/components/admin/theme-palette.tsx

@@ -104,7 +104,7 @@ export function PaletteGrid({
   onSelect: (name: string) => void
 }) {
   return (
-    <div className="grid grid-cols-[repeat(auto-fill,minmax(9.5rem,1fr))] gap-2">
+    <div className="grid grid-cols-2 gap-2 @lg:grid-cols-3">
       {cells.map((cell) => (
         <Cell
           key={cell.token.name}

package/src/components/admin/user-bulk-toolbar.tsx

@@ -53,7 +53,7 @@ export function UserBulkToolbar({
       <form
         id="admin-user-bulk"
         action={action}
-        className="flex flex-col gap-3 sm:flex-row sm:items-end"
+        className="flex flex-col gap-3 sm:flex-row sm:flex-wrap sm:items-end"
       >
         <label className="flex min-w-48 flex-col gap-1 text-sm">
           <span className="font-medium">{labels.action}</span>
@@ -81,7 +81,7 @@ export function UserBulkToolbar({
         </label>
         <button
           type="button"
-          className="inline-flex h-10 items-center justify-center rounded-md border border-border px-4 text-sm font-medium"
+          className="inline-flex h-10 shrink-0 items-center justify-center whitespace-nowrap rounded-md border border-border px-4 text-sm font-medium"
           onClick={() => {
             for (const checkbox of document.querySelectorAll<HTMLInputElement>(
               '[data-admin-user-select]',
@@ -92,7 +92,9 @@ export function UserBulkToolbar({
         >
           {labels.selectPage}
         </button>
-        <SubmitButton>{labels.apply}</SubmitButton>
+        <span className="min-w-48">
+          <SubmitButton>{labels.apply}</SubmitButton>
+        </span>
       </form>
     </div>
   )

package/src/server/upgrade-notice.ts

@@ -6,7 +6,7 @@ import { planUpgrade, type UpgradeState, upgradeNotice } from '@meith/upgrade'
 
 import { activeDefinitions } from './plugin-host'
 
-export const CODE_VERSION = '0.16.0'
+export const CODE_VERSION = '0.17.1'
 
 export async function pendingUpgradeNotice(): Promise<string | null> {
   if (env.DATA_SOURCE !== 'postgres') return null