@cloudbase/lowcode-builder 0.1.26 → 1.0.0

package/lib/builder/core/index.d.ts

@@ -1,5 +1,3 @@
-import { IInstallOpts } from '../service/webpack';
-export { getCompileDirs } from '../util';
 import { IMaterialItem, IWeAppData, IPlugin, IExtraData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { BuildType, GenerateMpType, WebpackBuildCallBack, WebpackModeType } from '../types/common';
 import { DEPLOY_MODE, RUNTIME } from '../../types';
@@ -40,8 +38,8 @@ export interface IBuildWedaApp extends IBaseAppProps {
 }
 export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
 export declare function cleanComponentDir(): Promise<void>;
-export declare function installDep(dir: any, opts?: IInstallOpts): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';
 export { downloadZip } from '../util/net';
+export { getCompileDirs } from '../util';
 export default buildWedaApp;

package/lib/builder/core/index.js

@@ -3,19 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.installDep = exports.cleanComponentDir = exports.buildWedaApp = exports.getCompileDirs = void 0;
+exports.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const webpack_1 = require("../service/webpack");
+const chalk_1 = __importDefault(require("chalk"));
+const path_1 = __importDefault(require("path"));
 const util_1 = require("../util");
-var util_2 = require("../util");
-Object.defineProperty(exports, "getCompileDirs", { enumerable: true, get: function () { return util_2.getCompileDirs; } });
 const common_1 = require("../types/common");
 const index_1 = require("../mp/index");
-const path_1 = __importDefault(require("path"));
 const types_1 = require("../../types");
 const mixMode_1 = require("../mp/mixMode");
 const index_2 = require("../h5/index");
-const chalk_1 = __importDefault(require("chalk"));
 const common_2 = require("../../utils/common");
 const postProcess_1 = require("../../utils/postProcess");
 const net_1 = require("../util/net");
@@ -29,27 +26,24 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         console.error('无效的应用配置');
         return;
     }
-    const mainAppSerializeData = (0, common_2.processCals2WeappsData)(cals, dependencies);
-    const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(item, dependencies))) ||
-        [];
     const { mode: deployMode = types_1.DEPLOY_MODE.PREVIEW } = deployOptions;
+    let appBuildDir = (output === null || output === void 0 ? void 0 : output.path) || (runtime === types_1.RUNTIME.CI ? (_a = (0, util_1.getCompileDirs)('app')) === null || _a === void 0 ? void 0 : _a.appBuildDir : (_b = (0, util_1.getCompileDirs)(appKey)) === null || _b === void 0 ? void 0 : _b.appBuildDir);
     console.log('domain', domain);
     console.log('应用名', appKey);
     console.log('生成模式', generateMpType);
