lvyjs 0.2.19 → 0.2.21

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/index.js

@@ -1,73 +1,6 @@
-import { buildAndRun } from './rullup/index.js';
-export { buildJS } from './rullup/index.js';
-import { initConfig } from './store.js';
-export { defineConfig, getOptions } from './store.js';
+import { main } from './start.js';
+export { defineConfig, getOptions, initConfig } from './store.js';
+export { buildAndRun, buildJS } from './rullup/index.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));
-        }
-    }
-    // 执行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 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 };

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

@@ -0,0 +1,69 @@
+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));
+        }
+    }
+    // 执行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 main = async () => {
+    if (process.argv.includes('--lvy-dev')) {
+        await initConfig();
+        await onDev();
+    }
+    else if (process.argv.includes('--lvy-build')) {
+        await initConfig();
+        await onBuild();
+        buildAndRun();
+    }
+};
+
+export { main };

package/lib/store.d.ts

@@ -10,6 +10,9 @@ type PluginsCallBack = PluginsValue | {
 };
 type PluginsOptions = (options: Options) => PluginsCallBack | void;
 type Options = {
+    env?: {
+        [key: string]: string;
+    };
     /**
      * 配置调整机及其回调插件
      */

package/lib/store.js

@@ -25,6 +25,12 @@ const initConfig = async () => {
         const v = await import(`file://${join(process.cwd(), configDir)}`);
         if (v?.default) {
             global.lvyConfig = v.default;
+            if (global.lvyConfig?.env) {
+                for (const key in global.lvyConfig.env) {
+                    process.env[key] = String(global.lvyConfig.env[key]);
+                }
+            }
+            process.env.NODE_ENV = process.env?.NODE_ENV || 'development';
         }
     }
 };

package/package.json

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