lvyjs 0.2.16 → 0.2.17

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/config.d.ts

@@ -1,12 +1,12 @@
-declare const assetsRegExp: RegExp;
-declare const stylesRegExp: RegExp;
+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;
+declare const createAlias: (val: any) => {}
+declare const isWin32: () => boolean
+declare const convertPath: (inputPath: string) => string
 
-export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp };
+export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp }

package/lib/config.js

@@ -1,23 +1,23 @@
-const assetsRegExp = /\.(png|jpg|jpeg|gif|svg|webp|ico)$/;
-const stylesRegExp = /\.(css|scss|less|sass|less)$/;
+const assetsRegExp = /\.(png|jpg|jpeg|gif|svg|webp|ico)$/
+const stylesRegExp = /\.(css|scss|less|sass|less)$/
 /**
  *
  * @param val
  * @returns
  */
 const createAlias = val => {
-    const alias = {};
-    // 遍历 entries 数组
-    val.entries.forEach(entry => {
-        alias[entry.find] = entry.replacement;
-    });
-    return alias;
-};
+  const alias = {}
+  // 遍历 entries 数组
+  val.entries.forEach(entry => {
+    alias[entry.find] = entry.replacement
+  })
+  return alias
+}
 const isWin32 = () => {
-    return ['win32'].includes(process.platform);
-};
-const convertPath = (inputPath) => {
-    return isWin32() ? inputPath.replace(/\\/g, '/') : inputPath;
-};
+  return ['win32'].includes(process.platform)
+}
+const convertPath = inputPath => {
+  return isWin32() ? inputPath.replace(/\\/g, '/') : inputPath
+}
 
-export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp };
+export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp }

package/lib/content.js

@@ -1,46 +1,48 @@
-import { join } from 'path';
-import crypto from 'node:crypto';
-import { convertPath } from './config.js';
+import { join } from 'path'
+import crypto from 'node:crypto'
+import { convertPath } from './config.js'
 
 /**
  * 生成模块内容
  * @param {string} relativePath 相对路径
  */
-const generateModuleContent = (relativePath) => {
-    const contents = [
-        `const reg = ['win32'].includes(process.platform) ? /^file:\\/\\/\\// : /^file:\\/\\// ;`,
-        `const fileUrl = import.meta.resolve('${convertPath(relativePath)}').replace(reg, '');`,
-        'export default fileUrl;'
-    ].join('\n');
-    return contents;
-};
-const getRandomName = (str) => {
-    // 使用 MD5 算法创建哈希对象
-    const hash = crypto.createHash('md5');
-    // 更新哈希对象内容
-    hash.update(str);
-    return hash.digest('hex');
-};
-const chache = {};
+const generateModuleContent = relativePath => {
+  const contents = [
+    `const reg = ['win32'].includes(process.platform) ? /^file:\\/\\/\\// : /^file:\\/\\// ;`,
+    `const fileUrl = import.meta.resolve('${convertPath(relativePath)}').replace(reg, '');`,
+    'export default fileUrl;'
+  ].join('\n')
+  return contents
+}
+const getRandomName = str => {
+  // 使用 MD5 算法创建哈希对象
+  const hash = crypto.createHash('md5')
+  // 更新哈希对象内容
+  hash.update(str)
+  return hash.digest('hex')
+}
+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]) {
-        global.lvyWorkerProt.postMessage({
-            type: 'CSS_MODULE_GENERATED',
-            payload: {
-                from: pathURL,
-                to: outputFileURL
-            }
-        });
-        chache[pathURL] = true;
-    }
-    return `export default "${outputFileURL}";`;
-};
+const generateCSSModuleContent = pathURL => {
+  const fileName = getRandomName(pathURL)
+  const outputFileURL = convertPath(
+    join(process.cwd(), 'node_modules', 'lvyjs', 'assets', `${fileName}.css`)
+  )
+  if (!chache[pathURL]) {
+    global.lvyWorkerProt.postMessage({
+      type: 'CSS_MODULE_GENERATED',
+      payload: {
+        from: pathURL,
+        to: outputFileURL
+      }
+    })
+    chache[pathURL] = true
+  }
+  return `export default "${outputFileURL}";`
+}
 
-export { generateCSSModuleContent, generateModuleContent };
+export { generateCSSModuleContent, generateModuleContent }

package/lib/index.d.ts

@@ -1,3 +1,11 @@
-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';
+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/index.js

