chore: fix retirejs related ci failures (#1235)

dequelabs · Nov 13, 2018 · 70805be · 70805be
1 parent cf86ff5
commit 70805be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,5 +1,5 @@
-/*eslint 
-complexity: ["error",12], 
+/*eslint
+complexity: ["error",12],
 max-statements: ["error", 35],
 camelcase: ["error", {"properties": "never"}]
 */
@@ -16,7 +16,6 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-eslint');
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-watch');
-	grunt.loadNpmTasks('grunt-retire');
 	grunt.loadNpmTasks('grunt-mocha');
 	grunt.loadNpmTasks('grunt-parallel');
 	grunt.loadNpmTasks('grunt-markdownlint');
@@ -67,16 +66,6 @@ module.exports = function(grunt) {
 			});
 			return driverTests;
 		})(),
-		retire: {
-			options: {
-				/** list of files to ignore **/
-				ignorefile: '.retireignore.json' //or '.retireignore.json'
-			},
-			js: ['lib/*.js'] /** Which js-files to scan. **/,
-			node: [
-				'./'
-			] /** Which node directories to scan (containing package.json). **/
-		},
 		clean: ['dist', 'tmp', 'axe.js', 'axe.*.js'],
 		babel: {
 			options: {
@@ -399,7 +388,6 @@ module.exports = function(grunt) {
 	grunt.registerTask('test', [
 		'build',
 		'file-exists',
-		'retire',
 		'testconfig',
 		'fixture',
 		'connect',
@@ -411,7 +399,6 @@ module.exports = function(grunt) {
 
 	grunt.registerTask('ci-build', [
 		'build',
-		'retire',
 		'testconfig',
 		'fixture',
 		'connect',

diff --git a/package.json b/package.json
@@ -57,17 +57,17 @@
   "scripts": {
     "api-docs": "jsdoc --configure .jsdoc.json",
     "build": "grunt",
-    "test-dts": "tsc",
-    "test": "npm run test-dts && grunt test",
-    "test-fast": "grunt test-fast",
+    "test": "npm run retire && tsc && grunt test",
     "version": "echo \"use 'npm run release' to bump axe-core version\" && exit 1",
     "prepublishOnly": "grunt build && grunt file-exists",
+    "retire": "retire --jspath 'lib' --nodepath './' --ignorefile '.retireignore.json' --severity 'medium'",
     "release": "standard-version -a",
     "next-release": "standard-version --scripts.prebump=./build/next-version.js --skip.commit=true --skip.tag=true",
     "sri-update": "grunt build && node build/sri-update && git add sri-history.json",
     "fmt": "prettier --write  *.js, **/*.ts '{build,doc,lib,test}/**/*.js'"
   },
   "devDependencies": {
+    "@babel/core": "^7.1.5",
     "aria-query": "^3.0.0",
     "axios": "^0.18.0",
     "babel-core": "^6.26.0",
@@ -93,7 +93,6 @@
     "grunt-markdownlint": "^2.0.0",
     "grunt-mocha": "1.1.0",
     "grunt-parallel": "^0.5.1",
-    "grunt-retire": "^1.0.7",
     "html-entities": "^1.2.0",
     "husky": "^1.1.1",
     "jquery": "^3.0.0",
@@ -104,6 +103,7 @@
     "mocha": "^5.2.0",
     "prettier": "^1.14.0",
     "promise": "~8.0.1",
+    "retire": "^2.0.1",
     "revalidator": "~0.3.1",
     "selenium-webdriver": "~3.6.0",
     "sri-toolbox": "^0.2.0",