@cloudbase/framework-plugin-low-code 0.7.0 → 0.7.2-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/builder/config/common.js +1 -1
- package/lib/builder/config/index.js +2 -2
- package/lib/builder/config/mp.js +1 -1
- package/lib/builder/core/copy.js +3 -3
- package/lib/builder/core/generate.js +11 -11
- package/lib/builder/core/index.js +13 -13
- package/lib/builder/core/material.js +6 -6
- package/lib/builder/core/plugin.js +3 -3
- package/lib/builder/core/prepare.js +2 -2
- package/lib/builder/core/webpack.js +5 -5
- package/lib/builder/mp/index.d.ts.map +1 -1
- package/lib/builder/mp/index.js +50 -49
- package/lib/builder/mp/lowcode.js +4 -4
- package/lib/builder/mp/materials.js +16 -16
- package/lib/builder/mp/mixMode.js +12 -12
- package/lib/builder/mp/mp_config.js +11 -11
- package/lib/builder/mp/util.js +6 -6
- package/lib/builder/mp/wxml.js +4 -4
- package/lib/builder/service/builder/copy.js +11 -11
- package/lib/builder/service/builder/generate.js +56 -52
- package/lib/builder/service/builder/index.js +2 -2
- package/lib/builder/service/builder/plugin.js +2 -2
- package/lib/builder/service/builder/webpack.js +24 -23
- package/lib/builder/types/common.js +1 -0
- package/lib/builder/util/common.d.ts.map +1 -1
- package/lib/builder/util/common.js +8 -6
- package/lib/builder/util/console.js +1 -1
- package/lib/builder/util/generateFiles.js +2 -2
- package/lib/builder/util/index.js +1 -1
- package/lib/builder/util/junk.js +4 -2
- package/lib/builder/util/mp.js +1 -1
- package/lib/builder/util/net.js +1 -1
- package/lib/builder/util/style.js +1 -1
- package/lib/builder/util/weapp.js +1 -1
- package/lib/generate.js +2 -2
- package/lib/generator/config/index.js +2 -2
- package/lib/generator/core/generate.js +36 -34
- package/lib/generator/core/index.js +4 -4
- package/lib/generator/core/material.js +14 -14
- package/lib/generator/types/common.js +6 -3
- package/lib/generator/util/common.d.ts.map +1 -1
- package/lib/generator/util/common.js +1 -1
- package/lib/generator/util/index.js +1 -1
- package/lib/generator/util/style.js +2 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +104 -66
- package/lib/utils/common.d.ts +1 -1
- package/lib/utils/common.d.ts.map +1 -1
- package/lib/utils/common.js +2 -2
- package/lib/utils/dataSource.js +2 -2
- package/lib/utils/index.js +1 -1
- package/lib/utils/postProcess.js +3 -3
- package/lib/weapps-core/config/index.js +1 -1
- package/lib/weapps-core/index.js +2 -2
- package/lib/weapps-core/types/index.js +1 -1
- package/lib/weapps-core/utils/appbuild.js +6 -3
- package/lib/weapps-core/utils/common.js +3 -2
- package/lib/weapps-core/utils/formily.js +37 -37
- package/lib/weapps-core/utils/index.js +1 -1
- package/lib/weapps-core/utils/style.js +15 -15
- package/package.json +1 -1
- package/template/html/index.html.ejs +1 -1
- package/template/mp/app/weapps-api.js +16 -6
- package/template/mp/app.js +59 -48
- package/template/mp/common/util.js +52 -4
- package/template/mp/common/weapp-page.js +16 -3
- package/template/mp/package.json +2 -2
- package/template/mp/page/index.js +3 -1
- package/template/package.json +2 -2
- package/template/src/app/global-api.js +20 -5
- package/template/src/handlers/FieldMiddleware/renderer.jsx +411 -321
- package/template/src/handlers/render.jsx +114 -97
- package/template/src/handlers/utils/common.js +28 -22
- package/template/src/index.jsx +3 -2
- package/template/src/pages/app.tpl +26 -25
- package/template/src/utils/formatEnum.js +42 -0
|
@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
7
7
|
o[k2] = m[k];
|
|
8
8
|
}));
|
|
9
9
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
-
for (var p in m) if (p !== "default" && !
|
|
10
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
__exportStar(require("../../generator/config/common"), exports);
|
|
@@ -14,12 +14,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
14
14
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
15
|
if (mod && mod.__esModule) return mod;
|
|
16
16
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
18
|
__setModuleDefault(result, mod);
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
21
21
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
22
|
-
for (var p in m) if (p !== "default" && !
|
|
22
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
23
23
|
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
25
|
exports.sharedMaterialsDir = void 0;
|
package/lib/builder/config/mp.js
CHANGED
|
@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
7
7
|
o[k2] = m[k];
|
|
8
8
|
}));
|
|
9
9
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
-
for (var p in m) if (p !== "default" && !
|
|
10
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
__exportStar(require("../../generator/config/mp"), exports);
|
package/lib/builder/core/copy.js
CHANGED
|
@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
14
14
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
15
|
if (mod && mod.__esModule) return mod;
|
|
16
16
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
18
|
__setModuleDefault(result, mod);
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
@@ -53,9 +53,9 @@ function runCopy(appBuildDir, webRuntimeAppData, options) {
|
|
|
53
53
|
for (const entry of srcFiles) {
|
|
54
54
|
const dstFile = path.join(appBuildDir, entry);
|
|
55
55
|
console.log(dstFile);
|
|
56
|
-
yield fs_extra_1.copy(path.join(config_1.appTemplateDir, entry), dstFile);
|
|
56
|
+
yield (0, fs_extra_1.copy)(path.join(config_1.appTemplateDir, entry), dstFile);
|
|
57
57
|
}
|
|
58
|
-
yield copy_1.copyEntryFile(appBuildDir, webRuntimeAppData, options.adminPortalKey);
|
|
58
|
+
yield (0, copy_1.copyEntryFile)(appBuildDir, webRuntimeAppData, options.adminPortalKey);
|
|
59
59
|
console.timeEnd(timeTag);
|
|
60
60
|
});
|
|
61
61
|
}
|
|
@@ -27,7 +27,7 @@ let lastDeps = null;
|
|
|
27
27
|
function isInLastDeps(deps) {
|
|
28
28
|
for (const i in deps) {
|
|
29
29
|
if (!lastDeps || !(lastDeps === null || lastDeps === void 0 ? void 0 : lastDeps[i]) || (lastDeps === null || lastDeps === void 0 ? void 0 : lastDeps[i]) !== deps[i]) {
|
|
30
|
-
console_1.log(`package.json ${i}:${deps[i]} 和 上一次依赖${lastDeps === null || lastDeps === void 0 ? void 0 : lastDeps[i]} 不一致, 重新安装依赖...`);
|
|
30
|
+
(0, console_1.log)(`package.json ${i}:${deps[i]} 和 上一次依赖${lastDeps === null || lastDeps === void 0 ? void 0 : lastDeps[i]} 不一致, 重新安装依赖...`);
|
|
31
31
|
return false;
|
|
32
32
|
}
|
|
33
33
|
}
|
|
@@ -61,11 +61,11 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
|
|
|
61
61
|
const tplStr = yield fs_extra_1.default.readFile(path_1.default.join(config_1.appTemplateDir, 'src/app/global-api.js'), {
|
|
62
62
|
encoding: 'utf8',
|
|
63
63
|
});
|
|
64
|
-
const globalApiContent = lodash_template_1.default(tplStr)({
|
|
64
|
+
const globalApiContent = (0, lodash_template_1.default)(tplStr)({
|
|
65
65
|
appId: appKey,
|
|
66
66
|
subPackageName: rootPath,
|
|
67
67
|
domain: domain,
|
|
68
|
-
appConfig: util_1.JsonToStringWithVariableName({
|
|
68
|
+
appConfig: (0, util_1.JsonToStringWithVariableName)({
|
|
69
69
|
id: appKey,
|
|
70
70
|
envId: appData.envId,
|
|
71
71
|
staticResourceDomain: domain || '',
|
|
@@ -82,19 +82,19 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
|
|
|
82
82
|
}),
|
|
83
83
|
});
|
|
84
84
|
yield fs_extra_1.default.writeFile(path_1.default.join(dstDir, 'app/global-api.js'), globalApiContent);
|
|
85
|
-
yield generate_1.generateAllPageJsxFile(pageInstanceList, dstDir, rootPath, dependencies, extraData, buildTypeList);
|
|
86
|
-
yield generate_1.generateCodeFromTpl(data, dstDir, dependencies, appKey, rootPath, deployMode, buildTypeList, extraData);
|
|
87
|
-
yield generate_1.writeLowCodeFiles(data, dstDir);
|
|
85
|
+
yield (0, generate_1.generateAllPageJsxFile)(pageInstanceList, dstDir, rootPath, dependencies, extraData, buildTypeList);
|
|
86
|
+
yield (0, generate_1.generateCodeFromTpl)(data, dstDir, dependencies, appKey, rootPath, deployMode, buildTypeList, extraData);
|
|
87
|
+
yield (0, generate_1.writeLowCodeFiles)(data, dstDir);
|
|
88
88
|
})));
|
|
89
|
-
yield generate_1.generateRouterFile(allAppDataList, appBuildDir, basename, buildTypeList);
|
|
90
|
-
yield generate_1.generateAppStyleLessFile(allAppDataList, appBuildDir);
|
|
91
|
-
yield generate_1.generateThemeVarsFile(appData.themeVars, appBuildDir);
|
|
89
|
+
yield (0, generate_1.generateRouterFile)(allAppDataList, appBuildDir, basename, buildTypeList);
|
|
90
|
+
yield (0, generate_1.generateAppStyleLessFile)(allAppDataList, appBuildDir);
|
|
91
|
+
yield (0, generate_1.generateThemeVarsFile)(appData.themeVars, appBuildDir);
|
|
92
92
|
if (lastDeps && isInLastDeps(deps)) {
|
|
93
|
-
console_1.notice('package.json dependencies 已经安装,如出现未安装成功或找不到依赖,请重启wa watch');
|
|
93
|
+
(0, console_1.notice)('package.json dependencies 已经安装,如出现未安装成功或找不到依赖,请重启wa watch');
|
|
94
94
|
}
|
|
95
95
|
else {
|
|
96
96
|
yield generatePackageJSON(deps, appBuildDir, appKey);
|
|
97
|
-
yield webpack_1.installDependencies(appBuildDir, {
|
|
97
|
+
yield (0, webpack_1.installDependencies)(appBuildDir, {
|
|
98
98
|
runtime,
|
|
99
99
|
ignoreInstall,
|
|
100
100
|
});
|
|
@@ -42,14 +42,14 @@ function buildWebApp({ mainAppSerializeData, subAppSerializeDataList = [], depen
|
|
|
42
42
|
if (generateMpType === "subpackage") {
|
|
43
43
|
console.log('主包项目路径', generateMpPath);
|
|
44
44
|
}
|
|
45
|
-
let { appBuildDir, materialsDir } = runtime === types_1.RUNTIME.CI ? builder_1.getCompileDirs('app') : builder_1.getCompileDirs(appKey);
|
|
45
|
+
let { appBuildDir, materialsDir } = runtime === types_1.RUNTIME.CI ? (0, builder_1.getCompileDirs)('app') : (0, builder_1.getCompileDirs)(appKey);
|
|
46
46
|
const startTime = Date.now();
|
|
47
47
|
if (buildTypeList.includes("mp")) {
|
|
48
48
|
appBuildDir = path_1.default.join(appBuildDir, 'mp');
|
|
49
49
|
const isMixMode = generateMpType === "subpackage";
|
|
50
50
|
const apps = [mainAppSerializeData, ...subAppSerializeDataList];
|
|
51
51
|
try {
|
|
52
|
-
const result = yield index_1.generateWxMp({
|
|
52
|
+
const result = yield (0, index_1.generateWxMp)({
|
|
53
53
|
weapps: apps,
|
|
54
54
|
projDir: appBuildDir,
|
|
55
55
|
appId: appKey,
|
|
@@ -66,7 +66,7 @@ function buildWebApp({ mainAppSerializeData, subAppSerializeDataList = [], depen
|
|
|
66
66
|
if (isMixMode) {
|
|
67
67
|
generateMpPath = appBuildDir;
|
|
68
68
|
console.log(chalk_1.default.green('【混合模式】'), generateMpPath);
|
|
69
|
-
yield mixMode_1.handleMixMode({
|
|
69
|
+
yield (0, mixMode_1.handleMixMode)({
|
|
70
70
|
apps,
|
|
71
71
|
generateMpPath,
|
|
72
72
|
miniprogramRoot: result.miniprogramRoot,
|
|
@@ -84,8 +84,8 @@ function buildWebApp({ mainAppSerializeData, subAppSerializeDataList = [], depen
|
|
|
84
84
|
}
|
|
85
85
|
else {
|
|
86
86
|
appBuildDir = path_1.default.join(appBuildDir, 'h5');
|
|
87
|
-
const mainAppData = weapps_core_1.deserialize(mainAppSerializeData);
|
|
88
|
-
const subAppDataList = subAppSerializeDataList.map((sub) => weapps_core_1.deserialize(sub));
|
|
87
|
+
const mainAppData = (0, weapps_core_1.deserialize)(mainAppSerializeData);
|
|
88
|
+
const subAppDataList = subAppSerializeDataList.map((sub) => (0, weapps_core_1.deserialize)(sub));
|
|
89
89
|
const buildContext = {
|
|
90
90
|
projDir: appBuildDir,
|
|
91
91
|
appId: appKey,
|
|
@@ -95,16 +95,16 @@ function buildWebApp({ mainAppSerializeData, subAppSerializeDataList = [], depen
|
|
|
95
95
|
domain,
|
|
96
96
|
mainAppData: mainAppSerializeData,
|
|
97
97
|
};
|
|
98
|
-
const { allAppUsedComps } = index_1.handleUsedComponents({
|
|
98
|
+
const { allAppUsedComps } = (0, index_1.handleUsedComponents)({
|
|
99
99
|
buildContext,
|
|
100
100
|
weapps: [mainAppSerializeData, ...subAppSerializeDataList],
|
|
101
101
|
materials: dependencies,
|
|
102
102
|
});
|
|
103
103
|
const { publicPath, basename, assets = '' } = ((_a = mainAppData.appConfig) === null || _a === void 0 ? void 0 : _a.window) || {};
|
|
104
|
-
const projectConfig = yield prepare_1.runPrepare(buildTypeList, appBuildDir, isCleanDistDir);
|
|
105
|
-
const mpConfig = yield webpack_1.extractAndRemoveKbConfig(mainAppData, subAppDataList, appBuildDir);
|
|
104
|
+
const projectConfig = yield (0, prepare_1.runPrepare)(buildTypeList, appBuildDir, isCleanDistDir);
|
|
105
|
+
const mpConfig = yield (0, webpack_1.extractAndRemoveKbConfig)(mainAppData, subAppDataList, appBuildDir);
|
|
106
106
|
const jsAssets = assets.split(',').map((item) => { var _a; return (_a = (item || '')) === null || _a === void 0 ? void 0 : _a.trim(); });
|
|
107
|
-
yield copy_1.runCopy(appBuildDir, mainAppData, {
|
|
107
|
+
yield (0, copy_1.runCopy)(appBuildDir, mainAppData, {
|
|
108
108
|
adminPortalKey: deployMode === types_1.DEPLOY_MODE.PREVIEW ? `${appKey}-preview` : appKey,
|
|
109
109
|
});
|
|
110
110
|
const runHandleMaterialTag = '======= buildWebApp-runHandleMaterial';
|
|
@@ -117,11 +117,11 @@ function buildWebApp({ mainAppSerializeData, subAppSerializeDataList = [], depen
|
|
|
117
117
|
return true;
|
|
118
118
|
}
|
|
119
119
|
});
|
|
120
|
-
yield material_1.runHandleMaterial(appBuildDir, filteredDependiences, materialsDir, runtime, ignoreInstall);
|
|
120
|
+
yield (0, material_1.runHandleMaterial)(appBuildDir, filteredDependiences, materialsDir, runtime, ignoreInstall);
|
|
121
121
|
console.timeEnd(runHandleMaterialTag);
|
|
122
|
-
yield generate_1.runGenerateCore(appBuildDir, mainAppData, subAppDataList, filteredDependiences, appKey, basename, buildTypeList, deployMode, runtime, ignoreInstall, extraData, domain);
|
|
123
|
-
const doneCallback = prepare_1.createDoneCallBack({ appBuildDir, projectConfig }, cb);
|
|
124
|
-
yield webpack_2.runWebpackCore({
|
|
122
|
+
yield (0, generate_1.runGenerateCore)(appBuildDir, mainAppData, subAppDataList, filteredDependiences, appKey, basename, buildTypeList, deployMode, runtime, ignoreInstall, extraData, domain);
|
|
123
|
+
const doneCallback = (0, prepare_1.createDoneCallBack)({ appBuildDir, projectConfig }, cb);
|
|
124
|
+
yield (0, webpack_2.runWebpackCore)({
|
|
125
125
|
appBuildDir,
|
|
126
126
|
mainAppData,
|
|
127
127
|
subAppDataList,
|
|
@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
14
14
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
15
|
if (mod && mod.__esModule) return mod;
|
|
16
16
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
18
|
__setModuleDefault(result, mod);
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
@@ -53,11 +53,11 @@ function handleNormalMaterial({ dependencies, materialsDir, appBuildDir, runtime
|
|
|
53
53
|
const timeTag = '-------------------- handleNormalMaterial';
|
|
54
54
|
console.time(timeTag);
|
|
55
55
|
const normalDependencies = dependencies.filter((item) => !item.isComposite);
|
|
56
|
-
yield webpack_1.downloadAndInstallDependencies(normalDependencies, materialsDir, {
|
|
56
|
+
yield (0, webpack_1.downloadAndInstallDependencies)(normalDependencies, materialsDir, {
|
|
57
57
|
runtime,
|
|
58
58
|
ignoreInstall,
|
|
59
59
|
});
|
|
60
|
-
yield copy_1.copyMaterialLibraries(normalDependencies, materialsDir, appBuildDir);
|
|
60
|
+
yield (0, copy_1.copyMaterialLibraries)(normalDependencies, materialsDir, appBuildDir);
|
|
61
61
|
console.timeEnd(timeTag);
|
|
62
62
|
});
|
|
63
63
|
}
|
|
@@ -72,9 +72,9 @@ function handleCompositeComponent({ dependencies, appBuildDir }) {
|
|
|
72
72
|
entries: item.entries,
|
|
73
73
|
schemaVersion: item.schemaVersion,
|
|
74
74
|
}));
|
|
75
|
-
const componentsMeta = yield util_1.getComponentsInfo(path.join(appBuildDir, 'src'), dependencies);
|
|
76
|
-
yield generate_1.writeLowCodeFilesForCompositeComp(compositeDependencies, appBuildDir);
|
|
77
|
-
yield copy_1.genCompositeComponentLibraries(compositeDependencies, appBuildDir, materialGroupInfoMap, componentsMeta);
|
|
75
|
+
const componentsMeta = yield (0, util_1.getComponentsInfo)(path.join(appBuildDir, 'src'), dependencies);
|
|
76
|
+
yield (0, generate_1.writeLowCodeFilesForCompositeComp)(compositeDependencies, appBuildDir);
|
|
77
|
+
yield (0, copy_1.genCompositeComponentLibraries)(compositeDependencies, appBuildDir, materialGroupInfoMap, componentsMeta);
|
|
78
78
|
console.timeEnd('handleCompositeComponent');
|
|
79
79
|
});
|
|
80
80
|
}
|
|
@@ -14,7 +14,7 @@ const plugin_1 = require("../service/builder/plugin");
|
|
|
14
14
|
function runHandleMpPlugin(appBuildDir, plugins) {
|
|
15
15
|
return __awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
console.time('runHandleMpPlugin');
|
|
17
|
-
yield plugin_1.installMpPlugin(appBuildDir, plugins);
|
|
17
|
+
yield (0, plugin_1.installMpPlugin)(appBuildDir, plugins);
|
|
18
18
|
console.timeEnd('runHandleMpPlugin');
|
|
19
19
|
});
|
|
20
20
|
}
|
|
@@ -22,8 +22,8 @@ exports.runHandleMpPlugin = runHandleMpPlugin;
|
|
|
22
22
|
function runHandleKbonePlugin(appBuildDir, plugins, mpConfig) {
|
|
23
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
24
|
console.time('runHandleKbonePlugin');
|
|
25
|
-
yield plugin_1.installKbonePlugin(appBuildDir, plugins);
|
|
26
|
-
yield plugin_1.mergeKbonePluginConfig(appBuildDir, plugins, mpConfig);
|
|
25
|
+
yield (0, plugin_1.installKbonePlugin)(appBuildDir, plugins);
|
|
26
|
+
yield (0, plugin_1.mergeKbonePluginConfig)(appBuildDir, plugins, mpConfig);
|
|
27
27
|
console.timeEnd('runHandleKbonePlugin');
|
|
28
28
|
});
|
|
29
29
|
}
|
|
@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
14
14
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
15
|
if (mod && mod.__esModule) return mod;
|
|
16
16
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
18
|
__setModuleDefault(result, mod);
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
@@ -61,7 +61,7 @@ function runPrepare(buildTypeList, appBuildDir, isCleanDistDir) {
|
|
|
61
61
|
yield fs_extra_1.default.remove(path_1.default.resolve(mpDirPath, dir));
|
|
62
62
|
})));
|
|
63
63
|
}
|
|
64
|
-
if (common_1.buildAsWebByBuildType(buildTypeList)) {
|
|
64
|
+
if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
|
|
65
65
|
yield fs_extra_1.default.emptyDir(path_1.default.resolve(appBuildDir, './preview'));
|
|
66
66
|
}
|
|
67
67
|
}
|
|
@@ -17,7 +17,7 @@ function runWebpackCore({ mainAppData, subAppDataList, appBuildDir, materialsDir
|
|
|
17
17
|
console.time('runWebpackCore');
|
|
18
18
|
console.time('webpackGenerate');
|
|
19
19
|
const allAppDataList = subAppDataList.concat(mainAppData);
|
|
20
|
-
const webWebpackConfigPath = yield webpack_1.generateWebpackWebBuildParamsFile({
|
|
20
|
+
const webWebpackConfigPath = yield (0, webpack_1.generateWebpackWebBuildParamsFile)({
|
|
21
21
|
appId: mainAppData.id || appKey,
|
|
22
22
|
allAppDataList,
|
|
23
23
|
appBuildDir,
|
|
@@ -33,17 +33,17 @@ function runWebpackCore({ mainAppData, subAppDataList, appBuildDir, materialsDir
|
|
|
33
33
|
console.timeEnd('webpackGenerate');
|
|
34
34
|
const taskList = [];
|
|
35
35
|
console.time('generateMpJsonConfigFile');
|
|
36
|
-
yield webpack_1.generateMpJsonConfigFile(allAppDataList, mpConfig, appBuildDir, plugins, {
|
|
36
|
+
yield (0, webpack_1.generateMpJsonConfigFile)(allAppDataList, mpConfig, appBuildDir, plugins, {
|
|
37
37
|
appKey,
|
|
38
38
|
generateMpType,
|
|
39
39
|
});
|
|
40
40
|
console.timeEnd('generateMpJsonConfigFile');
|
|
41
|
-
if (common_1.buildAsWebByBuildType(buildTypeList)) {
|
|
42
|
-
yield webpack_1.generateWebpackWebDevServerFile({
|
|
41
|
+
if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
|
|
42
|
+
yield (0, webpack_1.generateWebpackWebDevServerFile)({
|
|
43
43
|
appBuildDir,
|
|
44
44
|
buildTypeList,
|
|
45
45
|
});
|
|
46
|
-
webpack_1.startCompile({
|
|
46
|
+
(0, webpack_1.startCompile)({
|
|
47
47
|
appBuildDir,
|
|
48
48
|
configPath: webWebpackConfigPath,
|
|
49
49
|
appKey,
|
|
@@ -1 +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,CAwSvC;
|
|
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,CAwSvC;AAqLD,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
CHANGED
|
@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
14
14
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
15
|
if (mod && mod.__esModule) return mod;
|
|
16
16
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
18
|
__setModuleDefault(result, mod);
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
@@ -77,22 +77,22 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
77
77
|
mainAppData,
|
|
78
78
|
domain,
|
|
79
79
|
};
|
|
80
|
-
const yyptConfig = yield util_3.getYyptConfigInfo(extraData);
|
|
80
|
+
const yyptConfig = yield (0, util_3.getYyptConfigInfo)(extraData);
|
|
81
81
|
const { appUsedComps, allAppUsedComps } = handleUsedComponents({
|
|
82
82
|
buildContext,
|
|
83
83
|
weapps,
|
|
84
84
|
materials,
|
|
85
85
|
});
|
|
86
86
|
buildContext['miniprogramPlugins'] = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
|
|
87
|
-
yield materials_1.installMaterials(projDir, allAppUsedComps, weapps, buildContext);
|
|
88
|
-
const wxmlDataPrefix = mp_1.getWxmlDataPrefix(!isProduction);
|
|
89
|
-
const { projConfig, appConfig, pageConfigs } = mp_config_1.generateMpConfig(weapps, buildContext);
|
|
87
|
+
yield (0, materials_1.installMaterials)(projDir, allAppUsedComps, weapps, buildContext);
|
|
88
|
+
const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
|
|
89
|
+
const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(weapps, buildContext);
|
|
90
90
|
if (!mainAppData.mpPkgUrl) {
|
|
91
91
|
const projectFileData = {
|
|
92
92
|
'project.config.json': { content: projConfig },
|
|
93
93
|
};
|
|
94
94
|
console.log('Generating ' + em('project') + ' files');
|
|
95
|
-
yield generateFiles_1.default(projectFileData, templateDir, projDir, buildContext);
|
|
95
|
+
yield (0, generateFiles_1.default)(projectFileData, templateDir, projDir, buildContext);
|
|
96
96
|
}
|
|
97
97
|
yield generatePkg(mainAppData, path_1.default.join(projDir, '/'), Object.assign(Object.assign({}, buildContext), { rootPath: mainAppData.rootPath }), pageConfigs[0]);
|
|
98
98
|
const projectConfigJsonPath = path_1.default.join(projDir, mainAppData.rootPath || '', 'project.config.json');
|
|
@@ -104,12 +104,12 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
104
104
|
if (mainAppData.mpPkgUrl) {
|
|
105
105
|
let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
|
|
106
106
|
let appJsContent = yield fs.readFile(appJsPath);
|
|
107
|
-
yield generateFiles_1.writeFile(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
|
|
107
|
+
yield (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
|
|
108
108
|
}
|
|
109
109
|
appFileData = Object.assign(Object.assign({}, appFileData), { 'common/style.js': {}, 'common/utils.wxs': {
|
|
110
110
|
domain: domain,
|
|
111
111
|
}, 'common/util.js': {
|
|
112
|
-
isAdminPortal: common_1.buildAsAdminPortalByBuildType(buildTypeList),
|
|
112
|
+
isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
|
|
113
113
|
}, 'common/widget.js': {}, 'common/url.js': {}, 'common/weapp-sdk.js': {}, 'common/weapp-page.js': {
|
|
114
114
|
dataPropNames: wxmlDataPrefix,
|
|
115
115
|
debug: !buildContext.isProduction,
|
|
@@ -123,7 +123,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
123
123
|
projectConfigJson.setting = {};
|
|
124
124
|
}
|
|
125
125
|
projectConfigJson.setting = Object.assign(Object.assign({}, projectConfigJson.setting), projConfig.setting);
|
|
126
|
-
yield generateFiles_1.writeFile(projectConfigJsonPath, JSON.stringify(projectConfigJson, undefined, 2));
|
|
126
|
+
yield (0, generateFiles_1.writeFile)(projectConfigJsonPath, JSON.stringify(projectConfigJson, undefined, 2));
|
|
127
127
|
let appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
|
|
128
128
|
let appJson = yield fs.readJson(appJsonPath);
|
|
129
129
|
let subpackages = appJson.subpackages || [];
|
|
@@ -137,7 +137,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
139
|
appJson.subpackages = subpackages;
|
|
140
|
-
yield generateFiles_1.writeFile(appJsonPath, JSON.stringify(appJson, undefined, 2));
|
|
140
|
+
yield (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
|
|
141
141
|
}
|
|
142
142
|
else {
|
|
143
143
|
appFileData = Object.assign(Object.assign({}, appFileData), { 'common/wx_yypt_report_v2.js': {}, 'app.js': { yyptConfig: yyptConfig }, 'app.json': { content: appConfig }, 'app.wxss': {
|
|
@@ -153,7 +153,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
153
153
|
} });
|
|
154
154
|
}
|
|
155
155
|
console.log('Generating ' + em('miniprogramRoot') + ' files');
|
|
156
|
-
yield generateFiles_1.default(appFileData, templateDir, miniprogramRoot, buildContext);
|
|
156
|
+
yield (0, generateFiles_1.default)(appFileData, templateDir, miniprogramRoot, buildContext);
|
|
157
157
|
if (miniprogramRoot !== path_1.default.join(projDir, '/') &&
|
|
158
158
|
fs.existsSync(path_1.default.join(projDir, config_1.materialsDirName))) {
|
|
159
159
|
console.log('Move ' +
|
|
@@ -173,17 +173,17 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
173
173
|
clientID: ((_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.clientId) || '',
|
|
174
174
|
},
|
|
175
175
|
'datasources/datasource-profiles.js.tpl': {
|
|
176
|
-
datasourceProfiles: util_3.JsonToStringWithVariableName(dataSource_1.getDatasourceProfiles(weapps.reduce((datasources, app) => {
|
|
176
|
+
datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, dataSource_1.getDatasourceProfiles)(weapps.reduce((datasources, app) => {
|
|
177
177
|
datasources.push(...(app.datasources || []));
|
|
178
178
|
return datasources;
|
|
179
179
|
}, []))),
|
|
180
180
|
},
|
|
181
181
|
'datasources/dataset-profiles.js.tpl': {
|
|
182
|
-
datasetProfiles: util_3.JsonToStringWithVariableName(dataSource_1.getDatasetProfiles(mainAppData, weapps)),
|
|
182
|
+
datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, dataSource_1.getDatasetProfiles)(mainAppData, weapps)),
|
|
183
183
|
},
|
|
184
184
|
};
|
|
185
185
|
console.log('Generating ' + em('datasources') + ' files');
|
|
186
|
-
yield generateFiles_1.default(datasourceFileData, templateDir, miniprogramRoot, buildContext);
|
|
186
|
+
yield (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot, buildContext);
|
|
187
187
|
}
|
|
188
188
|
yield Promise.all(weapps.map((app, index) => __awaiter(this, void 0, void 0, function* () {
|
|
189
189
|
if (index == 0) {
|
|
@@ -196,7 +196,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
196
196
|
yield generateFramework(app, subpackageRootPath, subpackageBuildCtx);
|
|
197
197
|
let packageJsonPath = path_1.default.join(subpackageRootPath, 'package.json');
|
|
198
198
|
if (!fs.existsSync(packageJsonPath)) {
|
|
199
|
-
yield generateFiles_1.default({
|
|
199
|
+
yield (0, generateFiles_1.default)({
|
|
200
200
|
'package.json': {
|
|
201
201
|
appId,
|
|
202
202
|
extraDeps: resolveNpmDeps(),
|
|
@@ -206,7 +206,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
206
206
|
}
|
|
207
207
|
})));
|
|
208
208
|
if (fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
|
|
209
|
-
yield webpack_1.installDependencies(miniprogramRoot);
|
|
209
|
+
yield (0, webpack_1.installDependencies)(miniprogramRoot);
|
|
210
210
|
}
|
|
211
211
|
yield handleMpPlugins();
|
|
212
212
|
console.timeEnd(operationLabel);
|
|
@@ -227,8 +227,8 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
227
227
|
}
|
|
228
228
|
function handleMpPlugins() {
|
|
229
229
|
return __awaiter(this, void 0, void 0, function* () {
|
|
230
|
-
const mpPlugins = (yield plugin_1.getPluginType(miniprogramRoot, plugins)).filter((item) => item.type === 'mp');
|
|
231
|
-
yield plugin_2.runHandleMpPlugin(miniprogramRoot, mpPlugins);
|
|
230
|
+
const mpPlugins = (yield (0, plugin_1.getPluginType)(miniprogramRoot, plugins)).filter((item) => item.type === 'mp');
|
|
231
|
+
yield (0, plugin_2.runHandleMpPlugin)(miniprogramRoot, mpPlugins);
|
|
232
232
|
});
|
|
233
233
|
}
|
|
234
234
|
});
|
|
@@ -236,33 +236,34 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
236
236
|
exports.generateWxMp = generateWxMp;
|
|
237
237
|
function generatePkg(weapp, appRoot, ctx, pageConfigs) {
|
|
238
238
|
return __awaiter(this, void 0, void 0, function* () {
|
|
239
|
-
const wxmlDataPrefix = mp_1.getWxmlDataPrefix(!ctx.isProduction);
|
|
239
|
+
const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!ctx.isProduction);
|
|
240
240
|
console.log('Generating ' + em(weapp.rootPath ? 'subApp' : 'app') + ' to ' + appRoot);
|
|
241
241
|
if (weapp.mpPkgUrl) {
|
|
242
242
|
console.log(`Removing ${appRoot}`);
|
|
243
|
-
yield generateFiles_1.cleanDir(appRoot, ['materials']);
|
|
244
|
-
yield net_1.downloadZip(weapp.mpPkgUrl, appRoot);
|
|
243
|
+
yield (0, generateFiles_1.cleanDir)(appRoot, ['materials']);
|
|
244
|
+
yield (0, net_1.downloadZip)(weapp.mpPkgUrl, appRoot);
|
|
245
245
|
if (fs.existsSync(path_1.default.join(appRoot, '__MACOSX'))) {
|
|
246
246
|
yield fs.remove(path_1.default.join(appRoot, '__MACOSX'));
|
|
247
247
|
}
|
|
248
248
|
}
|
|
249
249
|
else {
|
|
250
250
|
console.log('Generating ' + em('page') + ' files');
|
|
251
|
-
generateFiles_1.cleanDir(path_1.default.join(appRoot, 'pages'), []);
|
|
251
|
+
(0, generateFiles_1.cleanDir)(path_1.default.join(appRoot, 'pages'), []);
|
|
252
252
|
yield Promise.all(weapp.pageInstanceList.map((page) => __awaiter(this, void 0, void 0, function* () {
|
|
253
|
-
var _a;
|
|
253
|
+
var _a, _b;
|
|
254
254
|
const rootPath = weapp.rootPath || '';
|
|
255
255
|
const usingComponents = {};
|
|
256
|
-
const wxml = wxml_1.generateWxml(page.componentInstances, `Page ${rootPath ? path_1.default.join(rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, Object.assign(Object.assign({}, ctx), { rootPath, isPage: true }), usingComponents);
|
|
257
|
-
const pageFileName = lodash_1.get(pageConfigs, `${page.id}.pageFileName`, 'index');
|
|
256
|
+
const wxml = (0, wxml_1.generateWxml)(page.componentInstances, `Page ${rootPath ? path_1.default.join(rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, Object.assign(Object.assign({}, ctx), { rootPath, isPage: true }), usingComponents);
|
|
257
|
+
const pageFileName = (0, lodash_1.get)(pageConfigs, `${page.id}.pageFileName`, 'index');
|
|
258
258
|
const pageFileData = {
|
|
259
259
|
[`index.js|${pageFileName}.js`]: {
|
|
260
|
-
widgetProps: util_2.createWidgetProps(page.componentInstances, ctx),
|
|
260
|
+
widgetProps: (0, util_2.createWidgetProps)(page.componentInstances, ctx),
|
|
261
261
|
pageUUID: rootPath ? `${rootPath}/${page.id}` : page.id,
|
|
262
262
|
pageName: page.id,
|
|
263
263
|
pageSource: page.data.src || '',
|
|
264
|
-
eventHanlders: util_2.createEventHanlders(page.componentInstances, '$page', ctx),
|
|
265
|
-
dataBinds: util_2.createDataBinds(page.componentInstances, ctx),
|
|
264
|
+
eventHanlders: (0, util_2.createEventHanlders)(page.componentInstances, '$page', ctx),
|
|
265
|
+
dataBinds: (0, util_2.createDataBinds)(page.componentInstances, ctx),
|
|
266
|
+
pageAttributes: Object.assign({}, (((_a = page.data) === null || _a === void 0 ? void 0 : _a.appShareMessage) ? { 'appShareMessage': page.data.appShareMessage.value } : {})),
|
|
266
267
|
debug: !ctx.isProduction,
|
|
267
268
|
stringifyObj: util_1.inspect,
|
|
268
269
|
subLevelPath: rootPath ? path_2.default.relative(rootPath, '') + '/' : '',
|
|
@@ -275,10 +276,10 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
|
|
|
275
276
|
content: wxml,
|
|
276
277
|
},
|
|
277
278
|
[`index.wxss|${pageFileName}.wxss`]: {
|
|
278
|
-
subWxss: rootPath && !((
|
|
279
|
+
subWxss: rootPath && !((_b = ctx.mainAppData) === null || _b === void 0 ? void 0 : _b.mpPkgUrl)
|
|
279
280
|
? `@import "${path_2.default.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
|
|
280
281
|
: '',
|
|
281
|
-
content: weapps_core_1.toCssText(weapps_core_1.toCssStyle(page.commonStyle, {
|
|
282
|
+
content: (0, weapps_core_1.toCssText)((0, weapps_core_1.toCssStyle)(page.commonStyle, {
|
|
282
283
|
toRem: false,
|
|
283
284
|
toRpx: true,
|
|
284
285
|
}), 'page'),
|
|
@@ -286,7 +287,7 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
|
|
|
286
287
|
},
|
|
287
288
|
'api.js': {},
|
|
288
289
|
};
|
|
289
|
-
yield generateFiles_1.default(pageFileData, templateDir + '/page', path_1.default.join(appRoot, 'pages', page.id), ctx);
|
|
290
|
+
yield (0, generateFiles_1.default)(pageFileData, templateDir + '/page', path_1.default.join(appRoot, 'pages', page.id), ctx);
|
|
290
291
|
})));
|
|
291
292
|
yield writeLowCodeFiles(weapp, appRoot, ctx);
|
|
292
293
|
}
|
|
@@ -309,7 +310,7 @@ function generateFramework(appData, outDir, ctx) {
|
|
|
309
310
|
}
|
|
310
311
|
else {
|
|
311
312
|
const allCodeModules = [];
|
|
312
|
-
weapps_core_1.loopDealWithFn(appData.pageInstanceList || [], (p) => {
|
|
313
|
+
(0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList || [], (p) => {
|
|
313
314
|
allCodeModules.push({
|
|
314
315
|
id: p.id,
|
|
315
316
|
lowCodes: p.lowCodes || [],
|
|
@@ -328,7 +329,7 @@ function generateFramework(appData, outDir, ctx) {
|
|
|
328
329
|
: '',
|
|
329
330
|
subPackageName: appData.rootPath || '',
|
|
330
331
|
isBare: false,
|
|
331
|
-
appConfig: util_3.JsonToStringWithVariableName({
|
|
332
|
+
appConfig: (0, util_3.JsonToStringWithVariableName)({
|
|
332
333
|
id: ctx.appId,
|
|
333
334
|
envId: appData.envId,
|
|
334
335
|
staticResourceDomain: ctx.domain || '',
|
|
@@ -351,23 +352,23 @@ function generateFramework(appData, outDir, ctx) {
|
|
|
351
352
|
}
|
|
352
353
|
}
|
|
353
354
|
console.log('Generate app framework');
|
|
354
|
-
yield generateFiles_1.default(fileData, templateDir, outDir, ctx);
|
|
355
|
+
yield (0, generateFiles_1.default)(fileData, templateDir, outDir, ctx);
|
|
355
356
|
});
|
|
356
357
|
}
|
|
357
358
|
function writeLowCodeFiles(appData, outDir, ctx) {
|
|
358
359
|
return __awaiter(this, void 0, void 0, function* () {
|
|
359
360
|
console.log('Writing ' + em('lowcode') + ' files:');
|
|
360
361
|
const lowcodeRootDir = path_1.default.join(outDir, 'lowcode');
|
|
361
|
-
const themeStyle = style_1.generateDefaultTheme(appData);
|
|
362
|
+
const themeStyle = (0, style_1.generateDefaultTheme)(appData);
|
|
362
363
|
if (!(ctx.isMixMode && appData.rootPath)) {
|
|
363
364
|
yield Promise.all(appData.lowCodes
|
|
364
365
|
.filter((mod) => mod.name !== '____index____')
|
|
365
|
-
.map((m) => lowcode_1.writeCode2file(m, lowcodeRootDir, { appDir: outDir }, themeStyle.code)));
|
|
366
|
+
.map((m) => (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { appDir: outDir }, themeStyle.code)));
|
|
366
367
|
}
|
|
367
|
-
yield Promise.all(weapps_core_1.loopDealWithFn(appData.pageInstanceList, (page) => __awaiter(this, void 0, void 0, function* () {
|
|
368
|
+
yield Promise.all((0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, (page) => __awaiter(this, void 0, void 0, function* () {
|
|
368
369
|
var _a;
|
|
369
|
-
style_1.generateDefaultStyle(page);
|
|
370
|
-
yield ((_a = page === null || page === void 0 ? void 0 : page.lowCodes) === null || _a === void 0 ? void 0 : _a.filter((mod) => mod.name !== '____index____').forEach((m) => lowcode_1.writeCode2file(m, lowcodeRootDir, { pageId: page.id, appDir: outDir }, themeStyle.code, ctx)));
|
|
370
|
+
(0, style_1.generateDefaultStyle)(page);
|
|
371
|
+
yield ((_a = page === null || page === void 0 ? void 0 : page.lowCodes) === null || _a === void 0 ? void 0 : _a.filter((mod) => mod.name !== '____index____').forEach((m) => (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { pageId: page.id, appDir: outDir }, themeStyle.code, ctx)));
|
|
371
372
|
})));
|
|
372
373
|
});
|
|
373
374
|
}
|
|
@@ -383,7 +384,7 @@ function handleUsedComponents({ buildContext, weapps, materials, }) {
|
|
|
383
384
|
const appUsedComps = weapps.map((app) => {
|
|
384
385
|
var _a;
|
|
385
386
|
const usedComps = {};
|
|
386
|
-
(_a = app.pageInstanceList) === null || _a === void 0 ? void 0 : _a.forEach((p) => wxml_1.getUsedComponents(p.componentInstances, usedComps));
|
|
387
|
+
(_a = app.pageInstanceList) === null || _a === void 0 ? void 0 : _a.forEach((p) => (0, wxml_1.getUsedComponents)(p.componentInstances, usedComps));
|
|
387
388
|
return {
|
|
388
389
|
rootPath: app.rootPath || '',
|
|
389
390
|
usedComps,
|
|
@@ -399,11 +400,11 @@ function handleUsedComponents({ buildContext, weapps, materials, }) {
|
|
|
399
400
|
return comps;
|
|
400
401
|
}, {});
|
|
401
402
|
const compositedLibs = materials.filter((lib) => lib.isComposite);
|
|
402
|
-
allAppUsedComps = materials_1.extractUsedCompsRecursively(allAppUsedComps, [], compositedLibs);
|
|
403
|
+
allAppUsedComps = (0, materials_1.extractUsedCompsRecursively)(allAppUsedComps, [], compositedLibs);
|
|
403
404
|
if (buildContext.isMixMode) {
|
|
404
405
|
appUsedComps.forEach((item) => {
|
|
405
406
|
const appCompositedLibs = materials.filter((lib) => lib.isComposite);
|
|
406
|
-
item.usedComps = materials_1.extractUsedCompsRecursively(item.usedComps, [], appCompositedLibs);
|
|
407
|
+
item.usedComps = (0, materials_1.extractUsedCompsRecursively)(item.usedComps, [], appCompositedLibs);
|
|
407
408
|
});
|
|
408
409
|
}
|
|
409
410
|
return {
|
|
@@ -434,20 +435,20 @@ function cleanPkg(pkg, miniprogramRoot) {
|
|
|
434
435
|
const pageDir = path_1.default.join(pagesDir, pageName);
|
|
435
436
|
const lowcodeDir = path_1.default.join(lowcodesDir, pageName);
|
|
436
437
|
if (pages.indexOf(pageName) < 0) {
|
|
437
|
-
generateFiles_1.removeFile(pageDir);
|
|
438
|
-
generateFiles_1.removeFile(lowcodeDir);
|
|
438
|
+
(0, generateFiles_1.removeFile)(pageDir);
|
|
439
|
+
(0, generateFiles_1.removeFile)(lowcodeDir);
|
|
439
440
|
}
|
|
440
441
|
else {
|
|
441
442
|
const handlersDir = path_1.default.join(lowcodeDir, 'handler');
|
|
442
443
|
const handlers = ((_d = (_c = (_b = (_a = pkg === null || pkg === void 0 ? void 0 : pkg.pageInstanceList) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === pageName)) === null || _b === void 0 ? void 0 : _b.lowCodes) === null || _c === void 0 ? void 0 : _c.filter((m) => m.type === 'handler-fn')) === null || _d === void 0 ? void 0 : _d.map((m) => m.name + '.js')) || [];
|
|
443
|
-
generateFiles_1.cleanDir(handlersDir, handlers);
|
|
444
|
+
(0, generateFiles_1.cleanDir)(handlersDir, handlers);
|
|
444
445
|
}
|
|
445
446
|
});
|
|
446
447
|
const commonModules = pkg.lowCodes
|
|
447
448
|
.filter((m) => m.type === 'normal-module')
|
|
448
449
|
.map((m) => m.name + '.js');
|
|
449
450
|
const commonDir = path_1.default.join(lowcodesDir, 'common');
|
|
450
|
-
generateFiles_1.cleanDir(commonDir, commonModules);
|
|
451
|
+
(0, generateFiles_1.cleanDir)(commonDir, commonModules);
|
|
451
452
|
});
|
|
452
453
|
}
|
|
453
454
|
function cleanMaterils(materialsDir, usedComps) {
|
|
@@ -458,16 +459,16 @@ function cleanMaterils(materialsDir, usedComps) {
|
|
|
458
459
|
const libDir = path_1.default.join(materialsDir, libName);
|
|
459
460
|
if (fs.existsSync(path_1.default.join(libDir, 'meta.json'))) {
|
|
460
461
|
try {
|
|
461
|
-
generateFiles_1.removeFile(path_1.default.join(libDir, 'meta.json'));
|
|
462
|
+
(0, generateFiles_1.removeFile)(path_1.default.join(libDir, 'meta.json'));
|
|
462
463
|
}
|
|
463
464
|
catch (e) { }
|
|
464
465
|
return;
|
|
465
466
|
}
|
|
466
467
|
if (!usedComps[libName]) {
|
|
467
|
-
generateFiles_1.removeFile(libDir);
|
|
468
|
+
(0, generateFiles_1.removeFile)(libDir);
|
|
468
469
|
return;
|
|
469
470
|
}
|
|
470
|
-
generateFiles_1.cleanDir(libDir, [...Array.from(usedComps[libName]), 'libCommonRes']);
|
|
471
|
+
(0, generateFiles_1.cleanDir)(libDir, [...Array.from(usedComps[libName]), 'libCommonRes']);
|
|
471
472
|
});
|
|
472
473
|
}
|
|
473
474
|
}
|