Skip to content

Commit a7e92a1

Browse files
philljenkinsphilljenkins
authored
Merge pull request #2169 from IBMa/mjs-js-ext
bug(node): ESM packages need .js extension for modules
2 parents 1b7339c + b6fa206 commit a7e92a1

File tree

12 files changed

+70
-68
lines changed

12 files changed

+70
-68
lines changed

‎accessibility-checker/src-ts/index.ts‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@
1414
limitations under the License.
1515
*****************************************************************************/
1616

17-
import { ACBrowserManager } from "./lib/ACBrowserManager";
18-
import { ACEngineManager } from "./lib/ACEngineManager";
19-
import { getComplianceHelper } from "./lib/ACHelper";
20-
import { eAssertResult, ICheckerReport, ICheckerResult, ReportResult } from "./lib/api/IChecker";
21-
import { ACConfigManager } from "./lib/common/config/ACConfigManager";
22-
import { IConfig, IConfigInternal } from "./lib/common/config/IConfig";
23-
import { Checkpoint } from "./lib/common/engine/IGuideline";
24-
import { IBaselineReport } from "./lib/common/engine/IReport";
25-
import { Issue } from "./lib/common/engine/IRule";
26-
import { BaselineManager } from "./lib/common/report/BaselineManager";
27-
import { ReporterManager } from "./lib/common/report/ReporterManager";
17+
import { ACBrowserManager } from "./lib/ACBrowserManager.js";
18+
import { ACEngineManager } from "./lib/ACEngineManager.js";
19+
import { getComplianceHelper } from "./lib/ACHelper.js";
20+
import { eAssertResult, ICheckerReport, ICheckerResult, ReportResult } from "./lib/api/IChecker.js";
21+
import { ACConfigManager } from "./lib/common/config/ACConfigManager.js";
22+
import { IConfig, IConfigInternal } from "./lib/common/config/IConfig.js";
23+
import { IBaselineReport } from "./lib/common/engine/IReport.js";
24+
import { BaselineManager } from "./lib/common/report/BaselineManager.js";
25+
import { ReporterManager } from "./lib/common/report/ReporterManager.js";
2826

2927
/**
3028
* This function is responsible performing a scan based on the context that is provided, following are

‎accessibility-checker/src-ts/lib/ACBrowserManager.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as puppeteer from "puppeteer";
2-
import { ACConfigManager } from "./common/config/ACConfigManager";
3-
import { IConfigInternal } from "./common/config/IConfig";
2+
import { ACConfigManager } from "./common/config/ACConfigManager.js";
3+
import { IConfigInternal } from "./common/config/IConfig.js";
44

55

66
export class ACBrowserManager {

‎accessibility-checker/src-ts/lib/ACEngineManager.ts‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as path from "path";
22
import * as fs from "fs";
3-
import { ACConfigManager } from "./common/config/ACConfigManager";
4-
import { fetch_get_text } from "./common/api-ext/Fetch";
5-
import { IChecker } from "./common/engine/IChecker";
3+
import { ACConfigManager } from "./common/config/ACConfigManager.js";
4+
import { fetch_get_text } from "./common/api-ext/Fetch.js";
5+
import { IChecker } from "./common/engine/IChecker.js";
66

77
let ace;
88

@@ -26,6 +26,7 @@ export class ACEngineManager {
2626
config.DEBUG && console.log("[INFO] aChecker.loadEngine detected Puppeteer/Playwright");
2727
let page = content;
2828
if (ENGINE_LOAD_MODE === "REMOTE") {
29+
config.DEBUG && console.log("[INFO] engineMode REMOTE");
2930
await page.evaluate((scriptUrl) => {
3031
try {
3132
var ace_backup_in_ibma;
@@ -61,19 +62,21 @@ export class ACEngineManager {
6162
}
6263
}, `${config.rulePack}/ace.js`);
6364
} else if (ENGINE_LOAD_MODE === "INJECT") {
64-
await page.evaluate((engineContent) => {
65+
config.DEBUG && console.log("[INFO] engineMode INJECT");
66+
let aceAlreadyExists = await page.evaluate(() => { try { return 'undefined' !== typeof(ace) } catch (e) { return false; } });
67+
await page.evaluate(({ engineContent, aceAlreadyExists }) => {
6568
try {
6669
var ace_backup_in_ibma;
67-
if ('undefined' !== typeof(ace)) {
70+
if (aceAlreadyExists) {
6871
if (!ace || !ace.Checker)
6972
ace_backup_in_ibma = ace;
7073
ace = null;
7174
}
72-
if ('undefined' === typeof (ace) || ace === null) {
75+
if (!aceAlreadyExists || ace === null) {
7376
return new Promise<void>((resolve, reject) => {
7477
eval(engineContent);
7578
globalThis.ace_ibma = ace;
76-
if ('undefined' !== typeof(ace)) {
79+
if (aceAlreadyExists) {
7780
ace = ace_backup_in_ibma;
7881
}
7982
resolve();
@@ -82,7 +85,8 @@ export class ACEngineManager {
8285
} catch (e) {
8386
return Promise.reject(e);
8487
}
85-
}, ACEngineManager.engineContent);
88+
}, {
89+
engineContent: ACEngineManager.engineContent, aceAlreadyExists });
8690
}
8791
return ACEngineManager.loadEngineLocal();
8892
} else if (ACEngineManager.isSelenium(content)) {

‎accessibility-checker/src-ts/lib/ACHelper.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { ICheckerReport, ICheckerResult } from "./api/IChecker";
2-
import { ACBrowserManager } from "./ACBrowserManager";
3-
import { ACEngineManager } from "./ACEngineManager";
4-
import { ACConfigManager } from "./common/config/ACConfigManager";
5-
import { IConfigInternal } from "./common/config/IConfig";
6-
import { ReporterManager } from "./common/report/ReporterManager";
71
import { existsSync, mkdirSync, writeFileSync } from "fs";
8-
import { IAbstractAPI } from "./common/api-ext/IAbstractAPI";
9-
import { EngineSummaryCounts, IBaselineReport, IEngineReport } from "./common/engine/IReport";
102
import { dirname, join, resolve as pathResolve } from "path";
11-
import { BaselineManager, RefactorMap } from "./common/report/BaselineManager";
3+
import { ICheckerReport, ICheckerResult } from "./api/IChecker.js";
4+
import { ACBrowserManager } from "./ACBrowserManager.js";
5+
import { ACEngineManager } from "./ACEngineManager.js";
6+
import { ACConfigManager } from "./common/config/ACConfigManager.js";
7+
import { IConfigInternal } from "./common/config/IConfig.js";
8+
import { ReporterManager } from "./common/report/ReporterManager.js";
9+
import { IAbstractAPI } from "./common/api-ext/IAbstractAPI.js";
10+
import { EngineSummaryCounts, IBaselineReport, IEngineReport } from "./common/engine/IReport.js";
11+
import { BaselineManager, RefactorMap } from "./common/report/BaselineManager.js";
1212

1313
declare var after;
1414

‎accessibility-checker/src-ts/lib/api/IChecker.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { eRuleLevel } from "../common/config/IConfig";
2-
import { IBaselineReport } from "../common/engine/IReport";
1+
import { eRuleLevel } from "../common/config/IConfig.js";
2+
import { IBaselineReport } from "../common/engine/IReport.js";
33

44
export enum eAssertResult {
55
ERROR = -1,

‎common/module/src/report/ACReporterCSV.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
limitations under the License.
1515
*****************************************************************************/
1616

