Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deps #3149

Merged
merged 1 commit into from May 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions .eslintrc.yml
Expand Up @@ -84,7 +84,7 @@ rules:
node/prefer-promises/fs: off

##############################################################################
# `eslint-plugin-import` rule list based on `v2.22.x`
# `eslint-plugin-import` rule list based on `v2.23.x`
##############################################################################

# Static analysis
Expand All @@ -106,6 +106,7 @@ rules:
import/no-cycle: error
import/no-useless-path-segments: error
import/no-relative-parent-imports: off
import/no-relative-packages: off

# Helpful warnings
# https://github.com/benmosher/eslint-plugin-import#helpful-warnings
Expand All @@ -123,14 +124,18 @@ rules:
import/no-commonjs: error
import/no-amd: error
import/no-nodejs-modules: error
import/no-import-module-exports: off

# Style guide
# https://github.com/benmosher/eslint-plugin-import#style-guide
import/first: error
import/exports-last: off
import/no-duplicates: error
import/no-namespace: error
import/extensions: [error, never] # TODO: switch to ignorePackages
import/extensions:
- error
- ignorePackages
- ts: never # TODO: remove once TS supports extensions
import/order: [error, { newlines-between: always-and-inside-groups }]
import/newline-after-import: error
import/prefer-default-export: off
Expand All @@ -144,7 +149,7 @@ rules:
import/dynamic-import-chunkname: off

##############################################################################
# ESLint builtin rules list based on `v7.25.x`
# ESLint builtin rules list based on `v7.27.x`
##############################################################################

# Possible Errors
Expand Down Expand Up @@ -447,7 +452,7 @@ overrides:
- plugin:import/typescript
rules:
##########################################################################
# `@typescript-eslint/eslint-plugin` rule list based on `v4.22.x`
# `@typescript-eslint/eslint-plugin` rule list based on `v4.25.x`
##########################################################################

# Supported Rules
Expand Down
3 changes: 2 additions & 1 deletion integrationTests/ts/package.json
Expand Up @@ -9,6 +9,7 @@
"typescript-3.9": "npm:typescript@3.9.x",
"typescript-4.0": "npm:typescript@4.0.x",
"typescript-4.1": "npm:typescript@4.1.x",
"typescript-4.2": "npm:typescript@4.2.x"
"typescript-4.2": "npm:typescript@4.2.x",
"typescript-4.3": "npm:typescript@4.2.x"
}
}
2,489 changes: 1,228 additions & 1,261 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
Expand Up @@ -44,27 +44,27 @@
"gitpublish:deno": "bash ./resources/gitpublish.sh deno denoDist"
},
"devDependencies": {
"@babel/core": "7.14.0",
"@babel/eslint-parser": "7.13.14",
"@babel/core": "7.14.3",
"@babel/eslint-parser": "7.14.4",
"@babel/plugin-syntax-typescript": "7.12.13",
"@babel/plugin-transform-typescript": "7.13.0",
"@babel/preset-env": "7.14.1",
"@babel/plugin-transform-typescript": "7.14.4",
"@babel/preset-env": "7.14.4",
"@babel/register": "7.13.16",
"@types/chai": "4.2.18",
"@types/mocha": "8.2.2",
"@types/node": "15.3.0",
"@typescript-eslint/eslint-plugin": "4.22.1",
"@typescript-eslint/parser": "4.22.1",
"@types/node": "15.6.1",
"@typescript-eslint/eslint-plugin": "4.25.0",
"@typescript-eslint/parser": "4.25.0",
"chai": "4.3.4",
"cspell": "5.4.0",
"eslint": "7.25.0",
"eslint-plugin-import": "2.22.1",
"cspell": "5.5.1",
"eslint": "7.27.0",
"eslint-plugin-import": "2.23.4",
"eslint-plugin-internal-rules": "file:./resources/eslint-internal-rules",
"eslint-plugin-istanbul": "0.1.2",
"eslint-plugin-node": "11.1.0",
"mocha": "8.3.2",
"mocha": "8.4.0",
"nyc": "15.1.0",
"prettier": "2.3.0",
"typescript": "4.2.4"
"typescript": "4.3.2"
}
}
2 changes: 1 addition & 1 deletion resources/build-deno.js
Expand Up @@ -6,7 +6,7 @@ const path = require('path');
const babel = require('@babel/core');
const prettier = require('prettier');

const { readdirRecursive, showDirStats } = require('./utils');
const { readdirRecursive, showDirStats } = require('./utils.js');

const prettierConfig = JSON.parse(
fs.readFileSync(require.resolve('../.prettierrc'), 'utf-8'),
Expand Down
2 changes: 1 addition & 1 deletion resources/build-npm.js
Expand Up @@ -8,7 +8,7 @@ const ts = require('typescript');
const babel = require('@babel/core');
const prettier = require('prettier');

const { readdirRecursive, showDirStats } = require('./utils');
const { readdirRecursive, showDirStats } = require('./utils.js');

const prettierConfig = JSON.parse(
fs.readFileSync(require.resolve('../.prettierrc'), 'utf-8'),
Expand Down
4 changes: 2 additions & 2 deletions resources/eslint-internal-rules/index.js
@@ -1,7 +1,7 @@
'use strict';

const onlyASCII = require('./only-ascii');
const noDirImport = require('./no-dir-import');
const onlyASCII = require('./only-ascii.js');
const noDirImport = require('./no-dir-import.js');

module.exports = {
rules: {
Expand Down
2 changes: 1 addition & 1 deletion resources/gen-changelog.js
Expand Up @@ -5,7 +5,7 @@ const https = require('https');

const packageJSON = require('../package.json');

const { exec } = require('./utils');
const { exec } = require('./utils.js');

const graphqlRequest = util.promisify(graphqlRequestImpl);
const labelsConfig = {
Expand Down
2 changes: 2 additions & 0 deletions src/jsutils/__tests__/suggestionList-test.ts
Expand Up @@ -22,9 +22,11 @@ describe('suggestionList', () => {
});

it('Rejects options with distance that exceeds threshold', () => {
// spell-checker:disable
expectSuggestions('aaaa', ['aaab']).to.deep.equal(['aaab']);
expectSuggestions('aaaa', ['aabb']).to.deep.equal(['aabb']);
expectSuggestions('aaaa', ['abbb']).to.deep.equal([]);
// spell-checker:enable

expectSuggestions('ab', ['ca']).to.deep.equal([]);
});
Expand Down