openharmony/developtools_ace-ets2bundle
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_ace-ets2bundle.git synced 2026-08-26 18:46:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

!809 support srcEntrance file to be ets file

Browse Source 
Merge pull request !809 from laibo102/temp
This commit is contained in:
openharmony_ci
2022-07-11 07:11:45 +00:00
committed by Gitee
parent 44221e03a5 6f17c7c218
commit ebcdc29e97
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/main.js
+15 -9
View File
@@ -226,8 +226,10 @@ function setAbilityFile(projectConfig, abilityPages) {
function readAbilityEntrance(moduleJson) {
let abilityPages = [];
if (moduleJson.module) {
if (moduleJson.module.srcEntrance) {
abilityPages.push(moduleJson.module.srcEntrance);
const moduleSrcEntrance = moduleJson.module.srcEntrance;
if (moduleSrcEntrance) {
abilityPages.push(moduleSrcEntrance);
abilityPagesFullPath.push(getAbilityFullPath(projectConfig.projectPath, moduleSrcEntrance));
}
if (moduleJson.module.abilities && moduleJson.module.abilities.length > 0) {
setEntrance(moduleJson.module.abilities, abilityPages);
@@ -244,18 +246,22 @@ function setEntrance(abilityConfig, abilityPages) {
abilityConfig.forEach(ability => {
if (ability.srcEntrance) {
abilityPages.push(ability.srcEntrance);
let finalPath = path.resolve(path.resolve(projectConfig.projectPath, '../'), ability.srcEntrance);
finalPath = finalPath.replace(/\\/g, '/');
if (fs.existsSync(finalPath)) {
abilityPagesFullPath.push(finalPath);
} else {
abilityPagesFullPath.push(ability.srcEntrance);
}
abilityPagesFullPath.push(getAbilityFullPath(projectConfig.projectPath, ability.srcEntrance));
}
});
}
}
function getAbilityFullPath(projectPath, abilityPath) {
let finalPath = path.resolve(path.resolve(projectPath, '../'), abilityPath);
finalPath = finalPath.replace(/\\/g, '/');
if (fs.existsSync(finalPath)) {
return finalPath;
} else {
return abilityPath;
}
}
function loadWorker(projectConfig, workerFileEntry) {
if (workerFileEntry) {
projectConfig.entryObj = Object.assign(projectConfig.entryObj, workerFileEntry);