@cloudbase/lowcode-builder 0.1.26 → 1.0.0

package/lib/builder/service/webpack.js

@@ -3,22 +3,21 @@ 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 = 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_template_1 = __importDefault(require("lodash.template"));
+const lodash_1 = require("lodash");
 const util_1 = require("../util");
 const axios_1 = __importDefault(require("axios"));
 const compressing_1 = __importDefault(require("compressing"));
 const cross_spawn_1 = __importDefault(require("cross-spawn"));
 const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const config_1 = require("../config");
-// import { getPluginKboneSubpackage } from './plugin';
 const common_1 = require("../types/common");
-const config_2 = require("../config");
 const common_2 = require("../util/common");
 const types_1 = require("../../types");
 const generateFiles_1 = require("../util/generateFiles");
+exports.PERSISTENT_DEPENDIENCES_MAP = {};
 async function fixAppJson(appBuildDir) {
     const appJsonPath = path_1.default.resolve(appBuildDir, 'dist/mp/app.json');
     if (!fs_extra_1.default.existsSync(appJsonPath)) {
@@ -139,7 +138,6 @@ function generateKbonePageConfig(mpConfig, mainAppData, subAppDataList = []) {
             config_1.KBONE_PAGE_KEYS.forEach((key) => {
                 if (item.data[key]) {
                     mpConfig.pages[pageId][key] = item.data[key];
-                    delete item.data[key];
                 }
             });
             // extra 配置
@@ -284,10 +282,13 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
         },
         htmlTemplatePath: path_1.default.resolve(appBuildDir, './index.html'),
         externals: {
+            react: 'window.React',
+            'react-dom': 'window.ReactDOM',
             mobx: 'window.mobx',
             '@cloudbase/js-sdk': 'window.cloudbase',
             '@cloudbase/weda-cloud-sdk/dist/h5': 'window.CloudSDK',
             '@zxing/library': 'window.ZXing',
+            '@cloudbase/lowcode-render': 'window["weda-render"]',
         },
         resolveModules: [
             // path.resolve(appBuildDir, 'node_modules'),
@@ -300,6 +301,11 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
             'process.env.isAdminPortal': (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
             ...extraDefine,
         },
+        devtool: ['app-nvzcvt10', 'app-msa2ihs9'].includes(appId)
+            ? 'source-map'
+            : mode !== common_1.WebpackModeType.PRODUCTION
+                ? 'eval'
+                : false,
     };
 }
 exports.getWebpackWebBuildParams = getWebpackWebBuildParams;
@@ -314,7 +320,8 @@ function getWebpackMpBuildParams(appBuildDir, materialsDir, dependencies = [], n
             appBuildDir,
             path_1.default.resolve(appBuildDir, 'node_modules'),
             path_1.default.resolve(appBuildDir, 'src'),
-            ...getMaterialNodeModulesPathList(dependencies, materialsDir),
+            ...getMaterialNodeModulesPathList(dependencies, materialsDir, appBuildDir),
+            'node_modules',
         ],
         watchOptions: {
             ignored: /node_modules/,
@@ -350,23 +357,53 @@ async function downloadAndInstallDependencies(dependencies = [], materialsDir, i
         const { name, version, srcZipUrl } = item;
         const materialNameVersion = `${name}@${version}`;
         const targetDir = path_1.default.join(materialsDir, materialNameVersion);
-        // 如果需要下载素材
-        if (!(await fs_extra_1.default.pathExists(targetDir))) {
-            await downloadDependencies(targetDir, item.srcZipUrl);
-            await installDependencies(targetDir, {
-                ...installOptions,
-                isDependence: true,
-                ignoreInstall: (0, common_2.isOfficialComponentLib)(name, version),
-            });
-        }
-        // 同步依赖
-        const packageJson = await fs_extra_1.default.readJson(path_1.default.join(targetDir, 'package.json'));
-        item.dependencies = packageJson.dependencies || {};
         // 当前本地目录是素材库的时候，直接用本地的
         if (localPkg && localPkg.name === name && localPkg.version === version) {
             console.log('当前本地目录是素材库的时候，无需安装', materialNameVersion);
             return;
         }
+        // 如果需要下载素材
+        if (!(await fs_extra_1.default.pathExists(targetDir))) {
+            const matched = srcZipUrl.match(/\/(cg-.*?)\//);
+            const { appBuildDir } = (0, util_1.getCompileDirs)('app');
+            if ((matched === null || matched === void 0 ? void 0 : matched[1]) && fs_extra_1.default.existsSync(path_1.default.resolve(appBuildDir, `.component_cache/web/${matched[1]}@${version}`))) {
+                console.log(`link ${name}@${version} ...`);
+                await fs_extra_1.default.symlink(path_1.default.resolve(appBuildDir, `.component_cache/web/${matched[1]}@${version}`), targetDir, 'dir');
+                // await fs.copy(
+                //   path.resolve(
+                //     appBuildDir,
+                //     `.component_cache/web/${matched[1]}@${version}`
+                //   ),
+                //   targetDir,
+                //   {
+                //     filter: function (src, dest) {
+                //       const path = src.split('/');
+                //       return !junk.is(path[path.length - 1]);
+                //     },
+                //   }
+                // );
+            }
+            else {
+                console.log(`下载${name}@${version} ...`);
+                await downloadDependencies(targetDir, srcZipUrl);
+            }
+        }
+        console.log(`处理${name}@${version}依赖 ...`);
+        await installDependencies(targetDir, {
+            ...installOptions,
+            isDependence: true,
+            ignoreInstall: (0, common_2.isOfficialComponentLib)(name, version) || (installOptions === null || installOptions === void 0 ? void 0 : installOptions.ignoreInstall),
+            dependenceMeta: {
+                name,
+                version,
+                downloadUrl: srcZipUrl,
+            },
+        });
+        // 同步依赖
+        // const packageJson = await fs.readJson(
+        //   path.join(targetDir, 'package.json')
+        // );
+        // item.dependencies = packageJson.dependencies || {};
     }));
 }
 exports.downloadAndInstallDependencies = downloadAndInstallDependencies;
