@lls/vitescripts 1.1.3 → 1.1.5

package/README.md

@@ -8,6 +8,6 @@ Purpose is to factorize vite plugin scripts
 
 ```
 npm version patch
-git push origin $(git describe --tags --abbrev=0)
+git push && git push origin $(git describe --tags --abbrev=0)
 npm publish
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/vitescripts",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "lls vite plugins",
   "main": "src/index.mjs",
   "files": [

package/src/llsLinariaImportsPlugin.mjs

@@ -1,7 +1,8 @@
-const llsLinariaImports = () => {
+const llsLinariaImports = ({ client } = {}) => {
   return {
     name: 'lls:linaria-imports',
     load(id) {
+      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')) {
@@ -9,6 +10,7 @@ const llsLinariaImports = () => {
       }
       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/lls-core/lib/assets/core.css')) { return '' }
     }
   }
 }

package/src/llsSideRefreshMetaPlugin.mjs

@@ -7,7 +7,7 @@ const pwd = process.cwd()
  * @param {*} param specifies which dependency is beign sideRefreshed
  * @returns a plugin to pass to vite and aliases for sideRefreshed packages
  */
-const llsSideRefreshMetaPlugin = ({ viewer: iViewer, superkit: iSuperkit, kit: iKit, utils: iUtils, core: iCore }) => {
+const llsSideRefreshMetaPlugin = ({ viewer: iViewer, superkit: iSuperkit, kit: iKit, utils: iUtils, core: iCore }, { client, publicDir='ladleassets' } = {}) => {
   if (!iViewer && !iSuperkit && !iKit && !iUtils && !iCore) { return { plugin: () => false, alias: {} } }
   // eslint-disable-next-line no-console
   console.log('sideResfresh: ', [
@@ -59,15 +59,20 @@ const llsSideRefreshMetaPlugin = ({ viewer: iViewer, superkit: iSuperkit, kit: i
   const utils = (iUtils && makeResolver('utils', 'commons')) || makeNoopResolver()
   const core = (iCore && makeResolver('lls-core', '@core')) || makeNoopResolver()
 
+  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 => {
+    return [VIRTUAL_ID + key(basename), client
+      ? fs.promises.readFile(key(basename))
+      : '']
+  }))
   const plugin = () => ({
     name: 'lls:sideRefresh',
     async resolveId(id, from) {
-      // viewer.css, superkit.css etc.. are part of the assets so they should not be resolved in project folder
-      if (id.endsWith('viewer.css') && from.includes('viewer')) { return 'llslinaria' }
-      if (id.endsWith('superkit.css') && from.includes('superkit')) { return 'llslinaria' }
-      if ((id.endsWith('lls-kit.css') || id.endsWith('lls-kit-fonts.css')) && from.includes('lls-kit')) { return 'llslinaria' }
-      if (id.endsWith('core.css') && from.includes('core')) { return 'llslinaria' }
-
+      const basename = path.basename(id)
+      if (['core.css', 'viewer.css', 'superkit.css', 'lls-kit.css', 'lls-kit-fonts.css'].includes(basename)) {
+        return VIRTUAL_ID + key(basename)
+      }
       if (id.includes('@linaria-cache')) { return }
       if (viewer.shouldResolve(from)) { return viewer.resolve.call(this, id, from) }
       if (superkit.shouldResolve(from)) { return superkit.resolve.call(this, id, from) }
@@ -76,8 +81,10 @@ const llsSideRefreshMetaPlugin = ({ viewer: iViewer, superkit: iSuperkit, kit: i
       if (core.shouldResolve(from)) { return core.resolve.call(this, id, from) }
     },
 
-    load(id) {
-      if (id === 'llslinaria') { return '' }
+    async load(id) {
+      if (loads.has(id)) {
+        return loads.get(id)
+      }
     }
   })
   const alias = {