lvyjs 0.2.20 → 0.2.22

package/bin/index.js

@@ -9,13 +9,23 @@ const currentFilePath = fileURLToPath(import.meta.url)
 const currentDirPath = dirname(currentFilePath)
 const pkgFilr = join(currentDirPath, '../package.json')
 const jsFile = join(currentDirPath, '../lib/index.js')
+const loaderFile = join(currentDirPath, '../lib/main.js')
 const jsdir = relative(process.cwd(), jsFile)
 const require = createRequire(import.meta.url)
-const tsxDir = require.resolve('tsx/cli')
+// const tsxDir = require.resolve('tsx/cli')
+// 构建时，使用 rollup
 if (args.includes('build')) {
   const argsx = args.filter(arg => arg !== 'build')
-  const msg = fork(tsxDir, [jsdir, '--lvy-build', ...argsx], {
+  const msg = fork(jsdir, ['--lvy-build', ...argsx], {
     stdio: 'inherit',
+    // 自己挂 execArgv
+    execArgv: [
+      ...process.execArgv,
+      '--require',
+      require.resolve('tsx/preflight'),
+      '--import',
+      require.resolve('tsx')
+    ],
     env: Object.assign({}, process.env, {
       PKG_DIR: pkgFilr
     }),
@@ -25,6 +35,7 @@ if (args.includes('build')) {
     console.error(msg.error)
     process.exit()
   }
+  // 运行时，使用 tsx
 } else if (args.includes('dev')) {
   const argsx = args.filter(arg => arg !== 'dev')
   const argv = [jsdir, '--lvy-dev']
@@ -32,8 +43,18 @@ if (args.includes('build')) {
     argv.unshift('--clear-screen=false')
     argv.unshift('watch')
   }
-  const msg = fork(tsxDir, [...argv, ...argsx], {
+  const msg = fork(jsdir, [...argv, ...argsx], {
     stdio: 'inherit',
+    // 自己挂 execArgv
+    execArgv: [
+      ...process.execArgv,
+      '--require',
+      require.resolve('tsx/preflight'),
+      '--import',
+      require.resolve('tsx'),
+      '--import',
+      loaderFile
+    ],
     env: Object.assign({}, process.env, {
       PKG_DIR: pkgFilr
     }),

package/lib/config.js

@@ -7,6 +7,9 @@ const stylesRegExp = /\.(css|scss|less|sass|less)$/;
  */
 const createAlias = val => {
     const alias = {};
+    if (!Array.isArray(val.entries)) {
+        return alias;
+    }
     // 遍历 entries 数组
     val.entries.forEach(entry => {
         alias[entry.find] = entry.replacement;

package/lib/loader.js

@@ -24,7 +24,7 @@ async function resolve(specifier, context, nextResolve) {
     if (!global.lvyConfig?.alias) {
         global.lvyConfig.alias = {};
     }
-    if (global.lvyConfig.alias?.entries) {
+    if (Array.isArray(global.lvyConfig.alias?.entries)) {
         for (const { find, replacement } of global.lvyConfig.alias?.entries) {
             if (specifier.startsWith(find)) {
                 const parentURL = `${baseURL}${convertPath(specifier.replace(find, replacement))}`;

package/lib/new-loader/content.js

@@ -0,0 +1,26 @@
+import crypto from 'node:crypto';
+import { convertPath } from '../config.js';
+
+/**
+ * 生成静态资源模块内容
+ * @param relativePath 相对路径
+ */
+const generateModuleContent = (relativePath) => {
+    const baseURL = decodeURIComponent(relativePath);
+    const contents = [
+        `const reg = ['win32'].includes(process.platform) ? /^file:\\/\\/\\// : /^file:\\/\\// ;`,
+        `const fileUrl = import.meta.resolve('${convertPath(baseURL)}').replace(reg, '');`,
+        'export default fileUrl;'
+    ].join('\n');
+    return contents;
+};
+/**
+ * 生成随机文件名
+ */
+const getRandomName = (str) => {
+    const hash = crypto.createHash('md5');
+    hash.update(str);
+    return hash.digest('hex');
+};
+
+export { generateModuleContent, getRandomName };

package/lib/new-loader/postcss.js

@@ -0,0 +1,202 @@
+import fs from 'fs';
+import postcss from 'postcss';
+import { createRequire } from 'module';
+import { join, resolve, dirname, isAbsolute } from 'path';
+import { convertPath, createAlias } from '../config.js';
+
+const require = createRequire(import.meta.url);
+const config = {
+    css: null,
+    sass: null,
+    less: null,
+    scss: null
+};
+function LessAliasPlugin(aliases) {
+    return {
+        install: function (less, pluginManager) {
+            const AliasFileManager = new less.FileManager();
+            AliasFileManager.loadFile = function (filename, currentDirectory, options, environment) {
+                // 替换路径中的别名
+                for (const alias in aliases) {
+                    if (filename.startsWith(alias)) {
+                        filename = filename.replace(alias, aliases[alias]);
+                        break;
+                    }
+                }
+                const fullPath = isAbsolute(filename) ? filename : resolve(currentDirectory, filename);
+                return less.FileManager.prototype.loadFile.call(this, fullPath, currentDirectory, options, environment);
+            };
+            // 注册自定义文件管理器
+            pluginManager.addFileManager(AliasFileManager);
+        },
+        minVersion: [3, 0] // 支持的最低 LESS 版本
+    };
+}
+/**
+ *
+ * @param configPath
+ * @param typing
+ * @returns
+ */
+const loadPostcssConfig = (configPath, typing) => {
+    if (config[typing]) {
+        return {
+            plugins: config[typing]
+        };
+    }
+    const plugins = [];
+    let aliasEntries = [];
+    if (typeof global.lvyConfig?.alias != 'boolean') {
+        aliasEntries = global.lvyConfig.alias?.entries || [];
+    }
+    const includeKeys = ['postcss-import', 'postcss-url', 'autoprefixer'];
+    //
+    if (aliasEntries.length > 0) {
+        // 创建 postcss-import 插件并配置别名解析
+        try {
+            plugins.push(require('postcss-import')({
+                resolve: (id, basedir) => {
+                    // 检查别名
+                    for (const entry of aliasEntries) {
+                        if (id.startsWith(entry.find)) {
+                            const aliasedPath = id.replace(entry.find, entry.replacement);
+                            return convertPath(resolve(basedir, aliasedPath));
+                        }
+                    }
+                    return id; // 默认返回原始路径
+                }
+            }));
+        }
+        catch (err) {
+            console.error(err);
+        }
+        try {
+            plugins.push(require('postcss-url')({
+                url: asset => {
+                    // 使用 resolve 逻辑处理 URL
+                    for (const entry of aliasEntries) {
+                        if (asset.url.startsWith(entry.find)) {
+                            const aliasedPath = asset.url.replace(entry.find, entry.replacement);
+                            return convertPath(aliasedPath);
+                        }
+                    }
+                    return convertPath(asset.url);
+                }
+            }));
+        }
+        catch (err) {
+            console.error(err);
+        }
+    }
+    for (let i = 2; i < includeKeys.length; i++) {
+        plugins.push(require(includeKeys[i])({}));
+    }
+    try {
+        if (fs.existsSync(configPath)) {
+            const cfg = require(configPath);
+            // 添加其他插件
+            if (!Array.isArray(cfg.plugins)) {
+                const keys = Object.keys(cfg.plugins);
+                for (const key of keys) {
+                    try {
+                        if (includeKeys.includes(key))
+                            continue;
+                        const pluginConfig = cfg.plugins[key];
+                        const plugin = require(key);
+                        if (typeof plugin === 'function') {
+                            plugins.push(plugin(pluginConfig));
+                        }
+                        else {
+                            throw new Error(`插件 ${key} 不是有效的 PostCSS 插件函数`);
+                        }
+                    }
+                    catch (err) {
+                        console.error(`加载 PostCSS 插件 ${key} 失败:`, err);
+                    }
+                }
+            }
+            else {
+                plugins.push(...cfg.plugins);
+            }
+        }
+    }
+    catch (err) {
+        console.error('加载 PostCSS 配置失败:', err);
+    }
+    config[typing] = plugins;
+    return {
+        plugins: config[typing]
+    };
+};
+/**
+ *
+ * @param inputPath
+ * @param outputPath
+ * @returns
+ */
+const postCSS = (inputPath, outputPath) => {
+    const configPath = join(process.cwd(), 'postcss.config.cjs');
+    let typing = 'css';
+    let parser = undefined;
+    if (/\.sass$/.test(inputPath)) {
+        typing = 'sass';
+    }
+    else if (/\.less$/.test(inputPath)) {
+        typing = 'less';
+    }
+    else if (/\.scss$/.test(inputPath)) {
+        typing = 'scss';
+    }
+    const postcssConfig = loadPostcssConfig(configPath, 'css');
+    if (!postcssConfig)
+        return;
+    const readAndProcessCSS = async () => {
+        let css = '';
+        if (typing === 'less') {
+            const less = require('less');
+            const lessResult = await less.render(fs.readFileSync(inputPath, 'utf-8'), {
+                filename: inputPath,
+                plugins: [LessAliasPlugin(createAlias(global.lvyConfig?.alias))] // 使用插件
+            });
+            css = lessResult.css;
+        }
+        else if (typing === 'sass' || typing === 'scss') {
+            const sass = require('sass');
+            const sassResult = sass.renderSync({ file: inputPath });
+            css = sassResult.css.toString();
+        }
+        else {
+            css = fs.readFileSync(inputPath, 'utf-8');
+        }
+        fs.mkdirSync(dirname(outputPath), { recursive: true });
+        const result = await postcss(postcssConfig.plugins).process(css, {
+            parser: parser,
+            from: inputPath,
+            to: outputPath
+        });
+        fs.writeFileSync(outputPath, result.css);
+        if (result.warnings().length) {
+            result.warnings().forEach(warn => {
+                console.warn(warn.toString());
+            });
+        }
+        const dependencies = result.messages
+            .filter(msg => msg.type === 'dependency')
+            .map(msg => msg.file);
+        for (const dep of dependencies) {
+            fs.watch(dep, eventType => {
+                if (eventType === 'change') {
+                    readAndProcessCSS();
+                }
+            });
+        }
+    };
+    readAndProcessCSS();
+    fs.watch(inputPath, eventType => {
+        if (eventType === 'change') {
+            readAndProcessCSS();
+        }
+    });
+};
+
+export { LessAliasPlugin as default, postCSS };

package/lib/rullup/index.js

@@ -54,6 +54,9 @@ const buildJS = async (inputs) => {
         plugins.push(rollupStylesCSSImport(global.lvyConfig.styles));
     }
     plugins.push(json());
+    const OutputOptions = global.lvyConfig?.build?.OutputOptions ?? [];
+    // 获取 dir 的值
+    const outputDir = OutputOptions['dir'] || 'lib';
     if (typeof global.lvyConfig.build != 'boolean') {
         //
         for (const key in global.lvyConfig.build) {
@@ -64,7 +67,11 @@ const buildJS = async (inputs) => {
                 plugins.push(commonjs(global.lvyConfig.build[key]));
             }
             else if (key == 'typescript' && !global.lvyConfig.build['@rollup/plugin-typescript']) {
-                plugins.push(typescript(global.lvyConfig.build[key]));
+                const config = global.lvyConfig.build[key] || {};
+                if (config.declarationDir === undefined) {
+                    config.declarationDir = outputDir;
+                }
+                plugins.push(typescript(config));
             }
             else if (key == 'OutputOptions') {
                 continue;
@@ -103,9 +110,6 @@ const buildJS = async (inputs) => {
         ...RollupOptions,
         plugins: Array.isArray(pl) ? [...plugins, ...pl] : pl
     });
-    const OutputOptions = global.lvyConfig?.build?.OutputOptions ?? [];
-    // 获取 dir 的值
-    const outputDir = OutputOptions['dir'] || 'lib';
     // 写入输出文件
     const { output } = await bundle.write({
         dir: outputDir,

package/lib/start.js

@@ -15,9 +15,6 @@ const onDev = async () => {
             await apps.push(plugin(global.lvyConfig));
         }
     }
-    // 执行loader
-    await import('./main.js');
-    //
     for (const app of apps) {
         if (!app) {
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lvyjs",
-  "version": "0.2.20",
+  "version": "0.2.22",
   "description": "tsx compile script",
   "author": "lemonade",
   "license": "MIT",
@@ -29,26 +29,31 @@
   "exports": {
     ".": {
       "import": "./lib/index.js",
-      "types": "./lib/index.d.ts"
+      "types": "./lib/index.d.ts",
+      "require": "./lib/index.js"
     },
     "./loader": {
       "import": "./lib/loader.js",
-      "types": "./lib/loader.d.ts"
+      "types": "./lib/loader.d.ts",
+      "require": "./lib/loader.js"
     },
     "./register": {
       "import": "./lib/main.js",
-      "types": "./lib/main.d.ts"
+      "types": "./lib/main.d.ts",
+      "require": "./lib/main.js"
     },
     "./env": {
       "types": "./env.d.ts"
     },
     "./tsconfig.json": {
       "import": "./tsconfig.json",
-      "types": "./tsconfig.json"
+      "types": "./tsconfig.json",
+      "require": "./tsconfig.json"
     },
     "./tsconfig": {
       "import": "./tsconfig.json",
-      "types": "./tsconfig.json"
+      "types": "./tsconfig.json",
+      "require": "./tsconfig.json"
     }
   },
   "bin": {