@lls/vitescripts 24.0.3-a03c8676c → 24.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/vitescripts",
-  "version": "24.0.3-a03c8676c",
+  "version": "24.0.3",
   "description": "lls vite plugins",
   "main": "src/index.mjs",
   "files": [
@@ -9,8 +9,7 @@
   "dependencies": {
     "browserslist": "4.22.1",
     "esbuild-plugin-lightningcss-modules": "0.1.1",
-    "lightningcss": "1.22.1",
-    "vite": "5.0.5"
+    "lightningcss": "1.22.1"
   },
   "type": "module",
   "author": "",

package/src/index.mjs

@@ -1,6 +1,9 @@
 export { default as llsAssetsPlugin } from './llsAssetsPlugin.mjs'
+export { default as llsLinariaImportsPlugin } from './llsLinariaImportsPlugin.mjs'
 export { default as llsCssSsrCollectPlugin } from './llsCssSsrCollectPlugin.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'
 export { default as postBuildAutoprefixerPlugin } from './postBuildAutoprefixerPlugin.mjs'
 export { default as esbuildCssModulePlugin } from './esbuildCssModulePlugin.mjs'

package/src/llsAssetsPlugin.mjs

@@ -3,6 +3,7 @@ import { promisify } from 'util'
 import { exec } from 'node:child_process'
 import path from 'path'
 const execP = promisify(exec)
+
 // https://github.com/vitejs/vite/pull/8574
 /**
  * Plugin that will copy assets from given repos to public dir of launched project
@@ -11,7 +12,6 @@ const execP = promisify(exec)
  * @returns config() method that copies assets
  * transform() method that replaces assets path to be resolved
  */
-const toLocal = pkgName => new URL(pkgName, import.meta.url).pathname
 const llsAssetsPlugin = (llsRepos, publicDir = 'ladleassets', { stripRoot = true } = {}) => {
   const publicAssetDir = path.join(publicDir, 'assets')
   const fileExists = (s) => new Promise(resolve => fs.access(s, e => resolve(!e)))
@@ -23,6 +23,38 @@ const llsAssetsPlugin = (llsRepos, publicDir = 'ladleassets', { stripRoot = true
   }
   return {
     name: 'lls:copyassets',
+    async config () {
+      await execP(`mkdir -p ${publicAssetDir}`)
+      const pnpmNameToPath = await execP('pnpm ls -r @lls/lls-drawer --json'/*'pnpm ls -r -d 0 --json'*/)
+        .then(({ stdout }) => JSON.parse(stdout))
+        .then(json => {
+          let drawer = null
+          const back = json.map(({ name, path, dependencies }) => {
+            if (dependencies?.['@lls/lls-drawer']?.path) {
+              drawer = ['@lls/lls-drawer', dependencies?.['@lls/lls-drawer']?.path + '/lib/assets/*']
+            }
+            return [name, path + '/lib/assets/*']
+          })
+          return back.concat(drawer ? [drawer] : [])
+        })
+        .then(Object.fromEntries)
+        .catch(e => {})
+      const repoArgs = await Promise.all(llsRepos.map(async repo => {
+        if (!repo.startsWith('@')) return repo
+        const pnpmPath = pnpmNameToPath[repo]
+        if (pnpmPath) return pnpmPath
+
+        const aPath = 'lib/assets/*'
+        const prefix = await fileExists(`${process.cwd()}/node_modules/${repo}`)
+          ? `${process.cwd()}/node_modules/${repo}`
+          : `${process.cwd()}/node_modules/.pnpm/${repo}`
+        return path.join(prefix, aPath)
+      }))
+      repoArgs.push('static/assets/*')
+      for (const repo of repoArgs) {
+        await execP(`cp -rf ${repo} ${publicAssetDir}`)
+      }
+    },
     ...(stripRoot && {
       transform (src, id) {
         if (

package/src/llsCssModuleMacroPlugin.mjs

@@ -39,7 +39,7 @@ const llsCssModuleMacroPlugin = async ({ themeIsFreeMode, themeIsDarkMode, theme
     return interceptSideRefreshTheme(cap, id, (cap) => {
       const back = cssMacroTheme[cap]
       if (!back) {
-        throw new Error('llsCssModuleMacroPlugin::missing definition for ' + cap+ '('+id+')')
+        throw new Error('llsCssModuleMacroPlugin::missing definition for ' + cap)
       }
       return back
     })

package/src/llsLadlePlugin.mjs

@@ -0,0 +1,16 @@
+const llsLadlePlugin = (sbFolder) => ({
+  name: 'lls:llsLadlePlugin',
+  config (config, { command }) {
+    const ladleCiEnv = /prod|tag|master|v\d/.test(process.env.LADLE_DEST) ? 'prod' : 'dev'
+    return {
+      base: command === 'serve' ? '/' : `https://build.lelivrescolaire.fr/storybook/${sbFolder}-${ladleCiEnv}/`,
+      // base: command === 'serve' ? '/' : 'http://localhost:5000/ladledist/',
+
+      build: {
+        minify: false
+      }
+    }
+  }
+})
+
+export default llsLadlePlugin

package/src/llsLinariaImportsPlugin.mjs

@@ -0,0 +1,19 @@
+const llsLinariaImports = ({ client } = {}) => {
+  return {
+    name: 'lls:linaria-imports',
+    load (id) {
+      console.log('llsLinariaImports plugin is deprecated, remove usage. Already handled by llsSideRefreshMetaPlugin')
+      if (client) return
+      if (id.endsWith('@lls/viewer/lib/assets/viewer.css')) { return '' }
+      if (id.endsWith('@lls/superkit/lib/assets/superkit.css')) { return '' }
+      if (id.endsWith('@lls/lls-kit/lib/assets/lls-kit.css') || id.endsWith('@lls/lls-kit/lib/assets/lls-kit-fonts.css')) {
+        return ''
+      }
+      if (id.endsWith('@lls/lls-drawer/lib/assets/lls-drawer.css')) { return '' }
+      if (id.endsWith('@lls/lls-code/lib/assets/lls-code.css')) { return '' }
+      if (id.endsWith('@lls/core/lib/assets/core.css')) { return '' }
+    }
+  }
+}
+
+export default llsLinariaImports

package/src/llsSideRefreshMetaPlugin.mjs

@@ -1,34 +1,23 @@
 import fs from 'fs'
 import path from 'path'
-import { searchForWorkspaceRoot } from 'vite'
 
 const toLocal = pkgName => new URL(pkgName, import.meta.url).pathname
 const pwd = toLocal('../')
 
 // sideRefreshActiveModules is of the form ['viewer', 'superkit', ...] with 'viewer' if repo launched
 // WITH_VIEWER=1 npm start
-export const makeSideRefreshThemeInterceptor = async (sideRefreshActiveModules = []) => {
-  const isMonorepo = path.basename(searchForWorkspaceRoot(pwd)) !== 'vitescripts'
-  const parentDir = path.basename(path.dirname(pwd))
+export const makeSideRefreshThemeInterceptor = async (sideRefreshActiveModules) => {
+  const parentDir = path.basename(path.dirname(process.cwd()))
   const sideRefreshThemes = {}
-  const cssThemeMap = isMonorepo
-    ? {
-      viewer: path.join(pwd, '../viewer/src/utils/css-bare.mjs'),
-      // kit: no themes for kit
-      superkit: path.join(pwd, '../superkit/src/internals/utils/css-bare.mjs'),
-      core: path.join(pwd, '../core/src/utils/css-bare.mjs'),
-      audio: path.join(pwd, '../lls-audio/src/utils/css-bare.mjs'),
-      code: path.join(pwd, '../lls-code/src/utils/css-bare.mjs')
-    }
-    : {
-      viewer: '@lls/viewer/lib/css-bare.mjs',
-      // kit: no themes for kit
-      superkit: '@lls/superkit/lib/css-bare.mjs',
-      core: '@lls/core/lib/css-bare.mjs',
-      audio: '@lls/lls-audio/lib/css-bare.mjs',
-      code: '@lls/lls-code/lib/css-bare.mjs'
-    }
-  await Promise.all((isMonorepo ? Object.keys(cssThemeMap) : sideRefreshActiveModules).map(sideRefreshName => {
+  const cssThemeMap = {
+    viewer: path.join(pwd, '../viewer/src/utils/css-bare.mjs'),
+    // kit: no themes for kit
+    superkit: path.join(pwd, '../superkit/src/internals/utils/css-bare.mjs'),
+    core: path.join(pwd, '../core/src/utils/css-bare.mjs'),
+    audio: path.join(pwd, '../lls-audio/src/utils/css-bare.mjs'),
+    code: path.join(pwd, '../lls-code/src/utils/css-bare.mjs')
+  }
+  await Promise.all(Object.keys(cssThemeMap).map(sideRefreshName => {
     if (!cssThemeMap[sideRefreshName]) {
       throw new Error('invalid side refresh name' + sideRefreshName)
     }
@@ -39,7 +28,7 @@ export const makeSideRefreshThemeInterceptor = async (sideRefreshActiveModules =
       sideRefreshThemes[`${sideRefreshName}_light`] = mod.themeIsNotDarkMode
     })
   }))
-  const folderRegex = new RegExp([...new Set(Object.keys(sideRefreshThemes).map(capName => parentDir + '/' + capName.split('_')[0]))].join('|'))
+  const folderRegex = new RegExp(Object.keys(sideRefreshThemes).map(capName => parentDir + '/' + capName.split('_')[0]).join('|'))
   return (cap, id, next) => {
     const match = id.match(folderRegex)?.[0]
     cap = match ? `${match.split('/')[1]}_${cap}` : cap
@@ -53,8 +42,7 @@ export const makeSideRefreshThemeInterceptor = async (sideRefreshActiveModules =
  * @returns a plugin to pass to vite and aliases for sideRefreshed packages
  */
 const llsSideRefreshMetaPlugin = ({ audio: iAudio, viewer: iViewer, superkit: iSuperkit, kit: iKit, utils: iUtils, core: iCore, code: iCode }, { client, publicDir = 'ladleassets' } = {}) => {
-  const isMonorepo = path.basename(searchForWorkspaceRoot(pwd)) !== 'vitescripts'
-  // TODO: imports from clientImports does not work for now
+  const pwd = process.cwd()
   let activeModules = []
   if ([iViewer, iSuperkit, iKit, iUtils, iCore, iCode, iAudio].some(x => x)) {
     activeModules = [
@@ -119,7 +107,7 @@ const llsSideRefreshMetaPlugin = ({ audio: iAudio, viewer: iViewer, superkit: iS
     let promise = ''
     const getPromise = () => {
       if (client && !pwd.includes(basename.replace('.css', ''))) {
-        promise = isMonorepo ? Promise.resolve('') : fs.promises.readFile(key(basename), 'utf8')
+        promise = fs.promises.readFile(key(basename), 'utf8')
       }
       return promise
     }

package/src/llsVitestMockPlugin.mjs

@@ -0,0 +1,14 @@
+const llsVitestMock = () => ({
+  name: 'lls:vitestmock',
+  transform (code, id) {
+    if (id.endsWith('@lls/viewer/lib/index.js')) {
+      return code
+        .replace(/require\("(@lls\/lls-audio|@lls\/lls-code|@yorab\/react-paint)"\)/g, (__, cap) => {
+          if (cap === '@lls/lls-audio') return '{__esModule: true, default: () => null, Recorder: () => null}'
+          return '{__esModule: true, default: () => null}'
+        })
+    }
+  }
+})
+
+export default llsVitestMock