@axe-core/watcher 3.20.1 → 3.20.2-next.0c9a5aa3
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/Controller.js +4 -4
- package/dist/Controller.js.map +1 -1
- package/dist/{cypress.d.ts → cypress/cypress.d.ts} +1 -1
- package/dist/{cypress.js → cypress/cypress.js} +20 -13
- package/dist/cypress/cypress.js.map +1 -0
- package/dist/cypressCommands.js +5 -6
- package/dist/cypressCommands.js.map +1 -1
- package/dist/git.d.ts +0 -6
- package/dist/git.js +70 -14
- package/dist/git.js.map +1 -1
- package/dist/index.d.ts +6 -6
- package/dist/index.js +6 -6
- package/dist/index.js.map +1 -1
- package/dist/{playwright.d.ts → playwright/playwright.d.ts} +2 -2
- package/dist/{playwright.js → playwright/playwright.js} +5 -5
- package/dist/playwright/playwright.js.map +1 -0
- package/dist/{playwrightWrapping.d.ts → playwright/playwrightWrapping.d.ts} +1 -1
- package/dist/{playwrightWrapping.js → playwright/playwrightWrapping.js} +1 -1
- package/dist/playwright/playwrightWrapping.js.map +1 -0
- package/dist/{playwrightTest.d.ts → playwright-test/playwrightTest.d.ts} +1 -1
- package/dist/{playwrightTest.js → playwright-test/playwrightTest.js} +9 -9
- package/dist/playwright-test/playwrightTest.js.map +1 -0
- package/dist/{puppeteer.d.ts → puppeteer/puppeteer.d.ts} +2 -2
- package/dist/{puppeteer.js → puppeteer/puppeteer.js} +5 -5
- package/dist/puppeteer/puppeteer.js.map +1 -0
- package/dist/{puppeteerWrapping.d.ts → puppeteer/puppeteerWrapping.d.ts} +1 -1
- package/dist/{puppeteerWrapping.js → puppeteer/puppeteerWrapping.js} +1 -1
- package/dist/puppeteer/puppeteerWrapping.js.map +1 -0
- package/dist/utils/assertVariablesWereWritten.js +3 -3
- package/dist/utils/assertVariablesWereWritten.js.map +1 -1
- package/dist/utils/constants.d.ts +6 -3
- package/dist/utils/constants.js +1 -8
- package/dist/utils/constants.js.map +1 -1
- package/dist/utils/constantsNode.d.ts +14 -0
- package/dist/utils/constantsNode.js +11 -0
- package/dist/utils/constantsNode.js.map +1 -0
- package/dist/utils/initializeSession.d.ts +2 -1
- package/dist/utils/initializeSession.js +5 -2
- package/dist/utils/initializeSession.js.map +1 -1
- package/dist/utils/mergeChromeArgs.d.ts +2 -1
- package/dist/utils/mergeChromeArgs.js +21 -6
- package/dist/utils/mergeChromeArgs.js.map +1 -1
- package/dist/utils/proxyHandlers.d.ts +1 -1
- package/dist/utils/proxyHandlers.js +1 -1
- package/dist/utils/proxyHandlers.js.map +1 -1
- package/dist/utils/readVariables.js +2 -2
- package/dist/utils/readVariables.js.map +1 -1
- package/dist/utils/validateHeadlessPlaywright.d.ts +1 -1
- package/dist/utils/writeExtensionManifest.js +2 -2
- package/dist/utils/writeExtensionManifest.js.map +1 -1
- package/dist/utils/writeSessionFile.js +3 -3
- package/dist/utils/writeSessionFile.js.map +1 -1
- package/dist/utils/writeVariables.d.ts +14 -1
- package/dist/utils/writeVariables.js +15 -5
- package/dist/utils/writeVariables.js.map +1 -1
- package/dist/{wdio.d.ts → wdio/wdio.d.ts} +2 -2
- package/dist/{wdio.js → wdio/wdio.js} +16 -10
- package/dist/wdio/wdio.js.map +1 -0
- package/dist/{webdriver.d.ts → webdriver/webdriver.d.ts} +2 -2
- package/dist/{webdriver.js → webdriver/webdriver.js} +7 -6
- package/dist/webdriver/webdriver.js.map +1 -0
- package/dist/{webdriverWrapping.d.ts → webdriver/webdriverWrapping.d.ts} +1 -1
- package/dist/{webdriverWrapping.js → webdriver/webdriverWrapping.js} +1 -1
- package/dist/webdriver/webdriverWrapping.js.map +1 -0
- package/extension/background.js +1 -1
- package/extension/content.js +1 -1
- package/package.json +6 -4
- package/LICENSES-3RD-PARTY.md +0 -720
- package/dist/cypress.js.map +0 -1
- package/dist/playwright.js.map +0 -1
- package/dist/playwrightTest.js.map +0 -1
- package/dist/playwrightWrapping.js.map +0 -1
- package/dist/puppeteer.js.map +0 -1
- package/dist/puppeteerWrapping.js.map +0 -1
- package/dist/wdio.js.map +0 -1
- package/dist/webdriver.js.map +0 -1
- package/dist/webdriverWrapping.js.map +0 -1
@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
const git = __importStar(require("../git"));
|
40
40
|
const fs_1 = __importDefault(require("fs"));
|
41
41
|
const constants_1 = require("./constants");
|
42
|
+
const constantsNode_1 = require("./constantsNode");
|
42
43
|
const validateAxeRunOptions_1 = require("./validateAxeRunOptions");
|
43
44
|
const createDebugger_1 = __importDefault(require("../createDebugger"));
|
44
45
|
const initializeSession_1 = __importDefault(require("./initializeSession"));
|
@@ -67,7 +68,7 @@ const DEFAULT_TIMEOUT = {
|
|
67
68
|
analyze: 5000,
|
68
69
|
flush: 5000
|
69
70
|
};
|
70
|
-
function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress, isPlaywrightTest, isWdioTestrunner, serverURL, sessionId, runContext, runOptions, excludeUrlPatterns, buildID, timeout = {}, takeScreenshots, experimentalAdvancedRules }) {
|
71
|
+
function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress, isPlaywrightTest, isWdioTestrunner, serverURL, sessionId, runContext, runOptions, excludeUrlPatterns, buildID, timeout = {}, takeScreenshots, experimentalAdvancedRules, projectId }) {
|
71
72
|
debugLogger('Received configuration:', {
|
72
73
|
apiKey: '<redacted>',
|
73
74
|
...(autoAnalyze !== undefined && { autoAnalyze }),
|
@@ -77,8 +78,10 @@ function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress,
|
|
77
78
|
...(runOptions !== undefined && { runOptions }),
|
78
79
|
...(configurationOverrides !== undefined && { configurationOverrides }),
|
79
80
|
...(excludeUrlPatterns !== undefined && { excludeUrlPatterns }),
|
80
|
-
...(buildID !== undefined && { buildID })
|
81
|
+
...(buildID !== undefined && { buildID }),
|
82
|
+
...(projectId !== undefined && { projectId })
|
81
83
|
});
|
84
|
+
const { AXE_WATCHER_PROJECT_ID } = process.env;
|
82
85
|
if (configurationOverrides && runOptions?.runOnly) {
|
83
86
|
throw new Error('You cannot use `configurationOverrides` and `runOptions.runOnly` together. These configuration options are mutually exclusive.');
|
84
87
|
}
|
@@ -124,10 +127,10 @@ function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress,
|
|
124
127
|
gitData.git_commit_message = info?.message;
|
125
128
|
}
|
126
129
|
if (!buildID && (isPlaywrightTest || isWdioTestrunner)) {
|
127
|
-
if (!sessionId && fs_1.default.existsSync(
|
130
|
+
if (!sessionId && fs_1.default.existsSync(constantsNode_1.PATH_TO_SESSION_FILE)) {
|
128
131
|
debugLogger('Reading session ID from file');
|
129
132
|
try {
|
130
|
-
const data = JSON.parse(fs_1.default.readFileSync(
|
133
|
+
const data = JSON.parse(fs_1.default.readFileSync(constantsNode_1.PATH_TO_SESSION_FILE, 'utf8'));
|
131
134
|
sessionId = data.id;
|
132
135
|
}
|
133
136
|
catch (error) {
|
@@ -135,9 +138,15 @@ function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress,
|
|
135
138
|
}
|
136
139
|
}
|
137
140
|
}
|
141
|
+
const isProjectIdFeatureFlagEnabled = AXE_WATCHER_PROJECT_ID && AXE_WATCHER_PROJECT_ID.toLowerCase() === 'true';
|
142
|
+
if (isProjectIdFeatureFlagEnabled && !projectId) {
|
143
|
+
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');
|
144
|
+
}
|
138
145
|
debugLogger('Initializing axe Watcher session');
|
146
|
+
const projectIdValue = isProjectIdFeatureFlagEnabled && projectId ? projectId : null;
|
139
147
|
const { axe_core_settings, session_id } = (0, initializeSession_1.default)({
|
140
148
|
apiKey,
|
149
|
+
projectId: projectIdValue,
|
141
150
|
serverURL: urlString,
|
142
151
|
watcherVersion: version,
|
143
152
|
sessionID: sessionId || null,
|
@@ -162,6 +171,7 @@ function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress,
|
|
162
171
|
}
|
163
172
|
const variables = {
|
164
173
|
api_key: apiKey,
|
174
|
+
project_id: projectIdValue,
|
165
175
|
server_url: urlString,
|
166
176
|
session_id: session_id || sessionId,
|
167
177
|
take_screenshots: !!takeScreenshots,
|
@@ -178,7 +188,7 @@ function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress,
|
|
178
188
|
...timeout
|
179
189
|
}
|
180
190
|
};
|
181
|
-
fs_1.default.writeFileSync(
|
191
|
+
fs_1.default.writeFileSync(constantsNode_1.PATH_TO_EXTENSION_VARIABLES, JSON.stringify(variables));
|
182
192
|
if (axe_core_settings?.axe_core_version) {
|
183
193
|
(0, writeExtensionManifest_1.default)({
|
184
194
|
js: [
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"writeVariables.js","sourceRoot":"","sources":["../../src/utils/writeVariables.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4CAA6B;AAC7B,4CAAmB;AACnB,
|
1
|
+
{"version":3,"file":"writeVariables.js","sourceRoot":"","sources":["../../src/utils/writeVariables.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import type { Options } from '@wdio/types';
|
2
2
|
import type { Browser as WDIOBrowser, BrowserCommandsType, ElementCommandsType, remote } from 'webdriverio';
|
3
|
-
import Controller from '
|
4
|
-
import { type Configuration } from '
|
3
|
+
import Controller from '../Controller';
|
4
|
+
import { type Configuration } from '../utils/writeVariables';
|
5
5
|
type RemoteOptions = Parameters<typeof remote>[0];
|
6
6
|
type Options = RemoteOptions & Configuration;
|
7
7
|
type Browser = WebdriverIO.Browser | WDIOBrowser;
|
@@ -7,13 +7,13 @@ exports.wrapWdio = exports.WRAPPED_ELEMENT_METHODS = exports.WRAPPED_BROWSER_MET
|
|
7
7
|
exports.wdioConfig = wdioConfig;
|
8
8
|
exports.wdioTestRunner = wdioTestRunner;
|
9
9
|
const fs_1 = __importDefault(require("fs"));
|
10
|
-
const Controller_1 = __importDefault(require("
|
11
|
-
const writeVariables_1 = __importDefault(require("
|
12
|
-
const
|
13
|
-
const headlessNotSupportedError_1 = require("
|
14
|
-
const mergeChromeArgs_1 = __importDefault(require("
|
15
|
-
const checkUserArgs_1 = require("
|
16
|
-
const writeSessionFile_1 = __importDefault(require("
|
10
|
+
const Controller_1 = __importDefault(require("../Controller"));
|
11
|
+
const writeVariables_1 = __importDefault(require("../utils/writeVariables"));
|
12
|
+
const constantsNode_1 = require("../utils/constantsNode");
|
13
|
+
const headlessNotSupportedError_1 = require("../utils/headlessNotSupportedError");
|
14
|
+
const mergeChromeArgs_1 = __importDefault(require("../utils/mergeChromeArgs"));
|
15
|
+
const checkUserArgs_1 = require("../utils/checkUserArgs");
|
16
|
+
const writeSessionFile_1 = __importDefault(require("../utils/writeSessionFile"));
|
17
17
|
const noop = () => {
|
18
18
|
};
|
19
19
|
function wdioConfig({ axe, ...options }) {
|
@@ -30,7 +30,10 @@ function wdioConfig({ axe, ...options }) {
|
|
30
30
|
...options?.capabilities,
|
31
31
|
browserName: 'chrome',
|
32
32
|
'goog:chromeOptions': {
|
33
|
-
args: (0, mergeChromeArgs_1.default)(args, {
|
33
|
+
args: (0, mergeChromeArgs_1.default)(args, {
|
34
|
+
disableOtherExtensions: true,
|
35
|
+
disableLoadExtensionCommandFeature: true
|
36
|
+
})
|
34
37
|
}
|
35
38
|
}
|
36
39
|
};
|
@@ -61,7 +64,10 @@ function wdioTestRunner(...params) {
|
|
61
64
|
throw new headlessNotSupportedError_1.HeadlessNotSupportedError(`In WebdriverIO, use "headless=new" instead of "headless" in the "args" property of your "${CHROME_OPTIONS}" browser capability configuration.`);
|
62
65
|
}
|
63
66
|
(0, checkUserArgs_1.checkUserArgs)(args);
|
64
|
-
chromeOpts.args = (0, mergeChromeArgs_1.default)(args, {
|
67
|
+
chromeOpts.args = (0, mergeChromeArgs_1.default)(args, {
|
68
|
+
disableOtherExtensions: false,
|
69
|
+
disableLoadExtensionCommandFeature: true
|
70
|
+
});
|
65
71
|
const { onPrepare = noop, onComplete = noop } = config;
|
66
72
|
return {
|
67
73
|
...config,
|
@@ -71,7 +77,7 @@ function wdioTestRunner(...params) {
|
|
71
77
|
},
|
72
78
|
onComplete(...completeParams) {
|
73
79
|
try {
|
74
|
-
fs_1.default.unlinkSync(
|
80
|
+
fs_1.default.unlinkSync(constantsNode_1.PATH_TO_SESSION_FILE);
|
75
81
|
}
|
76
82
|
catch {
|
77
83
|
}
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"wdio.js","sourceRoot":"","sources":["../../src/wdio/wdio.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import type { WebDriver } from 'selenium-webdriver';
|
2
2
|
import type { Options } from 'selenium-webdriver/chrome';
|
3
|
-
import Controller from '
|
4
|
-
import { type Configuration } from '
|
3
|
+
import Controller from '../Controller';
|
4
|
+
import { type Configuration } from '../utils/writeVariables';
|
5
5
|
export { wrapDriver as wrapWebdriver } from './webdriverWrapping';
|
6
6
|
interface WebDriverArgs extends Configuration {
|
7
7
|
options?: Options;
|
@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
exports.WebdriverController = exports.wrapWebdriver = void 0;
|
7
7
|
exports.webdriverConfig = webdriverConfig;
|
8
|
-
const Controller_1 = __importDefault(require("
|
9
|
-
const writeVariables_1 = __importDefault(require("
|
10
|
-
const headlessNotSupportedError_1 = require("
|
11
|
-
const mergeChromeArgs_1 = __importDefault(require("
|
12
|
-
const checkUserArgs_1 = require("
|
8
|
+
const Controller_1 = __importDefault(require("../Controller"));
|
9
|
+
const writeVariables_1 = __importDefault(require("../utils/writeVariables"));
|
10
|
+
const headlessNotSupportedError_1 = require("../utils/headlessNotSupportedError");
|
11
|
+
const mergeChromeArgs_1 = __importDefault(require("../utils/mergeChromeArgs"));
|
12
|
+
const checkUserArgs_1 = require("../utils/checkUserArgs");
|
13
13
|
var webdriverWrapping_1 = require("./webdriverWrapping");
|
14
14
|
Object.defineProperty(exports, "wrapWebdriver", { enumerable: true, get: function () { return webdriverWrapping_1.wrapDriver; } });
|
15
15
|
function webdriverConfig(arg) {
|
@@ -20,7 +20,8 @@ function webdriverConfig(arg) {
|
|
20
20
|
const existingArgs = (opts?.options_?.args || []);
|
21
21
|
(0, checkUserArgs_1.checkUserArgs)(existingArgs);
|
22
22
|
opts.options_.args = (0, mergeChromeArgs_1.default)(existingArgs, {
|
23
|
-
disableOtherExtensions: false
|
23
|
+
disableOtherExtensions: false,
|
24
|
+
disableLoadExtensionCommandFeature: true
|
24
25
|
});
|
25
26
|
if (['headless', '--headless'].some(flag => opts?.options_?.args?.includes(flag))) {
|
26
27
|
throw new headlessNotSupportedError_1.HeadlessNotSupportedError('In WebdriverJS, use "chromeOptions.addArguments(\'--headless=new\')" instead of "setHeadless(true)" or "addArguments(\'--headless\')"');
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"webdriver.js","sourceRoot":"","sources":["../../src/webdriver/webdriver.ts"],"names":[],"mappings":";;;;;;AAoBA,0CA+BC;AAjDD,+DAAsC;AACtC,6EAA4E;AAC5E,kFAA8E;AAC9E,+EAAsD;AACtD,0DAAsD;AAEtD,yDAAiE;AAAxD,kHAAA,UAAU,OAAiB;AAYpC,SAAgB,eAAe,CAAC,GAAkB;IAGhD,MAAM,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAA;IAEnD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;IAC5B,IAAA,wBAAc,EAAC,GAAG,CAAC,CAAA;IAEnB,MAAM,IAAI,GAAY,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAA;IAE9D,MAAM,YAAY,GAAG,CAAE,IAAY,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAa,CAAA;IACtE,IAAA,6BAAa,EAAC,YAAY,CAAC,CAE1B;IAAC,IAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAA,yBAAe,EAAC,YAAY,EAAE;QAC3D,sBAAsB,EAAE,KAAK;QAC7B,kCAAkC,EAAE,IAAI;KACzC,CAAC,CAAA;IAGF,IACE,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAEpC,IAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAC9C,EACD,CAAC;QACD,MAAM,IAAI,qDAAyB,CACjC,wIAAwI,CACzI,CAAA;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAa,mBAAoB,SAAQ,oBAAU;IAGjD,YAAY,MAAiB;QAC3B,KAAK,CAAC;YACJ,eAAe,EAAE,qBAAqB;YACtC,eAAe,EAAE,WAAW;YAC5B,qBAAqB,EAAE,mBAAmB;SAC3C,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,EAA+B,EAC/B,GAAG,IAAe;QAElB,MAAM,MAAM,GAAG;;;gBAGH,EAAE;;KAEb,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAA;QACpE,OAAO,MAAW,CAAA;IACpB,CAAC;CACF;AA1BD,kDA0BC"}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import type { WebDriver, Navigation, WebElement, TargetLocator } from 'selenium-webdriver';
|
2
2
|
import type { WebdriverController } from './webdriver';
|
3
|
-
import { type PossiblyWrapped } from '
|
3
|
+
import { type PossiblyWrapped } from '../utils/proxyHandlers';
|
4
4
|
export declare const wrapDriver: (driver: PossiblyWrapped<WebDriver>, controller: WebdriverController) => WebDriver;
|
5
5
|
export declare const wrapNavigation: (navigation: PossiblyWrapped<Navigation>, controller: WebdriverController) => Navigation;
|
6
6
|
export declare const wrapTargetLocator: (locator: PossiblyWrapped<TargetLocator>, controller: WebdriverController) => TargetLocator;
|
@@ -1,7 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.wrapElement = exports.wrapTargetLocator = exports.wrapNavigation = exports.wrapDriver = void 0;
|
4
|
-
const proxyHandlers_1 = require("
|
4
|
+
const proxyHandlers_1 = require("../utils/proxyHandlers");
|
5
5
|
const wrapDriver = (driver, controller) => {
|
6
6
|
if ((0, proxyHandlers_1.isWrapped)(driver)) {
|
7
7
|
return driver;
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"webdriverWrapping.js","sourceRoot":"","sources":["../../src/webdriver/webdriverWrapping.ts"],"names":[],"mappings":"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"}
|