From a8b9e449f3a504397c8676d7b2f6206c6cda76ea Mon Sep 17 00:00:00 2001 From: laibo102 Date: Tue, 6 Sep 2022 17:26:53 +0800 Subject: [PATCH] Update: update partialUpdate config Signed-off-by: laibo102 Change-Id: I7ed74fbd18962b3c8d8d2b5b739cf0bc04d01786 --- compiler/main.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/compiler/main.js b/compiler/main.js index 1d9f5fc..3c0675c 100644 --- a/compiler/main.js +++ b/compiler/main.js @@ -95,6 +95,9 @@ function loadEntryObj(projectConfig) { if (fs.existsSync(projectConfig.manifestFilePath)) { const jsonString = fs.readFileSync(projectConfig.manifestFilePath).toString(); manifest = JSON.parse(jsonString); + if (manifest && manifest.minPlatformVersion) { + partialUpdateController(manifest.minPlatformVersion); + } projectConfig.pagesJsonFileName = 'config.json'; } else if (projectConfig.aceModuleJsonPath && fs.existsSync(projectConfig.aceModuleJsonPath)) { process.env.compileMode = 'moduleJson'; @@ -127,6 +130,9 @@ function buildManifest(manifest, aceConfigPath) { try { const moduleConfigJson = JSON.parse(fs.readFileSync(aceConfigPath).toString()); manifest.type = process.env.abilityType; + if (moduleConfigJson && moduleConfigJson.app && moduleConfigJson.app.minAPIVersion) { + partialUpdateController(moduleConfigJson.app.minAPIVersion); + } if (moduleConfigJson.module) { manifest.pages = getPages(moduleConfigJson); } else { @@ -386,9 +392,6 @@ function loadModuleInfo(projectConfig, envArgs) { projectConfig.nodeModulesPath = buildJsonInfo.nodeModulesPath; } projectConfig.pandaMode = buildJsonInfo.pandaMode; - if (buildJsonInfo.compatibleSdkVersion >= 9) { - partialUpdateConfig.partialUpdateMode = true; - } } } @@ -434,12 +437,22 @@ function addSDKBuildDependencies(config) { } } +function partialUpdateController(minAPIVersion) { + if (partialUpdateConfig.alwaysClose) { + return; + } + if (minAPIVersion >= 9) { + partialUpdateConfig.partialUpdateMode = true; + } +} + const globalProgram = { program: null, watchProgram: null }; const partialUpdateConfig = { + alwaysClose: true, partialUpdateMode: false };