@axe-core/watcher 3.21.0 → 3.21.1-next.34572c3b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cypress/cypress.d.ts +12 -2
- package/dist/cypress/cypress.js +108 -66
- package/dist/cypress/cypress.js.map +1 -1
- package/dist/cypressCommands.js +20 -3
- package/dist/cypressCommands.js.map +1 -1
- package/dist/puppeteer/puppeteer.d.ts +1 -0
- package/dist/puppeteer/puppeteer.js +15 -0
- package/dist/puppeteer/puppeteer.js.map +1 -1
- package/dist/sendResultsToServer.d.ts +2 -1
- package/dist/sendResultsToServer.js +48 -3
- package/dist/sendResultsToServer.js.map +1 -1
- package/dist/utils/handleNoSupportForChromeLoadExtensions.d.ts +9 -0
- package/dist/utils/handleNoSupportForChromeLoadExtensions.js +16 -0
- package/dist/utils/handleNoSupportForChromeLoadExtensions.js.map +1 -0
- package/dist/utils/mergeChromeArgs.d.ts +2 -1
- package/dist/utils/mergeChromeArgs.js +16 -1
- package/dist/utils/mergeChromeArgs.js.map +1 -1
- package/dist/utils/types.d.ts +3 -0
- package/dist/utils/types.js +3 -0
- package/dist/utils/types.js.map +1 -0
- package/dist/utils/writeVariables.d.ts +11 -0
- package/dist/utils/writeVariables.js.map +1 -1
- package/dist/wdio/wdio.js +14 -2
- package/dist/wdio/wdio.js.map +1 -1
- package/dist/webdriver/webdriver.d.ts +1 -0
- package/dist/webdriver/webdriver.js +18 -1
- package/dist/webdriver/webdriver.js.map +1 -1
- package/extension/background.js +1 -1
- package/extension/content.js +1 -1
- package/package.json +8 -3
@@ -1,12 +1,22 @@
|
|
1
|
-
import { type
|
1
|
+
import { type CypressConfiguration } from '../utils/writeVariables';
|
2
2
|
export declare const configTimeout = "__AXE_WATCHER_TIMEOUT_CONFIG";
|
3
3
|
export declare const cypressConfigRunFlag = "__AXE_WATCHER_CYPRESS_CONFIG_RUN";
|
4
4
|
export declare const cypressConfigAutoAnalyzeFlag = "__AXE_WATCHER_AUTO_ANALYZE";
|
5
5
|
export declare const cypressAxeCoreSettingsFlag = "__AXE_WATCHER_AXE_CORE_SETTINGS";
|
6
6
|
export declare const cypressRunOptionsFlag = "__AXE_WATCHER_RUN_OPTIONS";
|
7
|
+
export declare const cypressEnabledTestingModes = "__AXE_WATCHER_CYPRESS_TESTING_TYPES";
|
8
|
+
export declare const cypressAxeWatcherDebug = "__AXE_WATCHER_DEBUG";
|
7
9
|
/**
|
8
10
|
* Create a Cypress config that uses the axe Watcher extension.
|
9
11
|
*
|
10
12
|
* @param config Cypress config to extend
|
11
13
|
*/
|
12
|
-
export declare const cypressConfig: (config: Cypress.ConfigOptions &
|
14
|
+
export declare const cypressConfig: (config: Cypress.ConfigOptions & CypressConfiguration) => Cypress.ConfigOptions;
|
15
|
+
/**
|
16
|
+
* Creates a setupNodeEvents function that handles both e2e and component test types
|
17
|
+
* @param testType The type of test (e2e or component)
|
18
|
+
* @param userConfig The user's Cypress configuration
|
19
|
+
* @returns A setupNodeEvents function configured for the specified test type
|
20
|
+
*/
|
21
|
+
export declare const createSetupNodeEvents: (testType: "e2e" | "component", userConfig: Cypress.ConfigOptions) => (cypressOn: Cypress.PluginEvents, ...args: unknown[]) => Promise<void | undefined | Cypress.PluginConfigOptions>;
|
22
|
+
export declare const normalizeTestingTypes: (testingTypes: string | string[] | undefined) => string[];
|
package/dist/cypress/cypress.js
CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.cypressConfig = exports.cypressRunOptionsFlag = exports.cypressAxeCoreSettingsFlag = exports.cypressConfigAutoAnalyzeFlag = exports.cypressConfigRunFlag = exports.configTimeout = void 0;
|
6
|
+
exports.normalizeTestingTypes = exports.createSetupNodeEvents = exports.cypressConfig = exports.cypressAxeWatcherDebug = exports.cypressEnabledTestingModes = exports.cypressRunOptionsFlag = exports.cypressAxeCoreSettingsFlag = exports.cypressConfigAutoAnalyzeFlag = exports.cypressConfigRunFlag = exports.configTimeout = void 0;
|
7
7
|
const sendResultsToServer_1 = __importDefault(require("../sendResultsToServer"));
|
8
8
|
const EventForwarder_1 = __importDefault(require("../EventForwarder"));
|
9
9
|
const writeVariables_1 = __importDefault(require("../utils/writeVariables"));
|
@@ -19,11 +19,14 @@ exports.cypressConfigRunFlag = '__AXE_WATCHER_CYPRESS_CONFIG_RUN';
|
|
19
19
|
exports.cypressConfigAutoAnalyzeFlag = '__AXE_WATCHER_AUTO_ANALYZE';
|
20
20
|
exports.cypressAxeCoreSettingsFlag = '__AXE_WATCHER_AXE_CORE_SETTINGS';
|
21
21
|
exports.cypressRunOptionsFlag = '__AXE_WATCHER_RUN_OPTIONS';
|
22
|
+
exports.cypressEnabledTestingModes = '__AXE_WATCHER_CYPRESS_TESTING_TYPES';
|
23
|
+
exports.cypressAxeWatcherDebug = '__AXE_WATCHER_DEBUG';
|
22
24
|
const cypressConfig = (config) => {
|
23
25
|
const { axe, ...userConfig } = config;
|
24
26
|
const { DEBUG, AXE_WATCHER_PROJECT_ID } = process.env;
|
25
27
|
const hasWatcherDebug = DEBUG && DEBUG.includes('axe-watcher');
|
26
28
|
const isProjectIdFeatureFlagEnabled = AXE_WATCHER_PROJECT_ID && AXE_WATCHER_PROJECT_ID.toLowerCase() === 'true';
|
29
|
+
const testingTypes = (0, exports.normalizeTestingTypes)(axe.testingTypes);
|
27
30
|
if (isProjectIdFeatureFlagEnabled && !axe.projectId) {
|
28
31
|
console.warn('Warning: `projectId` within axe configuration will become a mandatory field in a future release. Please supply your `projectId` found on your projects page');
|
29
32
|
}
|
@@ -36,85 +39,124 @@ const cypressConfig = (config) => {
|
|
36
39
|
(0, writeExtensionManifest_1.default)({
|
37
40
|
all_frames: true,
|
38
41
|
exclude_globs: [
|
39
|
-
'*/__/#/specs/runner?file=*'
|
40
|
-
'*/__cypress/iframes/*'
|
42
|
+
'*/__/#/specs/runner?file=*'
|
41
43
|
]
|
42
44
|
});
|
43
45
|
const variables = (0, readVariables_1.default)();
|
46
|
+
const shouldRunWatcherInComponentMode = testingTypes?.includes('component');
|
47
|
+
const envVariables = {
|
48
|
+
[exports.cypressConfigRunFlag]: true,
|
49
|
+
[exports.configTimeout]: variables.timeout,
|
50
|
+
[exports.cypressAxeCoreSettingsFlag]: variables.axe_core_settings,
|
51
|
+
[exports.cypressRunOptionsFlag]: variables.run_options,
|
52
|
+
[exports.cypressEnabledTestingModes]: testingTypes,
|
53
|
+
[exports.cypressAxeWatcherDebug]: hasWatcherDebug,
|
54
|
+
[exports.cypressConfigAutoAnalyzeFlag]: axe.autoAnalyze === undefined ? true : axe.autoAnalyze
|
55
|
+
};
|
44
56
|
if (userConfig.e2e?.env) {
|
45
|
-
userConfig.e2e.env = Object.assign({}, userConfig.e2e.env,
|
46
|
-
[exports.cypressConfigRunFlag]: true,
|
47
|
-
[exports.configTimeout]: variables.timeout,
|
48
|
-
[exports.cypressAxeCoreSettingsFlag]: variables.axe_core_settings,
|
49
|
-
[exports.cypressRunOptionsFlag]: variables.run_options
|
50
|
-
});
|
57
|
+
userConfig.e2e.env = Object.assign({}, userConfig.e2e.env, envVariables);
|
51
58
|
}
|
52
|
-
|
53
|
-
userConfig.env = Object.assign({}, userConfig.env,
|
54
|
-
[exports.cypressConfigRunFlag]: true,
|
55
|
-
[exports.configTimeout]: variables.timeout,
|
56
|
-
[exports.cypressAxeCoreSettingsFlag]: variables.axe_core_settings,
|
57
|
-
[exports.cypressRunOptionsFlag]: variables.run_options
|
58
|
-
});
|
59
|
+
if (userConfig.component?.env && shouldRunWatcherInComponentMode) {
|
60
|
+
userConfig.component.env = Object.assign({}, userConfig.component.env, envVariables);
|
59
61
|
}
|
60
|
-
if (
|
61
|
-
userConfig.env
|
62
|
-
|
63
|
-
});
|
62
|
+
if (!userConfig.e2e?.env &&
|
63
|
+
!(userConfig.component?.env && shouldRunWatcherInComponentMode)) {
|
64
|
+
userConfig.env = Object.assign({}, userConfig.env, envVariables);
|
64
65
|
}
|
65
|
-
userConfig.env = Object.assign({}, userConfig.env, {
|
66
|
-
[exports.cypressConfigAutoAnalyzeFlag]: axe.autoAnalyze === undefined ? true : axe.autoAnalyze
|
67
|
-
});
|
68
66
|
return {
|
69
67
|
...userConfig,
|
70
68
|
e2e: {
|
71
69
|
...userConfig.e2e,
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
70
|
+
setupNodeEvents: (0, exports.createSetupNodeEvents)('e2e', userConfig)
|
71
|
+
},
|
72
|
+
...(shouldRunWatcherInComponentMode &&
|
73
|
+
userConfig.component?.devServer && {
|
74
|
+
component: {
|
75
|
+
...userConfig.component,
|
76
|
+
setupNodeEvents: (0, exports.createSetupNodeEvents)('component', userConfig)
|
77
|
+
}
|
78
|
+
})
|
79
|
+
};
|
80
|
+
};
|
81
|
+
exports.cypressConfig = cypressConfig;
|
82
|
+
const createSetupNodeEvents = (testType, userConfig) => {
|
83
|
+
return async function setupNodeEvents(cypressOn, ...args) {
|
84
|
+
const eventForwarder = new EventForwarder_1.default();
|
85
|
+
const on = eventForwarder.on;
|
86
|
+
const userNodeEventConfig = await userConfig[testType]?.setupNodeEvents?.(on, ...args);
|
87
|
+
if (userNodeEventConfig) {
|
88
|
+
userNodeEventConfig.env = Object.assign({}, userNodeEventConfig.env, {
|
89
|
+
[exports.cypressConfigRunFlag]: true
|
90
|
+
});
|
91
|
+
}
|
92
|
+
on('task', {
|
93
|
+
__uploadAxeWatcherResults: async ({ results, skipped_url }) => {
|
94
|
+
if (!results?.length && !skipped_url) {
|
95
|
+
return null;
|
80
96
|
}
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
}
|
86
|
-
await (0, sendResultsToServer_1.default)({
|
87
|
-
skipped_url,
|
88
|
-
results,
|
89
|
-
debugLogger
|
90
|
-
});
|
91
|
-
return null;
|
92
|
-
},
|
93
|
-
__debugAxeWatcher: (message) => {
|
94
|
-
debugLogger(message);
|
95
|
-
return null;
|
96
|
-
}
|
97
|
+
const sentResult = await (0, sendResultsToServer_1.default)({
|
98
|
+
skipped_url,
|
99
|
+
results,
|
100
|
+
debugLogger
|
97
101
|
});
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
if (browser.isHeadless && launchOptions.args.includes('--headless')) {
|
104
|
-
throw new headlessNotSupportedError_1.HeadlessNotSupportedError('In Cypress, "--headless=new" became the default headless mode in Cypress version 12.15.0. Ensure your Cypress version is up to date and that you are not using a "before:browser:launch" configuration that adds "--headless" to launchOptions.args.');
|
105
|
-
}
|
106
|
-
const existingArgs = launchOptions.args;
|
107
|
-
(0, checkUserArgs_1.checkUserArgs)(existingArgs);
|
108
|
-
launchOptions.args = (0, mergeChromeArgs_1.default)(existingArgs, {
|
109
|
-
disableOtherExtensions: false
|
110
|
-
});
|
111
|
-
return launchOptions;
|
112
|
-
});
|
113
|
-
eventForwarder.forward(cypressOn);
|
114
|
-
return userNodeEventConfig;
|
102
|
+
return sentResult || null;
|
103
|
+
},
|
104
|
+
__debugAxeWatcher: (message) => {
|
105
|
+
debugLogger(message);
|
106
|
+
return null;
|
115
107
|
}
|
116
|
-
}
|
108
|
+
});
|
109
|
+
on('before:browser:launch', (browser, launchOptions) => {
|
110
|
+
if (browser.name.startsWith('firefox') ||
|
111
|
+
browser.name.startsWith('electron')) {
|
112
|
+
throw new Error(`The @axe-core/watcher package only supports running in Chrome browsers such as "Chrome", "Chrome for Testing" or "Chromium", but Cypress is configured with browser "${browser.name}". Please refer to our System Requirements for more information: https://docs.deque.com/developer-hub/2/en/dh-system-requirements`);
|
113
|
+
}
|
114
|
+
if (browser.name === 'chrome') {
|
115
|
+
const CHROME_VERSION_NO_EXTENSIONS = 139;
|
116
|
+
const chromeSupportMessage = `Branded versions of Google Chrome v${CHROME_VERSION_NO_EXTENSIONS} and higher removed support for tools like @axe-core/watcher. Use Chrome for Testing or Chromium instead. Please refer to our System Requirements for more information: https://docs.deque.com/developer-hub/2/en/dh-system-requirements`;
|
117
|
+
if (Number(browser.majorVersion) >= CHROME_VERSION_NO_EXTENSIONS) {
|
118
|
+
throw new Error(chromeSupportMessage);
|
119
|
+
}
|
120
|
+
else {
|
121
|
+
console.warn('Warning: ' + chromeSupportMessage);
|
122
|
+
}
|
123
|
+
}
|
124
|
+
if (browser.isHeadless && launchOptions.args.includes('--headless')) {
|
125
|
+
throw new headlessNotSupportedError_1.HeadlessNotSupportedError('In Cypress, "--headless=new" became the default headless mode in Cypress version 12.15.0. Ensure your Cypress version is up to date and that you are not using a "before:browser:launch" configuration that adds "--headless" to launchOptions.args.');
|
126
|
+
}
|
127
|
+
const existingArgs = launchOptions.args;
|
128
|
+
(0, checkUserArgs_1.checkUserArgs)(existingArgs);
|
129
|
+
launchOptions.args = (0, mergeChromeArgs_1.default)(existingArgs, {
|
130
|
+
disableOtherExtensions: false,
|
131
|
+
disableLoadExtensionCommandFeature: true
|
132
|
+
});
|
133
|
+
return launchOptions;
|
134
|
+
});
|
135
|
+
eventForwarder.forward(cypressOn);
|
136
|
+
return userNodeEventConfig;
|
117
137
|
};
|
118
138
|
};
|
119
|
-
exports.
|
139
|
+
exports.createSetupNodeEvents = createSetupNodeEvents;
|
140
|
+
const normalizeTestingTypes = (testingTypes) => {
|
141
|
+
const validTestingTypes = ['e2e', 'component'];
|
142
|
+
if (!testingTypes) {
|
143
|
+
return ['e2e'];
|
144
|
+
}
|
145
|
+
if (Array.isArray(testingTypes)) {
|
146
|
+
if (!testingTypes.length) {
|
147
|
+
throw new Error('`testingTypes` should include `e2e`, `component`, or both. Specifying an empty array is not supported.');
|
148
|
+
}
|
149
|
+
const invalidTestingTypes = testingTypes.filter(testingType => testingType && !validTestingTypes.includes(testingType));
|
150
|
+
if (invalidTestingTypes.length) {
|
151
|
+
throw new Error(`Invalid testing types provided: ${invalidTestingTypes.join(', ')}. Valid options are: ${validTestingTypes.join(', ')}.`);
|
152
|
+
}
|
153
|
+
}
|
154
|
+
else if (typeof testingTypes === 'string') {
|
155
|
+
if (!validTestingTypes.includes(testingTypes)) {
|
156
|
+
throw new Error(`Invalid testing type provided: ${testingTypes}. Valid options are: ${validTestingTypes.join(', ')}.`);
|
157
|
+
}
|
158
|
+
}
|
159
|
+
return Array.isArray(testingTypes) ? testingTypes : [testingTypes];
|
160
|
+
};
|
161
|
+
exports.normalizeTestingTypes = normalizeTestingTypes;
|
120
162
|
//# sourceMappingURL=cypress.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"cypress.js","sourceRoot":"","sources":["../../src/cypress/cypress.ts"],"names":[],"mappings":";;;;;;AACA,iFAAwD;AACxD,uEAA8C;AAC9C,
|
1
|
+
{"version":3,"file":"cypress.js","sourceRoot":"","sources":["../../src/cypress/cypress.ts"],"names":[],"mappings":"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"}
|
package/dist/cypressCommands.js
CHANGED
@@ -7,6 +7,7 @@ const cypressConfigAutoAnalyzeFlag = '__AXE_WATCHER_AUTO_ANALYZE';
|
|
7
7
|
const configTimeout = '__AXE_WATCHER_TIMEOUT_CONFIG';
|
8
8
|
const cypressAxeCoreSettingsFlag = '__AXE_WATCHER_AXE_CORE_SETTINGS';
|
9
9
|
const cypressRunOptionsFlag = '__AXE_WATCHER_RUN_OPTIONS';
|
10
|
+
const cypressEnabledTestingModes = '__AXE_WATCHER_CYPRESS_TESTING_TYPES';
|
10
11
|
let isStopped = !Cypress.env(cypressConfigAutoAnalyzeFlag);
|
11
12
|
exports.WRAPPED_COMMANDS = [
|
12
13
|
'blur',
|
@@ -41,7 +42,11 @@ exports.WRAPPED_COMMANDS.forEach(method => Cypress.Commands.overwrite(method, (o
|
|
41
42
|
const currentCommandName = currentCommand?.get('name');
|
42
43
|
const currentCommandType = currentCommand?.get('type');
|
43
44
|
const tryRequerySubject = 'getSubjectFromChain' in cy;
|
44
|
-
|
45
|
+
const isNestedCommandCall = currentCommandName && currentCommandName !== method;
|
46
|
+
const isComponentTestingMode = Cypress.testingType === 'component';
|
47
|
+
const isComponentTestingEnabled = Cypress.env(cypressEnabledTestingModes)?.includes('component');
|
48
|
+
const isComponentTestingNotConfigured = isComponentTestingMode && !isComponentTestingEnabled;
|
49
|
+
if (isNestedCommandCall || isComponentTestingNotConfigured) {
|
45
50
|
return originalFn(...args);
|
46
51
|
}
|
47
52
|
const originalSubject = cy.subject?.();
|
@@ -81,6 +86,13 @@ function axeWatcherFlushCommand({ timeout } = {}) {
|
|
81
86
|
logDebugAxeWatcher({
|
82
87
|
message: `Flush: Invoked (${isStopped ? 'will not' : 'may'} analyze implicitly)`
|
83
88
|
});
|
89
|
+
if (Cypress.testingType === 'component' &&
|
90
|
+
!Cypress.env(cypressEnabledTestingModes)?.includes('component')) {
|
91
|
+
logDebugAxeWatcher({
|
92
|
+
message: `Not executing Flush due to be running in component testing mode without watcher enabled for that mode`
|
93
|
+
});
|
94
|
+
return;
|
95
|
+
}
|
84
96
|
cy.window().then(win => {
|
85
97
|
if (!shouldAnalyzeLocation(win.location)) {
|
86
98
|
return Promise.resolve();
|
@@ -115,8 +127,13 @@ function axeWatcherFlushCommand({ timeout } = {}) {
|
|
115
127
|
})
|
116
128
|
])
|
117
129
|
.then(results => {
|
118
|
-
cy.task('__uploadAxeWatcherResults', { results }, { log: false })
|
119
|
-
|
130
|
+
cy.task('__uploadAxeWatcherResults', { results }, { log: false }).then(result => {
|
131
|
+
const resultWithFailureStatus = result;
|
132
|
+
const message = resultWithFailureStatus?.failureStatus
|
133
|
+
? `Failed. ${resultWithFailureStatus.failureStatus}`
|
134
|
+
: 'Complete';
|
135
|
+
logDebugAxeWatcher({ message: `Flush: ${message}` });
|
136
|
+
});
|
120
137
|
})
|
121
138
|
.finally(() => {
|
122
139
|
if (timer) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"cypressCommands.js","sourceRoot":"","sources":["../src/cypressCommands.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"cypressCommands.js","sourceRoot":"","sources":["../src/cypressCommands.ts"],"names":[],"mappings":"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"}
|
@@ -11,6 +11,7 @@ export declare function puppeteerConfig(opts: Configuration & LaunchOptions): No
|
|
11
11
|
export declare class PuppeteerController extends Controller {
|
12
12
|
private driver;
|
13
13
|
constructor(driver: Page);
|
14
|
+
checkBrowserCompatibility(): Promise<void>;
|
14
15
|
protected executeScript<T>(fn: string | (() => Promise<T>), ...args: unknown[]): Promise<T>;
|
15
16
|
}
|
16
17
|
/**
|
@@ -10,6 +10,7 @@ const headlessNotSupportedError_1 = require("../utils/headlessNotSupportedError"
|
|
10
10
|
const mergeChromeArgs_1 = __importDefault(require("../utils/mergeChromeArgs"));
|
11
11
|
const writeVariables_1 = __importDefault(require("../utils/writeVariables"));
|
12
12
|
const checkUserArgs_1 = require("../utils/checkUserArgs");
|
13
|
+
const handleNoSupportForChromeLoadExtensions_1 = __importDefault(require("../utils/handleNoSupportForChromeLoadExtensions"));
|
13
14
|
function headlessNotSupportedError(config) {
|
14
15
|
if (!config?.headless || config.headless === 'new') {
|
15
16
|
return;
|
@@ -41,6 +42,20 @@ class PuppeteerController extends Controller_1.default {
|
|
41
42
|
configurationFunction: 'puppeteerConfig()'
|
42
43
|
});
|
43
44
|
this.driver = driver;
|
45
|
+
this.checkBrowserCompatibility();
|
46
|
+
}
|
47
|
+
async checkBrowserCompatibility() {
|
48
|
+
try {
|
49
|
+
const browser = await this.driver.browser().version();
|
50
|
+
const browserName = browser.split('/')[0];
|
51
|
+
const browserMajorVersion = Number(browser.split('/')[1]?.split('.')[0]);
|
52
|
+
if (browserMajorVersion && browserName) {
|
53
|
+
(0, handleNoSupportForChromeLoadExtensions_1.default)(browserName, browserMajorVersion);
|
54
|
+
}
|
55
|
+
}
|
56
|
+
catch (error) {
|
57
|
+
throw new Error('Error checking browser compatibility. ' + error.message);
|
58
|
+
}
|
44
59
|
}
|
45
60
|
async executeScript(fn, ...args) {
|
46
61
|
const result = await this.driver.evaluate(fn, ...args);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"puppeteer.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer.ts"],"names":[],"mappings":";;;;;;
|
1
|
+
{"version":3,"file":"puppeteer.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer.ts"],"names":[],"mappings":";;;;;;AAyCA,0CAqBC;AA7DD,+DAAsC;AACtC,kFAA8E;AAC9E,+EAAsD;AACtD,6EAA4E;AAC5E,0DAAsD;AACtD,6HAAoG;AAWpG,SAAS,yBAAyB,CAChC,MAAuD;IAEvD,IAAI,CAAC,MAAM,EAAE,QAAQ,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QACnD,OAAM;IACR,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAChC,MAAM,IAAI,qDAAyB,CACjC,mGAAmG,CACpG,CAAA;IACH,CAAC;IAED,MAAM,IAAI,qDAAyB,CACjC,8HAA8H,CAC/H,CAAA;AACH,CAAC;AAQD,SAAgB,eAAe,CAC7B,IAAmC;IAEnC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAC/B,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,MAAM,CAAA;IAE1B,IAAA,6BAAa,EAAC,IAAI,CAAC,CAAA;IACnB,IAAA,wBAAc,EAAC,GAAG,CAAC,CAAA;IAEnB,yBAAyB,CACvB,MAAyD,CAC1D,CAAA;IAED,MAAM,YAAY,GAAG,IAAI,CAAA;IACzB,IAAI,GAAG,IAAA,yBAAe,EAAC,YAAY,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAA;IAEtE,OAAO;QACL,GAAG,MAAM;QACT,QAAQ,EAAE,KAAK;QACf,IAAI;KACL,CAAA;AACH,CAAC;AAED,MAAa,mBAAoB,SAAQ,oBAAU;IAGjD,YAAY,MAAY;QACtB,KAAK,CAAC;YACJ,eAAe,EAAE,qBAAqB;YACtC,eAAe,EAAE,WAAW;YAC5B,qBAAqB,EAAE,mBAAmB;SAC3C,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,yBAAyB,EAAE,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,yBAAyB;QAC7B,IAAI,CAAC;YAEH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAA;YACrD,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;YACzC,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACxE,IAAI,mBAAmB,IAAI,WAAW,EAAE,CAAC;gBACvC,IAAA,gDAAsC,EAAC,WAAW,EAAE,mBAAmB,CAAC,CAAA;YAC1E,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,wCAAwC,GAAI,KAAe,CAAC,OAAO,CACpE,CAAA;QACH,CAAC;IACH,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,EAA+B,EAC/B,GAAG,IAAe;QAElB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;QACtD,OAAO,MAAW,CAAA;IACpB,CAAC;CACF;AArCD,kDAqCC;AAKM,MAAM,aAAa,GAAG,CAE3B,cAA8B,EAE9B,UAA+B,EACf,EAAE;IAClB,MAAM,IAAI,KAAK,CAAC;;;;;;KAMb,CAAC,CAAA;AACN,CAAC,CAAA;AAbY,QAAA,aAAa,iBAazB;AAED,yDAAmE;AAA1D,sHAAA,QAAQ,OAAqB"}
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import type { AxeResults, ElementContext } from 'axe-core';
|
2
2
|
import type { RunOptions } from './utils/validateAxeRunOptions';
|
3
|
+
import type { SendResultsFailureStatus } from './utils/types';
|
3
4
|
/**
|
4
5
|
* Number of page states to send to the server at once.
|
5
6
|
*
|
@@ -25,5 +26,5 @@ interface SendResultsToServerParams {
|
|
25
26
|
debugLogger: debug.Debugger;
|
26
27
|
skipped_url?: string | null;
|
27
28
|
}
|
28
|
-
export declare const sendResultsToServer: ({ results, debugLogger }: SendResultsToServerParams) => Promise<void>;
|
29
|
+
export declare const sendResultsToServer: ({ results, debugLogger }: SendResultsToServerParams) => Promise<void | SendResultsFailureStatus>;
|
29
30
|
export default sendResultsToServer;
|
@@ -1,16 +1,50 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
19
|
+
var ownKeys = function(o) {
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
21
|
+
var ar = [];
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
23
|
+
return ar;
|
24
|
+
};
|
25
|
+
return ownKeys(o);
|
26
|
+
};
|
27
|
+
return function (mod) {
|
28
|
+
if (mod && mod.__esModule) return mod;
|
29
|
+
var result = {};
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
31
|
+
__setModuleDefault(result, mod);
|
32
|
+
return result;
|
33
|
+
};
|
34
|
+
})();
|
2
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
37
|
};
|
5
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
39
|
exports.sendResultsToServer = exports.MAX_RETRIES = exports.MAX_PAGE_STATES_PER_REQUEST = void 0;
|
7
|
-
const node_fetch_1 =
|
40
|
+
const node_fetch_1 = __importStar(require("node-fetch"));
|
8
41
|
const uuid_1 = require("uuid");
|
9
42
|
const readVariables_1 = __importDefault(require("./utils/readVariables"));
|
10
43
|
const linearBackoff_1 = __importDefault(require("./utils/linearBackoff"));
|
11
44
|
const { version } = require('../package.json');
|
12
45
|
exports.MAX_PAGE_STATES_PER_REQUEST = 5;
|
13
46
|
exports.MAX_RETRIES = 3;
|
47
|
+
const MAX_RETRIES_ERROR_TYPE = 'maximum-retries';
|
14
48
|
const sendResultsToServer = async ({ results, debugLogger }) => {
|
15
49
|
const { server_url, api_key, session_id, git_data } = (0, readVariables_1.default)();
|
16
50
|
const resultsURL = new URL(`/api-pub/watcher/sessions/${session_id}`, server_url);
|
@@ -67,12 +101,13 @@ const sendResultsToServer = async ({ results, debugLogger }) => {
|
|
67
101
|
await (0, linearBackoff_1.default)(incrementRetry);
|
68
102
|
await putResults(bodyResults, incrementRetry);
|
69
103
|
}
|
70
|
-
else if (retryAttempt === exports.MAX_RETRIES) {
|
104
|
+
else if (retryAttempt === exports.MAX_RETRIES && !res.ok) {
|
71
105
|
debugLogger('SendResultsToServer: Max retries reached', {
|
72
106
|
retryAttempt,
|
73
107
|
resStatus: res.status
|
74
108
|
});
|
75
109
|
console.warn('@axe-core/watcher: Unable to send results to server, max retries reached');
|
110
|
+
return Promise.reject(new node_fetch_1.FetchError('Maximum retries reached', MAX_RETRIES_ERROR_TYPE));
|
76
111
|
}
|
77
112
|
};
|
78
113
|
results.forEach(result => {
|
@@ -81,6 +116,9 @@ const sendResultsToServer = async ({ results, debugLogger }) => {
|
|
81
116
|
}
|
82
117
|
});
|
83
118
|
const requestErrorHandler = (error) => {
|
119
|
+
if (error.type === MAX_RETRIES_ERROR_TYPE) {
|
120
|
+
return { failureStatus: error.message };
|
121
|
+
}
|
84
122
|
debugLogger('SendResultsToServer: Fetch error', {
|
85
123
|
message: error.message,
|
86
124
|
type: error.type || 'NA',
|
@@ -89,11 +127,18 @@ const sendResultsToServer = async ({ results, debugLogger }) => {
|
|
89
127
|
errno: error.errno || 'NA'
|
90
128
|
});
|
91
129
|
};
|
130
|
+
let catchResult;
|
92
131
|
for (let i = 0; i < results.length; i += exports.MAX_PAGE_STATES_PER_REQUEST) {
|
93
132
|
const batch = results
|
94
133
|
.slice(i, i + exports.MAX_PAGE_STATES_PER_REQUEST)
|
95
134
|
.map(r => ({ ...r, screenshot: null }));
|
96
|
-
await putResults(batch).catch(requestErrorHandler);
|
135
|
+
catchResult = await putResults(batch).catch(requestErrorHandler);
|
136
|
+
if (catchResult) {
|
137
|
+
break;
|
138
|
+
}
|
139
|
+
}
|
140
|
+
if (catchResult) {
|
141
|
+
return Promise.resolve(catchResult);
|
97
142
|
}
|
98
143
|
await Promise.all(results.map(async ({ screenshot, screenshot_id }) => {
|
99
144
|
if (!screenshot) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sendResultsToServer.js","sourceRoot":"","sources":["../src/sendResultsToServer.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"sendResultsToServer.js","sourceRoot":"","sources":["../src/sendResultsToServer.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,9 @@
|
|
1
|
+
/**
|
2
|
+
* Checks the Chrome version and informs users that `--load-extensions` flag is no longer supported.
|
3
|
+
* For Chrome versions 139 and higher we are throwing an error since the load extensions flag is completely removed,
|
4
|
+
* see https://groups.google.com/a/chromium.org/g/chromium-extensions/c/1-g8EFx2BBY/m/S0ET5wPjCAAJ
|
5
|
+
* @param browserName - The name of the browser.
|
6
|
+
* @param browserVersion - The version of the browser.
|
7
|
+
*/
|
8
|
+
declare function handleNoSupportForChromeLoadExtensions(browserName: string, browserVersion: number): void;
|
9
|
+
export default handleNoSupportForChromeLoadExtensions;
|
@@ -0,0 +1,16 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
function handleNoSupportForChromeLoadExtensions(browserName, browserVersion) {
|
4
|
+
if (browserName === 'chrome') {
|
5
|
+
const CHROME_VERSION_NO_EXTENSIONS = 139;
|
6
|
+
const chromeSupportMessage = `Branded versions of Google Chrome v${CHROME_VERSION_NO_EXTENSIONS} and higher removed support for tools like @axe-core/watcher. Use Chrome for Testing or Chromium instead. Please refer to our System Requirements for more information: https://docs.deque.com/developer-hub/2/en/dh-system-requirements`;
|
7
|
+
if (browserVersion >= CHROME_VERSION_NO_EXTENSIONS) {
|
8
|
+
throw new Error(chromeSupportMessage);
|
9
|
+
}
|
10
|
+
else {
|
11
|
+
console.warn('Warning: ' + chromeSupportMessage);
|
12
|
+
}
|
13
|
+
}
|
14
|
+
}
|
15
|
+
exports.default = handleNoSupportForChromeLoadExtensions;
|
16
|
+
//# sourceMappingURL=handleNoSupportForChromeLoadExtensions.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"handleNoSupportForChromeLoadExtensions.js","sourceRoot":"","sources":["../../src/utils/handleNoSupportForChromeLoadExtensions.ts"],"names":[],"mappings":";;AAOA,SAAS,sCAAsC,CAC7C,WAAmB,EACnB,cAAsB;IAEtB,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;QAC7B,MAAM,4BAA4B,GAAG,GAAG,CAAA;QACxC,MAAM,oBAAoB,GAAG,sCAAsC,4BAA4B,0OAA0O,CAAA;QACzU,IAAI,cAAc,IAAI,4BAA4B,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACvC,CAAC;aAAM,CAAC;YAEN,OAAO,CAAC,IAAI,CAAC,WAAW,GAAG,oBAAoB,CAAC,CAAA;QAClD,CAAC;IACH,CAAC;AACH,CAAC;AAED,kBAAe,sCAAsC,CAAA"}
|
@@ -6,7 +6,8 @@
|
|
6
6
|
* @param disableOtherExtensions Whether to disable other extensions.
|
7
7
|
* @returns The merged arguments to pass to Chrome.
|
8
8
|
*/
|
9
|
-
declare function mergeChromeArgs(userArgs: string[], { disableOtherExtensions }: {
|
9
|
+
declare function mergeChromeArgs(userArgs: string[], { disableOtherExtensions, disableLoadExtensionCommandFeature }: {
|
10
10
|
disableOtherExtensions: boolean;
|
11
|
+
disableLoadExtensionCommandFeature?: boolean;
|
11
12
|
}): string[];
|
12
13
|
export default mergeChromeArgs;
|