Skip to content

Commit

Permalink
Merge 11070f8 into be43c0b
Browse files Browse the repository at this point in the history
  • Loading branch information
realityking committed Feb 11, 2018
2 parents be43c0b + 11070f8 commit f233cf4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
5 changes: 2 additions & 3 deletions lib/config-helpers.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
var yaml = require('js-yaml'),
fs = require('fs'),
path = require('path'),
merge = require('merge'),
pathIsAbsolute = require('path-is-absolute');
merge = require('merge');

/**
* Loads the default sass-lint configuration file
Expand Down Expand Up @@ -80,7 +79,7 @@ var checkForConfigExtend = function (config, curConfPath) {
resolvedSubConfig;

if (subConfig) {
if (!pathIsAbsolute(subConfig)) {
if (!path.isAbsolute(subConfig)) {
// Process.cwd() in most IDE's will be / so therefore we need to pass the current directory
// of the config from which you are 'extending' or we resort to process.cwd() which on the CLI
// will be correct
Expand Down
5 changes: 2 additions & 3 deletions lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

var path = require('path'),
merge = require('merge'),
confHelpers = require('./config-helpers'),
pathIsAbsolute = require('path-is-absolute');
confHelpers = require('./config-helpers');

var cacheConfig = {},
cacheEnabled = false;
Expand Down Expand Up @@ -58,7 +57,7 @@ module.exports = function (options, configPath) {
}
}
}
else if (!pathIsAbsolute(configPath)) {
else if (!path.isAbsolute(configPath)) {
configPath = path.resolve(process.cwd(), configPath);
}

Expand Down
5 changes: 2 additions & 3 deletions lib/format/formatters/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
'use strict';

const lodashTemplate = require('lodash.template');
const lodashMap = require('lodash.map');
const fs = require('fs');
const path = require('path');

Expand Down Expand Up @@ -76,7 +75,7 @@ const renderMessages = function (messages, parentIndex) {
* @param {Object} message Message.
* @returns {string} HTML (table row) describing a message.
*/
return lodashMap(messages, message => {
return messages.map(message => {
const lineNumber = message.line || 0;
const columnNumber = message.column || 0;

Expand All @@ -97,7 +96,7 @@ const renderMessages = function (messages, parentIndex) {
* @returns {string} HTML string describing the results.
*/
const renderResults = function (results) {
return lodashMap(results, (result, index) => resultTemplate({
return results.map((result, index) => resultTemplate({
index,
color: renderColor(result.errorCount, result.warningCount),
filePath: result.filePath,
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
},
"homepage": "https://github.com/sasstools/sass-lint",
"dependencies": {
"chalk": "^2.1.0",
"autoprefixer": "^7.1.3",
"chalk": "^2.1.0",
"commander": "^2.8.1",
"fs-extra": "^5.0.0",
"glob": "^7.0.0",
Expand All @@ -40,10 +40,8 @@
"known-css-properties": "^0.5.0",
"lodash.capitalize": "^4.1.0",
"lodash.kebabcase": "^4.0.0",
"lodash.map": "^4.6.0",
"lodash.template": "^4.4.0",
"merge": "^1.2.0",
"path-is-absolute": "^1.0.0",
"text-table": "^0.2.0",
"util": "^0.10.3"
},
Expand Down

0 comments on commit f233cf4

Please sign in to comment.