diff --git a/ets2panda/driver/build_system/src/build/generate_arktsconfig.ts b/ets2panda/driver/build_system/src/build/generate_arktsconfig.ts index 03852d906f9dedc6fc06ceef0d23a9874f8ae338..2017fa8863b210dc36bb375a71a8af431099b59b 100644 --- a/ets2panda/driver/build_system/src/build/generate_arktsconfig.ts +++ b/ets2panda/driver/build_system/src/build/generate_arktsconfig.ts @@ -248,10 +248,9 @@ export class ArkTSConfigGenerator { } - private getOhmurl(file: string, moduleInfo: ModuleInfo): string { + private getDependencyKey(file: string, moduleInfo: ModuleInfo): string { let unixFilePath: string = file.replace(/\\/g, '/'); - let ohmurl: string = moduleInfo.packageName + '/' + unixFilePath; - return changeFileExtension(ohmurl, ''); + return moduleInfo.packageName + '/' + unixFilePath; } private getDependenciesSection(moduleInfo: ModuleInfo, arktsconfig: ArkTSConfig): void { @@ -268,7 +267,7 @@ export class ArkTSConfigGenerator { const files = declFilesObject.files; Object.keys(files).forEach((file: string) => { - const ohmurl: string = this.getOhmurl(file, depModuleInfo); + const dependencyKey: string = this.getDependencyKey(file, depModuleInfo); const depItem: DependencyItem = { language: 'js', path: files[file].declPath, @@ -276,7 +275,7 @@ export class ArkTSConfigGenerator { }; arktsconfig.addDependency({ - name: ohmurl, + name: dependencyKey, item: depItem }); diff --git a/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts b/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts index 87034ff4ee7f3a207b48f743a7ec2eec9c070351..a7262ac5ba5f99102e49c27d6481e7e965ea226b 100644 --- a/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts +++ b/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts @@ -131,7 +131,6 @@ export class KitImportTransformer { } const sourcePath = DYNAMIC_PREFIX + symbolEntry.source.replace(/\.d\.ts$/, ''); - console.log('sourcePath',sourcePath); if (!grouped.has(sourcePath)) { grouped.set(sourcePath, []); }