@live-change/frontend-base 0.9.59 → 0.9.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/frontend-base",
-  "version": "0.9.59",
+  "version": "0.9.61",
   "scripts": {
     "memDev": "node server/start.js memDev --enableSessions --initScript ./init.js --templatePath ../../base-frontend/index.html",
     "localDevInit": "rm tmp.db; lcli localDev --enableSessions --initScript ./init.js",
@@ -35,22 +35,23 @@
     "@lezer/rust": "=1.0.1",
     "@lezer/sass": "=1.0.3",
     "@lezer/xml": "=1.0.2",
-    "@live-change/cli": "^0.9.59",
-    "@live-change/dao": "^0.9.59",
-    "@live-change/dao-message": "^0.9.59",
-    "@live-change/dao-sockjs": "^0.9.59",
-    "@live-change/dao-vue3": "^0.9.59",
-    "@live-change/dao-websocket": "^0.9.59",
-    "@live-change/email-service": "^0.9.59",
-    "@live-change/password-authentication-service": "^0.9.59",
-    "@live-change/secret-code-service": "^0.9.59",
-    "@live-change/secret-link-service": "^0.9.59",
-    "@live-change/security-frontend": "^0.9.59",
-    "@live-change/session-service": "^0.9.59",
-    "@live-change/user-service": "^0.9.59",
-    "@live-change/vue3-components": "^0.9.59",
-    "@live-change/vue3-ssr": "^0.9.59",
-    "@primevue/themes": "^4.2.5",
+    "@live-change/cli": "^0.9.61",
+    "@live-change/dao": "^0.9.61",
+    "@live-change/dao-message": "^0.9.61",
+    "@live-change/dao-sockjs": "^0.9.61",
+    "@live-change/dao-vue3": "^0.9.61",
+    "@live-change/dao-websocket": "^0.9.61",
+    "@live-change/email-service": "^0.9.61",
+    "@live-change/password-authentication-service": "^0.9.61",
+    "@live-change/secret-code-service": "^0.9.61",
+    "@live-change/secret-link-service": "^0.9.61",
+    "@live-change/security-frontend": "^0.9.61",
+    "@live-change/session-service": "^0.9.61",
+    "@live-change/user-service": "^0.9.61",
+    "@live-change/vue3-components": "^0.9.61",
+    "@live-change/vue3-ssr": "^0.9.61",
+    "@primevue/themes": "^4.3.3",
+    "@tailwindcss/node": "4.1.0",
     "@tailwindcss/vite": "4.1.0",
     "@unhead/ssr": "^1.6.2",
     "@vitejs/plugin-vue": "^5.0.5",
@@ -87,6 +88,7 @@
     "serve-static": "^1.16.2",
     "tailwindcss": "4.1.0",
     "tailwindcss-primeui": "^0.4.0",
+    "tsx": "4.19.2",
     "typescript": "5.4.5",
     "unhead": "^1.9.13",
     "unplugin-vue-components": "^0.27.0",
@@ -105,7 +107,7 @@
     "vue3-scroll-border": "0.1.6"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "^0.9.59",
+    "@live-change/codeceptjs-helper": "^0.9.61",
     "codeceptjs": "^3.6.10",
     "generate-password": "1.7.1",
     "playwright": "1.49.1",
@@ -119,5 +121,5 @@
   "author": "Michał Łaszczewski <michal@laszczewski.pl>",
   "license": "BSD-3-Clause",
   "description": "",
-  "gitHead": "c01ecf021b44868514a94ae5eb79c13d6bb37034"
+  "gitHead": "f750f29f912b9a76b5ffa2bdf5c46954cc7e7a67"
 }

package/tailwindcss-vite.ts

