@lls/vitescripts 1.0.0 → 1.1.0

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@lls/vitescripts",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "lls vite plugins",
   "main": "src/index.mjs",
-  "files": ["src/"],
+  "files": [
+    "src/"
+  ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -12,5 +14,8 @@
   },
   "type": "module",
   "author": "",
-  "license": "ISC"
+  "license": "ISC",
+  "devDependencies": {
+    "@lls/eslint-config-lls": "1.1.12"
+  }
 }

package/src/index.mjs

@@ -1,7 +1,7 @@
-export { default as llsAssetsPlugin } from './llsAssetsPlugin'
-export { default as llsLinariaImportsPlugin } from './llsLinariaImportsPlugin'
-export { default as llsLinariaSsrCollectPlugin } from './llsLinariaSsrCollectPlugin'
-export { default as llsRequirePlugin } from './llsRequirePlugin'
-export { default as llsSideRefreshMetaPlugin } from './llsSideRefreshMetaPlugin'
-export { default as llsVitestMockPlugin } from './llsVitestMock'
-export { default as llsLadlePlugin } from './llsLadlePlugin'
+export { default as llsAssetsPlugin } from './llsAssetsPlugin.mjs'
+export { default as llsLinariaImportsPlugin } from './llsLinariaImportsPlugin.mjs'
+export { default as llsLinariaSsrCollectPlugin } from './llsLinariaSsrCollectPlugin.mjs'
+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'

package/src/llsAssetsPlugin.mjs

@@ -2,9 +2,7 @@ import fs from 'fs'
 import { promisify } from 'util'
 import { exec } from 'node:child_process'
 import path from 'path'
-import VitePluginRequireTransform from 'vite-plugin-require-transform'
 const execP = promisify(exec)
