diff --git a/RoboFile.php b/RoboFile.php index 8fe432e382..70a6099d61 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -97,31 +97,8 @@ class RoboFile extends \Robo\Tasks { // Clean up folder from previous files array_map('unlink', glob("assets/dist/css/*.*")); - $scss_files = array( - 'assets/css/src/admin.scss', - 'assets/css/src/adminGlobal.scss', - 'assets/css/src/newsletterEditor.scss', - 'assets/css/src/public.scss', - 'assets/css/src/rtl.scss', - 'assets/css/src/importExport.scss', - ); - - foreach ($scss_files as $file) { - $this->_exec(join(' ', array( - './node_modules/node-sass/bin/node-sass', - $file, - '--output assets/dist/css/', - '--output-style compact', - ))); - } - - $compilation_result = $this->_exec(join(' ', array( - './node_modules/postcss-cli/bin/postcss', - 'assets/dist/css/*.css', - '--use autoprefixer', - '--no-map', - '--replace', - ))); + $this->_exec('npm run scss'); + $compilation_result = $this->_exec('npm run autoprefixer'); // Create manifest file $manifest = []; diff --git a/package.json b/package.json index 00ce135241..5fb5f79ca7 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,9 @@ "lint": "npm run lint6 && npm run lint5 && npm run lint-tests", "lint6": "eslint -c .eslintrc.es6.json --max-warnings 0 'assets/js/src/**/*.jsx'", "lint5": "eslint -c .eslintrc.es5.json --ignore-pattern helpscout.js --max-warnings 0 'assets/js/src/**/*.js'", - "lint-tests": "eslint -c .eslintrc.tests.json --max-warnings 0 'tests/javascript'" + "lint-tests": "eslint -c .eslintrc.tests.json --max-warnings 0 'tests/javascript'", + "autoprefixer": "postcss assets/dist/css/*.css --use autoprefixer --no-map --replace", + "scss": "node-sass assets/css/src/ --output assets/dist/css/ --output-style compact" }, "dependencies": { "@babel/runtime": "^7.2.0",