openharmony/developtools_ace_ets2bundle
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_ace_ets2bundle synced 2025-02-17 00:27:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!3963 模板替换适配

Browse Source 
Merge pull request !3963 from yuyi/bundlename1
This commit is contained in:
openharmony_ci 2024-11-22 21:06:13 +00:00 committed by Gitee
commit 6c52af0bc3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compiler/main.js
View File

@ -74,29 +74,12 @@ let ohosSystemModuleSubDirPaths = [];
let allModulesPaths = [];
function initProjectConfig(projectConfig) {
initProjectPathConfig(projectConfig);
projectConfig.entryObj = {};
projectConfig.entryArrayForObf = []; // Only used for arkguard
projectConfig.cardObj = {};
projectConfig.projectPath = projectConfig.projectPath || process.env.aceModuleRoot ||
path.join(process.cwd(), 'sample');
projectConfig.buildPath = projectConfig.buildPath || process.env.aceModuleBuild ||
path.resolve(projectConfig.projectPath, 'build');
projectConfig.aceModuleBuild = projectConfig.buildPath; // To be compatible with both webpack and rollup
projectConfig.manifestFilePath = projectConfig.manifestFilePath || process.env.aceManifestPath ||
path.join(projectConfig.projectPath, 'manifest.json');
projectConfig.aceProfilePath = projectConfig.aceProfilePath || process.env.aceProfilePath;
projectConfig.aceModuleJsonPath = projectConfig.aceModuleJsonPath || process.env.aceModuleJsonPath;
projectConfig.aceSuperVisualPath = projectConfig.aceSuperVisualPath ||
process.env.aceSuperVisualPath;
projectConfig.hashProjectPath = projectConfig.hashProjectPath ||
hashProjectPath(projectConfig.projectPath);
projectConfig.aceBuildJson = projectConfig.aceBuildJson || process.env.aceBuildJson;
projectConfig.cachePath = projectConfig.cachePath || process.env.cachePath ||
path.resolve(__dirname, 'node_modules/.cache');
projectConfig.aceSoPath = projectConfig.aceSoPath || process.env.aceSoPath;
projectConfig.xtsMode = /ets_loader_ark$/.test(__dirname) || process.env.xtsMode === 'true';
projectConfig.localPropertiesPath = projectConfig.localPropertiesPath || process.env.localPropertiesPath;
projectConfig.projectProfilePath = projectConfig.projectProfilePath || process.env.projectProfilePath;
projectConfig.isPreview = projectConfig.isPreview || process.env.isPreview === 'true';
projectConfig.compileMode = projectConfig.compileMode || process.env.compileMode || 'jsbundle';
projectConfig.runtimeOS = projectConfig.runtimeOS || process.env.runtimeOS || 'default';
@ -125,6 +108,28 @@ function initProjectConfig(projectConfig) {
projectConfig.otherCompileFiles = {};
// Packages which need to update version in bytecode har
projectConfig.updateVersionInfo = undefined;
projectConfig.allowEmptyBundleName = false;
}
function initProjectPathConfig(projectConfig) {
projectConfig.projectPath = projectConfig.projectPath || process.env.aceModuleRoot ||
path.join(process.cwd(), 'sample');
projectConfig.buildPath = projectConfig.buildPath || process.env.aceModuleBuild ||
path.resolve(projectConfig.projectPath, 'build');
projectConfig.aceModuleBuild = projectConfig.buildPath; // To be compatible with both webpack and rollup
projectConfig.manifestFilePath = projectConfig.manifestFilePath || process.env.aceManifestPath ||
path.join(projectConfig.projectPath, 'manifest.json');
projectConfig.aceProfilePath = projectConfig.aceProfilePath || process.env.aceProfilePath;
projectConfig.aceModuleJsonPath = projectConfig.aceModuleJsonPath || process.env.aceModuleJsonPath;
projectConfig.aceSuperVisualPath = projectConfig.aceSuperVisualPath ||
process.env.aceSuperVisualPath;
projectConfig.hashProjectPath = projectConfig.hashProjectPath ||
hashProjectPath(projectConfig.projectPath);
projectConfig.cachePath = projectConfig.cachePath || process.env.cachePath ||
path.resolve(__dirname, 'node_modules/.cache');
projectConfig.aceSoPath = projectConfig.aceSoPath || process.env.aceSoPath;
projectConfig.localPropertiesPath = projectConfig.localPropertiesPath || process.env.localPropertiesPath;
projectConfig.projectProfilePath = projectConfig.projectProfilePath || process.env.projectProfilePath;
}
function loadEntryObj(projectConfig) {
@ -1098,6 +1103,7 @@ function resetProjectConfig() {
projectConfig.changedFileList = undefined;
projectConfig.patchAbcPath = undefined;
projectConfig.removeChangedFileListInSdk = false;
projectConfig.allowEmptyBundleName = false;
const props = ['projectPath', 'buildPath', 'aceModuleBuild', 'manifestFilePath', 'aceProfilePath',
'aceModuleJsonPath', 'aceSuperVisualPath', 'hashProjectPath', 'aceBuildJson', 'cachePath',
'aceSoPath', 'localPropertiesPath', 'projectProfilePath', 'isPreview', 'compileMode', 'runtimeOS',

5
compiler/src/process_module_package.ts
View File

@ -71,11 +71,12 @@ export function routerBundleOrModule(context: ts.TransformationContext, isByteCo
if (isByteCodeHar) {
return context.factory.createPropertyAssignment(
context.factory.createIdentifier(typeKey),
context.factory.createIdentifier(type === RESOURCE_NAME_BUNDLE ? '__BUNDLE_NAME__' : '__MODULE_NAME__')
context.factory.createIdentifier(type === RESOURCE_NAME_BUNDLE ? (projectConfig.allowEmptyBundleName ? '' : '__BUNDLE_NAME__') : '__MODULE_NAME__')
);
}
return context.factory.createPropertyAssignment(
context.factory.createIdentifier(typeKey),
context.factory.createStringLiteral(type === RESOURCE_NAME_BUNDLE ? (projectConfig.bundleName || '') : (projectConfig.moduleName || ''))
context.factory.createStringLiteral(type === RESOURCE_NAME_BUNDLE ? (projectConfig.allowEmptyBundleName ? '' : (projectConfig.bundleName || '')) :
(projectConfig.moduleName || ''))
);
}

2
compiler/src/process_ui_syntax.ts
View File

@ -794,7 +794,7 @@ function addBundleAndModuleParam(propertyArray: Array<ts.PropertyAssignment>, re
if (projectConfig.bundleName || projectConfig.bundleName === '') {
propertyArray.push(ts.factory.createPropertyAssignment(
ts.factory.createStringLiteral(RESOURCE_NAME_BUNDLE),
projectConfig.resetBundleName ? ts.factory.createStringLiteral('') :
(projectConfig.resetBundleName || projectConfig.allowEmptyBundleName) ? ts.factory.createStringLiteral('') :
createBundleOrModuleNode(isByteCodeHar, 'bundleName')
));
}