-    let appBuildDir = (output === null || output === void 0 ? void 0 : output.path) ||
-        (runtime === types_1.RUNTIME.CI
-            ? (_a = (0, util_1.getCompileDirs)('app')) === null || _a === void 0 ? void 0 : _a.appBuildDir
-            : (_b = (0, util_1.getCompileDirs)(appKey)) === null || _b === void 0 ? void 0 : _b.appBuildDir);
-    const startTime = Date.now();
-    if (buildTypeList.includes(common_1.BuildType.MP)) {
-        appBuildDir = (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp');
-        const isMixMode = generateMpType === common_1.GenerateMpType.SUBPACKAGE;
-        const apps = [mainAppSerializeData, ...subAppSerializeDataList];
-        if (isBrowserMpBuilder) {
-            // 尽早下载物料
-            await (0, net_1.downloadBrowserMaterial)(output && output.path);
-        }
-        try {
+    console.log('生成路径', appBuildDir);
+    try {
+        const startTime = Date.now();
+        if (buildTypeList.includes(common_1.BuildType.MP)) {
+            const mainAppSerializeData = (0, common_2.processCals2WeappsData)(cals, dependencies);
+            const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(item, dependencies))) || [];
+            appBuildDir = (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp');
+            const isMixMode = generateMpType === common_1.GenerateMpType.SUBPACKAGE;
+            const apps = [mainAppSerializeData, ...subAppSerializeDataList];
+            if (isBrowserMpBuilder) {
+                // 尽早下载物料
+                await (0, net_1.downloadBrowserMaterial)(output === null || output === void 0 ? void 0 : output.path);
+            }
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,
                 projDir: appBuildDir,
@@ -99,34 +93,32 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             });
             return outDir;
         }
-        catch (e) {
-            console.log('generateWxMp error', e);
-            cb && cb(e);
-            throw e;
-        }
-    }
-    else {
-        const h5BuildDir = await (0, index_2.buildH5App)({
-            appKey,
-            buildDir: appBuildDir,
-            dependencies,
-            mainAppSerializeData,
-            subAppSerializeDataList,
-            extraData,
-            buildTypeList,
-            mode,
-            devTool,
-            runtime,
-            deployMode,
-            ignoreInstall,
-            domain,
-        });
-        cb &&
-            cb(null, {
+        else {
+            const h5BuildDir = await (0, index_2.buildH5App)({
+                appKey,
+                buildDir: appBuildDir,
+                dependencies,
+                cals,
+                subAppCalsList,
+                extraData,
+                buildTypeList,
+                mode,
+                devTool,
+                runtime,
+                deployMode,
+                ignoreInstall,
+                domain,
+            });
+            cb === null || cb === void 0 ? void 0 : cb(null, {
                 outDir: h5BuildDir,
                 timeElapsed: Date.now() - startTime,
             });
-        return h5BuildDir;
+            return h5BuildDir;
+        }
+    }
+    catch (e) {
+        cb === null || cb === void 0 ? void 0 : cb(e);
+        throw e;
     }
 }
 exports.buildWedaApp = buildWedaApp;
@@ -134,10 +126,6 @@ async function cleanComponentDir() {
     return fs_extra_1.default.emptyDir((0, util_1.getCompileDirs)().materialsDir);
 }
 exports.cleanComponentDir = cleanComponentDir;
-function installDep(dir, opts = {}) {
-    return (0, webpack_1.installDependencies)(dir, opts);
-}
-exports.installDep = installDep;
 exports.version = pkg.version;
 var generateFiles_1 = require("../util/generateFiles");
 Object.defineProperty(exports, "getFiles", { enumerable: true, get: function () { return generateFiles_1.getFiles; } });
@@ -145,4 +133,6 @@ Object.defineProperty(exports, "fileToZip", { enumerable: true, get: function ()
 Object.defineProperty(exports, "strToBuf", { enumerable: true, get: function () { return generateFiles_1.strToBuf; } });
 var net_2 = require("../util/net");
 Object.defineProperty(exports, "downloadZip", { enumerable: true, get: function () { return net_2.downloadZip; } });
+var util_2 = require("../util");
+Object.defineProperty(exports, "getCompileDirs", { enumerable: true, get: function () { return util_2.getCompileDirs; } });
 exports.default = buildWedaApp;

package/lib/builder/h5/compile.d.ts

@@ -7,4 +7,4 @@ export interface ICompileOpts {
     generateMpPath?: string;
     webpackMode: WebpackModeType;
 }
-export declare function startCompile(options: ICompileOpts, cb?: (error: any, data?: any) => void): void;
+export declare function startCompile(options: ICompileOpts, cb: (error: any, data?: any) => void): void;

package/lib/builder/h5/compile.js

@@ -4,7 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startCompile = void 0;
-const cross_spawn_1 = __importDefault(require("cross-spawn"));
+const webpack_1 = __importDefault(require("webpack"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
 const runningCompilations = {};
 function startCompile(options, cb) {
     const key = options.configPath;
@@ -13,28 +15,65 @@ function startCompile(options, cb) {
         console.log(`Compiling ${options.configPath} already running`);
         return;
     }
-    console.log('Running webpack by ' + options.configPath);
+    console.log(`Running webpack by ${options.configPath}`);
     console.log('Running webpack mode ', options.webpackMode);
-    // if (options.webpackMode === WebpackModeType.PRODUCTION) {
-    try {
-        console.log('【编译中】正在进行生产环境编译，请稍等...');
-        let startTime = Date.now();
-        runningCompilations[key] = true;
-        cross_spawn_1.default.sync('npm', ['run', 'build-web'], {
-            cwd: options.appBuildDir,
-            env: process.env,
-            stdio: 'inherit',
-        });
-        cb === null || cb === void 0 ? void 0 : cb(null, {
-            outDir: options.appBuildDir,
-            timeElapsed: Date.now() - startTime,
-        });
+    console.log('【编译中】正在进行生产环境编译，请稍等...');
+    fs_extra_1.default.emptyDirSync(path_1.default.resolve(options.appBuildDir, 'preview'));
+    const watching = (0, webpack_1.default)(require(options.configPath), async (err, stats) => {
+        if (err) {
+            console.error('webpack config error', err.stack || err);
+            if (err.details) {
+                console.error('webpack config error detail', err.details);
+            }
+            cb === null || cb === void 0 ? void 0 : cb(err);
+            delete runningCompilations[key];
+            return;
+        }
+        const info = stats.toJson('minimal');
+        if (stats.hasErrors()) {
+            console.error('Webpack compilation errors', info.errors.join('\n'));
+            cb === null || cb === void 0 ? void 0 : cb(info.errors);
+        }
+        else {
+            let { endTime = 0, startTime = 0 } = stats;
+            cb === null || cb === void 0 ? void 0 : cb(null, {
+                outDir: options.appBuildDir,
+                timeElapsed: endTime - startTime,
+            });
+        }
+        if (stats.hasWarnings()) {
+            console.warn('webpack compiling warnings', info.warnings.join('\n'));
+        }
+    });
+    if (!(watching instanceof webpack_1.default.Compiler)) {
+        runningCompilations[key] = false;
     }
-    catch (e) {
-        cb === null || cb === void 0 ? void 0 : cb([e]);
-        console.error('【失败】编译失败，请查看上面的日志修改后重试');
+    else {
+        runningCompilations[key] = true;
     }
-    runningCompilations[key] = false;
+    // if (options.webpackMode === WebpackModeType.PRODUCTION) {
+    // try {
+    //   console.log('【编译中】正在进行生产环境编译，请稍等...');
+    //   let startTime = Date.now();
+    //   runningCompilations[key] = true;
+    //   const webpackProcess = spawn.sync('npm', ['run', 'build-web'], {
+    //     cwd: options.appBuildDir,
+    //     env: process.env,
+    //     stdio: ['inherit', 'inherit', 'pipe'],
+    //   });
+    //   const { stderr } = webpackProcess;
+    //   if (stderr) {
+    //     throw new Error(stderr.toString());
+    //   }
+    //   cb?.(null, {
+    //     outDir: options.appBuildDir,
+    //     timeElapsed: Date.now() - startTime,
+    //   });
+    // } catch (e) {
+    //   cb?.([e.message]);
+    //   console.error('【失败】编译失败，请查看上面的日志修改后重试');
+    // }
+    // runningCompilations[key] = false;
     // }
 }
 exports.startCompile = startCompile;

package/lib/builder/h5/copy.js

@@ -25,7 +25,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyMaterialLibraries = exports.runCopy = void 0;
 const path = __importStar(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const fs_extra_2 = require("fs-extra");
 const chalk_1 = __importDefault(require("chalk"));
 const config_1 = require("../config");
 const generateFiles_1 = require("../util/generateFiles");
@@ -40,7 +39,7 @@ async function runCopy(appBuildDir, webRuntimeAppData, i18nConfig) {
     console.log(chalk_1.default.blue.bold('Copying files:'));
     for (const entry of srcFiles) {
         const dstFile = path.join(appBuildDir, entry);
-        await (0, fs_extra_2.copy)(path.join(config_1.appTemplateDir, entry), dstFile);
+        await fs_extra_1.default.copy(path.join(config_1.appTemplateDir, entry), dstFile);
     }
     await (0, generateFiles_1.writeFile)(path.join(appBuildDir, 'mainAppData.json'), JSON.stringify(webRuntimeAppData, null, 2));
     const fileDir = path.join(appBuildDir, 'src/i18n/');
@@ -79,8 +78,7 @@ async function copyMaterialLibraries(dependencies = [], materialsDir, appBuildDi
         });
         const nodeModulesPath = path.join(materialDir, 'node_modules');
         const targetNodeModulesPath = path.join(librariesDir, 'node_modules');
-        if (fs_extra_1.default.existsSync(nodeModulesPath) &&
-            !fs_extra_1.default.existsSync(targetNodeModulesPath)) {
+        if (fs_extra_1.default.existsSync(nodeModulesPath) && !fs_extra_1.default.existsSync(targetNodeModulesPath)) {
             await fs_extra_1.default.symlink(nodeModulesPath, targetNodeModulesPath, 'dir');
         }
         // 副作用修改了dependence定义，trycatch 不阻塞主流程

package/lib/builder/h5/generate.js

@@ -11,7 +11,7 @@ const util_1 = require("../util");
 const common_1 = require("../util/common");
 const webpack_1 = require("../service/webpack");
 const config_1 = require("../config");
-const lodash_1 = __importDefault(require("lodash"));
+const lodash_1 = require("lodash");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const common_2 = require("../types/common");
 /**
@@ -28,12 +28,12 @@ async function generateHTML({ appId, appBuildDir, jsApis, mode, devTool, isBuild
     const templatePath = path_1.default.join(config_1.appTemplateDir, 'html', 'index.html.ejs');
     const dstFilePath = path_1.default.join(appBuildDir, 'index.html');
     const packageTpl = await fs_extra_1.default.readFile(templatePath, { encoding: 'utf8' });
-    await fs_extra_1.default.writeFile(dstFilePath, lodash_1.default.template(packageTpl)({
+    await fs_extra_1.default.writeFile(dstFilePath, (0, lodash_1.template)(packageTpl)({
         appId,
         title: '',
         desc: 'WeDa构建的应用',
         canUseVite: (0, util_1.canUseVite)(mode, devTool),
-        jsApis: lodash_1.default.uniq(jsApis),
+        jsApis: (0, lodash_1.uniq)(jsApis),
         mode,
         isBuildApp,
         isAdminPortal: (0, common_2.buildAsAdminPortalByBuildType)(buildTypeList),

package/lib/builder/h5/index.d.ts

@@ -1,11 +1,12 @@
-import { IMaterialItem, IWeAppData, II18nConfig, IExtraData } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IMaterialItem, II18nConfig, IExtraData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { BuildType, WebpackModeType } from '../types/common';
 import { DEPLOY_MODE, RUNTIME } from '../../types';
-export declare function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, mainAppSerializeData, buildTypeList, subAppSerializeDataList, mode, devTool, runtime, deployMode, ignoreInstall, domain, }: {
+import { IPlatformApp } from '@cloudbase/cals';
+export declare function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployMode, ignoreInstall, domain, }: {
     appKey: string;
     buildDir: string;
-    mainAppSerializeData: IWeAppData;
-    subAppSerializeDataList: IWeAppData[];
+    cals: IPlatformApp;
+    subAppCalsList: IPlatformApp[];
     dependencies: IMaterialItem[];
     i18nConfig?: II18nConfig;
     buildTypeList: BuildType[];

package/lib/builder/h5/index.js

@@ -18,11 +18,14 @@ const compile_1 = require("./compile");
 const util_1 = require("../util");
 const types_1 = require("../../types");
 const mp_1 = require("../mp");
-async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, mainAppSerializeData, buildTypeList = [common_1.BuildType.WEB], subAppSerializeDataList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployMode = types_1.DEPLOY_MODE.PREVIEW, ignoreInstall = false, domain = '', }) {
+const common_2 = require("../../utils/common");
+async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployMode = types_1.DEPLOY_MODE.PREVIEW, ignoreInstall = false, domain = '', }) {
     var _a, _b;
     try {
         const { materialsDir } = runtime === types_1.RUNTIME.CI ? (0, util_1.getCompileDirs)(appKey) : (0, util_1.getCompileDirs)('app');
         const h5BuildDir = path_1.default.join(buildDir, 'h5');
+        const mainAppSerializeData = (0, common_2.processCals2WeappsData)(cals, dependencies);
+        const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(item, dependencies))) || [];
         const buildContext = {
             projDir: buildDir,
             appId: appKey,
@@ -47,19 +50,17 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
         }
         const subAppDataList = subAppSerializeDataList.map((sub) => (0, weapps_core_1.deserialize)(sub));
         // 前置操作
-        const { publicPath, basename, assets = '', } = ((_b = mainAppData.appConfig) === null || _b === void 0 ? void 0 : _b.window) || {};
+        const { publicPath, basename, assets = '' } = ((_b = mainAppData.appConfig) === null || _b === void 0 ? void 0 : _b.window) || {};
         // 获取 插入的cdn 资源
         const jsAssets = await (0, generate_2.handleAssets)({
             appBuildDir: buildDir,
             buildTypeList,
             assets,
         });
-        // 拷贝 Builder 需要的文件
-        // TODO：验证 router
         await (0, copy_1.runCopy)(h5BuildDir, mainAppData, i18nConfig);
         // 构建 APP 需要的配置文件
         const appConfig = await (0, webpack_2.generateAppConfig)(mainAppData, subAppDataList, h5BuildDir);
-        // 素材库
+        // // 素材库
         const runHandleMaterialTag = '🚥  buildWebApp-runHandleMaterial';
         console.time(runHandleMaterialTag);
         // 精简只使用用到的组件库
@@ -68,11 +69,12 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
         });
         await (0, material_1.runHandleMaterial)(h5BuildDir, filteredDependiences, materialsDir, runtime, ignoreInstall);
         console.timeEnd(runHandleMaterialTag);
-        // 获取 generate 需要的构建文件
+        // // 获取 generate 需要的构建文件
         const runGenerateTag = '🚥  buildWebApp-generateProjectFiles';
         console.time(runGenerateTag);
         await (0, generate_1.generateProjectFiles)({
             dependencies: filteredDependiences,
+            cals,
             mainAppData,
             subAppDataList,
             appKey,
@@ -87,7 +89,7 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
             deployMode,
         });
         console.timeEnd(runGenerateTag);
-        // 构建 NPM 包
+        // // 构建 NPM 包
         await (0, npm_1.handleNPM)({
             appKey,
             mainAppData,
@@ -114,17 +116,26 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
             publicPath,
             domain,
         });
-        // 开始编译前清理一下 lowcode 内容
-        (0, compile_1.startCompile)({
-            appBuildDir: h5BuildDir,
-            configPath: webpackConfigPath,
-            appKey,
-            webpackMode: mode,
+        await new Promise((resolve, reject) => {
+            // 开始编译前清理一下 lowcode 内容
+            (0, compile_1.startCompile)({
+                appBuildDir: h5BuildDir,
+                configPath: webpackConfigPath,
+                appKey,
+                webpackMode: mode,
+            }, function (err, data) {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(data);
+                }
+            });
         });
         return h5BuildDir;
     }
     catch (e) {
-        console.error('构建失败：', e);
+        // console.error('构建失败：', e);
         throw e;
     }
 }

package/lib/builder/h5/material.js

@@ -18,14 +18,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runHandleMaterial = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const lodash_1 = __importDefault(require("lodash"));
+const lodash_1 = require("lodash");
 const webpack_1 = require("../service/webpack");
 const copy_1 = require("./copy");
 const types_1 = require("../../types");
@@ -40,12 +37,12 @@ async function runHandleMaterial(appBuildDir, dependencies = [], materialsDir, r
             ignoreInstall,
         }),
     ];
-    return lodash_1.default.flatten(allMaterials);
+    return (0, lodash_1.flatten)(allMaterials);
     // TODO: 确认这里是否需要生成复合组件
     // await handleCompositeComponent({ dependencies, appBuildDir });
 }
 exports.runHandleMaterial = runHandleMaterial;
-async function handleNormalMaterial({ dependencies, materialsDir, appBuildDir, runtime, ignoreInstall = false, }) {
+async function handleNormalMaterial({ dependencies, materialsDir, appBuildDir, runtime, ignoreInstall = false }) {
     const timeTag = '-------------------- handleNormalMaterial';
     console.time(timeTag);
     const normalDependencies = dependencies.filter((item) => !item.isComposite);
@@ -77,10 +74,8 @@ async function handleNormalMaterial({ dependencies, materialsDir, appBuildDir, r
         }
         else {
             // 老格式，需要从子目录下读取
-            actions =
-                ((_a = fs.readdirSync(actionsDir)) === null || _a === void 0 ? void 0 : _a.map((dirName) => ({ name: dirName }))) || [];
-            components = (_b = fs
-                .readdirSync(materialComponentsPath)) === null || _b === void 0 ? void 0 : _b.map((dirName) => ({ name: dirName }));
+            actions = ((_a = fs.readdirSync(actionsDir)) === null || _a === void 0 ? void 0 : _a.map((dirName) => ({ name: dirName }))) || [];
+            components = (_b = fs.readdirSync(materialComponentsPath)) === null || _b === void 0 ? void 0 : _b.map((dirName) => ({ name: dirName }));
         }
         // TODO: 根据mata判断而非readdir
         return {
@@ -102,7 +97,7 @@ async function handleNormalMaterial({ dependencies, materialsDir, appBuildDir, r
 //       (materialGroupInfoMap[item.name] = {
 //         isComposite: item.isComposite,
 //         version: item.version,
-//         entry: item.entry,
+//         entries: item.entries,
 //         schemaVersion: item.schemaVersion,
 //       })
 //   );

package/lib/builder/h5/npm.js

@@ -10,7 +10,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const console_1 = require("../util/console");
 const config_1 = require("../config");
 const generateFiles_1 = require("../util/generateFiles");
-const lodash_1 = __importDefault(require("lodash"));
+const lodash_1 = require("lodash");
 const util_1 = require("../util");
 async function handleNPM({ mainAppData, subAppDataList = [], dependencies = [], appKey, appBuildDir, mode, devTool, ignoreInstall = false, }) {
     const allAppDataList = subAppDataList.concat(mainAppData);
@@ -41,9 +41,10 @@ async function handleNPM({ mainAppData, subAppDataList = [], dependencies = [],
     if (!isChange) {
         (0, console_1.notice)('package.json dependencies 已经安装，如出现未安装成功或找不到依赖，请重启wa watch');
     }
-    else if (!ignoreInstall) {
-        await (0, webpack_1.installDependencies)(appBuildDir);
-    }
+    await (0, webpack_1.installDependencies)(appBuildDir, {
+        isDependence: false,
+        ignoreInstall,
+    });
 }
 exports.handleNPM = handleNPM;
 async function generatePackageJSON(dependencies = {}, appBuildDir, appKey, mode, devTool) {
@@ -52,7 +53,7 @@ async function generatePackageJSON(dependencies = {}, appBuildDir, appKey, mode,
     const dstTempPath = path_1.default.join(appBuildDir, '.temp', 'package.json');
     const packageTpl = await fs_extra_1.default.readFile(templatePath, { encoding: 'utf8' });
     await fs_extra_1.default.ensureFile(dstTempPath);
-    await fs_extra_1.default.writeFile(dstTempPath, lodash_1.default.template(packageTpl)({
+    await fs_extra_1.default.writeFile(dstTempPath, (0, lodash_1.template)(packageTpl)({
         canUseVite: (0, util_1.canUseVite)(mode, devTool),
         appKey,
         appId: appKey,