Skip to content

chore: resolve npm audit issues #3378

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
WilcoFiers merged 11 commits into from
Feb 11, 2022
Merged

chore: resolve npm audit issues #3378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
45fea26
chore: resolve npm audit issues
WilcoFiers Feb 4, 2022
0b0cfb8
fix ACT karma config
WilcoFiers Feb 4, 2022
b106a79
chore(runPartial): skip tests in IE
WilcoFiers Feb 4, 2022
39b2c62
ci: try upgrading win executor
WilcoFiers Feb 4, 2022
57703aa
Update config.yml
WilcoFiers Feb 11, 2022
00494db
Update config.yml
WilcoFiers Feb 11, 2022
f5f7679
More tests not running in IE
WilcoFiers Feb 11, 2022
1baf16d
More of these
WilcoFiers Feb 11, 2022
b692905
Merge branch 'develop' into update-dependencies
WilcoFiers Feb 11, 2022
ccabdda
bump karma version
WilcoFiers Feb 11, 2022
1e73241
avoid using .finally()
WilcoFiers Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ unix_nightly_box: &unix_nightly_box

win_box: &win_box
executor:
name: win/vs2019
name: win/default
shell: bash.exe

orbs:
win: circleci/windows@1.0.0
win: circleci/windows@2.2.0
puppeteer: threetreeslight/puppeteer@0.1.2
browser-tools: circleci/browser-tools@1.1.0

Expand Down Expand Up @@ -394,4 +394,4 @@ workflows:
- dependencies_unix
- test_nightly_aria_practices:
requires:
- dependencies_unix
- dependencies_unix
7 changes: 5 additions & 2 deletions lib/core/public/run-partial.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,15 @@ export default function runPartial(...args) {
if (contextObj.initiator) {
environmentData = getEnvironmentData();
}

axe._running = false;
teardown();
return { results, frames, environmentData };
})
.finally(() => {
// Avoid .finally() to deal with Mocha 9 + IE issues
.catch((err) => {
axe._running = false;
teardown();
return Promise.reject(err);
});
}

Expand Down
1,191 changes: 393 additions & 798 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "4.4.1",
"license": "MPL-2.0",
"engines": {
"node": ">=4"
"node": ">=12"
Copy link
Copy Markdown
Contributor

@ljharb ljharb Jul 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: this is a breaking change and requires a semver-major update. See #3537.

},
"contributors": [
{
Expand Down Expand Up @@ -140,25 +140,25 @@
"grunt-contrib-uglify": "^4.0.0",
"grunt-contrib-watch": "^1.1.0",
"html-entities": "^1.2.0",
"http-server": "^0.12.3",
"http-server": "^14.1.0",
"husky": "^3.1.0",
"jquery": "^3.0.0",
"jsdoc": "^3.5.5",
"jsdoc": "^3.6.10",
"jsdom": "^16.3.0",
"karma": "^6.3.2",
"karma": "^6.3.16",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^3.1.0",
"karma-firefox-launcher": "^2.1.0",
"karma-ie-launcher": "^1.0.0",
"karma-mocha": "^2.0.1",
"karma-mocha-reporter": "^2.2.5",
"karma-sinon": "^1.0.5",
"karma-spec-reporter": "0.0.33",
"lint-staged": "^11.2.6",
"make-dir": "^3.0.0",
"markdown-table": "^1.1.2",
"memoizee": "^0.4.14",
"minami": "^1.2.3",
"mocha": "8.0.1",
"mocha": "^9.2.0",
"node-notifier": "^8.0.1",
"npm-run-all": "^4.1.5",
"prettier": "^1.17.1",
Expand Down
4 changes: 2 additions & 2 deletions test/act-mapping/karma.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = function(config) {
plugins: [
'karma-mocha',
'karma-chai',
'karma-mocha-reporter',
'karma-spec-reporter',
'karma-chrome-launcher',
require('./preprocessor')
],
Expand All @@ -24,7 +24,7 @@ module.exports = function(config) {
proxies: {
'/test-assets': '/base/node_modules/act-rules.github.io/test-assets'
},
reporters: ['mocha'],
reporters: ['spec'],
preprocessors: {
'**/*.json': ['act']
},
Expand Down
6 changes: 3 additions & 3 deletions test/integration/full/preload/preload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,12 @@ describe('axe.utils.preload integration test', function() {
.catch(function(err) {
assert.isNotNull(err);
assert.isTrue(err.message.includes('Preload assets timed out'));

axe.utils.preloadCssom = origPreloadCssom;
done();
})
.catch(done)
.finally(function() {
.catch(function (e) {
axe.utils.preloadCssom = origPreloadCssom;
done(e);
});
});
});
Expand Down
4 changes: 2 additions & 2 deletions test/integration/full/umd/umd-window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ describe('UMD window', function() {
.then(function(values) {
assert.lengthOf(values, 2);
assert.equal(values.join(' '), 'Hello World!');
done();
})
.catch(function() {
done(new Error('Expected to resolve.'));
})
.finally(done);
});
});
it('should reject Promise', function(done) {
new Promise(function(resolve, reject) {
Expand Down
4 changes: 2 additions & 2 deletions test/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ module.exports = function(config) {
'karma-mocha',
'karma-chai',
'karma-sinon',
'karma-mocha-reporter',
'karma-spec-reporter',
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-ie-launcher',
Expand All @@ -98,7 +98,7 @@ module.exports = function(config) {
'/axe.js': '/base/axe.js'
},
browsers: ['ChromeHeadless'],
reporters: ['mocha'],
reporters: ['spec'],
preprocessors: {
'test/integration/rules/**/*.json': ['integration']
},
Expand Down