From ab3015df6b60309929baeff6a5f79e94d2aab955 Mon Sep 17 00:00:00 2001 From: rejas Date: Fri, 10 Apr 2020 14:43:58 +0200 Subject: [PATCH] Remove rest of grunt calls --- .travis.yml | 1 - package.json | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f9f3690..d156ac1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ before_install: - npm i -g npm before_script: - yarn danger ci - - npm install grunt-cli -g - "export DISPLAY=:99.0" - "export ELECTRON_DISABLE_SANDBOX=1" - "sh -e /etc/init.d/xvfb start" diff --git a/package.json b/package.json index d2133132..faa710f2 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,11 @@ "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive", "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive", "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive", - "test:lint": "grunt --env=test", - "text:js": "eslint *.js js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json", + "test:lint": "npm run test:js && npm run test:style", + "test:js": "eslint *.js js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json", "test:style": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json", "config:check": "node tests/configs/check_config.js", - "lint": "grunt --env=lint", + "lint": "npm run lint:js && npm run lint:json && npm run lint:markdown && npm run lint:style && npm run lint:yaml", "lint:js": "eslint *.js js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix", "lint:json": "jsonlint -q package.json .eslintrc.json .markdownlintrc.json .stylelintrc.json modules/default/*/translations/*.json translations/*.json vendor/package.json", "lint:markdown": "markdownlint *.md modules/README.md modules/default/**/*.md --config .markdownlintrc.json", @@ -57,9 +57,8 @@ "mocha-each": "^1.1.0", "mocha-logger": "^1.0.6", "spectron": "^8.0.0", - "stylelint": "latest", - "stylelint-config-standard": "latest", - "time-grunt": "latest", + "stylelint": "^13.3.1", + "stylelint-config-standard": "^20.0.0", "yaml-lint": "^1.2.4" }, "optionalDependencies": {