openharmony/developtools_ace-ets2bundle
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_ace-ets2bundle.git synced 2026-07-19 16:43:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

!67 fix the problem of using absolute path

Browse Source 
Merge pull request !67 from houhaoyu/yangbo
This commit is contained in:
openharmony_ci
2021-10-20 11:11:57 +00:00
committed by Gitee
parent 37252f28d9 4ee1093c5a
commit 7ae946fe3b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/src/process_import.ts
+6 -4
View File
@@ -42,6 +42,7 @@ import {
IComponentSet
} from './validate_ui_syntax';
import { LogInfo } from './utils';
import { projectConfig } from '../main';
export default function processImport(node: ts.ImportDeclaration | ts.ImportEqualsDeclaration |
ts.ExportDeclaration, pagesDir: string, log: LogInfo[]): void {
@@ -81,7 +82,7 @@ export default function processImport(node: ts.ImportDeclaration | ts.ImportEqua
} else if (/^\//.test(filePath)) {
fileResolvePath = filePath;
} else {
fileResolvePath = getFileResolvePath(fileResolvePath, pagesDir, filePath);
fileResolvePath = getFileResolvePath(fileResolvePath, pagesDir, filePath, projectConfig.projectPath);
}
if (fs.existsSync(fileResolvePath) && fs.statSync(fileResolvePath).isFile()) {
const content: string = preprocessExtend(processSystemApi(
@@ -247,13 +248,14 @@ function getModuleFilePath(filePath: string): string {
return filePath;
}
function getFileResolvePath(fileResolvePath: string, pagesDir: string, filePath: string): string {
function getFileResolvePath(fileResolvePath: string, pagesDir: string, filePath: string,
projectPath: string): string {
const moduleFilePath: string = getModuleFilePath(filePath);
const defaultModule: string = path.join(pagesDir, '../', moduleFilePath);
const defaultModule: string = path.join(projectPath, moduleFilePath);
if (fs.existsSync(defaultModule)) {
return defaultModule;
}
const entryModule: string = path.join(pagesDir, '../../../../../../', moduleFilePath);
const entryModule: string = path.join(projectPath, '../../../../../', moduleFilePath);
if (fs.existsSync(entryModule)) {
return entryModule;
}