lvyjs 0.2.16 → 0.2.18

package/README.md

@@ -1,5 +1,5 @@
-# LVY
+# LYVJS
 
-一款为 node 构建的开发工具
+一款为 NodeJS 构建的开发工具
 
-https://github.com/lemonade-lab/lvyjs
+https://lvyjs.dev

package/bin/index.js

@@ -3,23 +3,15 @@
 import { fork } from 'child_process'
 import { join, dirname, relative } from 'path'
 import { fileURLToPath } from 'node:url'
-import { existsSync } from 'fs'
+import { createRequire } from 'node:module'
 const args = [...process.argv.slice(2)]
 const currentFilePath = fileURLToPath(import.meta.url)
 const currentDirPath = dirname(currentFilePath)
 const pkgFilr = join(currentDirPath, '../package.json')
 const jsFile = join(currentDirPath, '../lib/index.js')
 const jsdir = relative(process.cwd(), jsFile)
-let tsxDir = join(currentDirPath, '../../tsx/dist/cli.mjs')
-if (!existsSync(tsxDir)) {
-  tsxDir = join(currentDirPath, '../node_modules/tsx/dist/cli.mjs')
-}
-if (!existsSync(tsxDir)) {
-  tsxDir = join(process.cwd(), 'node_modules/tsx/dist/cli.mjs')
-}
-if (!existsSync(tsxDir)) {
-  new Error('tsx not found')
-}
+const require = createRequire(import.meta.url)
+const tsxDir = require.resolve('tsx/cli')
 if (args.includes('build')) {
   const argsx = args.filter(arg => arg !== 'build')
   const msg = fork(tsxDir, [jsdir, '--lvy-build', ...argsx], {

package/lib/content.js

@@ -7,9 +7,10 @@ import { convertPath } from './config.js';
  * @param {string} relativePath 相对路径
  */
 const generateModuleContent = (relativePath) => {
+    const baseURL = decodeURIComponent(relativePath);
     const contents = [
         `const reg = ['win32'].includes(process.platform) ? /^file:\\/\\/\\// : /^file:\\/\\// ;`,
-        `const fileUrl = import.meta.resolve('${convertPath(relativePath)}').replace(reg, '');`,
+        `const fileUrl = import.meta.resolve('${convertPath(baseURL)}').replace(reg, '');`,
         'export default fileUrl;'
     ].join('\n');
     return contents;
@@ -27,20 +28,21 @@ const chache = {};
  * @param fileUrl
  * @returns
  */
-const generateCSSModuleContent = (pathURL) => {
-    const fileName = getRandomName(pathURL);
-    const outputFileURL = convertPath(join(process.cwd(), 'node_modules', 'lvyjs', 'assets', `${fileName}.css`));
-    if (!chache[pathURL]) {
+const generateCSSModuleContent = (relativePath) => {
+    const inputURL = decodeURIComponent(relativePath);
+    const fileName = getRandomName(inputURL);
+    const outputURL = convertPath(join(process.cwd(), 'node_modules', 'lvyjs', 'assets', `${fileName}.css`));
+    if (!chache[inputURL]) {
         global.lvyWorkerProt.postMessage({
             type: 'CSS_MODULE_GENERATED',
             payload: {
-                from: pathURL,
-                to: outputFileURL
+                from: inputURL,
+                to: outputURL
             }
         });
-        chache[pathURL] = true;
+        chache[inputURL] = true;
     }
-    return `export default "${outputFileURL}";`;
+    return `export default "${outputURL}";`;
 };
 
 export { generateCSSModuleContent, generateModuleContent };

package/lib/loader.d.ts

@@ -4,6 +4,7 @@ declare global {
     var lvyWorkerProt: MessagePort;
 }
 /**
+ * 初始化时
  * @param param0
  */
 declare function initialize({ port, lvyConfig }: {
@@ -11,6 +12,7 @@ declare function initialize({ port, lvyConfig }: {
     lvyConfig: any;
 }): Promise<void>;
 /**
+ * 启动时
  * @param specifier
  * @param context
  * @param nextResolve
@@ -18,6 +20,7 @@ declare function initialize({ port, lvyConfig }: {
  */
 declare function resolve(specifier: any, context: any, nextResolve: any): Promise<any>;
 /**
+ * 加载脚本时
  * @param url
  * @param context
  * @param defaultLoad

package/lib/loader.js

@@ -1,10 +1,12 @@
 import { generateModuleContent, generateCSSModuleContent } from './content.js';
 import { isWin32, convertPath } from './config.js';
 
+// 用来消去 路径中的 file:///
 const reg = isWin32() ? /^file:\/\/\// : /^file:\/\//;
 const baseURL = isWin32() ? 'file:///' : 'file://';
 const nodeReg = /(node_modules|node_|node:)/;
 /**
+ * 初始化时
  * @param param0
  */
 async function initialize({ port, lvyConfig }) {
@@ -12,6 +14,7 @@ async function initialize({ port, lvyConfig }) {
     global.lvyWorkerProt = port;
 }
 /**
+ * 启动时
  * @param specifier
  * @param context
  * @param nextResolve
@@ -35,6 +38,7 @@ async function resolve(specifier, context, nextResolve) {
     return nextResolve(specifier, context);
 }
 /**
+ * 加载脚本时
  * @param url
  * @param context
  * @param defaultLoad
@@ -52,7 +56,9 @@ const load = (url, context, nextLoad) => {
     }
     // 匹配静态资源
     if (global.lvyConfig.assets?.filter && global.lvyConfig.assets?.filter.test(baseURL)) {
-        const code = generateModuleContent(baseURL.replace(reg, ''));
+        // 消除 file:///
+        const url = baseURL.replace(reg, '');
+        const code = generateModuleContent(url);
         return nextLoad(baseURL, {
             format: 'module',
             source: code
@@ -62,7 +68,9 @@ const load = (url, context, nextLoad) => {
         global.lvyConfig.styles = {};
     }
     if (global.lvyConfig.styles?.filter && global.lvyConfig.styles?.filter.test(baseURL)) {
-        const code = generateCSSModuleContent(baseURL.replace(reg, ''));
+        // 消除 file:///
+        const url = baseURL.replace(reg, '');
+        const code = generateCSSModuleContent(url);
         return nextLoad(baseURL, {
             format: 'module',
             source: code

package/lib/main.js

@@ -12,7 +12,9 @@ port1.on('message', msg => {
     if (msg.type == 'CSS_MODULE_GENERATED') {
         const { from, to } = msg.payload;
         if (!cache[from]) {
-            postCSS(from, to);
+            const formPath = decodeURIComponent(from);
+            postCSS(formPath, to);
+            // postCSS(from, to)
             cache[from] = true;
         }
     }

package/lib/rullup/plugins/funcCode.js

@@ -0,0 +1,10 @@
+const createFuncCode = (code) => {
+    return `
+    (() => {
+        ${code}  
+        return css;  
+    })()
+`;
+};
+
+export { createFuncCode };

package/lib/rullup/plugins/loader-css.js

@@ -1,6 +1,7 @@
 import { createFilter } from '@rollup/pluginutils';
 import { basename, resolve, dirname } from 'node:path';
 import { stylesRegExp } from '../../config.js';
+import { createFuncCode } from './funcCode.js';
 
 /**
  *
@@ -25,16 +26,11 @@ const rollupStylesCSSImport = (options) => {
             if (!filter(id))
                 return null;
             // 删除 export default css
-            const codex = code.replace(/(export|default css)/g, '');
+            const curCode = code.replace(/(export|default css)/g, '');
             // 使用 eval 执行代码并获取默认导出的值
-            const evalCode = `
-    (() => {
-        ${codex}  
-        return css;  
-    })()
-`;
+            const funcCode = createFuncCode(curCode);
             // 得到css变量的值
-            const csscode = eval(evalCode);
+            const csscode = eval(funcCode);
             // 确保最后生产的css文件
             const refeId = this.emitFile({
                 // 属于静态资源

package/lib/store.d.ts

@@ -85,4 +85,5 @@ declare const getOptions: () => Options;
  */
 declare const defineConfig: (optoins?: Options) => Options | undefined;
 
-export { type Options, type PluginsCallBack, type PluginsOptions, type PluginsValue, defineConfig, getOptions, initConfig };
+export { defineConfig, getOptions, initConfig };
+export type { Options, PluginsCallBack, PluginsOptions, PluginsValue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lvyjs",
-  "version": "0.2.16",
+  "version": "0.2.18",
   "description": "tsx compile script",
   "author": "lemonade",
   "license": "MIT",