@@ -382,7 +419,27 @@ async function downloadDependencies(targetDir, srcZipUrl) {
             // proxy: false
         });
         await fs_extra_1.default.ensureDir(targetDir);
+        // let download = spawn(
+        //   'curl',
+        //   ['-fsSL', srcZipUrl, '-o', `${targetDir}.zip`],
+        //   {
+        //     stdio: 'inherit',
+        //   }
+        // );
+        // await promisifyProcess(download);
+        const tag = `uncompress ${srcZipUrl}`;
+        console.time(tag);
         await compressing_1.default.zip.uncompress(response.data, targetDir);
+        // let unzip = spawn(
+        //   'unzip',
+        //   ['-q', '-o', `${targetDir}.zip`, '-d', targetDir],
+        //   {
+        //     stdio: 'inherit',
+        //   }
+        // );
+        // await promisifyProcess(unzip);
+        // await fs.remove(`${targetDir}.zip`);
+        console.timeEnd(tag);
     }
     catch (e) {
         console.error(`Fail to download weapps material package ${srcZipUrl}`, e);
@@ -417,8 +474,15 @@ async function installDependencies(targetDir, options = {}) {
     console.time(operationTag);
     const registry = `--registry=${config_1.npmRegistry}`;
     const npmOptions = ['--prefer-offline', '--no-audit', '--progress=false', registry];
-    if (options === null || options === void 0 ? void 0 : options.isDependence) {
+    if (options === null || options === void 0 ? void 0 : options.dependenceMeta) {
         npmOptions.push('--production');
+        const { name, version } = options.dependenceMeta;
+        if (!fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'node_modules'))) {
+            exports.PERSISTENT_DEPENDIENCES_MAP[`${name}@${version}`] = {
+                ...options === null || options === void 0 ? void 0 : options.dependenceMeta,
+                source: targetDir,
+            };
+        }
     }
     let installProcess;
     // 云端构建, 选用 npm
@@ -436,6 +500,11 @@ async function installDependencies(targetDir, options = {}) {
         installProcess = cross_spawn_1.default.sync('npm', ['install', packageName, ...npmOptions], installlProcessOptions);
     }
     fixNodeModules(targetDir);
+    try {
+        await fs_extra_1.default.remove(path_1.default.join(path_1.default.join(targetDir, 'package-lock.json')));
+        await fs_extra_1.default.remove(path_1.default.join(path_1.default.join(targetDir, 'yarn.lock')));
+    }
+    catch (e) { }
     console.timeEnd(operationTag);
 }
 exports.installDependencies = installDependencies;
