@lls/vitescripts 1.1.11 → 1.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/vitescripts",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "lls vite plugins",
   "main": "src/index.mjs",
   "files": [
@@ -10,7 +10,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "vite-plugin-require-transform": "1.0.9"
+    "lightningcss": "1.21.5"
   },
   "type": "module",
   "author": "",

package/src/index.mjs

@@ -5,3 +5,4 @@ export { default as llsRequirePlugin } from './llsRequirePlugin.mjs'
 export { default as llsSideRefreshMetaPlugin } from './llsSideRefreshMetaPlugin.mjs'
 export { default as llsVitestMockPlugin } from './llsVitestMockPlugin.mjs'
 export { default as llsLadlePlugin } from './llsLadlePlugin.mjs'
+export { default as llsCssModuleMacroPlugin } from './llsCssModuleMacroPlugin.mjs'

package/src/llsCssModuleMacroPlugin.mjs

@@ -0,0 +1,20 @@
+const llsCssModuleMacro = async (cname) => {
+  const { buildThemeIsFreeMode, buildThemeIsDarkMode, buildThemeIsNotDarkMode } = await import('@lls/lls-kit')
+  const cssMacroTheme = {
+    themeIsFreeMode: buildThemeIsFreeMode(cname),
+    themeIsDarkMode: buildThemeIsDarkMode(cname),
+    themeIsNotDarkMode: buildThemeIsNotDarkMode(cname)
+  }
+  return {// TODO remove, pending https://github.com/vitejs/vite/pull/14024
+    transform(src, id) {
+      if (!id.endsWith('module.css')) {
+        return src
+      }
+      return src
+        .replace(/getTruePx\((.*?)\)/g, 'calc(var(--size-index, 1) * $1 * 1px)')
+        .replace(/(themeIsFreeMode|themeIsDarkMode|themeIsNotDarkMode)\(\)/g, (__, cap) => cssMacroTheme[cap])
+    }
+  }
+}
+
+export default llsCssModuleMacro

package/src/llsLinariaSsrCollectPlugin.mjs

@@ -4,6 +4,7 @@
  * resolveId() method that filters files to be added to css set
  * flushStyles() method that generates and return <style> tag with refreshed style
  */
+import { transform } from 'lightningcss'
 const llsLinariaSsrCollectPlugin = () => {
   const cssIds = new Set()
   let linariaPlugin
@@ -18,12 +19,12 @@ const llsLinariaSsrCollectPlugin = () => {
       if (id.includes('@linaria-cache')) { cssIds.add(id) }
     },
     flushStyles() {
-      const back = `<style id="linaria-ssr-collect-plugin">${[...cssIds].map(linariaPlugin.load).join('\n')}</style>`
-      // linaria plugin keeps cache. But we dont want to keep ids which have changed (updating a css component)
-      // css is removed from client anyway but still be accurate
-      cssIds.clear()
+      const css = [...cssIds].map(linariaPlugin.load).join('\n')
 
-      return back
+      // when hmr, id changes but not css-selector so we get two rules with the same css-selector
+      // we dedupe the rules so old rule is now stripped.
+      const { code } = transform({ code: Buffer.from(css) })
+      return `<style id="linaria-ssr-collect-plugin">${code.toString()}</style>`
     }
   }
 }

package/src/llsSideRefreshMetaPlugin.mjs

@@ -62,7 +62,7 @@ const llsSideRefreshMetaPlugin = ({ viewer: iViewer, superkit: iSuperkit, kit: i
 
   const VIRTUAL_ID = 'sideRefresh/node_modules' // specify node_modules to bypass linaria plugin parsing css file... (cant tweak exclude regex)
   const key = basename => path.join(pwd, publicDir, 'assets', basename)
-  const loads = new Map(['core.css', 'viewer.css', 'superkit.css', 'lls-kit.css', 'lls-kit-fonts.css'].map(basename => {
+  const loads = new Map(['core.css', 'viewer.css', 'superkit.css', 'lls-kit.css', 'lls-kit-fonts.css', 'lls-audio.css'].map(basename => {
     let promise = ''
     const getPromise = () => {
       if (client && !pwd.includes(basename.replace('.css', ''))) {
@@ -76,7 +76,7 @@ const llsSideRefreshMetaPlugin = ({ viewer: iViewer, superkit: iSuperkit, kit: i
     name: 'lls:sideRefresh',
     async resolveId(id, from) {
       const basename = path.basename(id)
-      if (['core.css', 'viewer.css', 'superkit.css', 'lls-kit.css', 'lls-kit-fonts.css'].includes(basename)) {
+      if (['core.css', 'viewer.css', 'superkit.css', 'lls-kit.css', 'lls-kit-fonts.css', 'lls-audio.css'].includes(basename)) {
         return VIRTUAL_ID + key(basename)
       }
       if (id.includes('@linaria-cache')) { return }