Skip to content

feat!: package is in ecmascript module format #1819

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

Merged
merged 1 commit into from
Oct 14, 2024
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
2 changes: 1 addition & 1 deletion commitlint.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
extends: ['@commitlint/config-conventional'],
'type-enum': ['feat', 'fix', 'style', 'refactor', 'test', 'revert', 'build'],
}
9 changes: 5 additions & 4 deletions eslint.config.cjs → eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
module.exports = [
// eslint-disable-next-line @typescript-eslint/no-require-imports
require('.'),
import project from './lib/index.js'

export default [
project,
{
files: ['**/*.cjs', '**/*.js', '**/*.ts'],
languageOptions: {
parserOptions: {
projectService: {
allowDefaultProject: ['eslint.config.cjs', 'commitlint.config.js'],
allowDefaultProject: ['eslint.config.js', 'commitlint.config.js'],
defaultProject: './tsconfig.json',
},
},
Expand Down
7 changes: 0 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "eslint-config-love",
"type": "module",
"version": "86.1.1",
"description": "A TypeScript ESLint config that loves you",
"funding": [
Expand Down Expand Up @@ -89,7 +90,6 @@
"read-pkg-up": "11.0.0",
"semantic-release": "24.1.2",
"semver": "7.6.3",
"tsconfigs": "5.0.0",
"type-fest": "4.26.1",
"typescript": "5.6.3",
"typescript-eslint_bottom": "npm:[email protected]"
Expand Down
10 changes: 5 additions & 5 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { TSESLint } from '@typescript-eslint/utils'
import { parser, plugin as tseslintPlugin } from 'typescript-eslint'
import * as importPlugin from 'eslint-plugin-import'
import * as nPlugin from 'eslint-plugin-n'
import * as promisePlugin from 'eslint-plugin-promise'
import { rules } from './rules'
import importPlugin from 'eslint-plugin-import'
import nPlugin from 'eslint-plugin-n'
import promisePlugin from 'eslint-plugin-promise'
import { rules } from './rules.js'

const eslintRuleNames = [
...new TSESLint.Linter({ configType: 'eslintrc' }).getRules().keys(),
Expand Down Expand Up @@ -41,4 +41,4 @@ const config: TSESLint.FlatConfig.Config = {
},
}

export = config
export default config
6 changes: 3 additions & 3 deletions src/test/_expected-exported-value.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { TSESLint } from '@typescript-eslint/utils'
import { parser, plugin as tseslintPlugin } from 'typescript-eslint'
import * as importPlugin from 'eslint-plugin-import'
import * as nPlugin from 'eslint-plugin-n'
import * as promisePlugin from 'eslint-plugin-promise'
import importPlugin from 'eslint-plugin-import'
import nPlugin from 'eslint-plugin-n'
import promisePlugin from 'eslint-plugin-promise'

export const expectedEslintRules: Record<
string,
Expand Down
2 changes: 1 addition & 1 deletion src/test/_util.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import exported from '..'
import exported from '../index.js'
import { plugin as tseslintPlugin } from 'typescript-eslint'
import { TSESLint } from '@typescript-eslint/utils'
import semver from 'semver'
Expand Down
10 changes: 5 additions & 5 deletions src/test/compatibility.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import test from 'ava'
import type { TSESLint } from '@typescript-eslint/utils'
import { ESLint } from 'eslint_bottom'
import exported from '..'
import exported from '../index.js'
import semver from 'semver'
import { extractVersionRange, getPkgDetails } from './_util'
import { extractVersionRange, getPkgDetails } from './_util.js'
import {
parser as tseslintBottomParser,
plugin as tseslintBottomPlugin,
} from 'typescript-eslint_bottom'
import * as importBottomPlugin from 'eslint-plugin-import_bottom'
import * as nBottomPlugin from 'eslint-plugin-n_bottom'
import * as promiseBottomPlugin from 'eslint-plugin-promise_bottom'
import importBottomPlugin from 'eslint-plugin-import_bottom'
import nBottomPlugin from 'eslint-plugin-n_bottom'
import promiseBottomPlugin from 'eslint-plugin-promise_bottom'

test('bottom dep version is minimum of dep range', async (t) => {
const { ourDeps, ourDevDeps, ourPeerDeps } = await getPkgDetails()
Expand Down
2 changes: 1 addition & 1 deletion src/test/dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
getPkgDetails,
isPinnedRange,
isSingleCaretRange,
} from './_util'
} from './_util.js'

test('range types', async (t) => {
const { ourDeps, ourPeerDeps, ourDevDeps } = await getPkgDetails()
Expand Down
4 changes: 2 additions & 2 deletions src/test/export.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import test from 'ava'
import exported from '..'
import { expectedExportedValue } from './_expected-exported-value'
import exported from '../index.js'
import { expectedExportedValue } from './_expected-exported-value.js'

test('exported value', (t) => {
t.deepEqual(exported, expectedExportedValue)
Expand Down
4 changes: 2 additions & 2 deletions src/test/misc.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import test from 'ava'
import exported from '..'
import { getPkgDetails } from './_util'
import exported from '../index.js'
import { getPkgDetails } from './_util.js'

test('rule configs are arrays', (t) => {
if (exported.rules === undefined) throw new Error()
Expand Down
4 changes: 2 additions & 2 deletions src/test/resolved-config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import test from 'ava'
import { TSESLint } from '@typescript-eslint/utils'
import exported from '..'
import { expectedExportedValue } from './_expected-exported-value'
import exported from '../index.js'
import { expectedExportedValue } from './_expected-exported-value.js'

const eslint = new TSESLint.FlatESLint({
// using `overrideConfig` to mitigate the affect of this project's config
Expand Down
16 changes: 8 additions & 8 deletions src/test/rules.ts
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import test from 'ava'
import { plugin as pluginTseslint } from 'typescript-eslint'
import * as pluginN from 'eslint-plugin-n'
import * as pluginImport from 'eslint-plugin-import'
import * as pluginPromise from 'eslint-plugin-promise'
import { equivalents, ourRules } from './_util'
import pluginN from 'eslint-plugin-n'
import pluginImport from 'eslint-plugin-import'
import pluginPromise from 'eslint-plugin-promise'
import { equivalents, ourRules } from './_util.js'
import _ from 'lodash'
import { TSESLint } from '@typescript-eslint/utils'
import { intentionallyUnusedRules } from '../_intentionally-unused-rules'
import { intentionallyUnusedRules } from '../_intentionally-unused-rules.js'
import {
eslintRulesToConsider,
importRulesToConsider,
nRulesToConsider,
promiseRulesToConsider,
rulesToConsider,
tseslintRulesToConsider,
} from './_rules_to_consider'
} from './_rules_to_consider.js'
import {
expectedEslintRules,
expectedImportRules,
expectedNRules,
expectedPromiseRules,
expectedTseslintRules,
} from './_expected-exported-value'
import { importRules, nRules, promiseRules, tseslintRules } from '../rules'
} from './_expected-exported-value.js'
import { importRules, nRules, promiseRules, tseslintRules } from '../rules.js'

const eslintRules = new TSESLint.Linter({ configType: 'eslintrc' }).getRules()

Expand Down
12 changes: 6 additions & 6 deletions src/types.d.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
declare module 'eslint-plugin-n' {
import type { TSESLint } from '@typescript-eslint/utils'
const plugin: TSESLint.Linter.Plugin
export = plugin
export default plugin
}
declare module 'eslint-plugin-n_bottom' {
import type { TSESLint } from '@typescript-eslint/utils'
const plugin: TSESLint.Linter.Plugin
export = plugin
export default plugin
}
declare module 'eslint-plugin-import' {
import type { TSESLint } from '@typescript-eslint/utils'
const plugin: TSESLint.Linter.Plugin
export = plugin
export default plugin
}
declare module 'eslint-plugin-import_bottom' {
import type { TSESLint } from '@typescript-eslint/utils'
const plugin: TSESLint.Linter.Plugin
export = plugin
export default plugin
}
declare module 'eslint-plugin-promise' {
import type { TSESLint } from '@typescript-eslint/utils'
const plugin: TSESLint.Linter.Plugin
export = plugin
export default plugin
}
declare module 'eslint-plugin-promise_bottom' {
import type { TSESLint } from '@typescript-eslint/utils'
const plugin: TSESLint.Linter.Plugin
export = plugin
export default plugin
}
declare module 'eslint_bottom' {
import { TSESLint } from '@typescript-eslint/utils'
Expand Down
9 changes: 6 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"extends": "tsconfigs/nodejs-module",
"compilerOptions": {
"outDir": "lib",
"declaration": true,
"lib": ["ESNext"],
"module": "nodenext",
"moduleResolution": "nodenext"
"outDir": "lib",
"sourceMap": true,
"strict": true,
"types": ["node"]
},
"include": ["src/**/*.ts"]
}