@@ -0,0 +1,349 @@
+import { compile, env, Features, Instrumentation, normalizePath, optimize } from '@tailwindcss/node'
+import { clearRequireCache } from '@tailwindcss/node/require-cache'
+import { Scanner, SourceEntry } from '@tailwindcss/oxide'
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import type { Plugin, ResolvedConfig, ViteDevServer } from 'vite'
+
+const DEBUG = env.DEBUG
+const SPECIAL_QUERY_RE = /[?&](?:worker|sharedworker|raw|url)\b/
+const COMMON_JS_PROXY_RE = /\?commonjs-proxy/
+const INLINE_STYLE_ID_RE = /[?&]index\=\d+\.css$/
+
+interface TailwindViteConfig {
+  sources: SourceEntry[]
+}
+
+export default function tailwindcss(pluginConfig: TailwindViteConfig): Plugin[] {
+  let servers: ViteDevServer[] = []
+  let config: ResolvedConfig | null = null
+
+  let isSSR = false
+  let minify = false
+
+  let roots: DefaultMap<string, Root> = new DefaultMap((id) => {
+    let cssResolver = config!.createResolver({
+      ...config!.resolve,
+      extensions: ['.css'],
+      mainFields: ['style'],
+      conditions: ['style', 'development|production'],
+      tryIndex: false,
+      preferRelative: true,
+    })
+    function customCssResolver(id: string, base: string) {
+      return cssResolver(id, base, true, isSSR)
+    }
+
+    let jsResolver = config!.createResolver(config!.resolve)
+    function customJsResolver(id: string, base: string) {
+      return jsResolver(id, base, true, isSSR)
+    }
+    return new Root(id, config!.root, customCssResolver, customJsResolver)
+  })
+
+  return [
+    {
+      // Step 1: Scan source files for candidates
+      name: '@tailwindcss/vite:scan',
+      enforce: 'pre',
+
+      configureServer(server) {
+        servers.push(server)
+      },
+
+      async configResolved(_config) {
+        config = _config
+        minify = config.build.cssMinify !== false
+        isSSR = config.build.ssr !== false && config.build.ssr !== undefined
+      },
+    },
+
+    {
+      // Step 2 (serve mode): Generate CSS
+      name: '@tailwindcss/vite:generate:serve',
+      apply: 'serve',
+      enforce: 'pre',
+
+      async transform(src, id, options) {
+        if (!isPotentialCssRootFile(id)) return
+
+        using I = new Instrumentation()
+        DEBUG && I.start('[@tailwindcss/vite] Generate CSS (serve)')
+
+        let root = roots.get(id)
+
+        let generated = await root.generate(src, (file) => this.addWatchFile(file), I, pluginConfig)
+        if (!generated) {
+          roots.delete(id)
+          return src
+        }
+
+        DEBUG && I.end('[@tailwindcss/vite] Generate CSS (serve)')
+        return { code: generated }
+      },
+    },
+
+    {
+      // Step 2 (full build): Generate CSS
+      name: '@tailwindcss/vite:generate:build',
+      apply: 'build',
+      enforce: 'pre',
+
+      async transform(src, id) {
+        if (!isPotentialCssRootFile(id)) return
+
+        using I = new Instrumentation()
+        DEBUG && I.start('[@tailwindcss/vite] Generate CSS (build)')
+
+        let root = roots.get(id)
+
+        let generated = await root.generate(src, (file) => this.addWatchFile(file), I, pluginConfig)  
+        if (!generated) {
+          roots.delete(id)
+          return src
+        }
+        DEBUG && I.end('[@tailwindcss/vite] Generate CSS (build)')
+
+        DEBUG && I.start('[@tailwindcss/vite] Optimize CSS')
+        generated = optimize(generated, { minify })
+        DEBUG && I.end('[@tailwindcss/vite] Optimize CSS')
+
+        return { code: generated }
+      },
+    },
+  ] satisfies Plugin[]
+}
+
+function getExtension(id: string) {
+  let [filename] = id.split('?', 2)
+  return path.extname(filename).slice(1)
+}
+
+function isPotentialCssRootFile(id: string) {
+  if (id.includes('/.vite/')) return
+  let extension = getExtension(id)
+  let isCssFile =
+    (extension === 'css' || id.includes('&lang.css') || id.match(INLINE_STYLE_ID_RE)) &&
+    // Don't intercept special static asset resources
+    !SPECIAL_QUERY_RE.test(id) &&
+    !COMMON_JS_PROXY_RE.test(id)
+  return isCssFile
+}
+
+function idToPath(id: string) {
+  return path.resolve(id.replace(/\?.*$/, ''))
+}
+
+/**
+ * A Map that can generate default values for keys that don't exist.
+ * Generated default values are added to the map to avoid recomputation.
+ */
+class DefaultMap<K, V> extends Map<K, V> {
+  constructor(private factory: (key: K, self: DefaultMap<K, V>) => V) {
+    super()
+  }
+
+  get(key: K): V {
+    let value = super.get(key)
+
+    if (value === undefined) {
+      value = this.factory(key, this)
+      this.set(key, value)
+    }
+
+    return value
+  }
+}
+
+class Root {
+  // The lazily-initialized Tailwind compiler components. These are persisted
+  // throughout rebuilds but will be re-initialized if the rebuild strategy is
+  // set to `full`.
+  private compiler?: Awaited<ReturnType<typeof compile>>
+
+  // The lazily-initialized Tailwind scanner.
+  private scanner?: Scanner
+
+  // List of all candidates that were being returned by the root scanner during
+  // the lifetime of the root.
+  private candidates: Set<string> = new Set<string>()
+
+  // List of all build dependencies (e.g. imported  stylesheets or plugins) and
+  // their last modification timestamp. If no mtime can be found, we need to
+  // assume the file has always changed.
+  private buildDependencies = new Map<string, number | null>()
+
+  constructor(
+    private id: string,
+    private base: string,
+
+    private customCssResolver: (id: string, base: string) => Promise<string | false | undefined>,
+    private customJsResolver: (id: string, base: string) => Promise<string | false | undefined>,
+  ) {}
+
+  // Generate the CSS for the root file. This can return false if the file is
+  // not considered a Tailwind root. When this happened, the root can be GCed.
+  public async generate(
+    content: string,
+    _addWatchFile: (file: string) => void,
+    I: Instrumentation,
+    pluginConfig: TailwindViteConfig
+  ): Promise<string | false> {
+    let inputPath = idToPath(this.id)
+
+    function addWatchFile(file: string) {
+      // Don't watch the input file since it's already a dependency anc causes
+      // issues with some setups (e.g. Qwik).
+      if (file === inputPath) {
+        return
+      }
+
+      // Scanning `.svg` file containing a `#` or `?` in the path will
+      // crash Vite. We work around this for now by ignoring updates to them.
+      //
+      // https://github.com/tailwindlabs/tailwindcss/issues/16877
+      if (/[\#\?].*\.svg$/.test(file)) {
+        return
+      }
+      _addWatchFile(file)
+    }
+
+    let requiresBuildPromise = this.requiresBuild()
+    let inputBase = path.dirname(path.resolve(inputPath))
+
+    if (!this.compiler || !this.scanner || (await requiresBuildPromise)) {
+      clearRequireCache(Array.from(this.buildDependencies.keys()))
+      this.buildDependencies.clear()
+
+      this.addBuildDependency(idToPath(inputPath))
+
+      DEBUG && I.start('Setup compiler')
+      let addBuildDependenciesPromises: Promise<void>[] = []
+      this.compiler = await compile(content, {
+        base: inputBase,
+        shouldRewriteUrls: true,
+        onDependency: (path) => {
+          addWatchFile(path)
+          addBuildDependenciesPromises.push(this.addBuildDependency(path))
+        },
+
+        customCssResolver: this.customCssResolver,
+        customJsResolver: this.customJsResolver,
+      })
+      await Promise.all(addBuildDependenciesPromises)
+      DEBUG && I.end('Setup compiler')
+
+      DEBUG && I.start('Setup scanner')
+
+      let sources = (() => {
+        // Disable auto source detection
+        if (this.compiler.root === 'none') {
+          return []
+        }
+
+        // No root specified, auto-detect based on the `**/*` pattern
+        if (this.compiler.root === null) {
+          return [{ base: this.base, pattern: '**/*', negated: false }]
+        }
+
+        // Use the specified root
+        return [{ ...this.compiler.root, negated: false }]
+      })().concat(this.compiler.sources).concat(pluginConfig.sources)
+
+      this.scanner = new Scanner({ sources })
+      DEBUG && I.end('Setup scanner')
+    } else {
+      for (let buildDependency of this.buildDependencies.keys()) {
+        addWatchFile(buildDependency)
+      }
+    }
+
+    if (
+      !(
+        this.compiler.features &
+        (Features.AtApply | Features.JsPluginCompat | Features.ThemeFunction | Features.Utilities)
+      )
+    ) {
+      return false
+    }
+
+    if (this.compiler.features & Features.Utilities) {
+      // This should not be here, but right now the Vite plugin is setup where we
+      // setup a new scanner and compiler every time we request the CSS file
+      // (regardless whether it actually changed or not).
+      DEBUG && I.start('Scan for candidates')
+      for (let candidate of this.scanner.scan()) {
+        this.candidates.add(candidate)
+      }
+      DEBUG && I.end('Scan for candidates')
+    }
+
+    if (this.compiler.features & Features.Utilities) {
+      // Watch individual files found via custom `@source` paths
+      for (let file of this.scanner.files) {
+        addWatchFile(file)
+      }
+
+      // Watch globs found via custom `@source` paths
+      for (let glob of this.scanner.globs) {
+        if (glob.pattern[0] === '!') continue
+
+        let relative = path.relative(this.base, glob.base)
+        if (relative[0] !== '.') {
+          relative = './' + relative
+        }
+        // Ensure relative is a posix style path since we will merge it with the
+        // glob.
+        relative = normalizePath(relative)
+
+        addWatchFile(path.posix.join(relative, glob.pattern))
+
+        let root = this.compiler.root
+
+        if (root !== 'none' && root !== null) {
+          let basePath = normalizePath(path.resolve(root.base, root.pattern))
+
+          let isDir = await fs.stat(basePath).then(
+            (stats) => stats.isDirectory(),
+            () => false,
+          )
+
+          if (!isDir) {
+            throw new Error(
+              `The path given to \`source(…)\` must be a directory but got \`source(${basePath})\` instead.`,
+            )
+          }
+        }
+      }
+    }
+
+    DEBUG && I.start('Build CSS')
+    let result = this.compiler.build([...this.candidates])
+    DEBUG && I.end('Build CSS')
+
+    return result
+  }
+
+  private async addBuildDependency(path: string) {
+    let mtime: number | null = null
+    try {
+      mtime = (await fs.stat(path)).mtimeMs
+    } catch {}
+    this.buildDependencies.set(path, mtime)
+  }
+
+  private async requiresBuild(): Promise<boolean> {
+    for (let [path, mtime] of this.buildDependencies) {
+      if (mtime === null) return true
+      try {
+        let stat = await fs.stat(path)
+        if (stat.mtimeMs > mtime) {
+          return true
+        }
+      } catch {
+        return true
+      }
+    }
+    return false
+  }
+}

package/vite-config.js

@@ -5,7 +5,9 @@ import { findFreePorts } from 'find-free-ports'
 import path from 'path'
 import vuePlugin from '@vitejs/plugin-vue'
 
-import tailwindcss from '@tailwindcss/vite'
+//import tailwindcss from '@tailwindcss/vite'
+import { tsImport } from 'tsx/esm/api'
+const tailwindcss = (await tsImport('./tailwindcss-vite.ts', import.meta.url)).default
 
 import Markdown from 'unplugin-vue-markdown/vite'
 import MarkdownItAnchor from 'markdown-it-anchor'
@@ -83,7 +85,40 @@ export default async ({ command, mode, version }, options = {
           }
         },
       }),
