Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Changelog

## Unreleased

- Fixed broken imports in ESM configs using typescript versions lower than 5.5.

## v0.2.1

- Decrease minimum `typescript-eslint` version to ^8.1.0 (matches import-x plugin).
- Decreased minimum `typescript-eslint` version to ^8.1.0 (matches import-x plugin).

## v0.2.0

Expand Down
2 changes: 2 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ export default tseslint.config(gitignore(), {
},
],

'import-x/no-named-as-default-member': 'off',

'n/no-missing-import': 'off',

'eslint-plugin/require-meta-docs-description': [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"peerDependencies": {
"eslint": "^8.57.0 || ^9.0.0",
"rxjs": ">=7.0.0",
"typescript": ">=4.2.0"
"typescript": ">=4.7.4"
},
"devDependencies": {
"@eslint/js": "^9.14.0",
Expand Down
2 changes: 1 addition & 1 deletion src/etc/could-be-function.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as ts from 'typescript';
import ts from 'typescript';
import { couldBeType } from './could-be-type';

export function couldBeFunction(type: ts.Type): boolean {
Expand Down
2 changes: 1 addition & 1 deletion src/etc/could-be-type.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as tsutils from 'ts-api-utils';
import * as ts from 'typescript';
import ts from 'typescript';

export function couldBeType(
type: ts.Type,
Expand Down
2 changes: 1 addition & 1 deletion src/etc/get-loc.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { TSESTree } from '@typescript-eslint/utils';
import * as ts from 'typescript';
import ts from 'typescript';

export function getLoc(node: ts.Node): TSESTree.SourceLocation {
const sourceFile = node.getSourceFile();
Expand Down
2 changes: 1 addition & 1 deletion src/etc/get-type-services.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ESLintUtils, TSESLint, TSESTree } from '@typescript-eslint/utils';
import * as tsutils from 'ts-api-utils';
import * as ts from 'typescript';
import ts from 'typescript';
import { couldBeFunction } from './could-be-function';
import { couldBeType as tsutilsEtcCouldBeType } from './could-be-type';
import { isArrowFunctionExpression, isFunctionDeclaration } from './is';
Expand Down
2 changes: 1 addition & 1 deletion src/rules/no-cyclic-action.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { TSESTree as es } from '@typescript-eslint/utils';
import { stripIndent } from 'common-tags';
import * as ts from 'typescript';
import ts from 'typescript';
import { defaultObservable } from '../constants';
import { getTypeServices, isCallExpression, isIdentifier } from '../etc';
import { ruleCreator } from '../utils';
Expand Down
2 changes: 1 addition & 1 deletion src/rules/no-unsafe-subject-next.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { TSESTree as es } from '@typescript-eslint/utils';
import * as tsutils from 'ts-api-utils';
import * as ts from 'typescript';
import ts from 'typescript';
import {
couldBeType,
getTypeServices,
Expand Down
2 changes: 1 addition & 1 deletion src/rules/throw-error.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { TSESTree as es, ESLintUtils } from '@typescript-eslint/utils';
import * as tsutils from 'ts-api-utils';
import * as ts from 'typescript';
import ts from 'typescript';
import { couldBeFunction, couldBeType, getTypeServices } from '../etc';
import { ruleCreator } from '../utils';

Expand Down
2 changes: 1 addition & 1 deletion tests/etc/could-be-type.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as ts from 'typescript';
import ts from 'typescript';
import { couldBeType } from '../../src/etc/could-be-type';
import { createSourceFileAndTypeChecker } from './create-source-file-and-type-checker';

Expand Down
2 changes: 1 addition & 1 deletion tests/etc/create-source-file-and-type-checker.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as tsvfs from '@typescript/vfs';
import * as ts from 'typescript';
import ts from 'typescript';

interface SourceFileAndTypeChecker {
sourceFile: ts.SourceFile;
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2443,7 +2443,7 @@ __metadata:
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
rxjs: ">=7.0.0"
typescript: ">=4.2.0"
typescript: ">=4.7.4"
languageName: unknown
linkType: soft

Expand Down