@@ -450,25 +519,29 @@ function fixNodeModules(projDir) {
         }
     }
 }
-function getMaterialNodeModulesPathList(dependencies = [], materialsDir) {
+function getMaterialNodeModulesPathList(dependencies = [], materialsDir, base) {
     const localPkg = (0, util_1.getCurrentPackageJson)();
     return dependencies.map(({ name, version }) => {
         const nameVersion = `${name}@${version}`;
+        let target = '';
         if (localPkg && localPkg.name === name && localPkg.version === version) {
             console.log('当前本地目录是素材库的时候，直接使用当前目录的 node_modules', nameVersion);
-            return path_1.default.join(process.cwd(), 'node_modules');
+            target = path_1.default.join(process.cwd(), 'node_modules');
+        }
+        else {
+            target = path_1.default.join(materialsDir, nameVersion, 'node_modules');
         }
-        return path_1.default.join(materialsDir, nameVersion, 'node_modules');
+        return base ? path_1.default.relative(base, target) : target;
     });
 }
 exports.getMaterialNodeModulesPathList = getMaterialNodeModulesPathList;
 // 生成devServer 核心依赖
 async function generateWebpackWebDevServerFile({ appBuildDir, buildTypeList }) {
     const dest = path_1.default.resolve(appBuildDir, `./webpack/devServer.js`);
-    const template = await fs_extra_1.default.readFile(path_1.default.resolve(config_2.appTemplateDir, './webpack/devServer.js'), {
+    const template = await fs_extra_1.default.readFile(path_1.default.resolve(config_1.appTemplateDir, './webpack/devServer.js'), {
         encoding: 'utf8',
     });
-    const jsContent = (0, lodash_template_1.default)(template, {
+    const jsContent = (0, lodash_1.template)(template, {
         interpolate: /<%=([\s\S]+?)%>/g,
     })({
         isApp: buildTypeList.includes(common_1.BuildType.APP),

package/lib/builder/types/common.d.ts

@@ -1,4 +1,4 @@
-export { BuildType, GenerateMpType, WebpackModeType, WebpackBuildCallBack, IPackageJson, buildAsWebByBuildType, buildAsAdminPortalByBuildType, IAppUsedComp, IUsedComps, ISyncProp, IComponentInputProps, IFileCodeMap, } from '@cloudbase/lowcode-generator/lib/generator/types/common';
+export { BuildType, GenerateMpType, WebpackModeType, WebpackBuildCallBack, IPackageJson, buildAsWebByBuildType, buildAsAdminPortalByBuildType, buildAsXPageByBuildType, IAppUsedComp, IUsedComps, ISyncProp, IComponentInputProps, IFileCodeMap, } from '@cloudbase/lowcode-generator/lib/generator/types/common';
 import { IComponentMeta, ICompositedComponent } from '@cloudbase/lowcode-generator/lib/weapps-core';
 export declare type IComponentsInfoMap = {
     [componentSourceKey: string]: ({

package/lib/builder/types/common.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildAsAdminPortalByBuildType = exports.buildAsWebByBuildType = exports.WebpackModeType = exports.GenerateMpType = exports.BuildType = void 0;
+exports.buildAsXPageByBuildType = exports.buildAsAdminPortalByBuildType = exports.buildAsWebByBuildType = exports.WebpackModeType = exports.GenerateMpType = exports.BuildType = void 0;
 var common_1 = require("@cloudbase/lowcode-generator/lib/generator/types/common");
 Object.defineProperty(exports, "BuildType", { enumerable: true, get: function () { return common_1.BuildType; } });
 Object.defineProperty(exports, "GenerateMpType", { enumerable: true, get: function () { return common_1.GenerateMpType; } });
 Object.defineProperty(exports, "WebpackModeType", { enumerable: true, get: function () { return common_1.WebpackModeType; } });
 Object.defineProperty(exports, "buildAsWebByBuildType", { enumerable: true, get: function () { return common_1.buildAsWebByBuildType; } });
 Object.defineProperty(exports, "buildAsAdminPortalByBuildType", { enumerable: true, get: function () { return common_1.buildAsAdminPortalByBuildType; } });
+Object.defineProperty(exports, "buildAsXPageByBuildType", { enumerable: true, get: function () { return common_1.buildAsXPageByBuildType; } });

package/lib/builder/util/common.js

@@ -222,11 +222,8 @@ function readComponentLibMata(libDir) {
 }
 exports.readComponentLibMata = readComponentLibMata;
 const _OFFICIAL_COMPONENT_LIB = {
-    'gsd-h5-react': ['0.0.61', '0.0.70'],
+    'gsd-h5-react': ['*'],
     CLOUDBASE_BUSSINESS: ['1627377179261'],
-    crm_basis: ['*', '1629778630449'],
-    tea_basis: ['*', '1629209320310'],
-    tea_shop: ['*'],
 };
 function isOfficialComponentLib(name, version) {
     var _a, _b;

package/lib/builder/util/generateFiles.js

@@ -25,7 +25,7 @@ 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;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
-const lodash_template_1 = __importDefault(require("lodash.template"));
+const lodash_1 = require("lodash");
 const junk = __importStar(require("../util/junk"));
 const glob_1 = __importDefault(require("glob"));
 const jszip_1 = __importDefault(require("jszip"));
@@ -41,7 +41,7 @@ async function generateFiles(appFileData, srcDir, dstDir, ctx) {
         const tplStr = await fs_extra_1.default.readFile(path_1.default.join(srcDir, srcFileName), {
             encoding: 'utf8',
         });
-        let generatedCode = (0, lodash_template_1.default)(tplStr, { interpolate: /<%=([\s\S]+?)%>/ })(appFileData[file]);
+        let generatedCode = (0, lodash_1.template)(tplStr, { interpolate: /<%=([\s\S]+?)%>/ })(appFileData[file]);
         // 混合模式下，引用公共路径要多增加一层，并加多一层命名
         // 混合子包直接在对应目录上生成，而不采用替换的方式 @royhyang
         // if (ctx?.isMixMode && ctx?.rootPath) {
@@ -75,7 +75,7 @@ async function writeFile(outFile, content) {
 }
 exports.writeFile = writeFile;
 function removeFile(file) {
-    console.log('Removing ' + file);
+    console.log(`Removing ${file}`);
     Object.keys(generatedFileContents).map((cachedFile) => {
         if (cachedFile.indexOf(file) === 0) {
             delete generatedFileContents[cachedFile];
@@ -145,7 +145,7 @@ exports.copyFileSync = copyFileSync;
  */
 const copyRecursiveSync = function (src, dest, options) {
     const exists = fs_extra_1.default.existsSync(src);
-    if (!exists || (options && options.filter && !options.filter(src, dest))) {
+    if (!exists || ((options === null || options === void 0 ? void 0 : options.filter) && !options.filter(src, dest))) {
         return;
     }
     const stats = fs_extra_1.default.statSync(src);
@@ -155,7 +155,7 @@ const copyRecursiveSync = function (src, dest, options) {
     }
     if (isDirectory) {
         const files = fs_extra_1.default.readdirSync(src);
-        files.forEach(function (childItemName) {
+        files.forEach((childItemName) => {
             (0, exports.copyRecursiveSync)(path_1.default.join(src, childItemName), path_1.default.join(dest, childItemName), options);
         });
     }
@@ -171,7 +171,7 @@ exports.copyRecursiveSync = copyRecursiveSync;
  * @returns
  */
 function mkDirByPathSync(targetDir, { isRelativeToScript = false } = {}) {
-    const sep = path_1.default.sep;
+    const { sep } = path_1.default;
     const initDir = path_1.default.isAbsolute(targetDir) ? sep : '';
     const baseDir = isRelativeToScript ? __dirname : '.';
     return targetDir.split(sep).reduce((parentDir, childDir) => {
@@ -180,15 +180,17 @@ function mkDirByPathSync(targetDir, { isRelativeToScript = false } = {}) {
             fs_extra_1.default.mkdirSync(curDir);
         }
         catch (err) {
-            if (err.code === 'EEXIST') { // curDir already exists!
+            if (err.code === 'EEXIST') {
+                // curDir already exists!
                 return curDir;
             }
             // To avoid `EISDIR` error on Mac and `EACCES`-->`ENOENT` and `EPERM` on Windows.
-            if (err.code === 'ENOENT') { // Throw the original parentDir error on curDir `ENOENT` failure.
+            if (err.code === 'ENOENT') {
+                // Throw the original parentDir error on curDir `ENOENT` failure.
                 throw new Error(`EACCES: permission denied, mkdir '${parentDir}'`);
             }
             const caughtErr = ['EACCES', 'EPERM', 'EISDIR'].indexOf(err.code) > -1;
-            if (!caughtErr || caughtErr && curDir === path_1.default.resolve(targetDir)) {
+            if (!caughtErr || (caughtErr && curDir === path_1.default.resolve(targetDir))) {
                 throw err; // Throw if it's just the last created dir.
             }
         }
@@ -231,7 +233,7 @@ exports.getFiles = getFiles;
  * @returns
  */
 async function fileToZip(files, type) {
-    var zip = new jszip_1.default();
+    let zip = new jszip_1.default();
     for (let prop in files) {
         zip.file(prop, files[prop]);
     }

package/lib/builder/util/mp.js

@@ -18,9 +18,6 @@ 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.mergePages = exports.mergePackageDependiences = exports.mergePackageJson = exports.mergeSubPackages = void 0;
 /**
@@ -31,7 +28,7 @@ exports.mergePages = exports.mergePackageDependiences = exports.mergePackageJson
  * Please refer to license text included with this package for license details.
  */
 const fs = __importStar(require("fs-extra"));
-const lodash_1 = __importDefault(require("lodash"));
+const lodash_1 = require("lodash");
 const mp_config_1 = require("../mp/mp_config");
 // 将后面的子包配置合并到前面
 // 暂时不考虑 root 会重名的情况
@@ -80,10 +77,7 @@ exports.mergePackageDependiences = mergePackageDependiences;
 async function mergePages(baseAppJsonPath, mergeAppJsonPath) {
     const baseJson = fs.readJSONSync(baseAppJsonPath);
     const mergeJson = fs.readJSONSync(mergeAppJsonPath);
-    baseJson.pages = lodash_1.default.uniq([
-        ...(baseJson.pages || []),
-        ...(mergeJson.pages || []),
-    ]);
+    baseJson.pages = (0, lodash_1.uniq)([...(baseJson.pages || []), ...(mergeJson.pages || [])]);
     await fs.writeJSON(baseAppJsonPath, baseJson, { spaces: 2 });
 }
 exports.mergePages = mergePages;