@cloudbase/lowcode-builder 1.6.2 → 1.6.4

package/lib/builder/h5/copy.js

@@ -32,7 +32,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const chalk_1 = __importDefault(require("chalk"));
 const config_1 = require("../config");
 const generateFiles_1 = require("../util/generateFiles");
-const common_1 = require("../util/common");
 const junk = __importStar(require("../util/junk"));
 // 模版文件只复制一次
 async function runCopy(appBuildDir, webRuntimeAppData, i18nConfig) {
@@ -56,24 +55,18 @@ async function runCopy(appBuildDir, webRuntimeAppData, i18nConfig) {
 }
 exports.runCopy = runCopy;
 async function copyMaterialLibraries(dependencies = [], materialsDir, appBuildDir) {
-    const localPkg = (0, common_1.getCurrentPackageJson)();
     return Promise.all(dependencies.map(async (componentLib) => {
         const { name, version } = componentLib;
         const materialNameVersion = `${name}@${version}`;
         const materialDir = path.join(materialsDir, materialNameVersion);
         const srcDir = 'src';
         let targetDir = path.join(materialDir, srcDir);
-        // 当前本地目录是素材库的时候，直接用本地的
-        if (localPkg && localPkg.name === name && localPkg.version === version) {
-            console.log('当前本地目录是素材库的时候，直接用本地的', materialNameVersion);
-            targetDir = path.join(process.cwd(), 'src');
-        }
         const librariesDir = path.join(appBuildDir, 'src/libraries', materialNameVersion);
         const metaJosnPath = path.join(materialDir, 'meta.json');
         if (fs_extra_1.default.existsSync(metaJosnPath)) {
             await fs_extra_1.default.copy(metaJosnPath, path.join(librariesDir, 'meta.json'));
         }
-        await fs_extra_1.default.copy(targetDir, librariesDir, {
+        await fs_extra_1.default.copy(targetDir, path.join(librariesDir, srcDir), {
             filter: (src, dest) => {
                 let path = src.split('/');
                 return !junk.is(path[path.length - 1]);
@@ -84,6 +77,10 @@ async function copyMaterialLibraries(dependencies = [], materialsDir, appBuildDi
         if (fs_extra_1.default.existsSync(nodeModulesPath) && !fs_extra_1.default.existsSync(targetNodeModulesPath)) {
             await fs_extra_1.default.symlink(nodeModulesPath, targetNodeModulesPath, 'dir');
         }
+        const packageJsonPath = path.join(materialDir, 'package.json');
+        if (fs_extra_1.default.existsSync(packageJsonPath)) {
+            await fs_extra_1.default.copy(packageJsonPath, path.join(librariesDir, 'package.json'));
+        }
     }));
 }
 exports.copyMaterialLibraries = copyMaterialLibraries;

package/lib/builder/h5/material.js

@@ -79,14 +79,14 @@ async function handleNormalMaterial({ dependencies: normalDependencies, material
             if ((_b = (_a = packageJson.weda) === null || _a === void 0 ? void 0 : _a.platform) === null || _b === void 0 ? void 0 : _b.web) {
                 const _entries = (_d = (_c = packageJson.weda) === null || _c === void 0 ? void 0 : _c.platform) === null || _d === void 0 ? void 0 : _d.web;
                 entries = {
-                    entry: path.posix.relative('src', _entries.entry),
-                    components: path.posix.relative('src', _entries.components),
-                    actions: path.posix.relative('src', _entries.actions),
+                    entry: path.posix.join('./', _entries.entry),
+                    components: path.posix.join('./', _entries.components),
+                    actions: path.posix.join('./', _entries.actions),
                 };
             }
             else if (packageJson.lowcode) {
                 entries = {
-                    entry: path.posix.relative('src', packageJson.lowcode),
+                    entry: path.posix.join('./', packageJson.lowcode),
                 };
             }
         }

package/lib/builder/service/webpack.js

@@ -289,6 +289,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
             '@cloudbase/js-sdk': 'window.cloudbase',
             '@cloudbase/weda-cloud-sdk/dist/h5': 'window.CloudSDK',
             '@cloudbase/weda-cloud-sdk': 'window.CloudSDK',
+            '@cloudbase/weda-client': 'window.WedaClientSDK',
             '@zxing/library': 'window.ZXing',
             '@cloudbase/lowcode-render': 'window["weda-render"]',
         },

package/lib/builder/util/generateFiles.js

@@ -110,7 +110,6 @@ async function copyFiles(copyFiles, srcDir, dstDir) {
     return Promise.all(copyFiles.map(async (filePath) => {
         const srcFile = path_1.default.join(srcDir, filePath);
         const dstFile = path_1.default.join(dstDir, filePath);
-        // await fs.copy(path.join(appTemplateDir, 'src', entry), dstFile)
         // 用带 cache 功能的 writeFile 来替换 copy
         const srcContent = await fs_extra_1.default.readFile(srcFile, {
             encoding: 'utf8',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "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": "^1.0.2",
-    "@cloudbase/lowcode-generator": "^1.6.3",
+    "@cloudbase/cals": "^1.0.3",
+    "@cloudbase/lowcode-generator": "^1.6.4",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -543,7 +543,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.2da087be313ecb72121b.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.413fc7788ab27e709449.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/util.js

@@ -95,12 +95,12 @@ export function createEventHandlers(
         } catch (e) {
           let eventName = l.key ? `${prefix}$${l.key}_fail` : '';
           if (self[eventName]) {
-            console.error(`Action error: [${trigger}:${l.key}]`, e);
             await self[eventName]({
               ...event,
               detail: e,
             });
           } else {
+            console.error(`Action error: [${trigger}:${l.key}]`, e);
             if (!looseError) {
               app.showToast({
                 icon: 'error',

package/template/webpack/web.prod.js

@@ -127,6 +127,7 @@ module.exports = function (options) {
       WEBPACK_ENV: 'production',
     }),
     new VueLoaderPlugin(),
+    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
   ];
 
   const commonCSSLoaders = [