lvyjs 0.2.24 → 0.3.0-alpha.0

package/bin/index.js

@@ -3,61 +3,147 @@
 import { fork } from 'child_process'
 import { join, dirname, relative } from 'path'
 import { fileURLToPath } from 'node:url'
-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 loaderFile = join(currentDirPath, '../lib/main.js')
-const jsdir = relative(process.cwd(), jsFile)
-const require = createRequire(import.meta.url)
-// const tsxDir = require.resolve('tsx/cli')
-// 构建时，使用 rollup
-if (args.includes('build')) {
-  const argsx = args.filter(arg => arg !== 'build')
-  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
-    }),
-    shell: process.platform === 'win32'
-  })
-  if (msg.error) {
-    console.error(msg.error)
-    process.exit()
+const indexJavaScriptDir = join(currentDirPath, '../lib/index.js')
+const readConfigJavaScriptDir = relative(
+  process.cwd(),
+  join(currentDirPath, '../lib/readConfig.js')
+)
+
+const mode = args[0]
+
+const dev = () => {
+  const indexFileDir = args[0]
+  if (!indexFileDir) {
+    console.error('[lvyjs] 请指定入口文件')
+    process.exit(1)
   }
-  // 运行时，使用 tsx
-} else if (args.includes('dev')) {
-  const argsx = args.filter(arg => arg !== 'dev')
-  const argv = [jsdir, '--lvy-dev']
-  if (!args.includes('--no-watch')) {
-    argv.unshift('--clear-screen=false')
-    argv.unshift('watch')
+
+  let devProcess = null
+  let pendingRestart = false // 标记是否有重启 pending
+
+  // 启动开发进程
+  const startDevProcess = data => {
+    // 如果正在等待重启，先不启动
+    if (pendingRestart) return
+    const envConfig = data?.env || {}
+    // 前面1个被占用，剩余参数
+    const restArgs = args.slice(1)
+    devProcess = fork(indexFileDir, restArgs, {
+      stdio: 'inherit',
+      execArgv: [
+        ...process.execArgv,
+        '--require',
+        'tsx/preflight',
+        '--import',
+        'tsx',
+        '--import',
+        'lvyjs/register'
+      ],
+      env: {
+        ...process.env,
+        ...envConfig,
+        __LVYJS_REGISTER_CONFIG: JSON.stringify(data) // 传递配置给子进程
+      },
+      shell: process.platform === 'win32'
+    })
+
+    // 监听错误
+    devProcess.on('error', err => {
+      console.error('[lvyjs] 开发进程错误:', err)
+    })
+
+    // 进程退出时清空引用
+    devProcess.on('exit', (code, signal) => {
+      console.info(`[lvyjs] 开发进程退出 (${code || signal})`)
+      devProcess = null
+
+      // 如果是异常退出，可以尝试重启
+      if (code !== 0 && !pendingRestart) {
+        console.info('[lvyjs] 开发进程异常退出，等待配置重新加载...')
+      }
+    })
   }
-  const msg = fork(jsdir, [...argv, ...argsx], {
+
+  // 优雅重启开发进程
+  const restartDevProcess = newConfig => {
+    if (!devProcess) {
+      // 没有运行中的进程，直接启动
+      startDevProcess(newConfig)
+      return
+    }
+
+    pendingRestart = true
+    console.info('[lvyjs] 配置已更新，正在重启开发进程...')
+
+    // 监听退出事件，确保旧进程完全结束后再启动新进程
+    devProcess.once('exit', () => {
+      pendingRestart = false
+      startDevProcess(newConfig)
+    })
+
+    // 发送终止信号
+    devProcess.kill('SIGTERM')
+
+    // 超时保护：如果 5 秒后还没退出，强制杀掉
+    setTimeout(() => {
+      if (devProcess && !devProcess.killed) {
+        console.info('[lvyjs] 开发进程无响应，强制终止')
+        devProcess.kill('SIGKILL')
+      }
+    }, 5000)
+  }
+
+  // 启动配置进程
+  const readConfigFork = fork(readConfigJavaScriptDir, [], {
+    // stdio: 'inherit',
+    execArgv: [...process.execArgv, '--require', 'tsx/preflight', '--import', 'tsx'],
+    env: Object.assign({}, process.env, {}),
+    shell: process.platform === 'win32'
+  })
+
+  readConfigFork.on('message', msg => {
+    if (msg.error) {
+      console.error('[lvyjs] 配置进程错误:', msg.error)
+      process.exit(1)
+    }
+
+    if (msg.type === 'configReady') {
+      restartDevProcess(msg.payload.data)
+    }
+  })
+
+  readConfigFork.on('error', error => {
+    console.error('[lvyjs] 读取配置文件时发生错误:', error)
+    process.exit(1)
+  })
+
+  // 配置进程意外退出
+  readConfigFork.on('exit', code => {
+    if (code !== 0) {
+      console.error(`[lvyjs] 配置进程意外退出 (${code})`)
+      process.exit(1)
+    }
+  })
+
+  // 处理主进程退出
+  process.on('SIGINT', () => {
+    console.log('\n[lvyjs] 正在退出...')
+    if (devProcess) devProcess.kill()
+    if (readConfigFork) readConfigFork.kill()
+    process.exit(0)
+  })
+}
+
+const build = () => {
+  // 剩余参数
+  const restArgs = args.slice(1)
+  const msg = fork(indexJavaScriptDir, ['--lvy-build', ...restArgs], {
     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
-    }),
+    execArgv: [...process.execArgv, '--require', 'tsx/preflight', '--import', 'tsx'],
+    env: Object.assign({}, process.env, {}),
     shell: process.platform === 'win32'
   })
   if (msg.error) {
@@ -65,3 +151,9 @@ if (args.includes('build')) {
     process.exit()
   }
 }
+
+if (mode === 'build') {
+  build()
+} else {
+  dev()
+}

package/lib/assets/236e80b2c76c39f6fcf00d05ec8357c2.css

@@ -0,0 +1,35 @@
+.warning, .error, .success, .message {
+  border: 1px solid #ccc;
+  padding: 10px;
+  color: #333;
+}
+
+.success {
+  border-color: green;
+}
+
+.error {
+  border-color: red;
+}
+
+.warning {
+  border-color: yellow;
+}
+
+.info {
+  background: #A9A9A9;
+  box-shadow: 0 0 1px rgba(169, 169, 169, 0.25);
+  color: #fff;
+}
+
+.alert {
+  background: #8B0000;
+  box-shadow: 0 0 1px rgba(139, 0, 0, 0.25);
+  color: #fff;
+}
+
+.success {
+  background: #006400;
+  box-shadow: 0 0 1px rgba(0, 100, 0, 0.25);
+  color: #fff;
+}

package/lib/assets/60a108ca45b93041a762af82a920c63c.css

@@ -0,0 +1,14 @@
+div {
+  display: block;
+  background: url('/Users/lemonade/Desktop/lvyjs/src/assets/test.jpeg');
+}
+
+p {
+  padding: 0;
+}
+
+body {
+  margin: 0;
+  padding: 0;
+  position: absolute;
+}

package/lib/assets/dcb865bb1e44e5f95ecec3cb7290cfb7.css

@@ -0,0 +1,30 @@
+.button {
+  padding: 10px;
+  border-radius: 5px;
+  color: white;
+  background-color: #3498db;
+}
+.button:hover {
+  background-color: #217dbb;
+}
+.nav ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+.nav ul li {
+  display: inline-block;
+}
+.nav ul li a {
+  text-decoration: none;
+  color: #3498db;
+}
+.item-3 {
+  width: 300px;
+}
+.item-2 {
+  width: 200px;
+}
+.item-1 {
+  width: 100px;
+}

package/lib/assets/ff44ec490241107927aa7b6853fdb1fb.css

@@ -0,0 +1,55 @@
+div {
+  display: block;
+  background: url('/Users/lemonade/Desktop/lvyjs/src/assets/test.jpeg');
+}
+
+p {
+  padding: 0;
+}
+
+body {
+  margin: 0;
+  padding: 0;
+  position: absolute;
+}
+
+%message-shared {
+  border: 1px solid #ccc;
+  padding: 10px;
+  color: #333;
+}
+
+.warning2 {
+  @extend %message-shared;
+  border-color: yellow;
+}
+
+.warning, .error, .success, .message {
+  border: 1px solid #ccc;
+  padding: 10px;
+  color: #333;
+}
+
+.success {
+  border-color: green;
+}
+
+.error {
+  border-color: red;
+}
+
+.warning {
+  border-color: yellow;
+}
+
+.info {
+  background: #a9a9a9;
+  box-shadow: 0 0 1px rgba(169, 169, 169, 0.25);
+  color: #fff;
+}
+
+.alert {
+  background: #8b0000;
+  box-shadow: 0 0 1px rgba(139, 0, 0, 0.25);
+  color: #fff;
+}

package/lib/content.js

@@ -3,7 +3,7 @@ import { convertPath } from './config.js';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
+const __dirname$1 = dirname(fileURLToPath(import.meta.url));
 /**
  * 生成模块内容
  * @param {string} relativePath 相对路径
@@ -33,7 +33,7 @@ const chache = {};
 const generateCSSModuleContent = (relativePath) => {
     const inputURL = decodeURIComponent(relativePath);
     const fileName = getRandomName(inputURL);
-    const outputURL = convertPath(join(__dirname, 'assets', `${fileName}.css`));
+    const outputURL = convertPath(join(__dirname$1, 'assets', `${fileName}.css`));
     if (!chache[inputURL]) {
         global.lvyWorkerProt.postMessage({
             type: 'CSS_MODULE_GENERATED',

package/lib/main.js

@@ -1,13 +1,33 @@
-import module from 'node:module';
+import module$1 from 'node:module';
 import { MessageChannel } from 'node:worker_threads';
 import { initConfig } from './store.js';
 import { postCSS } from './postcss.js';
 import { stylesRegExp, assetsRegExp } from './config.js';
 
-if (!module.register) {
+if (!module$1.register) {
     throw new Error(`This version of Node.js (${process.version}) does not support module.register(). Please upgrade to Node v18.19 or v20.6 and above.`);
 }
-await initConfig();
+if (process.env?.__LVYJS_REGISTER_CONFIG) {
+    const configValues = JSON.parse(process.env.__LVYJS_REGISTER_CONFIG);
+    // 进行深度转换，将带有 __regexp 标记的对象转换为 RegExp 实例
+    const convertConfig = (obj) => {
+        if (obj && typeof obj === 'object') {
+            if (obj.__regexp) {
+                return new RegExp(obj.source, obj.flags);
+            }
+            const newObj = Array.isArray(obj) ? [] : {};
+            for (const key in obj) {
+                newObj[key] = convertConfig(obj[key]);
+            }
+            return newObj;
+        }
+        return obj;
+    };
+    global.lvyConfig = convertConfig(configValues);
+}
+else {
+    await initConfig();
+}
 const { port1, port2 } = new MessageChannel();
 const cache = {};
 port1.on('message', msg => {
@@ -22,7 +42,7 @@ port1.on('message', msg => {
     }
 });
 // port1.unref()
-module.register('./loader.js', {
+module$1.register('./loader.js', {
     parentURL: import.meta.url,
     data: {
         port: port2,

package/lib/postcss.js

@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 import { join, resolve, dirname, isAbsolute } from 'path';
 import { convertPath, createAlias } from './config.js';
 
-const require = createRequire(import.meta.url);
+const require$1 = createRequire(import.meta.url);
 const config = {
     css: null,
     sass: null,
@@ -54,7 +54,7 @@ const loadPostcssConfig = (configPath, typing) => {
     if (aliasEntries.length > 0) {
         // 创建 postcss-import 插件并配置别名解析
         try {
-            plugins.push(require('postcss-import')({
+            plugins.push(require$1('postcss-import')({
                 resolve: (id, basedir) => {
                     // 检查别名
                     for (const entry of aliasEntries) {
@@ -71,7 +71,7 @@ const loadPostcssConfig = (configPath, typing) => {
             console.error(err);
         }
         try {
-            plugins.push(require('postcss-url')({
+            plugins.push(require$1('postcss-url')({
                 url: asset => {
                     // 使用 resolve 逻辑处理 URL
                     for (const entry of aliasEntries) {
@@ -89,11 +89,11 @@ const loadPostcssConfig = (configPath, typing) => {
         }
     }
     for (let i = 2; i < includeKeys.length; i++) {
-        plugins.push(require(includeKeys[i])({}));
+        plugins.push(require$1(includeKeys[i])({}));
     }
     try {
         if (fs.existsSync(configPath)) {
-            const cfg = require(configPath);
+            const cfg = require$1(configPath);
             // 添加其他插件
             if (!Array.isArray(cfg.plugins)) {
                 const keys = Object.keys(cfg.plugins);
@@ -102,7 +102,7 @@ const loadPostcssConfig = (configPath, typing) => {
                         if (includeKeys.includes(key))
                             continue;
                         const pluginConfig = cfg.plugins[key];
-                        const plugin = require(key);
+                        const plugin = require$1(key);
                         if (typeof plugin === 'function') {
                             plugins.push(plugin(pluginConfig));
                         }
@@ -153,7 +153,7 @@ const postCSS = (inputPath, outputPath) => {
     const readAndProcessCSS = async () => {
         let css = '';
         if (typing === 'less') {
-            const less = require('less');
+            const less = require$1('less');
             const lessResult = await less.render(fs.readFileSync(inputPath, 'utf-8'), {
                 filename: inputPath,
                 plugins: [LessAliasPlugin(createAlias(global.lvyConfig?.alias))] // 使用插件
@@ -161,7 +161,7 @@ const postCSS = (inputPath, outputPath) => {
             css = lessResult.css;
         }
         else if (typing === 'sass' || typing === 'scss') {
-            const sass = require('sass');
+            const sass = require$1('sass');
             const sassResult = sass.renderSync({ file: inputPath });
             css = sassResult.css.toString();
         }
@@ -199,4 +199,4 @@ const postCSS = (inputPath, outputPath) => {
     });
 };
 
-export { LessAliasPlugin as default, postCSS };
+export { postCSS };

package/lib/readConfig.d.ts

@@ -0,0 +1,2 @@
+
+export { };

package/lib/readConfig.js

@@ -0,0 +1,69 @@
+import { existsSync, watch } from 'fs';
+import { join } from 'path';
+import process from 'process';
+
+const main = async () => {
+    const files = [
+        'lvy.config.ts',
+        'lvy.config.js',
+        'lvy.config.mjs',
+        'lvy.config.cjs',
+        'lvy.config.tsx'
+    ];
+    let configDir = '';
+    for (const file of files) {
+        if (existsSync(file)) {
+            configDir = file;
+            break;
+        }
+    }
+    if (!configDir) {
+        console.warn('[lvyjs] 未找到 lvy.config 文件，使用默认配置');
+        // 发送空配置，让主进程用默认值
+        process.send?.({
+            type: 'configReady',
+            payload: { data: {} }
+        });
+        return;
+    }
+    // 通知主进程配置已就绪
+    const sendConfig = async () => {
+        try {
+            // 清除缓存
+            const configPath = join(process.cwd(), configDir);
+            // 动态导入配置
+            const v = await import(`file://${configPath}?t=${Date.now()}`);
+            const lvyConfig = v.default || v;
+            // 序列化配置（处理正则等特殊类型）
+            const serializedConfig = JSON.parse(JSON.stringify(lvyConfig, (key, value) => {
+                if (value instanceof RegExp) {
+                    return { __regexp: true, source: value.source, flags: value.flags };
+                }
+                return value;
+            }));
+            // 发送给主进程
+            process.send?.({
+                type: 'configReady',
+                payload: { data: serializedConfig }
+            });
+        }
+        catch (err) {
+            console.error('[lvyjs] 加载配置失败:', err);
+            process.send?.({
+                type: 'error'
+            });
+        }
+    };
+    // 首次发送
+    await sendConfig();
+    // 监听文件变化
+    watch(process.cwd(), (_event, filename) => {
+        if (files.includes(filename)) {
+            console.info(`[lvyjs] 配置文件 ${filename} 已变化，重新加载...`);
+            sendConfig();
+        }
+    });
+    // 保持进程运行
+    process.on('SIGINT', () => process.exit(0));
+};
+main();

package/lib/start.js

@@ -1,64 +1,9 @@
 import { buildAndRun } from './rullup/index.js';
 import { initConfig } from './store.js';
 
-/**
- * @param input
- */
-const onDev = async () => {
-    const apps = [];
-    if (Array.isArray(global.lvyConfig?.plugins)) {
-        // 修改config
-        for (const plugin of global.lvyConfig.plugins) {
-            if (!plugin) {
-                continue;
-            }
-            await apps.push(plugin(global.lvyConfig));
-        }
-    }
-    for (const app of apps) {
-        if (!app) {
-            continue;
-        }
-        if (typeof app == 'function') {
-            await app(global.lvyConfig);
-        }
-        else if (typeof app.load == 'function') {
-            app.load(global.lvyConfig);
-        }
-    }
-};
-/**
- * @param input
- */
-const onBuild = async () => {
-    const apps = [];
-    if (Array.isArray(global.lvyConfig?.plugins)) {
-        // 修改config
-        for (const plugin of global.lvyConfig.plugins) {
-            if (!plugin) {
-                continue;
-            }
-            await apps.push(plugin(global.lvyConfig));
-        }
-    }
-    //
-    for (const app of apps) {
-        if (!app) {
-            continue;
-        }
-        if (typeof app != 'function' && typeof app.build == 'function') {
-            await app.build(global.lvyConfig);
-        }
-    }
-};
 const main = async () => {
-    if (process.argv.includes('--lvy-dev')) {
-        await initConfig();
-        await onDev();
-    }
-    else if (process.argv.includes('--lvy-build')) {
+    if (process.argv.includes('--lvy-build')) {
         await initConfig();
-        await onBuild();
         buildAndRun();
     }
 };

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "lvyjs",
-  "version": "0.2.24",
+  "version": "0.3.0-alpha.0",
   "description": "tsx compile script",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",
   "main": "lib/index.js",
   "scripts": {
-    "build": "node bundle.js"
+    "build": "node bundle.js",
+    "start": "node lib/index.js",
+    "dev": "tsx src/index.ts",
+    "dev:watch": "tsx watch src/index.ts"
   },
   "dependencies": {
     "@rollup/plugin-alias": "^5.1.0",
@@ -16,6 +19,7 @@
     "@rollup/plugin-typescript": "^11.1.6",
     "@rollup/pluginutils": "^5.1.3",
     "autoprefixer": "^10.4.20",
+    "chokidar": "^3.6.0",
     "postcss": "^8.4.47",
     "postcss-import": "^16.1.0",
     "postcss-url": "^10.1.3",
@@ -75,4 +79,4 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/lvyjs.git"
   }
-}
+}

package/lib/config.d.ts

@@ -1,12 +0,0 @@
-declare const assetsRegExp: RegExp;
-declare const stylesRegExp: RegExp;
-/**
- *
- * @param val
- * @returns
- */
-declare const createAlias: (val: any) => {};
-declare const isWin32: () => boolean;
-declare const convertPath: (inputPath: string) => string;
-
-export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp };

package/lib/index.d.ts

@@ -1,3 +0,0 @@
-export { Options, PluginsCallBack, PluginsOptions, PluginsValue, defineConfig, getOptions, initConfig } from './store.js';
-export { buildAndRun, buildJS } from './rullup/index.js';
-export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp } from './config.js';

