@axe-core/watcher 3.11.0 → 3.11.1-next.974a6e3c
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.d.ts +9 -1
- package/dist/Controller.js +21 -7
- package/dist/Controller.js.map +1 -1
- package/dist/EventForwarder.js +4 -6
- package/dist/EventForwarder.js.map +1 -1
- package/dist/createDebugger.d.ts +9 -0
- package/dist/createDebugger.js +27 -0
- package/dist/createDebugger.js.map +1 -0
- package/dist/cypress.js +23 -16
- package/dist/cypress.js.map +1 -1
- package/dist/cypressCommands.d.ts +2 -0
- package/dist/cypressCommands.js +24 -8
- package/dist/cypressCommands.js.map +1 -1
- package/dist/playwright.js +3 -2
- package/dist/playwright.js.map +1 -1
- package/dist/playwrightTest.js +3 -1
- package/dist/playwrightTest.js.map +1 -1
- package/dist/puppeteer.js +3 -2
- package/dist/puppeteer.js.map +1 -1
- package/dist/sendResultsToServer.d.ts +6 -1
- package/dist/sendResultsToServer.js +25 -3
- package/dist/sendResultsToServer.js.map +1 -1
- package/dist/util.d.ts +11 -1
- package/dist/util.js +78 -7
- package/dist/util.js.map +1 -1
- package/dist/wdio.js +3 -3
- package/dist/wdio.js.map +1 -1
- package/dist/webdriver.js +7 -2
- package/dist/webdriver.js.map +1 -1
- package/extension/background.js +1 -1
- package/extension/content.js +1 -1
- package/package.json +5 -3
package/dist/util.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.proxiedGetWithoutAnalyze = exports.proxiedGetFuncWithAnalyze = exports.markAsWrapped = exports.isWrapped = exports.updateAutoAnalyze = exports.readVariables = exports.writeManifest = exports.validateApiKey = exports.writeVariables = exports.HeadlessNotSupportedError = exports.
|
|
6
|
+
exports.mergeChromeArgs = exports.proxiedGetWithoutAnalyze = exports.proxiedGetFuncWithAnalyze = exports.markAsWrapped = exports.isWrapped = exports.updateAutoAnalyze = exports.readVariables = exports.writeManifest = exports.validateApiKey = exports.writeVariables = exports.HeadlessNotSupportedError = exports.PATH_TO_EXTENSION_VARIABLES = exports.PATH_TO_SESSION_FILE = exports.DEFAULT_SERVER_URL = exports.PATH_TO_EXTENSION = void 0;
|
|
7
7
|
const uuid_1 = require("uuid");
|
|
8
8
|
const sync_request_1 = __importDefault(require("sync-request"));
|
|
9
9
|
const assert_1 = __importDefault(require("assert"));
|
|
@@ -14,10 +14,9 @@ exports.PATH_TO_EXTENSION = path_1.default.join(__dirname, '..', 'extension');
|
|
|
14
14
|
exports.DEFAULT_SERVER_URL = 'https://axe.deque.com/';
|
|
15
15
|
exports.PATH_TO_SESSION_FILE = path_1.default.join(os_1.default.tmpdir(), 'axe-watcher-session.json');
|
|
16
16
|
exports.PATH_TO_EXTENSION_VARIABLES = path_1.default.join(exports.PATH_TO_EXTENSION, 'variables.json');
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
];
|
|
17
|
+
// Extension flags for Chrome
|
|
18
|
+
const DISABLE_OTHER_EXTENSIONS_FLAG = '--disable-extensions-except';
|
|
19
|
+
const LOAD_EXTENSION_FLAG = '--load-extension';
|
|
21
20
|
class HeadlessNotSupportedError extends Error {
|
|
22
21
|
constructor(extendedMessage) {
|
|
23
22
|
super('@axe-core/watcher does not support Chrome\'s older "--headless" mode. ' +
|
|
@@ -74,8 +73,11 @@ exports.writeVariables = writeVariables;
|
|
|
74
73
|
/** Validate the given `apiKey`. This method is blocking and should not be called unnecessarily. */
|
|
75
74
|
const validateApiKey = ({ apiKey, serverURL }) => {
|
|
76
75
|
(0, assert_1.default)(apiKey, 'API key is required');
|
|
77
|
-
const url = new URL(`/api/api-keys
|
|
76
|
+
const url = new URL(`/api/api-keys/validate/axe-devtools-watcher`, serverURL);
|
|
78
77
|
const res = (0, sync_request_1.default)('GET', url.toString(), {
|
|
78
|
+
headers: {
|
|
79
|
+
'X-API-Key': apiKey
|
|
80
|
+
},
|
|
79
81
|
maxRedirects: 2,
|
|
80
82
|
followRedirects: true,
|
|
81
83
|
maxRetries: 2,
|
|
@@ -127,7 +129,10 @@ const markAsWrapped = (o) => {
|
|
|
127
129
|
};
|
|
128
130
|
exports.markAsWrapped = markAsWrapped;
|
|
129
131
|
const proxiedGetFuncWithAnalyze = (target, prop, controller) => async (...args) => {
|
|
130
|
-
await controller.analyze({
|
|
132
|
+
await controller.analyze({
|
|
133
|
+
__Method: prop,
|
|
134
|
+
__UserRequestedAnalyze: false
|
|
135
|
+
});
|
|
131
136
|
// We use .call(target, ...) for the same reason that
|
|
132
137
|
// proxiedGetWithoutAnalyze uses .bind(target), see below.
|
|
133
138
|
//
|
|
@@ -164,4 +169,70 @@ const proxiedGetWithoutAnalyze = (target, prop) => {
|
|
|
164
169
|
return original;
|
|
165
170
|
};
|
|
166
171
|
exports.proxiedGetWithoutAnalyze = proxiedGetWithoutAnalyze;
|
|
172
|
+
/**
|
|
173
|
+
* A helper function to merge the user provided arguments with the extension args
|
|
174
|
+
* for Chrome.
|
|
175
|
+
*
|
|
176
|
+
* @param args The user provided arguments to merge with the extension args.
|
|
177
|
+
* @param disableOtherExtensions Whether to disable other extensions.
|
|
178
|
+
* @returns The merged arguments to pass to Chrome.
|
|
179
|
+
*/
|
|
180
|
+
const mergeChromeArgs = (userArgs, { disableOtherExtensions }) => {
|
|
181
|
+
/**
|
|
182
|
+
* It's possible for the user to do:
|
|
183
|
+
* `--load-extension=/path/A, --load-extension=/path/B`
|
|
184
|
+
*
|
|
185
|
+
* We only want to append our extension path onto
|
|
186
|
+
* the last occurrence of `--load-extension`.
|
|
187
|
+
*/
|
|
188
|
+
let loadExtensionFlagIndex = -1;
|
|
189
|
+
let disableExtensionsFlagIndex = -1;
|
|
190
|
+
/**
|
|
191
|
+
* We do not want to modify the user's args directly.
|
|
192
|
+
* We only want to modify and merge the extension args
|
|
193
|
+
* with the user's args if they exist.
|
|
194
|
+
*
|
|
195
|
+
* It's possible for some integrations like WebDriverJS
|
|
196
|
+
* to optionally include the `--` prefix in the flag,
|
|
197
|
+
* when we check for the extension flag we need to account for this.
|
|
198
|
+
*/
|
|
199
|
+
for (const [index, arg] of userArgs.entries()) {
|
|
200
|
+
if (arg.includes(LOAD_EXTENSION_FLAG) || arg.includes('load-extension')) {
|
|
201
|
+
loadExtensionFlagIndex = index;
|
|
202
|
+
}
|
|
203
|
+
if (arg.includes(DISABLE_OTHER_EXTENSIONS_FLAG) ||
|
|
204
|
+
arg.includes('disable-extensions-except')) {
|
|
205
|
+
disableExtensionsFlagIndex = index;
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
// The user has provided a `--load-extension` flag
|
|
209
|
+
// We want to append our extension path to the list of extensions.
|
|
210
|
+
if (loadExtensionFlagIndex !== -1) {
|
|
211
|
+
userArgs[loadExtensionFlagIndex] += `,${exports.PATH_TO_EXTENSION}`;
|
|
212
|
+
}
|
|
213
|
+
else {
|
|
214
|
+
userArgs.push(`${LOAD_EXTENSION_FLAG}=${exports.PATH_TO_EXTENSION}`);
|
|
215
|
+
}
|
|
216
|
+
// If the user has already disabled other extensions, we want to append
|
|
217
|
+
// our extension path to the list of disabled extensions.
|
|
218
|
+
if (disableExtensionsFlagIndex !== -1) {
|
|
219
|
+
userArgs[disableExtensionsFlagIndex] += `,${exports.PATH_TO_EXTENSION}`;
|
|
220
|
+
/**
|
|
221
|
+
* Puppeteer and Playwright by default include `--disable-extensions` which
|
|
222
|
+
* disables all extensions. We need to explicitly enable the axe-core/watcher
|
|
223
|
+
* extension.
|
|
224
|
+
*
|
|
225
|
+
* @see https://github.com/GoogleChrome/chrome-launcher/blob/main/docs/chrome-flags-for-tools.md#sources
|
|
226
|
+
*
|
|
227
|
+
* Cypress does not include `--disable-extensions` by default but does include
|
|
228
|
+
* their own extension outside of `--load-extension` so we do not able to disable it
|
|
229
|
+
* when injecting the axe-core/watcher extension.
|
|
230
|
+
*/
|
|
231
|
+
}
|
|
232
|
+
else if (disableOtherExtensions) {
|
|
233
|
+
userArgs.push(`${DISABLE_OTHER_EXTENSIONS_FLAG}=${exports.PATH_TO_EXTENSION}`);
|
|
234
|
+
}
|
|
235
|
+
return userArgs;
|
|
236
|
+
};
|
|
237
|
+
exports.mergeChromeArgs = mergeChromeArgs;
|
|
167
238
|
//# sourceMappingURL=util.js.map
|
package/dist/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAiC;AACjC,gEAAkC;AAClC,oDAA2B;AAC3B,4CAAmB;AACnB,gDAAuB;AACvB,4CAAmB;AAGN,QAAA,iBAAiB,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;AAC3D,QAAA,kBAAkB,GAAG,wBAAwB,CAAA;AAC7C,QAAA,oBAAoB,GAAG,cAAI,CAAC,IAAI,CAC3C,YAAE,CAAC,MAAM,EAAE,EACX,0BAA0B,CAC3B,CAAA;AACY,QAAA,2BAA2B,GAAG,cAAI,CAAC,IAAI,CAClD,yBAAiB,EACjB,gBAAgB,CACjB,CAAA;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
|
package/dist/wdio.js
CHANGED
|
@@ -31,7 +31,7 @@ function wdioConfig({ axe, ...options }) {
|
|
|
31
31
|
...options === null || options === void 0 ? void 0 : options.capabilities,
|
|
32
32
|
browserName: 'chrome',
|
|
33
33
|
'goog:chromeOptions': {
|
|
34
|
-
args: util_1.
|
|
34
|
+
args: (0, util_1.mergeChromeArgs)(args, { disableOtherExtensions: false })
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
};
|
|
@@ -62,7 +62,7 @@ function wdioTestRunner(...params) {
|
|
|
62
62
|
if (['headless', '--headless'].some(flag => args.includes(flag))) {
|
|
63
63
|
throw new util_1.HeadlessNotSupportedError(`In WebdriverIO, use "headless=new" instead of "headless" in the "args" property of your "${CHROME_OPTIONS}" browser capability configuration.`);
|
|
64
64
|
}
|
|
65
|
-
chromeOpts.args = util_1.
|
|
65
|
+
chromeOpts.args = (0, util_1.mergeChromeArgs)(args, { disableOtherExtensions: false });
|
|
66
66
|
const { onPrepare = noop, onComplete = noop } = config;
|
|
67
67
|
return {
|
|
68
68
|
...config,
|
|
@@ -89,7 +89,7 @@ function wdioTestRunner(...params) {
|
|
|
89
89
|
exports.wdioTestRunner = wdioTestRunner;
|
|
90
90
|
class WdioController extends Controller_1.default {
|
|
91
91
|
constructor(driver) {
|
|
92
|
-
super();
|
|
92
|
+
super({ debugLoggerName: 'WdioController' });
|
|
93
93
|
this.driver = driver;
|
|
94
94
|
}
|
|
95
95
|
async executeScript(fn, ...args) {
|
package/dist/wdio.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wdio.js","sourceRoot":"","sources":["../src/wdio.ts"],"names":[],"mappings":";;;;;;AAOA,4CAAmB;AACnB,iCAMe;AACf,8DAAqC;AAErC,MAAM,IAAI,GAAG,GAAS,EAAE;IACtB,WAAW;AACb,CAAC,CAAA;AAID;;;;GAIG;AAEH,SAAgB,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,EAAW;;IACrD,IAAA,qBAAc,EAAC,GAAG,CAAC,CAAA;IAEnB,iFAAiF;IACjF,uDAAuD;IACvD,MAAM,UAAU,GAAG,CAAA,MAAC,OAAO,CAAC,YAAoB,0CAAG,oBAAoB,CAAC,KAAI,EAAE,CAAA;IAC9E,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,EAAE,CAAA;IAElC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,gCAAyB,CACjC,4FAA4F,cAAc,qCAAqC,CAChJ,CAAA;IACH,CAAC;IAED,OAAO;QACL,GAAG,OAAO;QACV,YAAY,EAAE;YACZ,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY;YACxB,WAAW,EAAE,QAAQ;YACrB,oBAAoB,EAAE;gBACpB,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"wdio.js","sourceRoot":"","sources":["../src/wdio.ts"],"names":[],"mappings":"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"}
|
package/dist/webdriver.js
CHANGED
|
@@ -14,13 +14,18 @@ Object.defineProperty(exports, "wrapWebdriver", { enumerable: true, get: functio
|
|
|
14
14
|
* @param arg Config to extend
|
|
15
15
|
*/
|
|
16
16
|
function webdriverConfig(arg) {
|
|
17
|
+
var _a;
|
|
17
18
|
// Lazily require `chrome` to avoid Puppeteer/Playwright/WDIO users from needing `selenium-webdriver` installed.
|
|
18
19
|
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
19
20
|
const chrome = require('selenium-webdriver/chrome');
|
|
20
21
|
const { axe, options } = arg;
|
|
21
22
|
(0, util_1.writeVariables)(axe);
|
|
22
23
|
const opts = options ? options : new chrome.Options();
|
|
23
|
-
|
|
24
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
25
|
+
const existingArgs = (((_a = opts === null || opts === void 0 ? void 0 : opts.options_) === null || _a === void 0 ? void 0 : _a.args) || []);
|
|
26
|
+
opts.options_.args = (0, util_1.mergeChromeArgs)(existingArgs, {
|
|
27
|
+
disableOtherExtensions: false
|
|
28
|
+
});
|
|
24
29
|
// Note: fragile, but selenium does not give us a real way to check this
|
|
25
30
|
if (['headless', '--headless'].some(flag => { var _a, _b;
|
|
26
31
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -32,7 +37,7 @@ function webdriverConfig(arg) {
|
|
|
32
37
|
exports.webdriverConfig = webdriverConfig;
|
|
33
38
|
class WebdriverController extends Controller_1.default {
|
|
34
39
|
constructor(driver) {
|
|
35
|
-
super();
|
|
40
|
+
super({ debugLoggerName: 'WebdriverController' });
|
|
36
41
|
this.driver = driver;
|
|
37
42
|
}
|
|
38
43
|
async executeScript(fn, ...args) {
|
package/dist/webdriver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webdriver.js","sourceRoot":"","sources":["../src/webdriver.ts"],"names":[],"mappings":";;;;;;AAEA,iCAKe;AACf,8DAAqC;AAErC,yDAAiE;AAAxD,kHAAA,UAAU,OAAiB;AAMpC;;;;GAIG;AAEH,SAAgB,eAAe,CAAC,GAAkB
|
|
1
|
+
{"version":3,"file":"webdriver.js","sourceRoot":"","sources":["../src/webdriver.ts"],"names":[],"mappings":";;;;;;AAEA,iCAKe;AACf,8DAAqC;AAErC,yDAAiE;AAAxD,kHAAA,UAAU,OAAiB;AAMpC;;;;GAIG;AAEH,SAAgB,eAAe,CAAC,GAAkB;;IAChD,gHAAgH;IAChH,iEAAiE;IACjE,MAAM,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAA;IAEnD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;IAC5B,IAAA,qBAAc,EAAC,GAAG,CAAC,CAAA;IAEnB,MAAM,IAAI,GAAY,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAA;IAC9D,8DAA8D;IAC9D,MAAM,YAAY,GAAG,CAAC,CAAA,MAAC,IAAY,aAAZ,IAAI,uBAAJ,IAAI,CAAU,QAAQ,0CAAE,IAAI,KAAI,EAAE,CAAa,CAErE;IAAC,IAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAA,sBAAe,EAAC,YAAY,EAAE;QAC3D,sBAAsB,EAAE,KAAK;KAC9B,CAAC,CAAA;IAEF,wEAAwE;IACxE,IACE,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;IACrC,8DAA8D;IAC9D,OAAA,MAAA,MAAC,IAAY,aAAZ,IAAI,uBAAJ,IAAI,CAAU,QAAQ,0CAAE,IAAI,0CAAE,QAAQ,CAAC,IAAI,CAAC,CAAA,EAAA,CAC9C,EACD,CAAC;QACD,MAAM,IAAI,gCAAyB,CACjC,wIAAwI,CACzI,CAAA;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AA7BD,0CA6BC;AAED,MAAa,mBAAoB,SAAQ,oBAAU;IAGjD,YAAY,MAAiB;QAC3B,KAAK,CAAC,EAAE,eAAe,EAAE,qBAAqB,EAAE,CAAC,CAAA;QACjD,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;AArBD,kDAqBC"}
|