@cloudbase/lowcode-builder 0.1.3 → 0.1.4

package/lib/builder/mp/index.js

@@ -93,31 +93,42 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
     const miniprogramRoot = path_1.default.join(projDir, projectConfigJson.miniprogramRoot || '/');
     await generateFramework(mainAppData, miniprogramRoot, buildContext);
     // #3 生成主包根路径文件
-    let appFileData = {
-        'common/style.js': {},
-        'common/utils.wxs': {
-            domain: domain,
-        },
-        'common/util.js': {
-            isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
-        },
-        'common/widget.js': {},
-        'common/url.js': {},
-        'common/weapp-sdk.js': {},
-        'common/weapp-page.js': {
-            dataPropNames: wxmlDataPrefix,
-            debug: buildContext.debugMode,
-        },
-        'common/weapp-component.js': {},
-        'common/merge-renderer.js': {
-            dataPropNames: wxmlDataPrefix,
-            debug: buildContext.debugMode,
-        },
-        'common/process.js': {},
-        'common/data-patch.js': {},
-        'common/event-emitter.js': {},
-        'common/watch.js': {},
-    };
+    let appFileData = {};
+    if (weapps.find((item) => !item.mpPkgUrl)) {
+        await generateFramework(mainAppData, miniprogramRoot, buildContext);
+        // 有了 framework app 之后，并且是源码的方式,追加 app 引用
+        if (mainAppData.mpPkgUrl) {
+            let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
+            let appJsContent = await fs.readFile(appJsPath);
+            await (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
+        }
+        appFileData = {
+            ...appFileData,
+            'common/style.js': {},
+            'common/utils.wxs': {
+                domain: domain,
+            },
+            'common/util.js': {
+                isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
+            },
+            'common/widget.js': {},
+            'common/url.js': {},
+            'common/weapp-sdk.js': {},
+            'common/weapp-page.js': {
+                dataPropNames: wxmlDataPrefix,
+                debug: buildContext.debugMode,
+            },
+            'common/weapp-component.js': {},
+            'common/merge-renderer.js': {
+                dataPropNames: wxmlDataPrefix,
+                debug: buildContext.debugMode,
+            },
+            'common/process.js': {},
+            'common/data-patch.js': {},
+            'common/event-emitter.js': {},
+            'common/watch.js': {},
+        };
+    }
     if (mainAppData.mpPkgUrl) {
         // 合并 project 和 app json
         if (!projectConfigJson.setting) {
@@ -142,9 +153,6 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         }
         appJson.subpackages = subpackages;
         await (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
-        let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
-        let appJsContent = await fs.readFile(appJsPath);
-        await (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
     }
     else {
         appFileData = {
@@ -178,26 +186,28 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         await fs.move(path_1.default.join(projDir, config_1.materialsDirName), path_1.default.join(miniprogramRoot, config_1.materialsDirName));
     }
     // 生成数据源
-    const datasourceFileData = {
-        'datasources/index.js': {},
-        'datasources/config.js.tpl': {
-            envID: mainAppData.envId,
-            appID: appId,
-            resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
-            isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
-        },
-        'datasources/datasource-profiles.js.tpl': {
-            datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(weapps.reduce((datasources, app) => {
-                datasources.push(...(app.datasources || []));
-                return datasources;
-            }, [])), { EOL: true }),
-        },
-        'datasources/dataset-profiles.js.tpl': {
-            datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasetProfiles)(mainAppData, weapps), { EOL: true }),
-        },
-    };
-    console.log('Generating ' + em('datasources') + ' files');
-    await (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot, buildContext);
+    if (weapps.find((item) => !item.mpPkgUrl)) {
+        const datasourceFileData = {
+            'datasources/index.js': {},
+            'datasources/config.js.tpl': {
+                envID: mainAppData.envId,
+                appID: appId,
+                resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
+                isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
+            },
+            'datasources/datasource-profiles.js.tpl': {
+                datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(weapps.reduce((datasources, app) => {
+                    datasources.push(...(app.datasources || []));
+                    return datasources;
+                }, [])), { EOL: false }),
+            },
+            'datasources/dataset-profiles.js.tpl': {
+                datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasetProfiles)(mainAppData, weapps), { EOL: true }),
+            },
+        };
+        console.log('Generating ' + em('datasources') + ' files');
+        await (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot, buildContext);
+    }
     // 生成子包
     await Promise.all(weapps.map(async (app, index) => {
         if (index == 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -33,7 +33,7 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "0.3.3",
+    "@cloudbase/cals": "^0.3.3",
     "@cloudbase/lowcode-generator": "^0.6.13",
     "axios": "^0.21.0",
     "chalk": "^2.4.2",
@@ -68,4 +68,4 @@
     "ts-node": "^10.4.0",
     "typescript": "^4.4.2"
   }
-}
+}

package/lib/generate.d.ts

@@ -1 +0,0 @@
-export declare function handleMpPlugins(plugins: any[] | undefined, appBuildDir: string): Promise<void>;

package/lib/generate.js

@@ -1,60 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleMpPlugins = void 0;
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const core_1 = require("./builder/core");
-const lodash_1 = require("lodash");
-async function handleMpPlugins(plugins = [], appBuildDir) {
-    const appBuildMpDir = path_1.default.resolve(appBuildDir, 'dist/mp');
-    const appBuildNodeModulesDir = path_1.default.resolve(appBuildDir, 'node_modules');
-    const mpBuildPkgJsonPath = path_1.default.resolve(appBuildMpDir, 'package.json');
-    const buildPkgJson = fs_extra_1.default.readJsonSync(mpBuildPkgJsonPath);
-    const sourcePkgJson = fs_extra_1.default.readJsonSync(path_1.default.join(appBuildDir, 'package.json'));
-    // 合并插件内容
-    plugins
-        .filter((plugin) => plugin.type === 'mp')
-        .forEach((plugin) => {
-        const mpBuildAppJsonPath = path_1.default.resolve(appBuildMpDir, 'app.json');
-        const pluginAppJsonPath = path_1.default.resolve(appBuildNodeModulesDir, plugin.module, 'app.json');
-        // 合并 app.json
-        mergeSubPackages(mpBuildAppJsonPath, pluginAppJsonPath);
-        // 加入到包依赖中
-        buildPkgJson.dependencies[plugin.module] =
-            sourcePkgJson.dependencies[plugin.module];
-    });
-    // 安装
-    fs_extra_1.default.writeJsonSync(mpBuildPkgJsonPath, buildPkgJson, { spaces: 2 });
-    console.log('小程序安装依赖', appBuildMpDir);
-    await (0, core_1.installDep)(appBuildMpDir);
-}
-exports.handleMpPlugins = handleMpPlugins;
-function mergeSubPackages(baseAppJsonPath, mergeAppJsonPath) {
-    const baseJson = fs_extra_1.default.readJSONSync(baseAppJsonPath);
-    const mergeJson = fs_extra_1.default.readJSONSync(mergeAppJsonPath);
-    if (!mergeJson.subpackages)
-        return;
-    const newJson = { ...baseJson };
-    if (!baseJson.subpackages) {
-        newJson.subpackages = mergeJson.subpackages;
-    }
-    else {
-        mergeJson.subpackages.forEach((mergeItem) => {
-            // 找到重复的进行合并再去重
-            const targetItemIdx = newJson.subpackages.findIndex((item) => {
-                return item.root === mergeItem.root;
-            });
-            if (newJson.subpackages[targetItemIdx]) {
-                const pages = (0, lodash_1.uniq)([].concat(newJson.subpackages[targetItemIdx].pages, mergeItem.pages));
-                newJson.subpackages[targetItemIdx].pages = pages;
-            }
-            else {
-                newJson.subpackages.push(mergeItem);
-            }
-        });
-    }
-    fs_extra_1.default.writeJSONSync(baseAppJsonPath, newJson, { spaces: 2 });
-}

package/lib/tests/build.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/tests/build.js

@@ -1,19 +0,0 @@
-'use strict';
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("../index");
-const data_1 = __importDefault(require("./data"));
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const common_1 = require("../src/builder/types/common");
-const outPath = path_1.default.resolve(__dirname, '.temp');
-fs_extra_1.default.emptyDirSync(outPath);
-(0, index_1.buildWedaApp)({
-    ...data_1.default,
-    buildTypeList: [common_1.BuildType.WEB],
-    output: { path: outPath },
-}).then((dir) => {
-    console.log(dir);
-});

package/lib/tests/build.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/tests/build.test.js

@@ -1,22 +0,0 @@
-'use strict';
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("../index");
-const data_1 = __importDefault(require("./data"));
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const common_1 = require("../lib/builder/types/common");
-describe('build', () => {
-    it('needs tests', async () => {
-        const outPath = path_1.default.resolve(__dirname, './temp');
-        fs_extra_1.default.emptyDir(outPath);
-        let dir = await (0, index_1.buildWedaApp)({
-            ...data_1.default,
-            buildTypeList: [common_1.BuildType.WEB],
-            output: { path: outPath },
-        });
-        console.log(dir);
-    });
-});

package/lib/tests/data.d.ts

@@ -1,18 +0,0 @@
-import { BuildType } from '../builder/types/common';
-import { DEPLOY_MODE } from '../types';
-export declare const test: {
-    appKey: string;
-    cals: any;
-    subAppCalsList: never[];
-    dependencies: any[];
-    buildTypeList: BuildType[];
-    deployOptions: {
-        mode: DEPLOY_MODE;
-        mpAppId: string;
-        targetMpAppId: string;
-    };
-    domain: string;
-    resourceAppId: string;
-};
-declare const _default: any;
-export default _default;