@meith/web 0.20.0 → 0.21.1

package/bin/forum-web.mjs

@@ -306,10 +306,45 @@ 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)}";`
+const SOURCE_LINE = /[ \t]*@source "((?:\.\.\/)+)([^"]+)";\n?/g
+const BOARD_PACKAGES = ['node_modules', '@meith']
+
+/**
+ * MEI-131: every `@source` in globals.css names a directory of *this*
+ * repository — `themes`, `plugins`, `packages/ui/src`. Rebasing them onto the
+ * board's workspace root is right for the one in-repo consumer (boards/stock,
+ * whose FORUM_WORKSPACE_ROOT is this repo) and wrong for every scaffolded
+ * board, where none of those directories exist: the same code is installed
+ * under `node_modules/@meith` instead. Tailwind does not fail on a `@source`
+ * that resolves to nothing — it builds green and emits no utilities for
+ * anything it could not scan — so a board deployed this way served a page
+ * with no styling at all.
+ *
+ * A source whose target is really there is kept and rebased as before. One
+ * that is not is dropped in favour of a single source over the installed
+ * packages, which covers the themes, `@meith/ui` and the plugins together.
+ * Tailwind ignores `node_modules` when detecting sources itself, but honours
+ * it when named here, and follows the symlinks a pnpm install leaves — both
+ * confirmed against the version this app pins.
+ */
+export function rebaseGlobalsCssSources(css, cssDir, workspaceRoot, exists = existsSync) {
+  const rebased = []
+  let missing = false
+
+  for (const [, , tail] of css.matchAll(SOURCE_LINE)) {
+    const target = join(workspaceRoot, ...tail.split('/'))
+    if (exists(target)) rebased.push(toPosixRelative(cssDir, target))
+    else missing = true
+  }
+
+  const packages = join(workspaceRoot, ...BOARD_PACKAGES)
+  if (missing && exists(packages)) rebased.push(toPosixRelative(cssDir, packages))
+
+  let written = false
+  return css.replace(SOURCE_LINE, () => {
+    if (written) return ''
+    written = true
+    return rebased.map((source) => `@source "${source}";`).join('\n') + '\n'
   })
 }
 

package/bin/forum-web.test.ts

