Skip to content

bug(node): ESM packages need .js extension for modules #2169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philljenkins merged 5 commits into from
Feb 4, 2025
Merged

bug(node): ESM packages need .js extension for modules #2169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b092268
Add .js extension for modules
tombrunet Jan 24, 2025
9f493d0
Fix ace undefined errors
tombrunet Jan 27, 2025
a7df874
evaluate only uses one arg in Playwright
tombrunet Jan 28, 2025
dac8444
Merge branch 'master' into mjs-js-ext
tombrunet Feb 4, 2025
b6fa206
Missed one file
tombrunet Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions accessibility-checker/src-ts/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,15 @@
limitations under the License.
*****************************************************************************/

import { ACBrowserManager } from "./lib/ACBrowserManager";
import { ACEngineManager } from "./lib/ACEngineManager";
import { getComplianceHelper } from "./lib/ACHelper";
import { eAssertResult, ICheckerReport, ICheckerResult, ReportResult } from "./lib/api/IChecker";
import { ACConfigManager } from "./lib/common/config/ACConfigManager";
import { IConfig, IConfigInternal } from "./lib/common/config/IConfig";
import { Checkpoint } from "./lib/common/engine/IGuideline";
import { IBaselineReport } from "./lib/common/engine/IReport";
import { Issue } from "./lib/common/engine/IRule";
import { BaselineManager } from "./lib/common/report/BaselineManager";
import { ReporterManager } from "./lib/common/report/ReporterManager";
import { ACBrowserManager } from "./lib/ACBrowserManager.js";
import { ACEngineManager } from "./lib/ACEngineManager.js";
import { getComplianceHelper } from "./lib/ACHelper.js";
import { eAssertResult, ICheckerReport, ICheckerResult, ReportResult } from "./lib/api/IChecker.js";
import { ACConfigManager } from "./lib/common/config/ACConfigManager.js";
import { IConfig, IConfigInternal } from "./lib/common/config/IConfig.js";
import { IBaselineReport } from "./lib/common/engine/IReport.js";
import { BaselineManager } from "./lib/common/report/BaselineManager.js";
import { ReporterManager } from "./lib/common/report/ReporterManager.js";

