@axe-core/watcher 3.20.2 → 3.21.0-next.64626216
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 +11 -2
- package/dist/cypress/cypress.js +105 -62
- package/dist/cypress/cypress.js.map +1 -1
- package/dist/cypressCommands.js +14 -3
- package/dist/cypressCommands.js.map +1 -1
- package/dist/git.d.ts +0 -6
- package/dist/git.js +21 -4
- package/dist/git.js.map +1 -1
- package/dist/sendResultsToServer.js +1 -1
- package/dist/sendResultsToServer.js.map +1 -1
- 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 +16 -1
- package/dist/utils/mergeChromeArgs.js.map +1 -1
- package/dist/utils/writeVariables.d.ts +14 -1
- package/dist/utils/writeVariables.js +11 -2
- package/dist/utils/writeVariables.js.map +1 -1
- package/dist/wdio/wdio.js +8 -2
- package/dist/wdio/wdio.js.map +1 -1
- package/dist/webdriver/webdriver.js +2 -1
- package/dist/webdriver/webdriver.js.map +1 -1
- package/extension/background.js +1 -1
- package/extension/content.js +1 -1
- package/package.json +10 -4
- package/LICENSES-3RD-PARTY.md +0 -720
@@ -1,12 +1,21 @@
|
|
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";
|
7
8
|
/**
|
8
9
|
* Create a Cypress config that uses the axe Watcher extension.
|
9
10
|
*
|
10
11
|
* @param config Cypress config to extend
|
11
12
|
*/
|
12
|
-
export declare const cypressConfig: (config: Cypress.ConfigOptions &
|
13
|
+
export declare const cypressConfig: (config: Cypress.ConfigOptions & CypressConfiguration) => Cypress.ConfigOptions;
|
14
|
+
/**
|
15
|
+
* Creates a setupNodeEvents function that handles both e2e and component test types
|
16
|
+
* @param testType The type of test (e2e or component)
|
17
|
+
* @param userConfig The user's Cypress configuration
|
18
|
+
* @returns A setupNodeEvents function configured for the specified test type
|
19
|
+
*/
|
20
|
+
export declare const createSetupNodeEvents: (testType: "e2e" | "component", userConfig: Cypress.ConfigOptions) => (cypressOn: Cypress.PluginEvents, ...args: unknown[]) => Promise<void | undefined | Cypress.PluginConfigOptions>;
|
21
|
+
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.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,37 +19,46 @@ 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';
|
22
23
|
const cypressConfig = (config) => {
|
23
24
|
const { axe, ...userConfig } = config;
|
24
|
-
const { DEBUG } = process.env;
|
25
|
+
const { DEBUG, AXE_WATCHER_PROJECT_ID } = process.env;
|
25
26
|
const hasWatcherDebug = DEBUG && DEBUG.includes('axe-watcher');
|
27
|
+
const isProjectIdFeatureFlagEnabled = AXE_WATCHER_PROJECT_ID && AXE_WATCHER_PROJECT_ID.toLowerCase() === 'true';
|
28
|
+
const testingTypes = (0, exports.normalizeTestingTypes)(axe.testingTypes);
|
29
|
+
if (isProjectIdFeatureFlagEnabled && !axe.projectId) {
|
30
|
+
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');
|
31
|
+
}
|
32
|
+
const { projectId, ...axeCommonConfig } = axe;
|
26
33
|
(0, writeVariables_1.default)({
|
27
|
-
...
|
28
|
-
cypress: true
|
34
|
+
...axeCommonConfig,
|
35
|
+
cypress: true,
|
36
|
+
...(isProjectIdFeatureFlagEnabled && { projectId })
|
29
37
|
});
|
30
38
|
(0, writeExtensionManifest_1.default)({
|
31
39
|
all_frames: true,
|
32
40
|
exclude_globs: [
|
33
|
-
'*/__/#/specs/runner?file=*'
|
34
|
-
'*/__cypress/iframes/*'
|
41
|
+
'*/__/#/specs/runner?file=*'
|
35
42
|
]
|
36
43
|
});
|
37
44
|
const variables = (0, readVariables_1.default)();
|
45
|
+
const shouldRunWatcherInComponentMode = testingTypes?.includes('component');
|
46
|
+
const envVariables = {
|
47
|
+
[exports.cypressConfigRunFlag]: true,
|
48
|
+
[exports.configTimeout]: variables.timeout,
|
49
|
+
[exports.cypressAxeCoreSettingsFlag]: variables.axe_core_settings,
|
50
|
+
[exports.cypressRunOptionsFlag]: variables.run_options,
|
51
|
+
[exports.cypressEnabledTestingModes]: testingTypes
|
52
|
+
};
|
38
53
|
if (userConfig.e2e?.env) {
|
39
|
-
userConfig.e2e.env = Object.assign({}, userConfig.e2e.env,
|
40
|
-
[exports.cypressConfigRunFlag]: true,
|
41
|
-
[exports.configTimeout]: variables.timeout,
|
42
|
-
[exports.cypressAxeCoreSettingsFlag]: variables.axe_core_settings,
|
43
|
-
[exports.cypressRunOptionsFlag]: variables.run_options
|
44
|
-
});
|
54
|
+
userConfig.e2e.env = Object.assign({}, userConfig.e2e.env, envVariables);
|
45
55
|
}
|
46
|
-
|
47
|
-
userConfig.env = Object.assign({}, userConfig.env,
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
});
|
56
|
+
if (userConfig.component?.env && shouldRunWatcherInComponentMode) {
|
57
|
+
userConfig.component.env = Object.assign({}, userConfig.component.env, envVariables);
|
58
|
+
}
|
59
|
+
if (!userConfig.e2e?.env &&
|
60
|
+
!(userConfig.component?.env && shouldRunWatcherInComponentMode)) {
|
61
|
+
userConfig.env = Object.assign({}, userConfig.env, envVariables);
|
53
62
|
}
|
54
63
|
if (hasWatcherDebug) {
|
55
64
|
userConfig.env = Object.assign({}, userConfig.env, {
|
@@ -63,52 +72,86 @@ const cypressConfig = (config) => {
|
|
63
72
|
...userConfig,
|
64
73
|
e2e: {
|
65
74
|
...userConfig.e2e,
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
75
|
+
setupNodeEvents: (0, exports.createSetupNodeEvents)('e2e', userConfig)
|
76
|
+
},
|
77
|
+
...(shouldRunWatcherInComponentMode &&
|
78
|
+
userConfig.component?.devServer && {
|
79
|
+
component: {
|
80
|
+
...userConfig.component,
|
81
|
+
setupNodeEvents: (0, exports.createSetupNodeEvents)('component', userConfig)
|
82
|
+
}
|
83
|
+
})
|
84
|
+
};
|
85
|
+
};
|
86
|
+
exports.cypressConfig = cypressConfig;
|
87
|
+
const createSetupNodeEvents = (testType, userConfig) => {
|
88
|
+
return async function setupNodeEvents(cypressOn, ...args) {
|
89
|
+
const eventForwarder = new EventForwarder_1.default();
|
90
|
+
const on = eventForwarder.on;
|
91
|
+
const userNodeEventConfig = await userConfig[testType]?.setupNodeEvents?.(on, ...args);
|
92
|
+
if (userNodeEventConfig) {
|
93
|
+
userNodeEventConfig.env = Object.assign({}, userNodeEventConfig.env, {
|
94
|
+
[exports.cypressConfigRunFlag]: true
|
95
|
+
});
|
96
|
+
}
|
97
|
+
on('task', {
|
98
|
+
__uploadAxeWatcherResults: async ({ results, skipped_url }) => {
|
99
|
+
if (!results?.length && !skipped_url) {
|
100
|
+
return null;
|
74
101
|
}
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
}
|
80
|
-
await (0, sendResultsToServer_1.default)({
|
81
|
-
skipped_url,
|
82
|
-
results,
|
83
|
-
debugLogger
|
84
|
-
});
|
85
|
-
return null;
|
86
|
-
},
|
87
|
-
__debugAxeWatcher: (message) => {
|
88
|
-
debugLogger(message);
|
89
|
-
return null;
|
90
|
-
}
|
91
|
-
});
|
92
|
-
on('before:browser:launch', (browser, launchOptions) => {
|
93
|
-
if (browser.name.startsWith('firefox') ||
|
94
|
-
browser.name.startsWith('electron')) {
|
95
|
-
throw new Error(`The @axe-core/watcher package only supports running in Chrome, 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`);
|
96
|
-
}
|
97
|
-
if (browser.isHeadless && launchOptions.args.includes('--headless')) {
|
98
|
-
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.');
|
99
|
-
}
|
100
|
-
const existingArgs = launchOptions.args;
|
101
|
-
(0, checkUserArgs_1.checkUserArgs)(existingArgs);
|
102
|
-
launchOptions.args = (0, mergeChromeArgs_1.default)(existingArgs, {
|
103
|
-
disableOtherExtensions: false
|
104
|
-
});
|
105
|
-
return launchOptions;
|
102
|
+
await (0, sendResultsToServer_1.default)({
|
103
|
+
skipped_url,
|
104
|
+
results,
|
105
|
+
debugLogger
|
106
106
|
});
|
107
|
-
|
108
|
-
|
107
|
+
return null;
|
108
|
+
},
|
109
|
+
__debugAxeWatcher: (message) => {
|
110
|
+
debugLogger(message);
|
111
|
+
return null;
|
109
112
|
}
|
110
|
-
}
|
113
|
+
});
|
114
|
+
on('before:browser:launch', (browser, launchOptions) => {
|
115
|
+
if (browser.name.startsWith('firefox') ||
|
116
|
+
browser.name.startsWith('electron')) {
|
117
|
+
throw new Error(`The @axe-core/watcher package only supports running in Chrome, 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`);
|
118
|
+
}
|
119
|
+
if (browser.isHeadless && launchOptions.args.includes('--headless')) {
|
120
|
+
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.');
|
121
|
+
}
|
122
|
+
const existingArgs = launchOptions.args;
|
123
|
+
(0, checkUserArgs_1.checkUserArgs)(existingArgs);
|
124
|
+
launchOptions.args = (0, mergeChromeArgs_1.default)(existingArgs, {
|
125
|
+
disableOtherExtensions: false,
|
126
|
+
disableLoadExtensionCommandFeature: true
|
127
|
+
});
|
128
|
+
return launchOptions;
|
129
|
+
});
|
130
|
+
eventForwarder.forward(cypressOn);
|
131
|
+
return userNodeEventConfig;
|
111
132
|
};
|
112
133
|
};
|
113
|
-
exports.
|
134
|
+
exports.createSetupNodeEvents = createSetupNodeEvents;
|
135
|
+
const normalizeTestingTypes = (testingTypes) => {
|
136
|
+
const validTestingTypes = ['e2e', 'component'];
|
137
|
+
if (!testingTypes) {
|
138
|
+
return ['e2e'];
|
139
|
+
}
|
140
|
+
if (Array.isArray(testingTypes)) {
|
141
|
+
if (!testingTypes.length) {
|
142
|
+
throw new Error('`testingTypes` should include `e2e`, `component`, or both. Specifying an empty array is not supported.');
|
143
|
+
}
|
144
|
+
const invalidTestingTypes = testingTypes.filter(testingType => testingType && !validTestingTypes.includes(testingType));
|
145
|
+
if (invalidTestingTypes.length) {
|
146
|
+
throw new Error(`Invalid testing types provided: ${invalidTestingTypes.join(', ')}. Valid options are: ${validTestingTypes.join(', ')}.`);
|
147
|
+
}
|
148
|
+
}
|
149
|
+
else if (typeof testingTypes === 'string') {
|
150
|
+
if (!validTestingTypes.includes(testingTypes)) {
|
151
|
+
throw new Error(`Invalid testing type provided: ${testingTypes}. Valid options are: ${validTestingTypes.join(', ')}.`);
|
152
|
+
}
|
153
|
+
}
|
154
|
+
return Array.isArray(testingTypes) ? testingTypes : [testingTypes];
|
155
|
+
};
|
156
|
+
exports.normalizeTestingTypes = normalizeTestingTypes;
|
114
157
|
//# 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',
|
@@ -40,9 +41,12 @@ exports.WRAPPED_COMMANDS.forEach(method => Cypress.Commands.overwrite(method, (o
|
|
40
41
|
const currentCommand = cy.state('current');
|
41
42
|
const currentCommandName = currentCommand?.get('name');
|
42
43
|
const currentCommandType = currentCommand?.get('type');
|
43
|
-
const tryRequerySubject =
|
44
|
-
|
45
|
-
|
44
|
+
const tryRequerySubject = 'getSubjectFromChain' in cy;
|
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) {
|
46
50
|
return originalFn(...args);
|
47
51
|
}
|
48
52
|
const originalSubject = cy.subject?.();
|
@@ -82,6 +86,13 @@ function axeWatcherFlushCommand({ timeout } = {}) {
|
|
82
86
|
logDebugAxeWatcher({
|
83
87
|
message: `Flush: Invoked (${isStopped ? 'will not' : 'may'} analyze implicitly)`
|
84
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
|
+
}
|
85
96
|
cy.window().then(win => {
|
86
97
|
if (!shouldAnalyzeLocation(win.location)) {
|
87
98
|
return Promise.resolve();
|
@@ -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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"}
|
package/dist/git.d.ts
CHANGED
@@ -4,12 +4,6 @@ export declare const isRepository: (dir?: string) => boolean;
|
|
4
4
|
export declare const getBranchName: (dir?: string) => string | null;
|
5
5
|
/** Get the default branch name. */
|
6
6
|
export declare const getDefaultBranchName: (dir?: string) => string | null;
|
7
|
-
/**
|
8
|
-
* Parse the default branch name from the output of `git symbolic-ref --short refs/remotes/origin/HEAD`.
|
9
|
-
* @param output The output of the command. e.g. 'origin/develop'.
|
10
|
-
* @private Exported only for testing.
|
11
|
-
*/
|
12
|
-
export declare const parseDefaultFromShowRemoteOutput: (output: string) => string | null;
|
13
7
|
/** Get the repository's remote URL. */
|
14
8
|
export declare const getRemoteURL: (dir?: string) => string | null;
|
15
9
|
interface CommitInfo {
|
package/dist/git.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.getTag = exports.isDirty = exports.getCommitInfo = exports.getRemoteURL = exports.
|
6
|
+
exports.getTag = exports.isDirty = exports.getCommitInfo = exports.getRemoteURL = exports.getDefaultBranchName = exports.getBranchName = exports.isRepository = void 0;
|
7
7
|
const child_process_1 = require("child_process");
|
8
8
|
const createDebugger_1 = __importDefault(require("./createDebugger"));
|
9
9
|
const debugLogger = (0, createDebugger_1.default)('git');
|
@@ -52,21 +52,38 @@ const getDefaultBranchName = (dir = process.cwd()) => {
|
|
52
52
|
cwd: dir,
|
53
53
|
stdio: ['ignore', 'pipe', 'ignore']
|
54
54
|
}).toString();
|
55
|
-
const remoteOutput =
|
55
|
+
const remoteOutput = parseDefaultFromShowRemoteOutput(stdout);
|
56
56
|
debugLogger('Default branch name:', remoteOutput);
|
57
57
|
return remoteOutput;
|
58
58
|
}
|
59
59
|
catch (e) {
|
60
60
|
debugLogger('Error while getting default branch name:', e);
|
61
|
-
return
|
61
|
+
return getDefaultBranchNameByRemote(dir);
|
62
62
|
}
|
63
63
|
};
|
64
64
|
exports.getDefaultBranchName = getDefaultBranchName;
|
65
|
+
const getDefaultBranchNameByRemote = (dir = process.cwd()) => {
|
66
|
+
debugLogger('Getting default branch with `git remote show origin`');
|
67
|
+
try {
|
68
|
+
const stdout = (0, child_process_1.execSync)('git remote show origin', {
|
69
|
+
cwd: dir,
|
70
|
+
stdio: ['ignore', 'pipe', 'ignore']
|
71
|
+
}).toString();
|
72
|
+
return parseDefaultFromRemoteShowOriginOutput(stdout);
|
73
|
+
}
|
74
|
+
catch (e) {
|
75
|
+
debugLogger('Error getting default branch by `git remote show origin`:', e);
|
76
|
+
return null;
|
77
|
+
}
|
78
|
+
};
|
79
|
+
const parseDefaultFromRemoteShowOriginOutput = (output) => {
|
80
|
+
const match = output.match(/HEAD branch: (.*)/);
|
81
|
+
return match ? match[1] : null;
|
82
|
+
};
|
65
83
|
const parseDefaultFromShowRemoteOutput = (output) => {
|
66
84
|
const match = output.match(/origin\/(.+)/);
|
67
85
|
return match ? match[1] : null;
|
68
86
|
};
|
69
|
-
exports.parseDefaultFromShowRemoteOutput = parseDefaultFromShowRemoteOutput;
|
70
87
|
const getRemoteURL = (dir = process.cwd()) => {
|
71
88
|
try {
|
72
89
|
debugLogger('Getting remote URL for directory:', dir);
|
package/dist/git.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../src/git.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAwC;AACxC,sEAA6C;AAE7C,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,KAAK,CAAC,CAAA;AAGlC,MAAM,YAAY,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EAAW,EAAE;IAC3D,IAAI,CAAC;QACH,WAAW,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAA;QAC9D,IAAA,wBAAQ,EAAC,qCAAqC,EAAE;YAC9C,GAAG,EAAE,GAAG;YAER,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAA;QACF,WAAW,CAAC,+BAA+B,CAAC,CAAA;QAC5C,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,KAAK;YACpB,WAAW,CAAC,wDAAwD,EAAE;gBACpE,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,KAAK,EAAE,CAAC,CAAC,KAAK;aACf,CAAC,CAAA;QACJ,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC,CAAA;AAlBY,QAAA,YAAY,gBAkBxB;AAGM,MAAM,aAAa,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EAAiB,EAAE;IAClE,IAAI,CAAC;QACH,WAAW,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAA;QAC9D,MAAM,UAAU,GAAG,IAAA,wBAAQ,EAAC,iCAAiC,EAAE;YAC7D,GAAG,EAAE,GAAG;YAER,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;SACpC,CAAC;aACC,QAAQ,EAAE;aACV,IAAI,EAAE,CAAA;QAET,WAAW,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAA;QAC/C,OAAO,UAAU,CAAA;IACnB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,WAAW,CAAC,0CAA0C,EAAE,CAAC,CAAC,CAAA;QAC1D,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAjBY,QAAA,aAAa,iBAiBzB;AAGM,MAAM,oBAAoB,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EAAiB,EAAE;IACzE,IAAI,CAAC;QACH,WAAW,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAA;QAC9D,MAAM,MAAM,GAAG,IAAA,wBAAQ,EACrB,mDAAmD,EACnD;YACE,GAAG,EAAE,GAAG;YACR,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;SACpC,CACF,CAAC,QAAQ,EAAE,CAAA;QAEZ,MAAM,YAAY,GAAG,
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../src/git.ts"],"names":[],"mappings":"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"}
|
@@ -67,7 +67,7 @@ const sendResultsToServer = async ({ results, debugLogger }) => {
|
|
67
67
|
await (0, linearBackoff_1.default)(incrementRetry);
|
68
68
|
await putResults(bodyResults, incrementRetry);
|
69
69
|
}
|
70
|
-
else if (retryAttempt === exports.MAX_RETRIES) {
|
70
|
+
else if (retryAttempt === exports.MAX_RETRIES && !res.ok) {
|
71
71
|
debugLogger('SendResultsToServer: Max retries reached', {
|
72
72
|
retryAttempt,
|
73
73
|
resStatus: res.status
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sendResultsToServer.js","sourceRoot":"","sources":["../src/sendResultsToServer.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"sendResultsToServer.js","sourceRoot":"","sources":["../src/sendResultsToServer.ts"],"names":[],"mappings":"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"}
|
@@ -6,6 +6,7 @@ export interface AxeCoreSettings {
|
|
6
6
|
}
|
7
7
|
export interface InitializeSessionParams {
|
8
8
|
apiKey: string;
|
9
|
+
projectId: string | null;
|
9
10
|
serverURL: string;
|
10
11
|
watcherVersion: string;
|
11
12
|
sessionID: string | null;
|
@@ -23,7 +24,7 @@ export interface InitializeSessionParams {
|
|
23
24
|
runOptions: RunOptions | null;
|
24
25
|
}
|
25
26
|
/** Initialize a new session. */
|
26
|
-
declare function initializeSession({ apiKey, serverURL, watcherVersion, sessionID, buildID, gitCommitSha, gitUrl, gitBranch, gitCommitAuthor, gitIsDirty, gitDefaultBranch, gitCommitMessage, gitTag, gitCommitEmail, configOverrides, runOptions }: InitializeSessionParams): {
|
27
|
+
declare function initializeSession({ apiKey, projectId, serverURL, watcherVersion, sessionID, buildID, gitCommitSha, gitUrl, gitBranch, gitCommitAuthor, gitIsDirty, gitDefaultBranch, gitCommitMessage, gitTag, gitCommitEmail, configOverrides, runOptions }: InitializeSessionParams): {
|
27
28
|
axe_core_settings?: AxeCoreSettings;
|
28
29
|
session_id: string;
|
29
30
|
};
|
@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
const sync_request_1 = __importDefault(require("sync-request"));
|
7
7
|
const assert_1 = __importDefault(require("assert"));
|
8
|
+
const uuid_1 = require("uuid");
|
8
9
|
const createDebugger_1 = __importDefault(require("../createDebugger"));
|
9
10
|
const debugLogger = (0, createDebugger_1.default)('config:initializeSession');
|
10
|
-
function initializeSession({ apiKey, serverURL, watcherVersion, sessionID, buildID, gitCommitSha, gitUrl, gitBranch, gitCommitAuthor, gitIsDirty, gitDefaultBranch, gitCommitMessage, gitTag, gitCommitEmail, configOverrides, runOptions }) {
|
11
|
+
function initializeSession({ apiKey, projectId, serverURL, watcherVersion, sessionID, buildID, gitCommitSha, gitUrl, gitBranch, gitCommitAuthor, gitIsDirty, gitDefaultBranch, gitCommitMessage, gitTag, gitCommitEmail, configOverrides, runOptions }) {
|
11
12
|
(0, assert_1.default)(apiKey, 'API key is required');
|
12
13
|
(0, assert_1.default)(serverURL, 'Server URL is required');
|
13
14
|
(0, assert_1.default)(watcherVersion, 'Watcher version is required');
|
@@ -25,6 +26,7 @@ function initializeSession({ apiKey, serverURL, watcherVersion, sessionID, build
|
|
25
26
|
(0, assert_1.default)(gitCommitEmail === null || typeof gitCommitEmail === 'string', 'Git Commit Email must be a string or null');
|
26
27
|
(0, assert_1.default)(configOverrides === null || typeof configOverrides === 'object', 'Configuration Overrides must be an object or null');
|
27
28
|
(0, assert_1.default)(runOptions === null || typeof runOptions === 'object', 'Run Options must be an object or null');
|
29
|
+
(0, assert_1.default)(projectId === null || (0, uuid_1.validate)(projectId), 'Project ID must be a valid v4 UUID or null');
|
28
30
|
const url = new URL(`/api-pub/watcher/sessions`, serverURL);
|
29
31
|
const payload = {
|
30
32
|
watcher_version: watcherVersion,
|
@@ -49,7 +51,8 @@ function initializeSession({ apiKey, serverURL, watcherVersion, sessionID, build
|
|
49
51
|
}
|
50
52
|
: null,
|
51
53
|
run_options: runOptions
|
52
|
-
}
|
54
|
+
},
|
55
|
+
...(projectId && { project_id: projectId })
|
53
56
|
};
|
54
57
|
const res = (0, sync_request_1.default)('POST', url.toString(), {
|
55
58
|
headers: {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"initializeSession.js","sourceRoot":"","sources":["../../src/utils/initializeSession.ts"],"names":[],"mappings":";;;;;AAAA,gEAAkC;AAClC,oDAA2B;AAC3B,uEAA8C;AAI9C,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,0BAA0B,CAAC,CAAA;
|
1
|
+
{"version":3,"file":"initializeSession.js","sourceRoot":"","sources":["../../src/utils/initializeSession.ts"],"names":[],"mappings":"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"}
|
@@ -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;
|
@@ -4,10 +4,12 @@ const constantsNode_1 = require("./constantsNode");
|
|
4
4
|
const DISABLE_OTHER_EXTENSIONS_FLAG = '--disable-extensions-except';
|
5
5
|
const LOAD_EXTENSION_FLAG = '--load-extension';
|
6
6
|
const DISABLE_EXTENSIONS_FLAG = '--disable-extensions';
|
7
|
-
|
7
|
+
const DISABLE_FEATURES = '--disable-features';
|
8
|
+
function mergeChromeArgs(userArgs, { disableOtherExtensions, disableLoadExtensionCommandFeature }) {
|
8
9
|
let loadExtensionFlagIndex = -1;
|
9
10
|
let disableExtensionsExceptFlagIndex = -1;
|
10
11
|
let disableExtensionFlagIndex = -1;
|
12
|
+
let disableFeaturesFlagIndex = -1;
|
11
13
|
for (const [index, arg] of userArgs.entries()) {
|
12
14
|
const hasLoadExtension = arg.includes(LOAD_EXTENSION_FLAG) || arg.includes('load-extension');
|
13
15
|
const hasDisableExtensionsExcept = arg.includes(DISABLE_OTHER_EXTENSIONS_FLAG) ||
|
@@ -15,6 +17,7 @@ function mergeChromeArgs(userArgs, { disableOtherExtensions }) {
|
|
15
17
|
const hasDisableExtensions = (arg.includes(DISABLE_EXTENSIONS_FLAG) ||
|
16
18
|
arg.includes('disable-extensions')) &&
|
17
19
|
!hasDisableExtensionsExcept;
|
20
|
+
const hasDisableFeatures = arg.includes(DISABLE_FEATURES) || arg.includes('disable-features');
|
18
21
|
if (hasLoadExtension) {
|
19
22
|
loadExtensionFlagIndex = index;
|
20
23
|
}
|
@@ -24,6 +27,9 @@ function mergeChromeArgs(userArgs, { disableOtherExtensions }) {
|
|
24
27
|
if (hasDisableExtensions) {
|
25
28
|
disableExtensionFlagIndex = index;
|
26
29
|
}
|
30
|
+
if (hasDisableFeatures) {
|
31
|
+
disableFeaturesFlagIndex = index;
|
32
|
+
}
|
27
33
|
}
|
28
34
|
if (loadExtensionFlagIndex !== -1) {
|
29
35
|
userArgs[loadExtensionFlagIndex] += `,${constantsNode_1.PATH_TO_EXTENSION}`;
|
@@ -37,6 +43,15 @@ function mergeChromeArgs(userArgs, { disableOtherExtensions }) {
|
|
37
43
|
else if (disableOtherExtensions || disableExtensionFlagIndex !== -1) {
|
38
44
|
userArgs.push(`${DISABLE_OTHER_EXTENSIONS_FLAG}=${constantsNode_1.PATH_TO_EXTENSION}`);
|
39
45
|
}
|
46
|
+
if (disableLoadExtensionCommandFeature) {
|
47
|
+
if (disableFeaturesFlagIndex !== -1) {
|
48
|
+
userArgs[disableFeaturesFlagIndex] +=
|
49
|
+
`,DisableLoadExtensionCommandLineSwitch`;
|
50
|
+
}
|
51
|
+
else {
|
52
|
+
userArgs.push(`${DISABLE_FEATURES}=DisableLoadExtensionCommandLineSwitch`);
|
53
|
+
}
|
54
|
+
}
|
40
55
|
return userArgs;
|
41
56
|
}
|
42
57
|
exports.default = mergeChromeArgs;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mergeChromeArgs.js","sourceRoot":"","sources":["../../src/utils/mergeChromeArgs.ts"],"names":[],"mappings":";;AAAA,mDAAmD;AAGnD,MAAM,6BAA6B,GAAG,6BAA6B,CAAA;AACnE,MAAM,mBAAmB,GAAG,kBAAkB,CAAA;AAC9C,MAAM,uBAAuB,GAAG,sBAAsB,CAAA;
|
1
|
+
{"version":3,"file":"mergeChromeArgs.js","sourceRoot":"","sources":["../../src/utils/mergeChromeArgs.ts"],"names":[],"mappings":";;AAAA,mDAAmD;AAGnD,MAAM,6BAA6B,GAAG,6BAA6B,CAAA;AACnE,MAAM,mBAAmB,GAAG,kBAAkB,CAAA;AAC9C,MAAM,uBAAuB,GAAG,sBAAsB,CAAA;AACtD,MAAM,gBAAgB,GAAG,oBAAoB,CAAA;AAW7C,SAAS,eAAe,CACtB,QAAkB,EAClB,EACE,sBAAsB,EACtB,kCAAkC,EAInC;IASD,IAAI,sBAAsB,GAAG,CAAC,CAAC,CAAA;IAC/B,IAAI,gCAAgC,GAAG,CAAC,CAAC,CAAA;IACzC,IAAI,yBAAyB,GAAG,CAAC,CAAC,CAAA;IAClC,IAAI,wBAAwB,GAAG,CAAC,CAAC,CAAA;IAWjC,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAC9C,MAAM,gBAAgB,GACpB,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAA;QACrE,MAAM,0BAA0B,GAC9B,GAAG,CAAC,QAAQ,CAAC,6BAA6B,CAAC;YAC3C,GAAG,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAA;QAC3C,MAAM,oBAAoB,GACxB,CAAC,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC;YACpC,GAAG,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YACrC,CAAC,0BAA0B,CAAA;QAC7B,MAAM,kBAAkB,GACtB,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAA;QAEpE,IAAI,gBAAgB,EAAE,CAAC;YACrB,sBAAsB,GAAG,KAAK,CAAA;QAChC,CAAC;QAED,IAAI,0BAA0B,EAAE,CAAC;YAC/B,gCAAgC,GAAG,KAAK,CAAA;QAC1C,CAAC;QAED,IAAI,oBAAoB,EAAE,CAAC;YACzB,yBAAyB,GAAG,KAAK,CAAA;QACnC,CAAC;QAED,IAAI,kBAAkB,EAAE,CAAC;YACvB,wBAAwB,GAAG,KAAK,CAAA;QAClC,CAAC;IACH,CAAC;IAID,IAAI,sBAAsB,KAAK,CAAC,CAAC,EAAE,CAAC;QAClC,QAAQ,CAAC,sBAAsB,CAAC,IAAI,IAAI,iCAAiB,EAAE,CAAA;IAC7D,CAAC;SAAM,CAAC;QACN,QAAQ,CAAC,IAAI,CAAC,GAAG,mBAAmB,IAAI,iCAAiB,EAAE,CAAC,CAAA;IAC9D,CAAC;IAID,IAAI,gCAAgC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC5C,QAAQ,CAAC,gCAAgC,CAAC,IAAI,IAAI,iCAAiB,EAAE,CAAA;IAiBvE,CAAC;SAAM,IAAI,sBAAsB,IAAI,yBAAyB,KAAK,CAAC,CAAC,EAAE,CAAC;QACtE,QAAQ,CAAC,IAAI,CAAC,GAAG,6BAA6B,IAAI,iCAAiB,EAAE,CAAC,CAAA;IACxE,CAAC;IAED,IAAI,kCAAkC,EAAE,CAAC;QACvC,IAAI,wBAAwB,KAAK,CAAC,CAAC,EAAE,CAAC;YACpC,QAAQ,CAAC,wBAAwB,CAAC;gBAChC,wCAAwC,CAAA;QAC5C,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,GAAG,gBAAgB,wCAAwC,CAAC,CAAA;QAC5E,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,kBAAe,eAAe,CAAA"}
|