Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
sindresorhus committed Apr 20, 2021
1 parent e3c511b commit d9d7773
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 25 deletions.
1 change: 0 additions & 1 deletion lib/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ const ENGINE_RULES = {
const PRETTIER_CONFIG_OVERRIDE = {
'eslint-plugin-babel': 'prettier/babel',
'eslint-plugin-flowtype': 'prettier/flowtype',
'eslint-plugin-react': 'prettier/react',
'eslint-plugin-standard': 'prettier/standard',
'eslint-plugin-vue': 'prettier/vue'
};
Expand Down
1 change: 0 additions & 1 deletion lib/options-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ const buildPrettierConfig = (options, prettierConfig) => config => {

// The prettier config overrides ESLint stylistic rules that are handled by Prettier
config.baseConfig.extends = config.baseConfig.extends.concat('prettier');
config.baseConfig.extends = config.baseConfig.extends.concat('prettier/unicorn');

// The `prettier/prettier` rule reports errors if the code is not formatted in accordance to Prettier
config.rules['prettier/prettier'] = ['error', mergeWithPrettierConfig(options, prettierConfig)];
Expand Down
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,62 +51,62 @@
"typescript"
],
"dependencies": {
"@typescript-eslint/eslint-plugin": "^4.15.1",
"@typescript-eslint/parser": "^4.15.1",
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"arrify": "^2.0.1",
"cosmiconfig": "^7.0.0",
"debug": "^4.3.1",
"eslint": "^7.20.0",
"eslint-config-prettier": "^7.2.0",
"eslint": "^7.24.0",
"eslint-config-prettier": "^8.2.0",
"eslint-config-xo": "^0.36.0",
"eslint-config-xo-typescript": "^0.38.0",
"eslint-config-xo-typescript": "^0.39.0",
"eslint-formatter-pretty": "^4.0.0",
"eslint-import-resolver-webpack": "^0.13.0",
"eslint-plugin-ava": "^11.0.0",
"eslint-plugin-ava": "^12.0.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-no-use-extend-native": "^0.5.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-promise": "^4.3.1",
"eslint-plugin-unicorn": "^28.0.2",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-promise": "^5.1.0",
"eslint-plugin-unicorn": "^30.0.0",
"find-cache-dir": "^3.3.1",
"find-up": "^5.0.0",
"fs-extra": "^9.1.0",
"get-stdin": "^8.0.0",
"globby": "^9.2.0",
"has-flag": "^4.0.0",
"imurmurhash": "^0.1.4",
"is-path-inside": "^3.0.2",
"is-path-inside": "^3.0.3",
"json-stable-stringify-without-jsonify": "^1.0.1",
"json5": "^2.2.0",
"lodash": "^4.17.20",
"lodash": "^4.17.21",
"meow": "^9.0.0",
"micromatch": "^4.0.2",
"micromatch": "^4.0.4",
"open-editor": "^3.0.0",
"p-reduce": "^2.1.0",
"path-exists": "^4.0.0",
"prettier": "^2.2.1",
"resolve-cwd": "^3.0.0",
"resolve-from": "^5.0.0",
"semver": "^7.3.4",
"semver": "^7.3.5",
"slash": "^3.0.0",
"to-absolute-glob": "^2.0.2",
"typescript": "^4.1.5",
"typescript": "^4.2.4",
"update-notifier": "^5.1.0"
},
"devDependencies": {
"ava": "^3.15.0",
"eslint-config-xo-react": "^0.23.0",
"eslint-plugin-react": "^7.22.0",
"eslint-config-xo-react": "^0.25.0",
"eslint-plugin-react": "^7.23.2",
"eslint-plugin-react-hooks": "^4.2.0",
"esm": "^3.2.25",
"execa": "^5.0.0",
"nyc": "^15.1.0",
"pify": "^5.0.0",
"proxyquire": "^2.1.3",
"temp-write": "^4.0.0",
"webpack": "^5.23.0"
"webpack": "^5.34.0"
},
"eslintConfig": {
"extends": "eslint-config-xo",
Expand Down
10 changes: 4 additions & 6 deletions test/options-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ test('buildConfig: prettier: true', t => {
trailingComma: 'none'
}]);
// eslint-prettier-config must always be last
t.deepEqual(config.baseConfig.extends[config.baseConfig.extends.length - 1], 'prettier/unicorn');
t.deepEqual(config.baseConfig.extends[config.baseConfig.extends.length - 2], 'prettier');
t.is(config.baseConfig.extends[config.baseConfig.extends.length - 1], 'prettier');
// Indent rule is not enabled
t.is(config.rules.indent, undefined);
// Semi rule is not enabled
Expand All @@ -111,10 +110,9 @@ test('buildConfig: prettier: true, typescript file', t => {
}]);

// eslint-prettier-config must always be last
t.deepEqual(config.baseConfig.extends[config.baseConfig.extends.length - 1], 'prettier/@typescript-eslint');
t.deepEqual(config.baseConfig.extends[config.baseConfig.extends.length - 2], 'prettier/unicorn');
t.deepEqual(config.baseConfig.extends[config.baseConfig.extends.length - 3], 'prettier');
t.deepEqual(config.baseConfig.extends[config.baseConfig.extends.length - 4], 'xo-typescript');
t.is(config.baseConfig.extends[config.baseConfig.extends.length - 1], 'prettier/@typescript-eslint');
t.is(config.baseConfig.extends[config.baseConfig.extends.length - 2], 'prettier');
t.is(config.baseConfig.extends[config.baseConfig.extends.length - 3], 'xo-typescript');

// Indent rule is not enabled
t.is(config.rules.indent, undefined);
Expand Down

0 comments on commit d9d7773

Please sign in to comment.