prettier-eslint
Advanced tools
Comparing version
"use strict"; | ||
require("core-js/modules/es.array.iterator"); | ||
require("core-js/modules/es.string.trim-start"); | ||
require("core-js/modules/es.string.trim-end"); | ||
var _fs = _interopRequireDefault(require("fs")); | ||
@@ -29,8 +23,5 @@ | ||
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } | ||
/* eslint no-console:0, global-require:0, import/no-dynamic-require:0 */ | ||
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } | ||
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } | ||
/* eslint complexity: [1, 13] */ | ||
const logger = (0, _loglevelColoredLevelPrefix.default)({ | ||
@@ -221,3 +212,5 @@ prefix: 'prettier-eslint' | ||
logger.trace(`eslint config for "${filePath}" received`, (0, _prettyFormat.default)(config)); | ||
return _objectSpread(_objectSpread({}, eslintOptions), config); | ||
return { ...eslintOptions, | ||
...config | ||
}; | ||
} catch (error) { | ||
@@ -224,0 +217,0 @@ // is this noisy? Try setting options.disableLog to false |
"use strict"; | ||
require("core-js/modules/es.array.iterator"); | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -20,8 +18,3 @@ value: true | ||
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } | ||
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } | ||
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } | ||
/* eslint import/no-dynamic-require:0 */ | ||
const logger = (0, _loglevelColoredLevelPrefix.default)({ | ||
@@ -125,3 +118,3 @@ prefix: 'prettier-eslint' | ||
}, {}); | ||
return _objectSpread(_objectSpread({ | ||
return { | ||
// defaults | ||
@@ -131,4 +124,4 @@ useEslintrc: false, | ||
settings: eslintConfig.settings || {} | ||
} | ||
}, eslintConfig), {}, { | ||
}, | ||
...eslintConfig, | ||
// overrides | ||
@@ -138,3 +131,3 @@ rules: relevantRules, | ||
globals: [] | ||
}); | ||
}; | ||
} | ||
@@ -154,3 +147,5 @@ /** | ||
if (ruleValueExists(prettierPluginOptions)) { | ||
prettierOptions = _objectSpread(_objectSpread({}, prettierPluginOptions), prettierOptions); | ||
prettierOptions = { ...prettierPluginOptions, | ||
...prettierOptions | ||
}; | ||
} | ||
@@ -157,0 +152,0 @@ |
{ | ||
"name": "prettier-eslint", | ||
"version": "12.0.0", | ||
"version": "13.0.0", | ||
"description": "Formats your JavaScript using prettier followed by eslint --fix", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
47364
-4.6%535
-1.29%