diff --git a/.circleci/config.yml b/.circleci/config.yml index 58301a48e5..6220175298 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -142,8 +142,8 @@ jobs: - attach_workspace: at: /home/circleci/mailpoet - run: - name: "QA JavaScript" - command: ./do qa:javascript + name: "QA Frontend Assets" + command: ./do qa:frontend-assets qa_php: executor: wpcli_php_latest steps: diff --git a/RoboFile.php b/RoboFile.php index 2e6516d3f6..0886f8e3f4 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -95,7 +95,7 @@ class RoboFile extends \Robo\Tasks { // Clean up folder from previous files array_map('unlink', glob("assets/dist/css/*.*")); - $this->_exec('npm run stylelint -- "assets/css/src/components/**/*.scss"'); + $this->_exec('npm run stylelint -- "assets/css/src/**/*.scss"'); $this->_exec('npm run scss'); $compilationResult = $this->_exec('npm run autoprefixer'); @@ -350,7 +350,7 @@ class RoboFile extends \Robo\Tasks { public function qa() { $collection = $this->collectionBuilder(); $collection->addCode([$this, 'qaPhp']); - $collection->addCode([$this, 'qaJavascript']); + $collection->addCode([$this, 'qaFrontendAssets']); return $collection->run(); } @@ -363,7 +363,7 @@ class RoboFile extends \Robo\Tasks { return $collection->run(); } - public function qaJavascript() { + public function qaFrontendAssets() { $collection = $this->collectionBuilder(); $collection->addCode([$this, 'qaLintJavascript']); $collection->addCode([$this, 'qaLintCss']); @@ -379,7 +379,7 @@ class RoboFile extends \Robo\Tasks { } public function qaLintCss() { - return $this->_exec('npm run stylelint -- "assets/css/src/components/**/*.scss"'); + return $this->_exec('npm run stylelint-check -- "assets/css/src/**/*.scss"'); } public function qaCodeSniffer($severity='errors') { diff --git a/package.json b/package.json index 814bc3c904..f41d967154 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "autoprefixer": "postcss assets/dist/css/*.css --use autoprefixer --no-map --replace", "scss": "node-sass assets/css/src/ --output assets/dist/css/ --output-style compact", "stylelint": "stylelint --fix", + "stylelint-check": "stylelint", "test": "env NODE_PATH=$NODE_PATH:./assets/js/src mocha --require tests/javascript/babel_register.js tests/javascript/**/*.spec.js", "check-types": "tsc --noEmit", "storybook": "start-storybook -s ./ -p 8083",