lvyjs 0.1.1 → 0.1.3

package/bin/index.js

@@ -2,6 +2,7 @@
 import { fork } from 'child_process'
 import { join, dirname, relative } from 'path'
 import { fileURLToPath } from 'node:url'
+import { existsSync } from 'fs'
 const args = [...process.argv.slice(2)]
 const currentFilePath = fileURLToPath(import.meta.url)
 const currentDirPath = dirname(currentFilePath)
@@ -35,7 +36,11 @@ if (args.includes('build')) {
     jsdir,
     '--lvy-dev'
   ]
-  const msg = fork(join(currentDirPath, '../../tsx/dist/cli.mjs'), [...argv, ...argsx], {
+  let tsxDir = join(currentDirPath, '../../tsx/dist/cli.mjs')
+  if (!existsSync(tsxDir)) {
+    tsxDir = join(currentDirPath, '../node_modules/tsx/dist/cli.mjs')
+  }
+  const msg = fork(tsxDir, [...argv, ...argsx], {
     stdio: 'inherit',
     env: Object.assign({}, process.env, {
       PKG_DIR: pkgFilr

package/lib/index.d.ts

@@ -1 +1 @@
-export { defineConfig, initConfig } from './store.js';
+export { defineConfig, initConfig } from './loader/store.js';

package/lib/index.js

@@ -1,6 +1,6 @@
 import { buildAndRun } from './build/rullup.js';
-import { initConfig } from './store.js';
-export { defineConfig } from './store.js';
+import { initConfig } from './loader/store.js';
+export { defineConfig } from './loader/store.js';
 
 /**
  * @param input
@@ -20,7 +20,7 @@ const onDev = async () => {
         }
     }
     // 执行loader
-    await import('./loader/main.js');
+    await import('./main.js');
     // 执行 useApp
     for (const plugin of global.lvyConfig.plugins) {
         if (plugin?.useApp)

package/lib/loader/esbuild.js

@@ -7,29 +7,11 @@ const plugins = [];
  *
  */
 const initPlugins = async () => {
-    for (const key in global.lvyConfig.esbuild) {
-        if (typeof global.lvyConfig.esbuild[key] == 'boolean') {
-            continue;
-        }
+    if (typeof global.lvyConfig?.esbuild?.assets != 'boolean') {
+        plugins.push(esBuildAsstes(global.lvyConfig.esbuild.assets));
     }
-    // 如果不存在这些配置
-    const keys = ['assets', 'styles'];
-    for (const key of keys) {
-        // 如果是布尔值
-        if (typeof global.lvyConfig.esbuild[key] == 'boolean') {
-            continue;
-        }
-        // 存在这些配置
-        if (global.lvyConfig.esbuild[key]) {
-            continue;
-        }
-        //
-        if (key == 'assets') {
-            plugins.push(esBuildAsstes());
-        }
-        else if (key === 'styles') {
-            plugins.push(esBuildCSS());
-        }
+    if (typeof global.lvyConfig?.esbuild?.styles != 'boolean') {
+        plugins.push(esBuildCSS(global.lvyConfig.esbuild.styles));
     }
 };
 /**
@@ -43,7 +25,7 @@ const ESBuild = async (input) => {
         global.lvyConfig = {};
     if (!global.lvyConfig.esbuild)
         global.lvyConfig.esbuild = {};
-    // 如果没有插件
+    // 没有插件时，检查是否有可用插件。
     if (plugins.length === 0) {
         // init plugisn
         await initPlugins();

package/lib/loader/plugins.js

@@ -46,6 +46,14 @@ const startCssPost = (input, output) => {
         cssPostProcess.kill();
     });
 };
+/**
+ *
+ * @param inputPath
+ * @returns
+ */
+const convertPath = (inputPath) => {
+    return process.platform === 'win32' ? inputPath.replace(/\\/g, '/') : inputPath;
+};
 /**
  * 生成模块内容
  * @param {string} relativePath 相对路径
@@ -58,7 +66,7 @@ const generateModuleContent = (relativePath) => {
         'const reg = T ? /^file:\\/\\// : /^file:\\/\\/\\//;',
         "return new URL(path, basePath).href.replace(reg, '');",
         '};',
-        `const fileUrl = createUrl(import.meta.url, '${relativePath}');`,
+        `const fileUrl = createUrl(import.meta.url, '${convertPath(relativePath)}');`,
         'export default fileUrl;'
     ].join('\n');
     return contents;
@@ -71,14 +79,6 @@ const getHash = (str) => {
     hash.update(str);
     return hash.digest('hex');
 };
-/**
- *
- * @param inputPath
- * @returns
- */
-const convertPath = (inputPath) => {
-    return process.platform === 'win32' ? inputPath.replace(/\\/g, '/') : inputPath;
-};
 const handleAsstesFile = (url) => {
     for (const alias in aliases) {
         const aliasPattern = alias.replace('/*', '');

package/lib/{store.d.ts → loader/store.d.ts}

@@ -1,12 +1,12 @@
 import { RollupAliasOptions } from '@rollup/plugin-alias';
 import { RollupOptions } from 'rollup';
-import { RollupStylesCSSImportOptions } from './plugins/loader-css.js';
+import { RollupStylesCSSImportOptions } from '../plugins/loader-css.js';
 import { RollupCommonJSOptions } from '@rollup/plugin-commonjs';
 import { RollupJsonOptions } from '@rollup/plugin-json';
 import { RollupTypescriptOptions } from '@rollup/plugin-typescript';
 import { SameShape, BuildOptions } from 'esbuild';
-import { RollupAssetsOptions } from './plugins/loader-files.js';
-import { ESBuildAsstesOptions, ESBuildCSSOptions } from './loader/plugins.js';
+import { RollupAssetsOptions } from '../plugins/loader-files.js';
+import { ESBuildAsstesOptions, ESBuildCSSOptions } from './plugins.js';
 
 type Options = {
     /**

package/lib/{store.js → loader/store.js}

@@ -28,10 +28,5 @@ const initConfig = async () => {
         }
     }
 };
-/**
- * @param param0
- * @returns
- */
-const defineConfig = (optoins) => optoins;
 
-export { defineConfig, initConfig };
+export { initConfig };

package/lib/{loader/index.js → loader.js}

@@ -1,5 +1,7 @@
-import { ESBuild } from './esbuild.js';
+import { ESBuild } from './loader/esbuild.js';
+import { initConfig } from './loader/store.js';
 
+await initConfig();
 const platform = ['linux', 'android', 'darwin'];
 const T = platform.includes(process.platform);
 const reg = T ? /^file:\/\// : /^file:\/\/\//;

package/lib/main.js

@@ -0,0 +1,3 @@
+import { register } from 'node:module'
+
+register('./loader.js', import.meta.url)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lvyjs",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "tsx compile script",
   "author": "lemonade",
   "license": "MIT",
@@ -42,12 +42,12 @@
       "types": "./lib/index.d.ts"
     },
     "./loader": {
-      "import": "./lib/loader/index.js",
-      "types": "./lib/loader/index.d.ts"
+      "import": "./lib/loader.js",
+      "types": "./lib/loader.d.ts"
     },
     "./register": {
-      "import": "./lib/loader/main.js",
-      "types": "./lib/loader/main.d.ts"
+      "import": "./lib/main.js",
+      "types": "./lib/main.d.ts"
     },
     "./env": {
       "types": "./env.d.ts"

package/lib/loader/main.js

@@ -1,3 +0,0 @@
-import { register } from 'node:module';
-
-register('./index.js', import.meta.url);