@cloudbase/lowcode-builder 1.1.5-alpha.2 → 1.1.6

package/lib/builder/mp/index.js

@@ -54,18 +54,35 @@ const cals_1 = require("@cloudbase/cals");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
-async function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, }) {
+async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder = false, ignoreInstall = false, }) {
     var _a;
-    const { appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isBrowserMpBuilder, isPrivateMode = false, } = buildContext;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log(`Generating ${em('Wexin MiniProgram')} to ${projDir}`);
-    const { allAppUsedComps } = handleUsedComponents({ buildContext, weapps });
+    console.log(em('domain') + domain);
+    let mainAppData = weapps[0];
+    const buildContext = {
+        projDir,
+        appId,
+        isProduction,
+        materialLibs: materials,
+        debugMode: !isProduction && !!process.env.WEAPPS_DEBUG,
+        isMixMode,
+        mainAppData,
+        domain,
+        isBrowserMpBuilder,
+    };
+    const yyptConfig = await (0, util_3.getYyptConfigInfo)(extraData);
+    const { allAppUsedComps } = handleUsedComponents({
+        buildContext,
+        weapps,
+        materials,
+    });
     buildContext.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
     // 安装依赖库，生成 materials 目录
     await (0, materials_1.installMaterials)(projDir, allAppUsedComps, weapps, buildContext);
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
-    const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(weapps, buildContext, { mpAppId: options.mpAppId });
+    const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(weapps, buildContext, { mpAppId: options === null || options === void 0 ? void 0 : options.mpAppId });
     // #1 generate project files
     if (!mainAppData.mpPkgUrl) {
         const projectFileData = {
@@ -118,8 +135,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
         };
     }
     if (mainAppData.mpPkgUrl) {
-        // 合并 project 和 app json，复写 appId
-        projectConfigJson.appId = projConfig.appId;
+        // 合并 project 和 app json
         if (!projectConfigJson.setting) {
             projectConfigJson.setting = {};
         }
@@ -137,6 +153,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
         const importor = (0, util_3.generateLowcodeImportor)(mainAppData.lowCodes || []);
         appFileData = {
             ...appFileData,
+            'common/wx_yypt_report_v2.js': {},
             'app.js': { appConfig, importor },
             'app.json': { content: appConfig },
             'app.wxss': {
@@ -149,7 +166,6 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
             },
             'package.json': {
                 appId,
-                isPrivateMode,
                 extraDeps: resolveNpmDeps(),
             },
         };
@@ -171,7 +187,6 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
                 clientID: (_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
-                isPrivateMode,
             },
             'datasources/datasource-profiles.js.tpl': {
                 datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(
@@ -206,7 +221,6 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
                 await (0, generateFiles_1.default)({
                     'package.json': {
                         appId,
-                        isPrivateMode,
                         extraDeps: resolveNpmDeps(),
                     },
                 }, templateDir, subpackageRootPath, buildContext);
@@ -214,9 +228,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
         }
     }));
     if (!isBrowserMpBuilder && fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
-        await (0, webpack_1.installDependencies)(miniprogramRoot, {
-            fixNodeModulesMap: { '@cloudbase/js-sdk': !isPrivateMode, mobx: true },
-        });
+        await (0, webpack_1.installDependencies)(miniprogramRoot, { ignoreInstall });
     }
     await handleMpPlugins();
     console.timeEnd(operationLabel);
@@ -228,7 +240,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
         var _a;
         const deps = [
             {
-                deps: ((_a = weapps.find((a) => !a.rootPath)) === null || _a === void 0 ? void 0 : _a.npmDependencies) || {},
+                deps: ((_a = weapps.find((a) => !a.rootPath)) === null || _a === void 0 ? void 0 : _a.npmDependencies) || [],
                 name: '主包',
             },
         ];
