@cloudbase/framework-plugin-low-code 0.6.55 → 0.6.58-alpha.0
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.d.ts.map +1 -1
- package/lib/builder/core/generate.js +18 -14
- 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 +54 -50
- 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.d.ts.map +1 -1
- package/lib/builder/service/builder/generate.js +58 -60
- 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 +23 -24
- package/lib/builder/types/common.js +0 -1
- package/lib/builder/util/common.js +6 -8
- 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 +2 -4
- 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 +34 -36
- package/lib/generator/core/index.js +4 -4
- package/lib/generator/core/material.js +14 -14
- package/lib/generator/types/common.js +3 -6
- package/lib/generator/util/index.js +1 -1
- package/lib/generator/util/style.js +2 -2
- package/lib/index.js +53 -58
- 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 +3 -6
- package/lib/weapps-core/utils/common.js +2 -3
- package/lib/weapps-core/utils/file.d.ts +1 -1
- 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 +6 -3
- package/template/mp/common/weapp-page.js +23 -11
- package/template/mp/component/index.js +2 -2
- package/template/mp/page/index.js +2 -2
- package/template/package.json +1 -0
- package/template/src/pages/app.tpl +53 -11
|
@@ -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" && !exports.hasOwnProperty(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.
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.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" && !exports.hasOwnProperty(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" && !exports.hasOwnProperty(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.
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.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
|
|
56
|
+
yield fs_extra_1.copy(path.join(config_1.appTemplateDir, entry), dstFile);
|
|
57
57
|
}
|
|
58
|
-
yield
|
|
58
|
+
yield copy_1.copyEntryFile(appBuildDir, webRuntimeAppData, options.adminPortalKey);
|
|
59
59
|
console.timeEnd(timeTag);
|
|
60
60
|
});
|
|
61
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,iBAyGf;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}
|
|
@@ -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
|
-
|
|
30
|
+
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,33 +61,37 @@ 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 =
|
|
64
|
+
const globalApiContent = lodash_template_1.default(tplStr)({
|
|
65
65
|
appId: appKey,
|
|
66
66
|
subPackageName: rootPath,
|
|
67
67
|
domain: domain,
|
|
68
|
-
appConfig:
|
|
68
|
+
appConfig: util_1.JsonToStringWithVariableName({
|
|
69
69
|
id: appKey,
|
|
70
70
|
pages: pageInstanceList
|
|
71
71
|
.sort((item) => (item.isHome ? -1 : 1))
|
|
72
|
-
.map((item) =>
|
|
73
|
-
|
|
74
|
-
|
|
72
|
+
.map((item) => {
|
|
73
|
+
var _a;
|
|
74
|
+
return {
|
|
75
|
+
id: item.id,
|
|
76
|
+
type: ((_a = item.data) === null || _a === void 0 ? void 0 : _a.isCustomLoginPage) ? 'login' : '',
|
|
77
|
+
};
|
|
78
|
+
}),
|
|
75
79
|
}),
|
|
76
80
|
});
|
|
77
81
|
yield fs_extra_1.default.writeFile(path_1.default.join(dstDir, 'app/global-api.js'), globalApiContent);
|
|
78
|
-
yield
|
|
79
|
-
yield
|
|
80
|
-
yield
|
|
82
|
+
yield generate_1.generateAllPageJsxFile(pageInstanceList, dstDir, rootPath, dependencies, extraData, buildTypeList);
|
|
83
|
+
yield generate_1.generateCodeFromTpl(data, dstDir, dependencies, appKey, rootPath, deployMode, buildTypeList, extraData);
|
|
84
|
+
yield generate_1.writeLowCodeFiles(data, dstDir);
|
|
81
85
|
})));
|
|
82
|
-
yield
|
|
83
|
-
yield
|
|
84
|
-
yield
|
|
86
|
+
yield generate_1.generateRouterFile(allAppDataList, appBuildDir, basename, buildTypeList);
|
|
87
|
+
yield generate_1.generateAppStyleLessFile(allAppDataList, appBuildDir);
|
|
88
|
+
yield generate_1.generateThemeVarsFile(appData.themeVars, appBuildDir);
|
|
85
89
|
if (lastDeps && isInLastDeps(deps)) {
|
|
86
|
-
|
|
90
|
+
console_1.notice('package.json dependencies 已经安装,如出现未安装成功或找不到依赖,请重启wa watch');
|
|
87
91
|
}
|
|
88
92
|
else {
|
|
89
93
|
yield generatePackageJSON(deps, appBuildDir, appKey);
|
|
90
|
-
yield
|
|
94
|
+
yield webpack_1.installDependencies(appBuildDir, {
|
|
91
95
|
runtime,
|
|
92
96
|
ignoreInstall,
|
|
93
97
|
});
|
|
@@ -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 ?
|
|
45
|
+
let { appBuildDir, materialsDir } = runtime === types_1.RUNTIME.CI ? builder_1.getCompileDirs('app') : 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
|
|
52
|
+
const result = yield 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
|
|
69
|
+
yield 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 =
|
|
88
|
-
const subAppDataList = subAppSerializeDataList.map((sub) =>
|
|
87
|
+
const mainAppData = weapps_core_1.deserialize(mainAppSerializeData);
|
|
88
|
+
const subAppDataList = subAppSerializeDataList.map((sub) => 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 } =
|
|
98
|
+
const { allAppUsedComps } = 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
|
|
105
|
-
const mpConfig = yield
|
|
104
|
+
const projectConfig = yield prepare_1.runPrepare(buildTypeList, appBuildDir, isCleanDistDir);
|
|
105
|
+
const mpConfig = yield 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
|
|
107
|
+
yield 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
|
|
120
|
+
yield material_1.runHandleMaterial(appBuildDir, filteredDependiences, materialsDir, runtime, ignoreInstall);
|
|
121
121
|
console.timeEnd(runHandleMaterialTag);
|
|
122
|
-
yield
|
|
123
|
-
const doneCallback =
|
|
124
|
-
yield
|
|
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({
|
|
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.
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.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
|
|
56
|
+
yield webpack_1.downloadAndInstallDependencies(normalDependencies, materialsDir, {
|
|
57
57
|
runtime,
|
|
58
58
|
ignoreInstall,
|
|
59
59
|
});
|
|
60
|
-
yield
|
|
60
|
+
yield 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
|
|
76
|
-
yield
|
|
77
|
-
yield
|
|
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);
|
|
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
|
|
17
|
+
yield 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
|
|
26
|
-
yield
|
|
25
|
+
yield plugin_1.installKbonePlugin(appBuildDir, plugins);
|
|
26
|
+
yield 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.
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.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 (
|
|
64
|
+
if (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
|
|
20
|
+
const webWebpackConfigPath = yield 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
|
|
36
|
+
yield webpack_1.generateMpJsonConfigFile(allAppDataList, mpConfig, appBuildDir, plugins, {
|
|
37
37
|
appKey,
|
|
38
38
|
generateMpType,
|
|
39
39
|
});
|
|
40
40
|
console.timeEnd('generateMpJsonConfigFile');
|
|
41
|
-
if (
|
|
42
|
-
yield
|
|
41
|
+
if (common_1.buildAsWebByBuildType(buildTypeList)) {
|
|
42
|
+
yield webpack_1.generateWebpackWebDevServerFile({
|
|
43
43
|
appBuildDir,
|
|
44
44
|
buildTypeList,
|
|
45
45
|
});
|
|
46
|
-
|
|
46
|
+
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,CAuSvC;
|
|
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,CAuSvC;AA+KD,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.
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
18
|
__setModuleDefault(result, mod);
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
@@ -76,22 +76,22 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
76
76
|
mainAppData,
|
|
77
77
|
domain,
|
|
78
78
|
};
|
|
79
|
-
const yyptConfig = yield
|
|
79
|
+
const yyptConfig = yield util_3.getYyptConfigInfo(extraData);
|
|
80
80
|
const { appUsedComps, allAppUsedComps } = handleUsedComponents({
|
|
81
81
|
buildContext,
|
|
82
82
|
weapps,
|
|
83
83
|
materials,
|
|
84
84
|
});
|
|
85
85
|
buildContext['miniprogramPlugins'] = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
|
|
86
|
-
yield
|
|
87
|
-
const wxmlDataPrefix =
|
|
88
|
-
const { projConfig, appConfig, pageConfigs } =
|
|
86
|
+
yield materials_1.installMaterials(projDir, allAppUsedComps, weapps, buildContext);
|
|
87
|
+
const wxmlDataPrefix = mp_1.getWxmlDataPrefix(!isProduction);
|
|
88
|
+
const { projConfig, appConfig, pageConfigs } = mp_config_1.generateMpConfig(weapps, buildContext);
|
|
89
89
|
if (!mainAppData.mpPkgUrl) {
|
|
90
90
|
const projectFileData = {
|
|
91
91
|
'project.config.json': { content: projConfig },
|
|
92
92
|
};
|
|
93
93
|
console.log('Generating ' + em('project') + ' files');
|
|
94
|
-
yield
|
|
94
|
+
yield generateFiles_1.default(projectFileData, templateDir, projDir, buildContext);
|
|
95
95
|
}
|
|
96
96
|
yield generatePkg(mainAppData, path_1.default.join(projDir, '/'), Object.assign(Object.assign({}, buildContext), { rootPath: mainAppData.rootPath }), pageConfigs[0]);
|
|
97
97
|
const projectConfigJsonPath = path_1.default.join(projDir, mainAppData.rootPath || '', 'project.config.json');
|
|
@@ -103,12 +103,12 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
103
103
|
if (mainAppData.mpPkgUrl) {
|
|
104
104
|
let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
|
|
105
105
|
let appJsContent = yield fs.readFile(appJsPath);
|
|
106
|
-
yield
|
|
106
|
+
yield generateFiles_1.writeFile(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
|
|
107
107
|
}
|
|
108
108
|
appFileData = Object.assign(Object.assign({}, appFileData), { 'common/style.js': {}, 'common/utils.wxs': {
|
|
109
109
|
domain: domain,
|
|
110
110
|
}, 'common/util.js': {
|
|
111
|
-
isAdminPortal:
|
|
111
|
+
isAdminPortal: common_1.buildAsAdminPortalByBuildType(buildTypeList),
|
|
112
112
|
}, 'common/widget.js': {}, 'common/url.js': {}, 'common/weapp-sdk.js': {}, 'common/weapp-page.js': {
|
|
113
113
|
dataPropNames: wxmlDataPrefix,
|
|
114
114
|
debug: !buildContext.isProduction,
|
|
@@ -122,7 +122,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
122
122
|
projectConfigJson.setting = {};
|
|
123
123
|
}
|
|
124
124
|
projectConfigJson.setting = Object.assign(Object.assign({}, projectConfigJson.setting), projConfig.setting);
|
|
125
|
-
yield
|
|
125
|
+
yield generateFiles_1.writeFile(projectConfigJsonPath, JSON.stringify(projectConfigJson, undefined, 2));
|
|
126
126
|
let appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
|
|
127
127
|
let appJson = yield fs.readJson(appJsonPath);
|
|
128
128
|
let subpackages = appJson.subpackages || [];
|
|
@@ -136,7 +136,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
appJson.subpackages = subpackages;
|
|
139
|
-
yield
|
|
139
|
+
yield generateFiles_1.writeFile(appJsonPath, JSON.stringify(appJson, undefined, 2));
|
|
140
140
|
}
|
|
141
141
|
else {
|
|
142
142
|
appFileData = Object.assign(Object.assign({}, appFileData), { 'common/wx_yypt_report_v2.js': {}, 'app.js': { yyptConfig: yyptConfig }, 'app.json': { content: appConfig }, 'app.wxss': {
|
|
@@ -152,7 +152,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
152
152
|
} });
|
|
153
153
|
}
|
|
154
154
|
console.log('Generating ' + em('miniprogramRoot') + ' files');
|
|
155
|
-
yield
|
|
155
|
+
yield generateFiles_1.default(appFileData, templateDir, miniprogramRoot, buildContext);
|
|
156
156
|
if (miniprogramRoot !== path_1.default.join(projDir, '/') &&
|
|
157
157
|
fs.existsSync(path_1.default.join(projDir, config_1.materialsDirName))) {
|
|
158
158
|
console.log('Move ' +
|
|
@@ -171,17 +171,17 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
171
171
|
isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
|
|
172
172
|
},
|
|
173
173
|
'datasources/datasource-profiles.js.tpl': {
|
|
174
|
-
datasourceProfiles:
|
|
174
|
+
datasourceProfiles: util_3.JsonToStringWithVariableName(dataSource_1.getDatasourceProfiles(weapps.reduce((datasources, app) => {
|
|
175
175
|
datasources.push(...(app.datasources || []));
|
|
176
176
|
return datasources;
|
|
177
177
|
}, []))),
|
|
178
178
|
},
|
|
179
179
|
'datasources/dataset-profiles.js.tpl': {
|
|
180
|
-
datasetProfiles:
|
|
180
|
+
datasetProfiles: util_3.JsonToStringWithVariableName(dataSource_1.getDatasetProfiles(mainAppData, weapps)),
|
|
181
181
|
},
|
|
182
182
|
};
|
|
183
183
|
console.log('Generating ' + em('datasources') + ' files');
|
|
184
|
-
yield
|
|
184
|
+
yield generateFiles_1.default(datasourceFileData, templateDir, miniprogramRoot, buildContext);
|
|
185
185
|
}
|
|
186
186
|
yield Promise.all(weapps.map((app, index) => __awaiter(this, void 0, void 0, function* () {
|
|
187
187
|
if (index == 0) {
|
|
@@ -194,7 +194,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
194
194
|
yield generateFramework(app, subpackageRootPath, subpackageBuildCtx);
|
|
195
195
|
let packageJsonPath = path_1.default.join(subpackageRootPath, 'package.json');
|
|
196
196
|
if (!fs.existsSync(packageJsonPath)) {
|
|
197
|
-
yield
|
|
197
|
+
yield generateFiles_1.default({
|
|
198
198
|
'package.json': {
|
|
199
199
|
appId,
|
|
200
200
|
extraDeps: resolveNpmDeps(),
|
|
@@ -204,7 +204,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
204
204
|
}
|
|
205
205
|
})));
|
|
206
206
|
if (fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
|
|
207
|
-
yield
|
|
207
|
+
yield webpack_1.installDependencies(miniprogramRoot);
|
|
208
208
|
}
|
|
209
209
|
yield handleMpPlugins();
|
|
210
210
|
console.timeEnd(operationLabel);
|
|
@@ -225,8 +225,8 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
225
225
|
}
|
|
226
226
|
function handleMpPlugins() {
|
|
227
227
|
return __awaiter(this, void 0, void 0, function* () {
|
|
228
|
-
const mpPlugins = (yield
|
|
229
|
-
yield
|
|
228
|
+
const mpPlugins = (yield plugin_1.getPluginType(miniprogramRoot, plugins)).filter((item) => item.type === 'mp');
|
|
229
|
+
yield plugin_2.runHandleMpPlugin(miniprogramRoot, mpPlugins);
|
|
230
230
|
});
|
|
231
231
|
}
|
|
232
232
|
});
|
|
@@ -234,32 +234,33 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
|
|
|
234
234
|
exports.generateWxMp = generateWxMp;
|
|
235
235
|
function generatePkg(weapp, appRoot, ctx, pageConfigs) {
|
|
236
236
|
return __awaiter(this, void 0, void 0, function* () {
|
|
237
|
-
const wxmlDataPrefix =
|
|
237
|
+
const wxmlDataPrefix = mp_1.getWxmlDataPrefix(!ctx.isProduction);
|
|
238
238
|
console.log('Generating ' + em(weapp.rootPath ? 'subApp' : 'app') + ' to ' + appRoot);
|
|
239
239
|
if (weapp.mpPkgUrl) {
|
|
240
240
|
console.log(`Removing ${appRoot}`);
|
|
241
|
-
yield
|
|
242
|
-
yield
|
|
241
|
+
yield generateFiles_1.cleanDir(appRoot, ['materials']);
|
|
242
|
+
yield net_1.downloadZip(weapp.mpPkgUrl, appRoot);
|
|
243
243
|
if (fs.existsSync(path_1.default.join(appRoot, '__MACOSX'))) {
|
|
244
244
|
yield fs.remove(path_1.default.join(appRoot, '__MACOSX'));
|
|
245
245
|
}
|
|
246
246
|
}
|
|
247
247
|
else {
|
|
248
248
|
console.log('Generating ' + em('page') + ' files');
|
|
249
|
-
|
|
249
|
+
generateFiles_1.cleanDir(path_1.default.join(appRoot, 'pages'), []);
|
|
250
250
|
yield Promise.all(weapp.pageInstanceList.map((page) => __awaiter(this, void 0, void 0, function* () {
|
|
251
251
|
var _a;
|
|
252
252
|
const rootPath = weapp.rootPath || '';
|
|
253
253
|
const usingComponents = {};
|
|
254
|
-
const wxml =
|
|
255
|
-
const pageFileName =
|
|
254
|
+
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);
|
|
255
|
+
const pageFileName = lodash_1.get(pageConfigs, `${page.id}.pageFileName`, 'index');
|
|
256
256
|
const pageFileData = {
|
|
257
257
|
[`index.js|${pageFileName}.js`]: {
|
|
258
|
-
widgetProps:
|
|
258
|
+
widgetProps: util_2.createWidgetProps(page.componentInstances, ctx),
|
|
259
259
|
pageUUID: rootPath ? `${rootPath}/${page.id}` : page.id,
|
|
260
260
|
pageName: page.id,
|
|
261
|
-
|
|
262
|
-
|
|
261
|
+
pageSource: page.data.src || '',
|
|
262
|
+
eventHanlders: util_2.createEventHanlders(page.componentInstances, '$page', ctx),
|
|
263
|
+
dataBinds: util_2.createDataBinds(page.componentInstances, ctx),
|
|
263
264
|
debug: !ctx.isProduction,
|
|
264
265
|
stringifyObj: util_1.inspect,
|
|
265
266
|
subLevelPath: rootPath ? path_2.default.relative(rootPath, '') + '/' : '',
|
|
@@ -275,7 +276,7 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
|
|
|
275
276
|
subWxss: rootPath && !((_a = ctx.mainAppData) === null || _a === void 0 ? void 0 : _a.mpPkgUrl)
|
|
276
277
|
? `@import "${path_2.default.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
|
|
277
278
|
: '',
|
|
278
|
-
content:
|
|
279
|
+
content: weapps_core_1.toCssText(weapps_core_1.toCssStyle(page.commonStyle, {
|
|
279
280
|
toRem: false,
|
|
280
281
|
toRpx: true,
|
|
281
282
|
}), 'page'),
|
|
@@ -283,7 +284,7 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
|
|
|
283
284
|
},
|
|
284
285
|
'api.js': {},
|
|
285
286
|
};
|
|
286
|
-
yield
|
|
287
|
+
yield generateFiles_1.default(pageFileData, templateDir + '/page', path_1.default.join(appRoot, 'pages', page.id), ctx);
|
|
287
288
|
})));
|
|
288
289
|
yield writeLowCodeFiles(weapp, appRoot, ctx);
|
|
289
290
|
}
|
|
@@ -306,7 +307,7 @@ function generateFramework(appData, outDir, ctx) {
|
|
|
306
307
|
}
|
|
307
308
|
else {
|
|
308
309
|
const allCodeModules = [];
|
|
309
|
-
|
|
310
|
+
weapps_core_1.loopDealWithFn(appData.pageInstanceList || [], (p) => {
|
|
310
311
|
allCodeModules.push({
|
|
311
312
|
id: p.id,
|
|
312
313
|
lowCodes: p.lowCodes || [],
|
|
@@ -325,13 +326,16 @@ function generateFramework(appData, outDir, ctx) {
|
|
|
325
326
|
: '',
|
|
326
327
|
subPackageName: appData.rootPath || '',
|
|
327
328
|
isBare: false,
|
|
328
|
-
appConfig:
|
|
329
|
+
appConfig: util_3.JsonToStringWithVariableName({
|
|
329
330
|
id: ctx.appId,
|
|
330
331
|
pages: appData.pageInstanceList
|
|
331
332
|
.sort((item) => (item.isHome ? -1 : 1))
|
|
332
|
-
.map((item) =>
|
|
333
|
-
|
|
334
|
-
|
|
333
|
+
.map((item) => {
|
|
334
|
+
return {
|
|
335
|
+
id: item.id,
|
|
336
|
+
type: item.data.isCustomLoginPage ? 'login' : '',
|
|
337
|
+
};
|
|
338
|
+
}),
|
|
335
339
|
}),
|
|
336
340
|
}, 'app/common.js': {
|
|
337
341
|
mods: appData.lowCodes
|
|
@@ -342,23 +346,23 @@ function generateFramework(appData, outDir, ctx) {
|
|
|
342
346
|
}
|
|
343
347
|
}
|
|
344
348
|
console.log('Generate app framework');
|
|
345
|
-
yield
|
|
349
|
+
yield generateFiles_1.default(fileData, templateDir, outDir, ctx);
|
|
346
350
|
});
|
|
347
351
|
}
|
|
348
352
|
function writeLowCodeFiles(appData, outDir, ctx) {
|
|
349
353
|
return __awaiter(this, void 0, void 0, function* () {
|
|
350
354
|
console.log('Writing ' + em('lowcode') + ' files:');
|
|
351
355
|
const lowcodeRootDir = path_1.default.join(outDir, 'lowcode');
|
|
352
|
-
const themeStyle =
|
|
356
|
+
const themeStyle = style_1.generateDefaultTheme(appData);
|
|
353
357
|
if (!(ctx.isMixMode && appData.rootPath)) {
|
|
354
358
|
yield Promise.all(appData.lowCodes
|
|
355
359
|
.filter((mod) => mod.name !== '____index____')
|
|
356
|
-
.map((m) =>
|
|
360
|
+
.map((m) => lowcode_1.writeCode2file(m, lowcodeRootDir, { appDir: outDir }, themeStyle.code)));
|
|
357
361
|
}
|
|
358
|
-
yield Promise.all(
|
|
362
|
+
yield Promise.all(weapps_core_1.loopDealWithFn(appData.pageInstanceList, (page) => __awaiter(this, void 0, void 0, function* () {
|
|
359
363
|
var _a;
|
|
360
|
-
|
|
361
|
-
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) =>
|
|
364
|
+
style_1.generateDefaultStyle(page);
|
|
365
|
+
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)));
|
|
362
366
|
})));
|
|
363
367
|
});
|
|
364
368
|
}
|
|
@@ -374,7 +378,7 @@ function handleUsedComponents({ buildContext, weapps, materials, }) {
|
|
|
374
378
|
const appUsedComps = weapps.map((app) => {
|
|
375
379
|
var _a;
|
|
376
380
|
const usedComps = {};
|
|
377
|
-
(_a = app.pageInstanceList) === null || _a === void 0 ? void 0 : _a.forEach((p) =>
|
|
381
|
+
(_a = app.pageInstanceList) === null || _a === void 0 ? void 0 : _a.forEach((p) => wxml_1.getUsedComponents(p.componentInstances, usedComps));
|
|
378
382
|
return {
|
|
379
383
|
rootPath: app.rootPath || '',
|
|
380
384
|
usedComps,
|
|
@@ -390,11 +394,11 @@ function handleUsedComponents({ buildContext, weapps, materials, }) {
|
|
|
390
394
|
return comps;
|
|
391
395
|
}, {});
|
|
392
396
|
const compositedLibs = materials.filter((lib) => lib.isComposite);
|
|
393
|
-
allAppUsedComps =
|
|
397
|
+
allAppUsedComps = materials_1.extractUsedCompsRecursively(allAppUsedComps, [], compositedLibs);
|
|
394
398
|
if (buildContext.isMixMode) {
|
|
395
399
|
appUsedComps.forEach((item) => {
|
|
396
400
|
const appCompositedLibs = materials.filter((lib) => lib.isComposite);
|
|
397
|
-
item.usedComps =
|
|
401
|
+
item.usedComps = materials_1.extractUsedCompsRecursively(item.usedComps, [], appCompositedLibs);
|
|
398
402
|
});
|
|
399
403
|
}
|
|
400
404
|
return {
|
|
@@ -425,20 +429,20 @@ function cleanPkg(pkg, miniprogramRoot) {
|
|
|
425
429
|
const pageDir = path_1.default.join(pagesDir, pageName);
|
|
426
430
|
const lowcodeDir = path_1.default.join(lowcodesDir, pageName);
|
|
427
431
|
if (pages.indexOf(pageName) < 0) {
|
|
428
|
-
|
|
429
|
-
|
|
432
|
+
generateFiles_1.removeFile(pageDir);
|
|
433
|
+
generateFiles_1.removeFile(lowcodeDir);
|
|
430
434
|
}
|
|
431
435
|
else {
|
|
432
436
|
const handlersDir = path_1.default.join(lowcodeDir, 'handler');
|
|
433
437
|
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')) || [];
|
|
434
|
-
|
|
438
|
+
generateFiles_1.cleanDir(handlersDir, handlers);
|
|
435
439
|
}
|
|
436
440
|
});
|
|
437
441
|
const commonModules = pkg.lowCodes
|
|
438
442
|
.filter((m) => m.type === 'normal-module')
|
|
439
443
|
.map((m) => m.name + '.js');
|
|
440
444
|
const commonDir = path_1.default.join(lowcodesDir, 'common');
|
|
441
|
-
|
|
445
|
+
generateFiles_1.cleanDir(commonDir, commonModules);
|
|
442
446
|
});
|
|
443
447
|
}
|
|
444
448
|
function cleanMaterils(materialsDir, usedComps) {
|
|
@@ -449,16 +453,16 @@ function cleanMaterils(materialsDir, usedComps) {
|
|
|
449
453
|
const libDir = path_1.default.join(materialsDir, libName);
|
|
450
454
|
if (fs.existsSync(path_1.default.join(libDir, 'meta.json'))) {
|
|
451
455
|
try {
|
|
452
|
-
|
|
456
|
+
generateFiles_1.removeFile(path_1.default.join(libDir, 'meta.json'));
|
|
453
457
|
}
|
|
454
458
|
catch (e) { }
|
|
455
459
|
return;
|
|
456
460
|
}
|
|
457
461
|
if (!usedComps[libName]) {
|
|
458
|
-
|
|
462
|
+
generateFiles_1.removeFile(libDir);
|
|
459
463
|
return;
|
|
460
464
|
}
|
|
461
|
-
|
|
465
|
+
generateFiles_1.cleanDir(libDir, [...Array.from(usedComps[libName]), 'libCommonRes']);
|
|
462
466
|
});
|
|
463
467
|
}
|
|
464
468
|
}
|