@@ -1,73 +1,71 @@
-import { buildAndRun } from './rullup/index.js';
-export { buildJS } from './rullup/index.js';
-import { initConfig } from './store.js';
-export { defineConfig, getOptions } from './store.js';
-export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp } from './config.js';
+import { buildAndRun } from './rullup/index.js'
+export { buildJS } from './rullup/index.js'
+import { initConfig } from './store.js'
+export { defineConfig, getOptions } from './store.js'
+export { assetsRegExp, convertPath, createAlias, isWin32, stylesRegExp } from './config.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));
-        }
+  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))
     }
-    // 执行loader
-    await import('./main.js');
-    //
-    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);
-        }
+  }
+  // 执行loader
+  await import('./main.js')
+  //
+  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 apps = []
+  if (Array.isArray(global.lvyConfig?.plugins)) {
+    // 修改config
+    for (const plugin of global.lvyConfig.plugins) {
+      if (!plugin) {
+        continue
+      }
+      await apps.push(plugin(global.lvyConfig))
     }
-};
-const main = async () => {
-    if (process.argv.includes('--lvy-dev')) {
-        await initConfig();
-        await onDev();
+  }
+  //
+  for (const app of apps) {
+    if (!app) {
+      continue
     }
-    else if (process.argv.includes('--lvy-build')) {
-        await initConfig();
-        await onBuild();
-        buildAndRun();
+    if (typeof app != 'function' && typeof app.build == 'function') {
+      await app.build(global.lvyConfig)
     }
-};
-main();
+  }
+}
+const main = async () => {
+  if (process.argv.includes('--lvy-dev')) {
+    await initConfig()
+    await onDev()
+  } else if (process.argv.includes('--lvy-build')) {
+    await initConfig()
+    await onBuild()
+    buildAndRun()
+  }
+}
+main()
 
-export { buildAndRun, initConfig };
+export { buildAndRun, initConfig }

package/lib/loader.d.ts

@@ -1,28 +1,25 @@
-import { MessagePort } from 'worker_threads';
+import { MessagePort } from 'worker_threads'
 
 declare global {
-    var lvyWorkerProt: MessagePort;
+  var lvyWorkerProt: MessagePort
 }
 /**
  * @param param0
  */
-declare function initialize({ port, lvyConfig }: {
-    port: any;
-    lvyConfig: any;
-}): Promise<void>;
+declare function initialize({ port, lvyConfig }: { port: any; lvyConfig: any }): Promise<void>
 /**
  * @param specifier
  * @param context
  * @param nextResolve
  * @returns
  */
-declare function resolve(specifier: any, context: any, nextResolve: any): Promise<any>;
+declare function resolve(specifier: any, context: any, nextResolve: any): Promise<any>
 /**
  * @param url
  * @param context
  * @param defaultLoad
  * @returns
  */
-declare const load: (url: any, context: any, nextLoad: any) => any;
+declare const load: (url: any, context: any, nextLoad: any) => any
 
-export { initialize, load, resolve };
+export { initialize, load, resolve }

package/lib/loader.js

@@ -1,15 +1,15 @@
-import { generateModuleContent, generateCSSModuleContent } from './content.js';
-import { isWin32, convertPath } from './config.js';
+import { generateModuleContent, generateCSSModuleContent } from './content.js'
+import { isWin32, convertPath } from './config.js'
 