-      tailwindcss(),
+      tailwindcss({
+        sources: [
+          '@live-change/frontend-base/src',
+          '@live-change/access-control-frontend/src',
+          '@live-change/content-frontend/src',
+          '@live-change/blog-frontend/src',
+          '@live-change/image-frontend/src',
+          '@live-change/security-frontend/src',
+          '@live-change/upload-frontend/src',
+          '@live-change/url-frontend/src',
+          '@live-change/user-frontend/src',
+          '@live-change/wysiwyg-frontend/src',
+          '@live-change/flow-frontend/src',
+          '@live-change/task-frontend/src',
+          '@live-change/balance-frontend/src',
+          '@live-change/billing-frontend/src',
+          '@live-change/survey-frontend/src',
+          '@live-change/peer-connection-frontend/src',
+          '@live-change/video-call-frontend/src',
+          '@live-change/frontend-auto-form/src',
+          '@live-change/db-web/src',          
+        ].map(p => {
+          try {
+            return {
+              base: path.dirname(fileURLToPath(import.meta.resolve(p))),
+              pattern: '**/*.{vue,css,scss,sass,less,styl,md}',
+              negated: false
+            }
+          } catch (e) {
+            // ignore import errors
+            return null
+          }  
+        }).filter(Boolean)
+      }),
       Markdown({
         headEnabled: true,
         markdownItOptions: {