/**
* This function is responsible performing a scan based on the context that is provided, following are
Expand Down
4 changes: 2 additions & 2 deletions accessibility-checker/src-ts/lib/ACBrowserManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as puppeteer from "puppeteer";
import { ACConfigManager } from "./common/config/ACConfigManager";
import { IConfigInternal } from "./common/config/IConfig";
import { ACConfigManager } from "./common/config/ACConfigManager.js";
import { IConfigInternal } from "./common/config/IConfig.js";


export class ACBrowserManager {
Expand Down
20 changes: 12 additions & 8 deletions accessibility-checker/src-ts/lib/ACEngineManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as path from "path";
import * as fs from "fs";
import { ACConfigManager } from "./common/config/ACConfigManager";
import { fetch_get_text } from "./common/api-ext/Fetch";
import { IChecker } from "./common/engine/IChecker";
import { ACConfigManager } from "./common/config/ACConfigManager.js";
import { fetch_get_text } from "./common/api-ext/Fetch.js";
import { IChecker } from "./common/engine/IChecker.js";

let ace;

Expand All @@ -26,6 +26,7 @@ export class ACEngineManager {
config.DEBUG && console.log("[INFO] aChecker.loadEngine detected Puppeteer/Playwright");
let page = content;
if (ENGINE_LOAD_MODE === "REMOTE") {
config.DEBUG && console.log("[INFO] engineMode REMOTE");
await page.evaluate((scriptUrl) => {
try {
var ace_backup_in_ibma;
Expand Down Expand Up @@ -61,19 +62,21 @@ export class ACEngineManager {
}
}, `${config.rulePack}/ace.js`);
} else if (ENGINE_LOAD_MODE === "INJECT") {
await page.evaluate((engineContent) => {
config.DEBUG && console.log("[INFO] engineMode INJECT");
let aceAlreadyExists = await page.evaluate(() => { try { return 'undefined' !== typeof(ace) } catch (e) { return false; } });
await page.evaluate(({ engineContent, aceAlreadyExists }) => {
try {
var ace_backup_in_ibma;
if ('undefined' !== typeof(ace)) {
if (aceAlreadyExists) {
if (!ace || !ace.Checker)
ace_backup_in_ibma = ace;
ace = null;
}
if ('undefined' === typeof (ace) || ace === null) {
if (!aceAlreadyExists || ace === null) {
return new Promise<void>((resolve, reject) => {
eval(engineContent);
globalThis.ace_ibma = ace;
if ('undefined' !== typeof(ace)) {
if (aceAlreadyExists) {
ace = ace_backup_in_ibma;
}
resolve();
Expand All @@ -82,7 +85,8 @@ export class ACEngineManager {
} catch (e) {
return Promise.reject(e);
}
}, ACEngineManager.engineContent);
}, {
engineContent: ACEngineManager.engineContent, aceAlreadyExists });
}
return ACEngineManager.loadEngineLocal();
} else if (ACEngineManager.isSelenium(content)) {
Expand Down
18 changes: 9 additions & 9 deletions accessibility-checker/src-ts/lib/ACHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { ICheckerReport, ICheckerResult } from "./api/IChecker";
import { ACBrowserManager } from "./ACBrowserManager";
import { ACEngineManager } from "./ACEngineManager";
import { ACConfigManager } from "./common/config/ACConfigManager";
import { IConfigInternal } from "./common/config/IConfig";
import { ReporterManager } from "./common/report/ReporterManager";
import { existsSync, mkdirSync, writeFileSync } from "fs";
import { IAbstractAPI } from "./common/api-ext/IAbstractAPI";
import { EngineSummaryCounts, IBaselineReport, IEngineReport } from "./common/engine/IReport";
import { dirname, join, resolve as pathResolve } from "path";
import { BaselineManager, RefactorMap } from "./common/report/BaselineManager";
import { ICheckerReport, ICheckerResult } from "./api/IChecker.js";
import { ACBrowserManager } from "./ACBrowserManager.js";
import { ACEngineManager } from "./ACEngineManager.js";
import { ACConfigManager } from "./common/config/ACConfigManager.js";
import { IConfigInternal } from "./common/config/IConfig.js";
import { ReporterManager } from "./common/report/ReporterManager.js";
import { IAbstractAPI } from "./common/api-ext/IAbstractAPI.js";
import { EngineSummaryCounts, IBaselineReport, IEngineReport } from "./common/engine/IReport.js";
import { BaselineManager, RefactorMap } from "./common/report/BaselineManager.js";

declare var after;

Expand Down
4 changes: 2 additions & 2 deletions accessibility-checker/src-ts/lib/api/IChecker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { eRuleLevel } from "../common/config/IConfig";
import { IBaselineReport } from "../common/engine/IReport";
import { eRuleLevel } from "../common/config/IConfig.js";
import { IBaselineReport } from "../common/engine/IReport.js";

export enum eAssertResult {
ERROR = -1,
Expand Down
8 changes: 4 additions & 4 deletions common/module/src/report/ACReporterCSV.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
limitations under the License.
*****************************************************************************/

import { IConfigInternal } from "../config/IConfig";
import { Guideline } from "../engine/IGuideline";
import { CompressedReport } from "../engine/IReport";
import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager";
import { IConfigInternal } from "../config/IConfig.js";
import { Guideline } from "../engine/IGuideline.js";
import { CompressedReport } from "../engine/IReport.js";
import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager.js";

