diff --git a/compiler/package-lock.json b/compiler/package-lock.json index f9da5ee8700924e761cd413fd5b02827aa42b5e7..bbf370ddf53904651ce195ed27bbea685ff98eff 100644 --- a/compiler/package-lock.json +++ b/compiler/package-lock.json @@ -4148,7 +4148,7 @@ }, "typescript": { "version": "file:deps/ohos-typescript-4.2.3-r2.tgz", - "integrity": "sha512-gXEQNp7qZgph/d8sjg/JLDVxpC4V1Fwe7XoIw5LJZPuhNgfEljjj4/UTFSdQJecfY49PkQQJlzX3QhAsSOWKww==", + "integrity": "sha512-j+ALWFX2rIEomth3qtYLD9JCcbx41wxV0NSFrOUOeJHmvOlFvU/iBWHeLVHDcAmolWjuD+DwmZU8f+9UEBzFYw==", "requires": { "json5": "^2.2.3" } diff --git a/compiler/src/ets_checker.ts b/compiler/src/ets_checker.ts index 6f25281b8562952deb00573765e13f70a1114fb1..eab8b9ead3053d41c42231f3be0aa9a1248222fd 100644 --- a/compiler/src/ets_checker.ts +++ b/compiler/src/ets_checker.ts @@ -945,7 +945,7 @@ function runArkTSLinter(): void { } function printArkTSLinterDiagnostic(diagnostic: ts.Diagnostic): void { - if (diagnostic.category === ts.DiagnosticCategory.Error && (isInOhModuleFile(diagnostic) || isInSDK(diagnostic) || isInApplicationsStandard(diagnostic))) { + if (diagnostic.category === ts.DiagnosticCategory.Error && (isInOhModuleFile(diagnostic) || isInSDK(diagnostic))) { const originalCategory = diagnostic.category; diagnostic.category = ts.DiagnosticCategory.Warning; printDiagnostic(diagnostic); @@ -960,10 +960,6 @@ function isInOhModuleFile(diagnostics: ts.Diagnostic): boolean { ((diagnostics.file.fileName.indexOf('/oh_modules/') !== -1) || diagnostics.file.fileName.indexOf('\\oh_modules\\') !== -1); } -function isInApplicationsStandard(diagnostics: ts.Diagnostic): boolean { - return (diagnostics.file !== undefined) && (diagnostics.file.fileName.indexOf('/applications/standard/') !== -1); -} - function isInSDK(diagnostics: ts.Diagnostic): boolean { const fileName = diagnostics.file?.fileName; if (projectConfig.etsLoaderPath === undefined || fileName === undefined) { @@ -983,7 +979,7 @@ export function getArkTSLinterMode(): ArkTSLinterMode { } if (isStandardMode()) { - return ArkTSLinterMode.STANDARD_MODE; + return ArkTSLinterMode.COMPATIBLE_MODE; } return ArkTSLinterMode.COMPATIBLE_MODE; } diff --git a/compiler/src/fast_build/ark_compiler/check_import_module.ts b/compiler/src/fast_build/ark_compiler/check_import_module.ts index 1cba038ce549af7fadf5b6c00cf2bf6a821e96d2..f7256d688815712f9a5cbd324a34d907b8e791a7 100644 --- a/compiler/src/fast_build/ark_compiler/check_import_module.ts +++ b/compiler/src/fast_build/ark_compiler/check_import_module.ts @@ -27,7 +27,7 @@ import { export function checkIfJsImportingArkts(rollupObject: any): void { ModuleSourceFile.getSourceFiles().forEach((sourceFile: ModuleSourceFile) => { const id: string = sourceFile.getModuleId(); - if (isJsSourceFile(id) && id.indexOf('/oh_modules/') === -1 && id.indexOf('/applications/standard/') === -1) { + if (isJsSourceFile(id) && id.indexOf('/oh_modules/') === -1) { const importMap = rollupObject.getModuleInfo(id).importedIdMaps; Object.values(importMap).forEach((requestFile: string) => { if (requestFile.endsWith(EXTNAME_ETS) || requestFile.endsWith(EXTNAME_D_ETS)) {