-const pwd = process.cwd()
 
 // https://github.com/vitejs/vite/pull/8574
 const llsAssetsPlugin = (llsRepos, publicDir = 'ladleassets') => {

package/src/llsLadlePlugin.mjs

@@ -1,11 +1,3 @@
-import fs from 'fs'
-import { promisify } from 'util'
-import { exec } from 'node:child_process'
-import path from 'path'
-import VitePluginRequireTransform from 'vite-plugin-require-transform'
-const execP = promisify(exec)
-const pwd = process.cwd()
-
 const llsLadlePlugin = (sbFolder) => ({
   name: 'lls:llsLadlePlugin',
   config(config, { command }) {
@@ -21,4 +13,4 @@ const llsLadlePlugin = (sbFolder) => ({
   }
 })
 
-export default llsLadlePlugin
+export default llsLadlePlugin

package/src/llsLinariaImportsPlugin.mjs

@@ -1,11 +1,3 @@
-import fs from 'fs'
-import { promisify } from 'util'
-import { exec } from 'node:child_process'
-import path from 'path'
-import VitePluginRequireTransform from 'vite-plugin-require-transform'
-const execP = promisify(exec)
-const pwd = process.cwd()
-
 const llsLinariaImports = () => {
   return {
     name: 'lls:linaria-imports',

package/src/llsLinariaSsrCollectPlugin.mjs

@@ -0,0 +1,19 @@
+const llsLinariaSsrCollectPlugin = () => {
+  const cssIds = new Set()
+  let linariaPlugin
+  return {
+    name: 'lls:llsLinariaSsrCollect',
+    config(config) {
+      linariaPlugin = config.plugins.find(plugin => plugin.name === 'linaria')
+    },
+    async resolveId(id, from) {
+      if (id.includes('@linaria-cache')) { cssIds.add(id) }
+    },
+
+    collectSsrStyles() {
+      return `<style>${[...cssIds].map(linariaPlugin.load).join('\n')}</style>`
+    }
+  }
+}
+
+export default llsLinariaSsrCollectPlugin

package/src/llsRequirePlugin.mjs

@@ -1,10 +1,4 @@
-import fs from 'fs'
-import { promisify } from 'util'
-import { exec } from 'node:child_process'
-import path from 'path'
 import VitePluginRequireTransform from 'vite-plugin-require-transform'
-const execP = promisify(exec)
-const pwd = process.cwd()
 
 // needed for viewer if siderefresh
 const llsSsrRequirePlugin = () => {

package/src/llsSideRefreshMetaPlugin.mjs

@@ -1,42 +1,49 @@
 import fs from 'fs'
-import { promisify } from 'util'
-import { exec } from 'node:child_process'
 import path from 'path'
-import VitePluginRequireTransform from 'vite-plugin-require-transform'
-const execP = promisify(exec)
 const pwd = process.cwd()
 
+/**
+ * Side refresh plugin for LLS clients
+ * @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 }) => {
+  if (!iViewer && !iSuperkit && !iKit && !iUtils) { return { plugin: () => false, alias: {} } }
+  console.log('sideResfresh: ', [
+    iViewer && 'viewer',
+    iSuperkit && 'superkit',
+    iKit && 'kit',
+    iUtils && 'utils']
+    .filter(Boolean))
 
-const llsSideRefreshMetaPlugin = ({
-  viewer: iViewer = process.env.WITH_VIEWER === '1',
-  superkit: iSuperkit = process.env.WITH_SUPERKIT === '1', 
-  kit: iKit = process.env.WITH_KIT === '1'
-}) => {
-  if (!iViewer && !iSuperkit && !iKit) { return { plugin: () => false, alias: {} } }
-  console.log('sideResfresh: ', [iViewer && 'viewer', iSuperkit && 'superkit', iKit && 'lls-kit'].filter(Boolean))
-  const makeResolver = dirname => {
-    const viewerPath = path.resolve(pwd, '../', dirname)  
-    const viewerDir = path.join(viewerPath, 'src/')
-    const viewerDirs = fs.readdirSync(viewerDir).map(x => x.replace(/\.[jt]sx?$/,''))
+  const makeResolver = (dirname, aliasImport) => {
+    const projectPath = path.resolve(pwd, '../', dirname)
+    const projectDir = path.join(projectPath, 'src/')
+    const projectDirs = fs.readdirSync(projectDir).map(x => x.replace(/\.[jt]sx?$/, ''))
     return {
-      async resolve (id, from) {
-        if (viewerDirs.some(dir => id.startsWith(dir))) {
+      async resolve(id, from) {
+        if (projectDirs.some(dir => id.startsWith(dir))) {
           try {
-            const resolution = await this.resolve(viewerDir + id, from, { skipSelf: true })
+            const resolution = await this.resolve(projectDir + id, from, { skipSelf: true })
             return resolution.id
           } catch (e) {
-            return
           }
         }
       },
       alias: {
-        ['@lls/'+dirname+'/lib/assets'] : path.join(viewerPath, 'public/assets'),
-        ['@lls/'+dirname+'/lib'] : path.join(viewerPath, 'src'),
-        ['@lls/'+dirname]: path.join(viewerPath, 'src/index.jsx'),
-        ['@'+dirname]: path.join(viewerPath, 'src')
+        // kit has no public/assets folder, and should fallback to next case (/lib)
+        ...(dirname === 'lls-kit'
+          ? {}
+          : { ['@lls/' + dirname + '/lib/assets']: path.join(projectPath, 'public/assets') }
+        ),
+        // handle multiple cases : @lls/superkit/lib, @lls/superkit, @superkit, or alias import
+        ['@lls/' + dirname + '/lib']: path.join(projectPath, 'src'),
+        ['@lls/' + dirname]: path.join(projectPath, 'src/index'),
+        ['@' + dirname]: path.join(projectPath, 'src'),
+        [aliasImport || '@' + dirname]: path.join(projectPath, 'src')
       },
-      shouldResolve (from) {
-        return from.includes(dirname) && !from.includes('webview')
+      shouldResolve(from) {
+        return from.includes(dirname)
       }
     }
   }
@@ -44,35 +51,37 @@ const llsSideRefreshMetaPlugin = ({
     shouldResolve: () => false,
     alias: {}
   })
-  const viewer = iViewer && makeResolver('viewer') || makeNoopResolver()
-  const superkit = iSuperkit && makeResolver('superkit') || makeNoopResolver()
-  const kit = iKit && makeResolver('lls-kit') || makeNoopResolver()
-  
+  const viewer = (iViewer && makeResolver('viewer')) || makeNoopResolver()
+  const superkit = (iSuperkit && makeResolver('superkit')) || makeNoopResolver()
+  const kit = (iKit && makeResolver('lls-kit', '@kit')) || makeNoopResolver()
+  const utils = (iUtils && makeResolver('utils', 'commons')) || makeNoopResolver()
+
   const plugin = () => ({
     name: 'lls:sideRefresh',
-    async resolveId (id, from) {
+    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') && from.includes('lls-kit')) { return 'llslinaria' }
+      if ((id.endsWith('lls-kit.css') || id.endsWith('lls-kit-fonts.css')) && from.includes('lls-kit')) { return 'llslinaria' }
+
+      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) }
       if (kit.shouldResolve(from)) { return kit.resolve.call(this, id, from) }
+      if (utils.shouldResolve(from)) { return utils.resolve.call(this, id, from) }
     },
 
-    load (id) {
+    load(id) {
       if (id === 'llslinaria') { return '' }
     }
   })
   const alias = {
     ...viewer.alias,
-    ...superkit.alias
+    ...superkit.alias,
+    ...kit.alias,
+    ...utils.alias
   }
-  plugin.ssrOptions = { noExternal: [
-    iViewer && '@lls/viewer',
-    iSuperkit && '@lls/superkit',
-    iKit && '@lls/lls-kit'
-  ].filter(Boolean) }
   return { plugin, alias }
 }
 
-export default llsSideRefreshMetaPlugin
+export default llsSideRefreshMetaPlugin

package/src/llsVitestMockPlugin.mjs

@@ -1,11 +1,3 @@
-import fs from 'fs'
-import { promisify } from 'util'
-import { exec } from 'node:child_process'
-import path from 'path'
-import VitePluginRequireTransform from 'vite-plugin-require-transform'
-const execP = promisify(exec)
-const pwd = process.cwd()
-
 const llsVitestMock = () => ({
   name: 'lls:vitestmock',
   transform(code, id) {

package/src/llsLinariaSsrCollectPlugin.js

@@ -1,27 +0,0 @@
-import fs from 'fs'
-import { promisify } from 'util'
-import { exec } from 'node:child_process'
-import path from 'path'
-import VitePluginRequireTransform from 'vite-plugin-require-transform'
-const execP = promisify(exec)
-const pwd = process.cwd()
-
-const llsLinariaSsrCollectPlugin = () => {
-  const cssIds = new Set()
-  let linariaPlugin
-  return {
-    name: 'lls:llsLinariaSsrCollect',
-    config (config) {
-      linariaPlugin = config.plugins.find(plugin => plugin.name === 'linaria')
-    },
-    async resolveId(id, from) {
-      if (id.includes('@linaria-cache')) { cssIds.add(id); return }
-    },
-
-    collectSsrStyles () {
-      return `<style>${[...cssIds].map(linariaPlugin.load).join('\n')}</style>`
-    }
-  }
-}
-
-export default llsLinariaSsrCollectPlugin