@@ -9,6 +9,8 @@ import { afterAll, 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'
 
+const ALL_PRESENT = () => true
+
 describe('rebaseGlobalsCssSources', () => {
   it('rebases every @source line against the real workspace root', () => {
     const css = [
@@ -25,7 +27,7 @@ describe('rebaseGlobalsCssSources', () => {
     const cssDir = '/repo/boards/stock/.meith/app/src/styles'
     const workspaceRoot = '/repo'
 
-    const rewritten = rebaseGlobalsCssSources(css, cssDir, workspaceRoot)
+    const rewritten = rebaseGlobalsCssSources(css, cssDir, workspaceRoot, ALL_PRESENT)
 
     expect(rewritten).toContain('@source "../../../../../../themes";')
     expect(rewritten).toContain('@source "../../../../../../plugins";')
@@ -49,12 +51,22 @@ describe('rebaseGlobalsCssSources', () => {
 
   it('leaves the shipped globals.css byte for byte alone at the default depth', () => {
     expect(
-      rebaseGlobalsCssSources(shippedGlobalsCss, '/board/.meith/app/src/styles', '/board'),
+      rebaseGlobalsCssSources(
+        shippedGlobalsCss,
+        '/board/.meith/app/src/styles',
+        '/board',
+        ALL_PRESENT,
+      ),
     ).toBe(shippedGlobalsCss)
   })
 
   it('rebases every shipped @source against the board root at depth zero', () => {
-    const rewritten = rebaseGlobalsCssSources(shippedGlobalsCss, '/board/src/styles', '/board')
+    const rewritten = rebaseGlobalsCssSources(
+      shippedGlobalsCss,
+      '/board/src/styles',
+      '/board',
+      ALL_PRESENT,
+    )
     const sources = [...rewritten.matchAll(/@source "([^"]+)";/g)].map((match) => match[1])
 
     expect(sources.length).toBeGreaterThan(0)
@@ -65,9 +77,83 @@ describe('rebaseGlobalsCssSources', () => {
 
   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,
-    )
+    expect(
+      rebaseGlobalsCssSources(
+        css,
+        '/repo/boards/stock/.meith/app/src/styles',
+        '/repo',
+        ALL_PRESENT,
+      ),
+    ).toBe(css)
+  })
+
+  /**
+   * MEI-131. A scaffolded board has none of the directories these sources
+   * name — the same code is installed under `node_modules/@meith` — and
+   * Tailwind emits no utilities for a source it cannot scan while still
+   * exiting 0, so the failure is a board that serves an unstyled page rather
+   * than a build that stops.
+   */
+  describe('in a board, where none of those directories exist', () => {
+    const inBoard = (path: string) => path.includes('node_modules')
+
+    function sourcesFor(cssDir: string): string[] {
+      const rewritten = rebaseGlobalsCssSources(shippedGlobalsCss, cssDir, '/board', inBoard)
+      return [...rewritten.matchAll(/@source "([^"]+)";/g)].map((match) => match[1]!)
+    }
+
+    it('scans the installed packages, which is where that code actually is', () => {
+      expect(sourcesFor('/board/src/styles')).toEqual(['../../node_modules/@meith'])
+    })
+
+    it('names no directory that is not there, at either materialization depth', () => {
+      for (const sources of [
+        sourcesFor('/board/src/styles'),
+        sourcesFor('/board/.meith/app/src/styles'),
+      ]) {
+        for (const source of sources) expect(source).toContain('node_modules/@meith')
+      }
+    })
+
+    it('leaves the rest of the stylesheet untouched', () => {
+      const rewritten = rebaseGlobalsCssSources(
+        shippedGlobalsCss,
+        '/board/src/styles',
+        '/board',
+        inBoard,
+      )
+
+      expect(rewritten).toContain('@import "tailwindcss";')
+      expect(rewritten.replace(/@source "[^"]+";\n/g, '')).toBe(
+        shippedGlobalsCss.replace(/@source "[^"]+";\n/g, ''),
+      )
+    })
+
+    it('keeps a source that is really there, so a hybrid layout loses nothing', () => {
+      const present = (path: string) =>
+        path.includes('node_modules') || path.endsWith('/board/themes')
+      const rewritten = rebaseGlobalsCssSources(
+        shippedGlobalsCss,
+        '/board/src/styles',
+        '/board',
+        present,
+      )
+      const sources = [...rewritten.matchAll(/@source "([^"]+)";/g)].map((match) => match[1])
+
+      expect(sources).toContain('../../themes')
+      expect(sources).toContain('../../node_modules/@meith')
+    })
+
+    it('adds nothing when the packages are not installed either', () => {
+      const rewritten = rebaseGlobalsCssSources(
+        shippedGlobalsCss,
+        '/board/src/styles',
+        '/board',
+        () => false,
+      )
+
+      expect(rewritten).not.toContain('@source')
+    })
   })
 })
 

package/package.json

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

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.20.0'
+export const CODE_VERSION = '0.21.1'
 
 export async function pendingUpgradeNotice(): Promise<string | null> {
   if (env.DATA_SOURCE !== 'postgres') return null

package/src/styles/globals.css

@@ -10,9 +10,12 @@
  * the build is green, the classes are simply absent, and the page renders
  * unstyled with no error anywhere to explain why.
  *
- * Paths are relative to this file, and deliberately not the `node_modules`
- * symlinks: scanning through a symlinked workspace package is inconsistent
- * between pnpm layouts.
+ * Paths are relative to this file and name this repository's own directories,
+ * which is all they can do from here. A board installed from npm has none of
+ * them — the same code arrives under `node_modules/@meith` — so
+ * `apps/community/bin/forum-web.mjs` rebases these at materialization and
+ * substitutes that directory for the ones that are not there. Editing a path
+ * here without reading `rebaseGlobalsCssSources` will only work in this repo.
  */
 @source "../../../../themes";
 @source "../../../../plugins";