Commit 00616a5d authored by axelbraunschweiger's avatar axelbraunschweiger
parents 51bdf4a8 e2409d5b
......@@ -3,7 +3,7 @@
"description": "sgalinski command line interface",
"homepage": "https://www.sgalinski.de",
"license": "proprietary",
"version": "3.5.20",
"version": "3.6.2",
"replace": {
"sgc-core": "self.version"
}
......
......@@ -97,6 +97,12 @@ module.exports = class Css extends Task {
qaSteps.push(this._qa(file));
});
await Promise.all(qaSteps);
if (this._printedError) {
this._logger.displayNotification(
'SGC css:qa task',
'You have some linting-errors in your CSS. Please fix them!'
);
}
resolve();
});
}
......@@ -238,12 +244,6 @@ module.exports = class Css extends Task {
from: _input,
syntax: scss
}).then(() => {
if (this._printedError) {
this._logger.displayNotification(
'SGC css:qa task',
'You have some linting-errors in your CSS. Please fix them!'
);
}
resolve();
});
});
......
......@@ -7,6 +7,7 @@ const mkdirp = require('mkdirp');
const globby = require('globby');
const browserify = require('browserify');
const babelify = require('babelify');
const tfilter = require('tfilter');
const tinyify = require('tinyify');
const CLIEngine = require('eslint').CLIEngine;
const LintingFormatter = require('../lintingFormatter');
......@@ -134,7 +135,23 @@ module.exports = class Js extends Task {
let bundler = browserify(_input, {
paths: this._config.js.libraryPaths,
debug: this._config.jsPipeline.sourceMaps
}).transform(babelify, {
}).transform(tfilter(babelify, {
filter: (fileName) => {
if (fileName.indexOf('node_modules') >= 0) {
if (!this._config.js.transpiler) {
return false;
}
const modulesToCompile = this._config.js.transpiler.node_modules;
if (modulesToCompile) {
for (let moduleName of modulesToCompile) {
return fileName.indexOf(moduleName) >= 0
}
}
}
return true;
}
}), {
global: true,
presets: [
[require('@babel/preset-env'), presetEnvConfiguration],
]
......
SGC_VERSION=3.5.20
SGC_VERSION=3.6.2
......@@ -13,7 +13,7 @@ echo -e " \033[33m ╚══════╝ ╚═════╝ ╚═══
echo -e " \033[103m\033[30m \033[0m"
echo -e " \033[103m\033[30m Welcome to the \033[0m"
echo -e " \033[103m\033[30m sgalinski CLI Task Runner \033[0m"
echo -e " \033[103m\033[30m \033[1mv${SGC_VERSION} \033[0m"
echo -e " \033[103m\033[30m \033[1mv${SGC_VERSION} \033[0m"
echo -e " \033[103m\033[30m \033[0m"
echo -e "\n"
......
This diff is collapsed.
......@@ -8,7 +8,7 @@
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"version": "3.5.20",
"version": "3.6.2",
"license": "SEE LICENSE IN LICENSE.md",
"devDependencies": {},
"engines": {
......@@ -17,12 +17,12 @@
"dependencies": {
"@babel/core": "^7.0.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-env": "^7.3.1",
"@csstools/postcss-sass": "^2.0.0",
"@sgalinski/image-dimensions": "^1.0.0",
"@sgalinski/inline-svg": "^1.2.1",
"async": "^2.6.1",
"autoprefixer": "^9.1.3",
"autoprefixer": "^9.4.6",
"babelify": "^9.0.0",
"browser-sync": "^2.24.7",
"browserify": "^16.2.2",
......@@ -54,6 +54,7 @@
"replace-in-file": "^3.4.2",
"stylelint": "^9.5.0",
"stylelint-config-sgalinski": "^1.3.0",
"tfilter": "^1.0.1",
"time-stamp": "^2.1.0",
"tinyify": "^2.4.3",
"uglifyify": "^5.0.1",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment