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

!641 add node_module path

Browse Source 
Merge pull request !641 from 蒲亚军/pyjbugopendthree
This commit is contained in:
openharmony_ci
2022-05-16 02:04:21 +00:00
committed by Gitee
parent 46df6467bb 140ec9eda5
commit e2cdc0c89c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/src/process_import.ts
+8 -4
View File
@@ -79,9 +79,9 @@ export default function processImport(node: ts.ImportDeclaration | ts.ImportEqua
}
try {
let fileResolvePath: string;
if (/^(\.|\.\.)\//.test(filePath)) {
if (/^(\.|\.\.)\//.test(filePath) && filePath.indexOf(NODE_MODULES) < 0) {
fileResolvePath = path.resolve(pagesDir, filePath);
} else if (/^\//.test(filePath)) {
} else if (/^\//.test(filePath) && filePath.indexOf(NODE_MODULES) < 0) {
fileResolvePath = filePath;
} else {
fileResolvePath = getFileResolvePath(fileResolvePath, pagesDir, filePath, projectConfig.projectPath);
@@ -257,7 +257,7 @@ function hasCollection(node: ts.Identifier): boolean {
}
function isModule(filePath: string): boolean {
return !/^(\.|\.\.)?\//.test(filePath);
return !/^(\.|\.\.)?\//.test(filePath) || filePath.indexOf(NODE_MODULES) > -1;
}
function isCustomComponent(node: ts.ClassDeclaration): boolean {
@@ -323,7 +323,11 @@ function getFileResolvePath(fileResolvePath: string, pagesDir: string, filePath:
}
let curPageDir: string = pagesDir;
while (!fs.existsSync(fileResolvePath)) {
fileResolvePath = path.join(curPageDir, NODE_MODULES, filePath);
if (filePath.indexOf(NODE_MODULES) > -1) {
fileResolvePath = path.join(curPageDir, filePath);
} else {
fileResolvePath = path.join(curPageDir, NODE_MODULES, filePath);
}
if (fs.existsSync(fileResolvePath + EXTNAME_ETS)) {
fileResolvePath = fileResolvePath + EXTNAME_ETS;
} else if (isPackageJsonEntry(fileResolvePath)) {