@cloudbase/framework-plugin-low-code 0.6.8 → 0.6.12

package/lib/builder/mp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAUzB,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CA6RvC;AAkKD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,aAAa,iBAgCnB;AAYD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA0CA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAUzB,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAqSvC;AAkKD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,aAAa,iBAgCnB;AAYD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA0CA"}

package/lib/builder/mp/index.js

@@ -97,30 +97,24 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
         const projectConfigJsonPath = path_1.default.join(projDir, mainAppData.rootPath || '', 'project.config.json');
         let projectConfigJson = yield fs.readJSON(projectConfigJsonPath);
         const miniprogramRoot = path_1.default.join(projDir, projectConfigJson.miniprogramRoot || '/');
-        yield generateFramework(mainAppData, miniprogramRoot, buildContext);
-        let appFileData = {
-            'common/style.js': {},
-            'common/utils.wxs': {
-                domain: domain,
-            },
-            'common/util.js': {
-                isAdminPortal: common_1.buildAsAdminPortalByBuildType(buildTypeList),
-            },
-            'common/widget.js': {},
-            'common/url.js': {},
-            'common/weapp-sdk.js': {},
-            'common/weapp-page.js': {
-                dataPropNames: wxmlDataPrefix,
-                debug: !buildContext.isProduction,
-            },
-            'common/weapp-component.js': {},
-            'common/merge-renderer.js': {
-                dataPropNames: wxmlDataPrefix,
-                debug: !buildContext.isProduction,
-            },
-            'common/process.js': {},
-            'common/data-patch.js': {},
-        };
+        let appFileData = {};
+        if (weapps.find((item) => !item.mpPkgUrl)) {
+            yield generateFramework(mainAppData, miniprogramRoot, buildContext);
+            let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
+            let appJsContent = yield fs.readFile(appJsPath);
+            yield generateFiles_1.writeFile(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
+            appFileData = Object.assign(Object.assign({}, appFileData), { 'common/style.js': {}, 'common/utils.wxs': {
+                    domain: domain,
+                }, 'common/util.js': {
+                    isAdminPortal: common_1.buildAsAdminPortalByBuildType(buildTypeList),
+                }, 'common/widget.js': {}, 'common/url.js': {}, 'common/weapp-sdk.js': {}, 'common/weapp-page.js': {
+                    dataPropNames: wxmlDataPrefix,
+                    debug: !buildContext.isProduction,
+                }, 'common/weapp-component.js': {}, 'common/merge-renderer.js': {
+                    dataPropNames: wxmlDataPrefix,
+                    debug: !buildContext.isProduction,
+                }, 'common/process.js': {}, 'common/data-patch.js': {} });
+        }
         if (mainAppData.mpPkgUrl) {
             if (!projectConfigJson.setting) {
                 projectConfigJson.setting = {};
@@ -141,9 +135,6 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
             }
             appJson.subpackages = subpackages;
             yield generateFiles_1.writeFile(appJsonPath, JSON.stringify(appJson, undefined, 2));
-            let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
-            let appJsContent = yield fs.readFile(appJsPath);
-            yield generateFiles_1.writeFile(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
         }
         else {
             appFileData = Object.assign(Object.assign({}, appFileData), { 'common/wx_yypt_report_v2.js': {}, 'app.js': { yyptConfig: yyptConfig }, 'app.json': { content: appConfig }, 'app.wxss': {
@@ -168,26 +159,28 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
                 `${projDir} to ${miniprogramRoot}`);
             yield 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: util_3.JsonToStringWithVariableName(dataSource_1.getDatasourceProfiles(weapps.reduce((datasources, app) => {
-                    datasources.push(...(app.datasources || []));
-                    return datasources;
-                }, []))),
-            },
-            'datasources/dataset-profiles.js.tpl': {
-                datasetProfiles: util_3.JsonToStringWithVariableName(dataSource_1.getDatasetProfiles(mainAppData, weapps)),
-            },
-        };
-        console.log('Generating ' + em('datasources') + ' files');
-        yield 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: util_3.JsonToStringWithVariableName(dataSource_1.getDatasourceProfiles(weapps.reduce((datasources, app) => {
+                        datasources.push(...(app.datasources || []));
+                        return datasources;
+                    }, []))),
+                },
+                'datasources/dataset-profiles.js.tpl': {
+                    datasetProfiles: util_3.JsonToStringWithVariableName(dataSource_1.getDatasetProfiles(mainAppData, weapps)),
+                },
+            };
+            console.log('Generating ' + em('datasources') + ' files');
+            yield generateFiles_1.default(datasourceFileData, templateDir, miniprogramRoot, buildContext);
+        }
         yield Promise.all(weapps.map((app, index) => __awaiter(this, void 0, void 0, function* () {
             if (index == 0) {
                 return;

package/lib/builder/mp/wxml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wxml.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/wxml.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,uBAAuB,EAEvB,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,wBAAgB,YAAY,CAC1B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,MAAM,EAAE,MAAM,EACd,cAAc,KAAA,EACd,GAAG,EAAE,aAAa,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,EACxC,eAAe,KAAA,EACf,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,uBAAuB,EAAE,IAAI,KAAA,KAAK,IAAI,UA0U7D;AA4BD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,eAAoB,UAS/B;AAuBD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,QAAQ,GAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAO;;EAYlD"}
+{"version":3,"file":"wxml.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/wxml.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,uBAAuB,EAEvB,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,wBAAgB,YAAY,CAC1B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,MAAM,EAAE,MAAM,EACd,cAAc,KAAA,EACd,GAAG,EAAE,aAAa,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,EACxC,eAAe,KAAA,EACf,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,uBAAuB,EAAE,IAAI,KAAA,KAAK,IAAI,UA8U7D;AA4BD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,eAAoB,UAS/B;AAuBD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,QAAQ,GAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAO;;EAYlD"}

package/lib/builder/mp/wxml.js

@@ -109,7 +109,11 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nod
                 elements.push({
                     type: 'element',
                     name: tagName,
-                    attributes: { name: data0.name.value },
+                    attributes: {
+                        name: data0.name.type && data0.name.type !== 'static'
+                            ? `{{${id}.name}}`
+                            : data0.name.value,
+                    },
                     elements: [],
                     _order: xIndex || 0,
                     _parent: null,
@@ -186,7 +190,8 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nod
             listeners.forEach((l) => {
                 const evtName = getMpEventName(l.trigger);
                 const modifiers = l;
-                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] = getMpEventHanlderName(id, evtName, modifiers);
+                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] =
+                    getMpEventHanlderName(id, evtName, modifiers);
             });
             const compConfig = componentProto.compConfig;
             if (compConfig && compConfig.pluginConfig) {

package/lib/utils/postProcess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postProcess.d.ts","sourceRoot":"","sources":["../../src/utils/postProcess.ts"],"names":[],"mappings":"AAKA,wBAAgB,wBAAwB,CAAC,eAAe,KAAA,EAAE,IAAI,KAAA,QAI7D;AAED,wBAAgB,0BAA0B,CAAC,WAAW,KAAA,EAAE,aAAa,KAAA,QAqBpE"}
+{"version":3,"file":"postProcess.d.ts","sourceRoot":"","sources":["../../src/utils/postProcess.ts"],"names":[],"mappings":"AAKA,wBAAgB,wBAAwB,CAAC,eAAe,KAAA,EAAE,IAAI,KAAA,QAI7D;AAED,wBAAgB,0BAA0B,CAAC,WAAW,KAAA,EAAE,aAAa,KAAA,QAkBpE"}

package/lib/utils/postProcess.js

@@ -1,10 +1,29 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __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.postprocessDeployExtraJson = exports.postprocessProjectConfig = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
+const fs_extra_1 = __importStar(require("fs-extra"));
 const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
 function postprocessProjectConfig(projectJsonPath, data) {
@@ -17,11 +36,9 @@ function postprocessDeployExtraJson(projectPath, deployOptions) {
     if (targetMpAppId !== mpAppId) {
         let projectJson = fs_extra_1.default.readJsonSync(path_1.default.resolve(projectPath, 'project.config.json'));
         const miniprogramRoot = (projectJson === null || projectJson === void 0 ? void 0 : projectJson.miniprogramRoot) || './';
-        fs_extra_1.default.writeFileSync(path_1.default.resolve(projectPath, miniprogramRoot, 'ext.json'), JSON.stringify({
-            extEnable: true,
-            extAppid: targetMpAppId,
-            directCommit: true,
-        }, null, 2));
+        const extPaht = path_1.default.resolve(projectPath, miniprogramRoot, 'ext.json');
+        const extJson = Object.assign(Object.assign({}, (fs_extra_1.default.existsSync(extPaht) ? fs_extra_1.readJsonSync(extPaht) : {})), { extEnable: true, extAppid: targetMpAppId, directCommit: true });
+        fs_extra_1.default.writeFileSync(extPaht, JSON.stringify(extJson, null, 2));
     }
 }
 exports.postprocessDeployExtraJson = postprocessDeployExtraJson;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.6.8",
+  "version": "0.6.12",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/html/index.html.ejs

@@ -443,7 +443,7 @@
       src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js"
       crossorigin="anonymous"
     ></script>
-    <script src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@0.3.19/dist/h5.browser.js"></script>
+    <script src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.1/dist/h5.browser.js"></script>
     <script src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js"></script>
   </body>
 </html>

package/template/mp/datasources/config.js.tpl

@@ -1,5 +1,5 @@
-import dataSourceProfiles from './datasource-profiles'
 import datasetProfiles from './dataset-profiles'
+const dataSourceProfiles = require('./datasource-profiles.js')
 
 /**
  * 数据源基本配置

package/template/mp/datasources/datasource-profiles.js.tpl

@@ -1,4 +1,4 @@
 /**
  * 数据源摘要描述数组
  */
-export default <%= datasourceProfiles %>
+module.exports = <%= datasourceProfiles %>

package/template/package.json

@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@cloudbase/js-sdk": "1.5.3-alpha.0",
-    "@cloudbase/weda-cloud-sdk": "stable",
+    "@cloudbase/weda-cloud-sdk": "1.0.1",
     "@tcwd/weapps-core": "2.2.6",
     "@tcwd/weapps-sdk": "1.2.9",
     "@zxing/library": "^0.18.6",