Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

Commit

Permalink
feat(prettier-eslint): bump to 13.0.0
Browse files Browse the repository at this point in the history
Resolves #1181
  • Loading branch information
robwise committed Dec 15, 2021
1 parent 5f867e6 commit 3154276
Show file tree
Hide file tree
Showing 11 changed files with 72 additions and 121 deletions.
2 changes: 1 addition & 1 deletion dist/displayDebugInfo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Atom version: ${getAtomVersion()}
prettier-atom version: ${getPackageInfo(__dirname).version}
prettier: ${globalPrettierPath || 'bundled'}
prettier version: ${getPackageInfo(globalPrettierPath || getDepPath('prettier')).version}
prettier-eslint version: ${getPackageInfo(getDepPath('@lewisl9029/prettier-eslint')).version}
prettier-eslint version: ${getPackageInfo(getDepPath('prettier-eslint')).version}
prettier-atom configuration: ${JSON.stringify(getPrettierAtomConfig(), null, 2)}
`.trim();
};
Expand Down
6 changes: 3 additions & 3 deletions dist/executePrettier/executePrettierOnBufferRange.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/

var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));

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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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) { (0, _defineProperty2.default)(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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }

const _ = require('lodash/fp');

const prettierEslint = require('@lewisl9029/prettier-eslint');
const prettierEslint = require('prettier-eslint');

const prettierStylelint = require('prettier-stylelint');

Expand Down
8 changes: 4 additions & 4 deletions dist/executePrettier/executePrettierOnBufferRange.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de

var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));

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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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) { (0, _defineProperty2.default)(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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }

jest.mock('@lewisl9029/prettier-eslint');
jest.mock('prettier-eslint');
jest.mock('prettier-stylelint');
jest.mock('prettier');
jest.mock('../atomInterface');
Expand All @@ -20,7 +20,7 @@ jest.mock('./handleError');

const prettier = require('prettier');

const prettierEslint = require('@lewisl9029/prettier-eslint');
const prettierEslint = require('prettier-eslint');

const prettierStylelint = require('prettier-stylelint');

Expand Down
8 changes: 4 additions & 4 deletions dist/helpers/atomRelated.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"use strict";

const Point = require('atom-text-buffer-point');
const AtomTextBufferPoint = require('atom-text-buffer-point');

const Range = require('atom-text-buffer-range');
const AtomTextBufferRange = require('atom-text-buffer-range');

const createPoint = (row, column) => new Point(row, column);
const createPoint = (row, column) => new AtomTextBufferPoint(row, column);

const createRange = (start, end) => new Range(start, end);
const createRange = (start, end) => new AtomTextBufferRange(start, end);

module.exports = {
createPoint,
Expand Down
4 changes: 2 additions & 2 deletions dist/helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau

var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));

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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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) { (0, _defineProperty2.default)(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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }

const getPrettierInstance = require('./getPrettierInstance');

Expand Down
42 changes: 0 additions & 42 deletions flow-typed/npm/@lewisl9029/prettier-eslint_vx.x.x.js

This file was deleted.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
],
"dependencies": {
"@babel/runtime": "^7.15.3",
"@lewisl9029/prettier-eslint": "^9.0.1",
"atom-linter": "^10.0.0",
"atom-package-deps": "^8.0.0",
"atom-text-buffer-point": "^1.0.0",
Expand All @@ -33,6 +32,7 @@
"lodash": "^4.17.21",
"loophole": "^1.1.0",
"prettier": "2.3.2",
"prettier-eslint": "^13.0.0",
"prettier-stylelint": "^0.4.2",
"read-pkg-up": "^7.0.1",
"yarn-global-modules": "^1.0.1"
Expand Down Expand Up @@ -62,7 +62,6 @@
"jest": "^25.5.4",
"nps": "^5.10.0",
"opt-cli": "^1.6.0",
"prettier-eslint": "^13.0.0",
"prettier-eslint-cli": "^5.0.1",
"rimraf": "^3.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion src/displayDebugInfo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Atom version: ${getAtomVersion()}
prettier-atom version: ${getPackageInfo(__dirname).version}
prettier: ${globalPrettierPath || 'bundled'}
prettier version: ${getPackageInfo(globalPrettierPath || getDepPath('prettier')).version}
prettier-eslint version: ${getPackageInfo(getDepPath('@lewisl9029/prettier-eslint')).version}
prettier-eslint version: ${getPackageInfo(getDepPath('prettier-eslint')).version}
prettier-atom configuration: ${JSON.stringify(getPrettierAtomConfig(), null, 2)}
`.trim();
};
Expand Down
2 changes: 1 addition & 1 deletion src/executePrettier/executePrettierOnBufferRange.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @flow
const _ = require('lodash/fp');
const prettierEslint = require('@lewisl9029/prettier-eslint');
const prettierEslint = require('prettier-eslint');
const prettierStylelint = require('prettier-stylelint');
const { allowUnsafeNewFunction } = require('loophole');

Expand Down
4 changes: 2 additions & 2 deletions src/executePrettier/executePrettierOnBufferRange.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jest.mock('@lewisl9029/prettier-eslint');
jest.mock('prettier-eslint');
jest.mock('prettier-stylelint');
jest.mock('prettier');
jest.mock('../atomInterface');
Expand All @@ -7,7 +7,7 @@ jest.mock('../helpers');
jest.mock('./handleError');

const prettier = require('prettier');
const prettierEslint = require('@lewisl9029/prettier-eslint');
const prettierEslint = require('prettier-eslint');
const prettierStylelint = require('prettier-stylelint');
const {
getPrettierEslintOptions,
Expand Down
Loading

0 comments on commit 3154276

Please sign in to comment.