-const reg = isWin32() ? /^file:\/\/\// : /^file:\/\//;
-const baseURL = isWin32() ? 'file:///' : 'file://';
-const nodeReg = /(node_modules|node_|node:)/;
+const reg = isWin32() ? /^file:\/\/\// : /^file:\/\//
+const baseURL = isWin32() ? 'file:///' : 'file://'
+const nodeReg = /(node_modules|node_|node:)/
 /**
  * @param param0
  */
 async function initialize({ port, lvyConfig }) {
-    global.lvyConfig = lvyConfig;
-    global.lvyWorkerProt = port;
+  global.lvyConfig = lvyConfig
+  global.lvyWorkerProt = port
 }
 /**
  * @param specifier
@@ -18,21 +18,21 @@ async function initialize({ port, lvyConfig }) {
  * @returns
  */
 async function resolve(specifier, context, nextResolve) {
-    if (!global.lvyConfig?.alias) {
-        global.lvyConfig.alias = {};
+  if (!global.lvyConfig?.alias) {
+    global.lvyConfig.alias = {}
+  }
+  if (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))}`
+        return nextResolve(specifier, {
+          ...context,
+          parentURL: parentURL
+        })
+      }
     }
-    if (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))}`;
-                return nextResolve(specifier, {
-                    ...context,
-                    parentURL: parentURL
-                });
-            }
-        }
-    }
-    return nextResolve(specifier, context);
+  }
+  return nextResolve(specifier, context)
 }
 /**
  * @param url
@@ -41,34 +41,34 @@ async function resolve(specifier, context, nextResolve) {
  * @returns
  */
 const load = (url, context, nextLoad) => {
-    if (nodeReg.test(url)) {
-        return nextLoad(url, context);
-    }
-    const urls = url.split('?');
-    const baseURL = urls[0];
-    // 得到静态资源。转为普通的文件引用。
-    if (!global.lvyConfig.assets) {
-        global.lvyConfig.assets = {};
-    }
-    // 匹配静态资源
-    if (global.lvyConfig.assets?.filter && global.lvyConfig.assets?.filter.test(baseURL)) {
-        const code = generateModuleContent(baseURL.replace(reg, ''));
-        return nextLoad(baseURL, {
-            format: 'module',
-            source: code
-        });
-    }
-    if (!global.lvyConfig.styles) {
-        global.lvyConfig.styles = {};
-    }
-    if (global.lvyConfig.styles?.filter && global.lvyConfig.styles?.filter.test(baseURL)) {
-        const code = generateCSSModuleContent(baseURL.replace(reg, ''));
-        return nextLoad(baseURL, {
-            format: 'module',
-            source: code
-        });
-    }
-    return nextLoad(url, context);
-};
+  if (nodeReg.test(url)) {
+    return nextLoad(url, context)
+  }
+  const urls = url.split('?')
+  const baseURL = urls[0]
+  // 得到静态资源。转为普通的文件引用。
+  if (!global.lvyConfig.assets) {
+    global.lvyConfig.assets = {}
+  }
+  // 匹配静态资源
+  if (global.lvyConfig.assets?.filter && global.lvyConfig.assets?.filter.test(baseURL)) {
+    const code = generateModuleContent(baseURL.replace(reg, ''))
+    return nextLoad(baseURL, {
+      format: 'module',
+      source: code
+    })
+  }
+  if (!global.lvyConfig.styles) {
+    global.lvyConfig.styles = {}
+  }
+  if (global.lvyConfig.styles?.filter && global.lvyConfig.styles?.filter.test(baseURL)) {
+    const code = generateCSSModuleContent(baseURL.replace(reg, ''))
+    return nextLoad(baseURL, {
+      format: 'module',
+      source: code
+    })
+  }
+  return nextLoad(url, context)
+}
 
-export { initialize, load, resolve };
+export { initialize, load, resolve }

package/lib/main.js

@@ -1,36 +1,38 @@
-import module from 'node:module';
-import { MessageChannel } from 'node:worker_threads';
-import { postCSS } from './postcss.js';
-import { stylesRegExp, assetsRegExp } from './config.js';
+import module from 'node:module'
+import { MessageChannel } from 'node:worker_threads'
+import { postCSS } from './postcss.js'
+import { stylesRegExp, assetsRegExp } from './config.js'
 
 if (!module.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.`);
+  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.`
+  )
 }
-const { port1, port2 } = new MessageChannel();
-const cache = {};
+const { port1, port2 } = new MessageChannel()
+const cache = {}
 port1.on('message', msg => {
-    if (msg.type == 'CSS_MODULE_GENERATED') {
-        const { from, to } = msg.payload;
-        if (!cache[from]) {
-            postCSS(from, to);
-            cache[from] = true;
-        }
+  if (msg.type == 'CSS_MODULE_GENERATED') {
+    const { from, to } = msg.payload
+    if (!cache[from]) {
+      postCSS(from, to)
+      cache[from] = true
     }
-});
+  }
+})
 // port1.unref()
 module.register('./loader.js', {
-    parentURL: import.meta.url,
-    data: {
-        port: port2,
-        lvyConfig: {
-            alias: global.lvyConfig?.alias,
-            assets: global.lvyConfig?.assets ?? {
-                filter: assetsRegExp
-            },
-            styles: global.lvyConfig?.styles ?? {
-                filter: stylesRegExp
-            }
-        }
-    },
-    transferList: [port2]
-});
+  parentURL: import.meta.url,
+  data: {
+    port: port2,
+    lvyConfig: {
+      alias: global.lvyConfig?.alias,
+      assets: global.lvyConfig?.assets ?? {
+        filter: assetsRegExp
+      },
+      styles: global.lvyConfig?.styles ?? {
+        filter: stylesRegExp
+      }
+    }
+  },
+  transferList: [port2]
+})