Skip to content

Commit

Permalink
Update dependencies (xojs#607)
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR authored and devinrhode2 committed Oct 8, 2021
1 parent 0318399 commit 13c8cd6
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions lib/options-manager.js
Expand Up @@ -4,7 +4,7 @@ import os from 'node:os';
import path from 'node:path';
import arrify from 'arrify';
import {mergeWith, flow, pick} from 'lodash-es';
import findUp from 'find-up';
import {findUpSync} from 'find-up';
import findCacheDir from 'find-cache-dir';
import prettier from 'prettier';
import semver from 'semver';
Expand Down Expand Up @@ -207,7 +207,7 @@ const mergeOptions = (options, xoOptions = {}, enginesOptions = {}) => {
...options,
});

mergedOptions.extensions = DEFAULT_EXTENSION.concat(mergedOptions.extensions || []);
mergedOptions.extensions = [...DEFAULT_EXTENSION, ...(mergedOptions.extensions || [])];
mergedOptions.ignores = getIgnores(mergedOptions);

return mergedOptions;
Expand Down Expand Up @@ -497,7 +497,7 @@ const findApplicableOverrides = (path, overrides) => {
};
};

const getIgnores = ({ignores}) => DEFAULT_IGNORES.concat(ignores || []);
const getIgnores = ({ignores}) => [...DEFAULT_IGNORES, ...(ignores || [])];

const gatherImportResolvers = options => {
let resolvers = {};
Expand All @@ -517,7 +517,7 @@ const gatherImportResolvers = options => {
webpackResolverSettings = options.webpack === true ? {} : options.webpack;
} else if (!(options.webpack === false || resolvers.webpack)) {
// If a webpack config file exists, add the import resolver automatically
const webpackConfigPath = findUp.sync('webpack.config.js', {cwd: options.cwd});
const webpackConfigPath = findUpSync('webpack.config.js', {cwd: options.cwd});
if (webpackConfigPath) {
webpackResolverSettings = {config: webpackConfigPath};
}
Expand Down
32 changes: 16 additions & 16 deletions package.json
Expand Up @@ -52,54 +52,54 @@
"typescript"
],
"dependencies": {
"@eslint/eslintrc": "^1.0.0",
"@typescript-eslint/eslint-plugin": "^4.29.0",
"@typescript-eslint/parser": "^4.29.0",
"@eslint/eslintrc": "^1.0.1",
"@typescript-eslint/eslint-plugin": "^4.31.2",
"@typescript-eslint/parser": "^4.31.2",
"arrify": "^3.0.0",
"cosmiconfig": "^7.0.0",
"cosmiconfig": "^7.0.1",
"define-lazy-prop": "^3.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-xo": "^0.38.0",
"eslint-config-xo-typescript": "^0.44.0",
"eslint-formatter-pretty": "^4.1.0",
"eslint-import-resolver-webpack": "^0.13.1",
"eslint-plugin-ava": "^12.0.0",
"eslint-plugin-ava": "^13.0.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-no-use-extend-native": "^0.5.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-promise": "^5.1.0",
"eslint-plugin-unicorn": "^35.0.0",
"esm-utils": "^1.1.0",
"find-cache-dir": "^3.3.1",
"find-up": "^5.0.0",
"eslint-plugin-unicorn": "^36.0.0",
"esm-utils": "^2.0.0",
"find-cache-dir": "^3.3.2",
"find-up": "^6.1.0",
"get-stdin": "^9.0.0",
"globby": "^12.0.0",
"globby": "^12.0.2",
"imurmurhash": "^0.1.4",
"json-stable-stringify-without-jsonify": "^1.0.1",
"json5": "^2.2.0",
"lodash-es": "^4.17.21",
"meow": "^10.1.1",
"micromatch": "^4.0.4",
"open-editor": "^3.0.0",
"prettier": "^2.3.2",
"prettier": "^2.4.1",
"semver": "^7.3.5",
"slash": "^4.0.0",
"to-absolute-glob": "^2.0.2",
"typescript": "^4.3.5"
"typescript": "^4.4.3"
},
"devDependencies": {
"ava": "^3.15.0",
"eslint-config-xo-react": "^0.25.0",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react": "^7.26.0",
"eslint-plugin-react-hooks": "^4.2.0",
"execa": "^5.1.1",
"nyc": "^15.1.0",
"proxyquire": "^2.1.3",
"temp-write": "^5.0.0",
"webpack": "^5.49.0"
"webpack": "^5.54.0"
},
"xo": {
"ignores": [
Expand Down

0 comments on commit 13c8cd6

Please sign in to comment.