17-
import { IConfigInternal } from "../config/IConfig";
18-
import { Guideline } from "../engine/IGuideline";
19-
import { CompressedReport } from "../engine/IReport";
20-
import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager";
17+
import { IConfigInternal } from "../config/IConfig.js";
18+
import { Guideline } from "../engine/IGuideline.js";
19+
import { CompressedReport } from "../engine/IReport.js";
20+
import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager.js";
2121

2222
export class ACReporterCSV implements IReporter {
2323
public name(): string {

‎common/module/src/report/ACReporterHTML.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
limitations under the License.
1515
*****************************************************************************/
1616

17-
import { IConfigInternal } from "../config/IConfig";
18-
import { Guideline } from "../engine/IGuideline";
19-
import { CompressedReport, IBaselineReport } from "../engine/IReport";
20-
import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager";
21-
import { genReport } from "./genReport";
17+
import { IConfigInternal } from "../config/IConfig.js";
18+
import { Guideline } from "../engine/IGuideline.js";
19+
import { CompressedReport, IBaselineReport } from "../engine/IReport.js";
20+
import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager.js";
21+
import { genReport } from "./genReport.js";
2222

2323
export class ACReporterHTML implements IReporter {
2424
public name(): string {

‎common/module/src/report/ACReporterJSON.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
limitations under the License.
1515
*****************************************************************************/
1616

17-
import { IConfigInternal } from "../config/IConfig";
18-
import { Guideline } from "../engine/IGuideline";
19-
import { CompressedReport, IBaselineReport, IEngineReport } from "../engine/IReport";
20-
import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager";
17+
import { IConfigInternal } from "../config/IConfig.js";
18+
import { Guideline } from "../engine/IGuideline.js";
19+
import { CompressedReport, IBaselineReport, IEngineReport } from "../engine/IReport.js";
20+
import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager.js";
2121

2222
export class ACReporterJSON implements IReporter {
2323
public name(): string {

‎common/module/src/report/ACReporterMetrics.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
limitations under the License.
1515
*****************************************************************************/
1616

17-
import { fetch_get } from "../api-ext/Fetch";
18-
import { IConfigInternal } from "../config/IConfig";
19-
import { Guideline } from "../engine/IGuideline";
20-
import { CompressedReport } from "../engine/IReport";
21-
import { GenSummReturn, IReporter, IReporterStored } from "./ReporterManager";
17+
import { fetch_get } from "../api-ext/Fetch.js";
18+
import { IConfigInternal } from "../config/IConfig.js";
19+
import { Guideline } from "../engine/IGuideline.js";
20+
import { CompressedReport } from "../engine/IReport.js";
21+
import { GenSummReturn, IReporter, IReporterStored } from "./ReporterManager.js";
2222

2323
/*******************************************************************************
2424
* NAME: ACMetricsLogger.js

‎common/module/src/report/ACReporterXLSX.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
limitations under the License.
1515
*****************************************************************************/
1616

17-
import { IConfigInternal, eRuleLevel } from "../config/IConfig";
18-
import { Checkpoint, Guideline, eToolkitLevel } from "../engine/IGuideline";
19-
import { CompressedReport } from "../engine/IReport";
20-
import { eRuleConfidence } from "../engine/IRule";
21-
import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager";
17+
import { IConfigInternal, eRuleLevel } from "../config/IConfig.js";
18+
import { Checkpoint, Guideline, eToolkitLevel } from "../engine/IGuideline.js";
19+
import { CompressedReport } from "../engine/IReport.js";
20+
import { eRuleConfidence } from "../engine/IRule.js";
21+
import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager.js";
2222
import * as ExcelJS from "exceljs";
2323

2424
type PolicyInfo = {

0 commit comments

Comments
 (0)