@@ -415,7 +427,7 @@ async function writeLowCodeFiles(appData, outDir, ctx) {
     // 混合模式，子包不生成顶级（应用级）的 lowcodes
     if (!(ctx.isMixMode && appData.rootPath)) {
         await Promise.all(lowCodes
-            .filter((mod) => mod.type !== cals_1.ECodeType.RENDERER)
+            .filter((mod) => mod.type !== 'renderer')
             .map((m) => {
             (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { appDir: outDir }, themeStyle.code);
         }));
@@ -423,7 +435,7 @@ async function writeLowCodeFiles(appData, outDir, ctx) {
     await Promise.all((0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, async (page) => {
         const codes = (0, cals_1.processRuntimeCodeResources)({ id: page.id }, page.lowCodes || page.codeModules, 'page');
         await codes
-            .filter((mod) => mod.type !== cals_1.ECodeType.RENDERER)
+            .filter((mod) => mod.type !== 'renderer')
             .forEach((m) => {
             (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { pageId: page.id, appDir: outDir }, themeStyle.code, ctx);
         });
@@ -451,8 +463,7 @@ function getAppendableJson(json) {
  * TODO: 与 cals 里的实现进行整合
  * 关键点在于 appUsedComps 分组， 与 generic componen 的实现
  */
-function handleUsedComponents({ buildContext, weapps }) {
-    const { materialLibs: materials } = buildContext;
+function handleUsedComponents({ buildContext, weapps, materials, }) {
     const appUsedComps = weapps.map((app) => {
         var _a;
         const usedComps = {};

package/lib/builder/mp/materials.js

@@ -327,12 +327,6 @@ async function generateCompositeComponent(compositedComp, ctx, compLibCommonReso
          ${compLibCommonResource.theme.class || ''}
       `;
         }
-        /**
-         * 低码没有开放 index 类别，直接去掉
-         */
-        if (mod.name === 'index') {
-            return;
-        }
         return (0, lowcode_1.writeCode2file)(mod, path.join(outDir, LOWCODE_DIR_NAME), { comp: compositedComp }, themeCode, ctx);
     });
     // await writeLowCodeFiles(weapp, appRoot)

package/lib/builder/mp/mixMode.d.ts

@@ -1,9 +1,8 @@
 import { IWeAppData, IPlugin, IMaterialItem } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IAppUsedComp } from '../types/common';
-import { IBuildContext } from '../mp/BuildContext';
-export declare function handleMixMode({ buildContext, apps, miniprogramRoot, plugins, }: {
-    buildContext: IBuildContext;
+export declare function handleMixMode({ apps, generateMpPath, miniprogramRoot, plugins, }: {
     apps: IWeAppData[];
+    generateMpPath: string;
     miniprogramRoot: string;
     plugins: IPlugin[];
 }): Promise<void>;

package/lib/builder/mp/mixMode.js

@@ -36,16 +36,13 @@ const chalk_1 = __importDefault(require("chalk"));
 const generateFiles_1 = require("../util/generateFiles");
 const webpack_1 = require("../service/webpack");
 // 将 BUILD 目录往混合模式移动
-async function handleMixMode({ buildContext, apps = [], miniprogramRoot, plugins = [], }) {
-    const { projDir: generateMpPath, isPrivateMode } = buildContext;
+async function handleMixMode({ apps = [], generateMpPath, miniprogramRoot, plugins = [], }) {
     // await handleMainApp()
     // await handleAppPages()
     await handleSubApps();
     // await handleAppJson()
     // await handlePkgJson()
-    await (0, webpack_1.installDependencies)(miniprogramRoot, {
-        fixNodeModulesMap: { mobx: true, '@cloudbase/js-sdk': !isPrivateMode },
-    });
+    await (0, webpack_1.installDependencies)(miniprogramRoot);
     await handlePlugins();
     // 复制框架公用内容
     async function handleMainApp() {

package/lib/builder/mp/mp_config.d.ts

@@ -6,7 +6,7 @@ import { IBuildContext } from './BuildContext';
  * @param kboneConfig https://wechat-miniprogram.github.io/kbone/docs/config/
  * @param appConfigs app config from prop edit panel
  */
-export declare function generateMpConfig(weapps: IWeAppData[], ctx: IBuildContext, options: {
+export declare function generateMpConfig(weapps: IWeAppData[], ctx: IBuildContext, options?: {
     mpAppId?: string;
 }): {
     appConfig: any;

package/lib/builder/mp/mp_config.js

@@ -48,6 +48,7 @@ function generateMpConfig(weapps, ctx, options) {
     const { miniprogramPlugins = [] } = ctx;
     const projConfig = (0, lodash_1.merge)({}, mp_1.defaultProjConfig, {
         projectname: (ctx.mainAppData && ctx.mainAppData.label) || `WeDa-${ctx.appId}`,
+        appid: (options === null || options === void 0 ? void 0 : options.mpAppId) || mp_1.defaultProjConfig.appid,
     });
     const pageConfigs = weapps.map((app) => {
         var _a;
@@ -116,9 +117,6 @@ function generateMpConfig(weapps, ctx, options) {
             });
         }
     });
-    if (options.mpAppId) {
-        projConfig.appId = options.mpAppId;
-    }
     // merge(pageConfigs, extractAllPagesConfig())
     return { appConfig, projConfig, pageConfigs };
 }
@@ -167,7 +165,7 @@ function transformDynamicData(originData) {
     const temp = {};
     for (const key in originData) {
         const target = originData[key];
-        if (target === null || target === void 0 ? void 0 : target.value) {
+        if (target && target.value) {
             temp[key] = target.value;
         }
     }

package/lib/builder/mp/util.js

@@ -67,7 +67,7 @@ function generateDataBindMeta(bind) {
             imports += (0, lowcode_generator_1.generateExpressionAlias)(value);
         }
         catch (e) {
-            console.error('parse expression error', value);
+            console.error('parse expression error', value, e === null || e === void 0 ? void 0 : e.message);
         }
         expr = value;
     }

package/lib/builder/service/webpack.d.ts

@@ -2,7 +2,6 @@ import { IMaterialItem, IWebRuntimeAppData } from '@cloudbase/lowcode-generator/
 import { BuildType, WebpackModeType } from '../types/common';
 import { RUNTIME } from '../../types';
 export declare const PERSISTENT_DEPENDIENCES_MAP: {};
-export declare const OUTPUT_DIR = "preview";
 export interface IMpConfig {
     origin: string;
     entry: string;
@@ -75,17 +74,11 @@ export interface IInstallOpts {
         version: string;
         downloadUrl: string;
     };
-    fixNodeModulesMap?: IFixNodeModulesMap;
 }
 export declare function installDependencies(targetDir: string, options?: IInstallOpts): Promise<void>;
-interface IFixNodeModulesMap {
-    mobx?: boolean;
-    '@cloudbase/js-sdk'?: boolean;
-}
 export declare function getMaterialNodeModulesPathList(dependencies: IMaterialItem[] | undefined, materialsDir: string, base?: string): string[];
 export declare function generateWebpackWebDevServerFile({ appBuildDir, buildTypeList }: {
     appBuildDir: any;
     buildTypeList: any;
 }): Promise<void>;
 export declare function downloadAssets(targetDir: string, assetUrl: string): Promise<unknown>;
-export {};

package/lib/builder/service/webpack.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadAssets = exports.generateWebpackWebDevServerFile = exports.getMaterialNodeModulesPathList = exports.installDependencies = exports.downloadDependencies = exports.downloadAndInstallDependencies = exports.getAllPageMpEntryPath = exports.getWebpackMpBuildParams = exports.getWebpackWebBuildParams = exports.getMpAllRouterConfig = exports.getPageName = exports.getHomePageInstance = exports.getMainAppDataByList = exports.generateMpJsonConfigFile = exports.generateKboneAppConfig = exports.generateKbonePageConfig = exports.downloadAndWriteTabBarIcon = exports.generateKboneTabBarConfig = exports.generateAppConfig = exports.generateWebpackWebBuildParamsFile = exports.fixAppJson = exports.OUTPUT_DIR = exports.PERSISTENT_DEPENDIENCES_MAP = void 0;
+exports.downloadAssets = exports.generateWebpackWebDevServerFile = exports.getMaterialNodeModulesPathList = exports.installDependencies = exports.downloadDependencies = exports.downloadAndInstallDependencies = exports.getAllPageMpEntryPath = exports.getWebpackMpBuildParams = exports.getWebpackWebBuildParams = exports.getMpAllRouterConfig = exports.getPageName = exports.getHomePageInstance = exports.getMainAppDataByList = exports.generateMpJsonConfigFile = exports.generateKboneAppConfig = exports.generateKbonePageConfig = exports.downloadAndWriteTabBarIcon = exports.generateKboneTabBarConfig = exports.generateAppConfig = exports.generateWebpackWebBuildParamsFile = exports.fixAppJson = exports.PERSISTENT_DEPENDIENCES_MAP = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = require("lodash");
@@ -18,7 +18,6 @@ const common_2 = require("../util/common");
 const types_1 = require("../../types");
 const generateFiles_1 = require("../util/generateFiles");
 exports.PERSISTENT_DEPENDIENCES_MAP = {};
-exports.OUTPUT_DIR = 'preview';
 async function fixAppJson(appBuildDir) {
     const appJsonPath = path_1.default.resolve(appBuildDir, 'dist/mp/app.json');
     if (!fs_extra_1.default.existsSync(appJsonPath)) {
@@ -274,7 +273,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
         watch: false,
         entry: path_1.default.resolve(appBuildDir, 'src/index.jsx'),
         output: {
-            path: path_1.default.resolve(appBuildDir, exports.OUTPUT_DIR),
+            path: path_1.default.resolve(appBuildDir, './preview'),
             filename: '[name].[contenthash].bundle.js',
             chunkFilename: '[name].[contenthash].chunk.js',
             publicPath: buildTypeList.includes(common_1.BuildType.APP) || buildTypeList.includes(common_1.BuildType.ADMIN_PORTAL) ? '' : publicPath,
@@ -295,6 +294,8 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
         resolveModules: [path_1.default.resolve(appBuildDir), 'node_modules'],
         definePlugin: {
             'process.env.buildType': `"${buildTypeList[0]}"`,
+            'process.env.isApp': buildTypeList.includes(common_1.BuildType.APP),
+            'process.env.isAdminPortal': (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
             ...extraDefine,
         },
         devtool: ['app-nvzcvt10', 'app-msa2ihs9'].includes(appId)
@@ -455,7 +456,11 @@ async function installDependencies(targetDir, options = {}) {
         }
     }
     catch (e) { }
-    if ((options === null || options === void 0 ? void 0 : options.ignoreInstall) && fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'node_modules'))) {
+    // 如果generatedFileContents[path.resolve(targetDir, 'package.json')]不存在，说明是不存在缓存文件，isPkgModify必须是true，才不会忽略install
+    const isPkgModify = !generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')]
+        ? true
+        : generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')].modify;
+    if ((options === null || options === void 0 ? void 0 : options.ignoreInstall) && fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'node_modules')) && !isPkgModify) {
         console.log(`ignore install dependencies in ${targetDir}`);
         return;
     }
@@ -480,25 +485,20 @@ async function installDependencies(targetDir, options = {}) {
             };
         }
     }
+    let installProcess;
     // 云端构建, 选用 npm
-    const installProcessOptions = {
+    const installlProcessOptions = {
         cwd: targetDir,
         // NODE_ENV="production"时，devDependencies里的包不会下载，兼容h5在线编译
         env: { ...process.env, NODE_ENV: '' },
         stdio: 'inherit',
     };
-    let installprocess;
-    // TODO: install 失败 应该终止进程
     if (yarnExists && (options === null || options === void 0 ? void 0 : options.runtime) !== types_1.RUNTIME.CI) {
         const addPackage = packageName ? ['add', packageName] : [];
-        installprocess = cross_spawn_1.default.sync('yarn', [...addPackage, registry], installProcessOptions);
+        installProcess = cross_spawn_1.default.sync('yarn', [...addPackage, registry], installlProcessOptions);
     }
     else {
-        installprocess = cross_spawn_1.default.sync('npm', ['install', packageName, ...npmOptions], installProcessOptions);
-    }
-    // TODO: 确认 process.status 语义来判断是否标识进程正常退出
-    if (installprocess.status) {
-        throw new Error(`安装依赖失败 ${installprocess.error || ''}`);
+        installProcess = cross_spawn_1.default.sync('npm', ['install', packageName, ...npmOptions], installlProcessOptions);
     }
     fixNodeModules(targetDir);
     try {
@@ -509,24 +509,14 @@ async function installDependencies(targetDir, options = {}) {
     console.timeEnd(operationTag);
 }
 exports.installDependencies = installDependencies;
-function fixNodeModules(projDir, options = { mobx: false, '@cloudbase/js-sdk': false }) {
-    const { mobx = false, ['@cloudbase/js-sdk']: jsSDK = false } = options;
-    if (mobx) {
-        // # fix mobx/package.json: "main": "lib/index.js" -> "main": "lib/index.js"
-        const mobxPackageFile = path_1.default.join(projDir, 'node_modules', 'mobx/package.json');
-        if (fs_extra_1.default.existsSync(mobxPackageFile)) {
-            const mobxPackageFileContent = fs_extra_1.default.readJSONSync(mobxPackageFile);
-            if (fs_extra_1.default.existsSync(path_1.default.join(projDir, 'node_modules', 'mobx/lib/mobx.min.js'))) {
-                mobxPackageFileContent.main = 'lib/mobx.min.js';
-                fs_extra_1.default.writeJSONSync(mobxPackageFile, mobxPackageFileContent);
-            }
-        }
-    }
-    if (jsSDK) {
-        const scriptPath = path_1.default.resolve(projDir, 'node_modules', '@cloudbase/weda-cloud-sdk/scripts/fix-wx-none-private');
-        if (fs_extra_1.default.existsSync(scriptPath)) {
-            const fix = require(scriptPath);
-            fix();
+function fixNodeModules(projDir) {
+    // # fix mobx/package.json: "main": "lib/index.js" -> "main": "lib/index.js"
+    const mobxPackageFile = path_1.default.join(projDir, 'node_modules', 'mobx/package.json');
+    if (fs_extra_1.default.existsSync(mobxPackageFile)) {
+        const mobxPackageFileContent = fs_extra_1.default.readJSONSync(mobxPackageFile);
+        if (fs_extra_1.default.existsSync(path_1.default.join(projDir, 'node_modules', 'mobx/lib/mobx.min.js'))) {
+            mobxPackageFileContent.main = 'lib/mobx.min.js';
+            fs_extra_1.default.writeJSONSync(mobxPackageFile, mobxPackageFileContent);
         }
     }
 }

package/lib/builder/util/generateFiles.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { IBuildContext } from '../mp/BuildContext';
 import { OutputType } from 'jszip';
+export declare const generatedFileContents: {};
 export default function generateFiles(appFileData: any, srcDir: string, dstDir: string, ctx: IBuildContext): Promise<string[]>;
 export declare function writeFile(outFile: string, content: string): Promise<boolean>;
 export declare function removeFile(file: string): void;

package/lib/builder/util/generateFiles.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.strToBuf = exports.fileToZip = exports.getFiles = exports.copyRecursiveSync = exports.copyFileSync = exports.copy = exports.copyFiles = exports.cleanDir = exports.removeFile = exports.writeFile = void 0;
+exports.strToBuf = exports.fileToZip = exports.getFiles = exports.copyRecursiveSync = exports.copyFileSync = exports.copy = exports.copyFiles = exports.cleanDir = exports.removeFile = exports.writeFile = exports.generatedFileContents = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const lodash_1 = require("lodash");
@@ -34,7 +34,7 @@ const junk = __importStar(require("../util/junk"));
 const glob_1 = __importDefault(require("glob"));
 const jszip_1 = __importDefault(require("jszip"));
 const buffer_1 = require("buffer");
-const generatedFileContents = {}; // generated files for incrmental build
+exports.generatedFileContents = {}; // generated files for incrmental build
 async function generateFiles(appFileData, srcDir, dstDir, ctx) {
     const filesGenerated = [];
     // Generating file by template and data
@@ -67,22 +67,24 @@ async function generateFiles(appFileData, srcDir, dstDir, ctx) {
 }
 exports.default = generateFiles;
 async function writeFile(outFile, content) {
-    const generated = generatedFileContents[outFile];
+    var _a;
+    const generated = (_a = exports.generatedFileContents[outFile]) === null || _a === void 0 ? void 0 : _a.content;
     if (generated === content && fs_extra_1.default.existsSync(outFile)) {
+        exports.generatedFileContents[outFile].modify = false;
         return false;
     }
     // console.log(outFile);
     await fs_extra_1.default.ensureFile(outFile);
     await fs_extra_1.default.writeFile(outFile, content);
-    generatedFileContents[outFile] = content;
+    exports.generatedFileContents[outFile] = { content, modify: true };
     return true;
 }
 exports.writeFile = writeFile;
 function removeFile(file) {
     console.log(`Removing ${file}`);
-    Object.keys(generatedFileContents).map((cachedFile) => {
+    Object.keys(exports.generatedFileContents).map((cachedFile) => {
         if (cachedFile.indexOf(file) === 0) {
-            delete generatedFileContents[cachedFile];
+            delete exports.generatedFileContents[cachedFile];
         }
     });
     return fs_extra_1.default.removeSync(file);

package/lib/builder/util/junk.d.ts

@@ -1,2 +1,3 @@
 export declare const is: (filename: any) => boolean;
 export declare const not: (filename: any) => boolean;
+export declare const isFilePath: (filename: any) => boolean;

package/lib/builder/util/junk.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.not = exports.is = void 0;
+exports.isFilePath = exports.not = exports.is = void 0;
 const ignoreList = [
     // # All
     '^npm-debug\\.log$',
@@ -25,8 +25,14 @@ const ignoreList = [
     '^readme.md$',
     '^README.md$',
 ];
+const filePathIgnoreList = [
+    '__MACOSX', // 路径有__MACOSX就过滤
+];
 const regex = new RegExp(ignoreList.join('|'));
+const filePathRegex = new RegExp(filePathIgnoreList.join('|'));
 const is = (filename) => regex.test(filename);
 exports.is = is;
 const not = (filename) => !(0, exports.is)(filename);
 exports.not = not;
+const isFilePath = (filename) => filePathRegex.test(filename);
+exports.isFilePath = isFilePath;

package/lib/builder/util/net.js

@@ -34,6 +34,7 @@ const compressing_1 = __importDefault(require("compressing"));
 const jszip_1 = __importDefault(require("jszip"));
 const config_1 = require("../config");
 const generateFiles_1 = require("../util/generateFiles");
+const junk_1 = require("../util/junk");
 async function downloadFile(url, filePath) {
     await fs_extra_1.default.ensureDir(path.dirname(filePath));
     const res = await axios_1.default.get(url, { responseType: 'stream' });
@@ -91,6 +92,9 @@ async function saveFiles(files, dstDir) {
     try {
         for (const fileName of Object.keys(files)) {
             const dest = path.join(dstDir, fileName);
+            if ((0, junk_1.isFilePath)(dest)) {
+                continue;
+            }
             if (files[fileName].dir) { // 如果该文件为目录需先创建文件夹
                 fs_extra_1.default.mkdirSync(dest, {
                     recursive: true