@cloudbase/lowcode-builder 1.0.21 → 1.0.24

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

@@ -1,4 +1,4 @@
-export { REPLACE_SIGN, MP_CONFIG_MODULE_NAME, KBONE_PAGE_KEYS, npmRegistry, remConfig, rpxConfig, } from '@cloudbase/lowcode-generator/lib/generator/config/index';
+export { REPLACE_SIGN, MP_CONFIG_MODULE_NAME, KBONE_PAGE_KEYS, npmRegistry, remConfig, rpxConfig, OFFICIAL_LIB_KEY, } from '@cloudbase/lowcode-generator/lib/generator/config/index';
 export declare const sharedMaterialsDir: string;
 export declare const appTemplateDir: string;
 export declare const materialsDirName = "materials";

package/lib/builder/config/index.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.miniprogramDir = exports.miniprogramURL = exports.builderTemplateURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
+exports.miniprogramDir = exports.miniprogramURL = exports.builderTemplateURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.OFFICIAL_LIB_KEY = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
 const path = __importStar(require("path"));
 const os_1 = __importDefault(require("os"));
 var index_1 = require("@cloudbase/lowcode-generator/lib/generator/config/index");
@@ -36,6 +36,7 @@ Object.defineProperty(exports, "KBONE_PAGE_KEYS", { enumerable: true, get: funct
 Object.defineProperty(exports, "npmRegistry", { enumerable: true, get: function () { return index_1.npmRegistry; } });
 Object.defineProperty(exports, "remConfig", { enumerable: true, get: function () { return index_1.remConfig; } });
 Object.defineProperty(exports, "rpxConfig", { enumerable: true, get: function () { return index_1.rpxConfig; } });
+Object.defineProperty(exports, "OFFICIAL_LIB_KEY", { enumerable: true, get: function () { return index_1.OFFICIAL_LIB_KEY; } });
 exports.sharedMaterialsDir = path.join(os_1.default.homedir(), '.weapps-materials');
 exports.appTemplateDir = path.resolve(__dirname, '../../../template');
 exports.materialsDirName = 'materials'; // materials diretory of current project

package/lib/builder/h5/index.js

@@ -18,6 +18,7 @@ const util_1 = require("../util");
 const types_1 = require("../../types");
 const mp_1 = require("../mp");
 const common_2 = require("../../utils/common");
+const config_1 = require("../config");
 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 {
@@ -64,7 +65,8 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
         console.time(runHandleMaterialTag);
         // 精简只使用用到的组件库，并获取补齐json格式
         const processedDependiencies = await (0, material_1.runHandleMaterial)(h5BuildDir, dependencies.filter((lib) => {
-            return !!allAppUsedComps[lib.name];
+            // 注意需要包涵官方的(gsd)，部分平台方法需要由其补充
+            return lib.name === config_1.OFFICIAL_LIB_KEY || !!allAppUsedComps[lib.name];
         }), materialsDir, runtime, ignoreInstall);
         console.timeEnd(runHandleMaterialTag);
         // // 获取 generate 需要的构建文件

package/lib/builder/mp/index.js

@@ -338,7 +338,7 @@ async function generatePkg(weapp, appRoot, ctx, pageConfigs) {
                     subWxss: rootPath && !((_b = ctx.mainAppData) === null || _b === void 0 ? void 0 : _b.mpPkgUrl)
                         ? `@import "${path_1.default.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
                         : '',
-                    content: (0, weapps_core_1.toCssText)((0, weapps_core_1.toCssStyle)(page.commonStyle, {
+                    content: (0, weapps_core_1.toCssText)((0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {
                         toRem: false,
                         toRpx: true,
                     }), 'page'),

package/lib/builder/mp/util.js

@@ -5,11 +5,12 @@ const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const weapp_1 = require("@cloudbase/lowcode-generator/lib/generator/util/weapp");
 const wxml_1 = require("./wxml");
 const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
+const cals_1 = require("@cloudbase/cals");
 function extractWidgetProps(props, compInfo) {
     var _a, _b;
     const { classList } = props;
     const staticProps = {
-        style: (0, weapps_core_1.toCssStyle)(props.commonStyle, {
+        style: (0, cals_1.processCommonStyle2CSSProperties)(props.commonStyle, {
             toRpx: true,
             toRem: false,
         }),

package/lib/builder/util/common.js

@@ -11,6 +11,7 @@ const style_1 = require("@cloudbase/lowcode-generator/lib/generator/util/style")
 const generateFiles_1 = require("./generateFiles");
 const cals_1 = require("@cloudbase/cals");
 const compare_versions_1 = __importDefault(require("compare-versions"));
+const config_1 = require("../config");
 const os_1 = __importDefault(require("os"));
 var common_1 = require("@cloudbase/lowcode-generator/lib/generator/util/common");
 Object.defineProperty(exports, "getMetaInfoBySourceKey", { enumerable: true, get: function () { return common_1.getMetaInfoBySourceKey; } });
@@ -200,7 +201,6 @@ function readComponentLibMata(libDir) {
     if (!isExistsMeta) {
         return null;
     }
-    console.log('meta path', metaPath);
     let meta = fs_extra_1.default.readJSONSync(metaPath);
     let [major] = ((_a = meta === null || meta === void 0 ? void 0 : meta.schemaVersion) === null || _a === void 0 ? void 0 : _a.split('.')) || [];
     const originComponentMetaMap = meta.components;
@@ -218,7 +218,7 @@ function readComponentLibMata(libDir) {
 }
 exports.readComponentLibMata = readComponentLibMata;
 const _OFFICIAL_COMPONENT_LIB = {
-    'gsd-h5-react': ['*'],
+    [config_1.OFFICIAL_LIB_KEY]: ['*'],
     CLOUDBASE_BUSSINESS: ['1627377179261'],
 };
 function isOfficialComponentLib(name, version) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.0.21",
+  "version": "1.0.24",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,8 +38,8 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.4.2",
-    "@cloudbase/lowcode-generator": "^1.0.7",
+    "@cloudbase/cals": "^0.4.4",
+    "@cloudbase/lowcode-generator": "^1.0.10",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -461,7 +461,7 @@
     ></script>
     <script
       crossorigin
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.51d9d452d9a709afe6a4.bundle.js"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.19da26e1c1fbee5e0bc4.bundle.js"
     ></script>
   </body>
 </html>