Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: import-js/eslint-plugin-import
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.21.0
Choose a base ref
...
head repository: import-js/eslint-plugin-import
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.21.1
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 8, 2020

  1. [Fix] TypeScript: named: avoid requiring typescript when not usin… 

    …g TS

Fixes #1805.
    @ljharb
    ljharb committed Jun 8, 2020
    Copy the full SHA
    381b2b5 View commit details

  2. Bump to v2.21.1

    @ljharb
    ljharb committed Jun 8, 2020
    Copy the full SHA
    63d2a3f View commit details
Showing with 15 additions and 4 deletions.
  1. +6 −1 CHANGELOG.md
  2. +1 −1 package.json
  3. +8 −2 src/ExportMap.js
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel

## [Unreleased]

## [2.21.1] - 2020-06-07
### Fixed
- TypeScript: [`import/named`]: avoid requiring `typescript` when not using TS ([#1805], thanks [@ljharb])

## [2.21.0] - 2020-06-07
### Added
- [`import/default`]: support default export in TSExportAssignment ([#1528], thanks [@joaovieira])
@@ -978,7 +982,8 @@ for info on changes for earlier releases.
[#119]: https://github.com/benmosher/eslint-plugin-import/issues/119
[#89]: https://github.com/benmosher/eslint-plugin-import/issues/89

[Unreleased]: https://github.com/benmosher/eslint-plugin-import/compare/v2.21.0...HEAD
[Unreleased]: https://github.com/benmosher/eslint-plugin-import/compare/v2.21.1...HEAD
[2.21.1]: https://github.com/benmosher/eslint-plugin-import/compare/v2.21.0...v2.21.1
[2.21.0]: https://github.com/benmosher/eslint-plugin-import/compare/v2.20.2...v2.21.0
[2.20.1]: https://github.com/benmosher/eslint-plugin-import/compare/v2.20.1...v2.20.2
[2.20.0]: https://github.com/benmosher/eslint-plugin-import/compare/v2.20.0...v2.20.1
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-import",
"version": "2.21.0",
"version": "2.21.1",
"description": "Import with sanity.",
"engines": {
"node": ">=4"
10 changes: 8 additions & 2 deletions src/ExportMap.js
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ import { tsConfigLoader } from 'tsconfig-paths/lib/tsconfig-loader'

import includes from 'array-includes'

import {parseConfigFileTextToJson} from 'typescript'
let parseConfigFileTextToJson

const log = debug('eslint-plugin-import:ExportMap')

@@ -459,6 +459,10 @@ ExportMap.parse = function (path, content, context) {
try {
if (tsConfigInfo.tsConfigPath !== undefined) {
const jsonText = fs.readFileSync(tsConfigInfo.tsConfigPath).toString()
if (!parseConfigFileTextToJson) {
// this is because projects not using TypeScript won't have typescript installed
({parseConfigFileTextToJson} = require('typescript'))
}
const tsConfig = parseConfigFileTextToJson(tsConfigInfo.tsConfigPath, jsonText).config
return tsConfig.compilerOptions.esModuleInterop
}
@@ -552,7 +556,9 @@ ExportMap.parse = function (path, content, context) {
const isEsModuleInteropTrue = isEsModuleInterop()

const exports = ['TSExportAssignment']
isEsModuleInteropTrue && exports.push('TSNamespaceExportDeclaration')
if (isEsModuleInteropTrue) {
exports.push('TSNamespaceExportDeclaration')
}

// This doesn't declare anything, but changes what's being exported.
if (includes(exports, n.type)) {