package/lib/rullup/index.d.ts

@@ -1,17 +0,0 @@
-/**
- * 打包 JS
- * *** 注意 **
- * 和initConfig配合使用
- * **
- * 确保已经初始化了配置
- * @param inputs
- * @param output
- */
-declare const buildJS: (inputs: string[]) => Promise<void>;
-/**
- *
- * @param script
- */
-declare function buildAndRun(): Promise<void>;
-
-export { buildAndRun, buildJS };

package/lib/store.d.ts

@@ -1,92 +0,0 @@
-import { RollupCommonJSOptions } from '@rollup/plugin-commonjs';
-import { RollupTypescriptOptions } from '@rollup/plugin-typescript';
-import { RollupOptions, OutputOptions } from 'rollup';
-import { Alias } from './typing.js';
-
-type PluginsValue = (options: Options) => void;
-type PluginsCallBack = PluginsValue | {
-    load?: PluginsValue;
-    build?: PluginsValue;
-};
-type PluginsOptions = (options: Options) => PluginsCallBack | void;
-type Options = {
-    env?: {
-        [key: string]: string;
-    };
-    /**
-     * 配置调整机及其回调插件
-     */
-    plugins?: PluginsOptions[];
-    /**
-     * 别名
-     */
-    alias?: {
-        /**
-         * 别名规则
-         */
-        entries?: Alias[];
-    } | false;
-    /**
-     * 静态资源识别
-     */
-    assets?: {
-        /**
-         * 过滤得到指定格式的文件识别之为静态资源
-         */
-        filter?: RegExp;
-    } | false;
-    styles?: {
-        /**
-         * 过滤得到指定格式的文件识别之为静态资源
-         */
-        filter?: RegExp;
-    } | false;
-    /**
-     * 打包时配置
-     */
-    build?: {
-        /**
-         * cjs文件处理
-         */
-        commonjs?: RollupCommonJSOptions | false;
-        /**
-         * ts配置
-         */
-        typescript?: RollupTypescriptOptions | false;
-        /**
-         *
-         */
-        RollupOptions?: RollupOptions;
-        /**
-         *
-         */
-        OutputOptions?: OutputOptions & {
-            /**
-             * 默认 src
-             */
-            input?: string;
-        };
-    } | false;
-};
-/**
- *
- */
-declare global {
-    var lvyConfig: Options;
-}
-/**
- *
- */
-declare const initConfig: () => Promise<void>;
-/**
- * @returns
- */
-declare const getOptions: () => Options;
-/**
- * @param param0
- * @returns
- */
-declare const defineConfig: (optoins?: Options) => Options | undefined;
-
-export { defineConfig, getOptions, initConfig };
-export type { Options, PluginsCallBack, PluginsOptions, PluginsValue };

package/lib/typing.d.ts

@@ -1,6 +0,0 @@
-interface Alias {
-    find: string;
-    replacement: string;
-}
-
-export type { Alias };