export class ACReporterCSV implements IReporter {
public name(): string {
Expand Down
10 changes: 5 additions & 5 deletions common/module/src/report/ACReporterHTML.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
limitations under the License.
*****************************************************************************/

import { IConfigInternal } from "../config/IConfig";
import { Guideline } from "../engine/IGuideline";
import { CompressedReport, IBaselineReport } from "../engine/IReport";
import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager";
import { genReport } from "./genReport";
import { IConfigInternal } from "../config/IConfig.js";
import { Guideline } from "../engine/IGuideline.js";
import { CompressedReport, IBaselineReport } from "../engine/IReport.js";
import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager.js";
import { genReport } from "./genReport.js";

export class ACReporterHTML implements IReporter {
public name(): string {
Expand Down
8 changes: 4 additions & 4 deletions common/module/src/report/ACReporterJSON.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
limitations under the License.
*****************************************************************************/

import { IConfigInternal } from "../config/IConfig";
import { Guideline } from "../engine/IGuideline";
import { CompressedReport, IBaselineReport, IEngineReport } from "../engine/IReport";
import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager";
import { IConfigInternal } from "../config/IConfig.js";
import { Guideline } from "../engine/IGuideline.js";
import { CompressedReport, IBaselineReport, IEngineReport } from "../engine/IReport.js";
import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager.js";

export class ACReporterJSON implements IReporter {
public name(): string {
Expand Down
10 changes: 5 additions & 5 deletions common/module/src/report/ACReporterMetrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
limitations under the License.
*****************************************************************************/

import { fetch_get } from "../api-ext/Fetch";
import { IConfigInternal } from "../config/IConfig";
import { Guideline } from "../engine/IGuideline";
import { CompressedReport } from "../engine/IReport";
import { GenSummReturn, IReporter, IReporterStored } from "./ReporterManager";
import { fetch_get } from "../api-ext/Fetch.js";
import { IConfigInternal } from "../config/IConfig.js";
import { Guideline } from "../engine/IGuideline.js";
import { CompressedReport } from "../engine/IReport.js";
import { GenSummReturn, IReporter, IReporterStored } from "./ReporterManager.js";

/*******************************************************************************
* NAME: ACMetricsLogger.js
Expand Down
10 changes: 5 additions & 5 deletions common/module/src/report/ACReporterXLSX.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
limitations under the License.
*****************************************************************************/

import { IConfigInternal, eRuleLevel } from "../config/IConfig";
import { Checkpoint, Guideline, eToolkitLevel } from "../engine/IGuideline";
import { CompressedReport } from "../engine/IReport";
import { eRuleConfidence } from "../engine/IRule";
import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager";
import { IConfigInternal, eRuleLevel } from "../config/IConfig.js";
import { Checkpoint, Guideline, eToolkitLevel } from "../engine/IGuideline.js";
import { CompressedReport } from "../engine/IReport.js";
import { eRuleConfidence } from "../engine/IRule.js";
import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager.js";
import * as ExcelJS from "exceljs";

type PolicyInfo = {
Expand Down
6 changes: 3 additions & 3 deletions common/module/src/report/BaselineManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
limitations under the License.
*****************************************************************************/

import { IAbstractAPI } from "../api-ext/IAbstractAPI";
import { IConfigInternal, eAssertResult } from "../config/IConfig";
import { IBaselineReport } from "../engine/IReport";
import { IAbstractAPI } from "../api-ext/IAbstractAPI.js";
import { IConfigInternal, eAssertResult } from "../config/IConfig.js";
import { IBaselineReport } from "../engine/IReport.js";
import * as DeepDiff from "deep-diff";

export type RefactorMap = {
Expand Down
20 changes: 10 additions & 10 deletions common/module/src/report/ReporterManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
limitations under the License.
*****************************************************************************/

import { IAbstractAPI } from "../api-ext/IAbstractAPI";
import { IConfigInternal, eRuleLevel } from "../config/IConfig";
import { CompressedIssue, CompressedReport, IBaselineReport, IBaselineResult, IEngineReport } from "../engine/IReport";
import { ACReporterMetrics } from "./ACReporterMetrics";
import { ACReporterCSV } from "./ACReporterCSV";
import { ACReporterHTML } from "./ACReporterHTML";
import { ACReporterJSON } from "./ACReporterJSON";
import { ACReporterXLSX } from "./ACReporterXLSX";
import { Guideline } from "../engine/IGuideline";
import { eRuleConfidence, eRulePolicy } from "../engine/IRule";
import { IAbstractAPI } from "../api-ext/IAbstractAPI.js";
import { IConfigInternal, eRuleLevel } from "../config/IConfig.js";
import { CompressedIssue, CompressedReport, IBaselineReport, IBaselineResult, IEngineReport } from "../engine/IReport.js";
import { ACReporterCSV } from "./ACReporterCSV.js";
import { ACReporterHTML } from "./ACReporterHTML.js";
import { ACReporterJSON } from "./ACReporterJSON.js";
import { ACReporterXLSX } from "./ACReporterXLSX.js";
import { Guideline } from "../engine/IGuideline.js";
import { eRuleConfidence, eRulePolicy } from "../engine/IRule.js";
import { ACReporterMetrics } from "./ACReporterMetrics.js";

export interface IReporterStored {
startScan: number,
Expand Down