Skip to content

Commit 6ddf6b2

Browse files
committed
feat(lint-package-json,npm-package-json-lint-config)!: package type changed to module
1 parent c232629 commit 6ddf6b2

8 files changed

Lines changed: 30 additions & 40 deletions

File tree

packages/lint-package-json/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"postpublish": "del ./package"
3434
},
3535
"dependencies": {
36-
"@trigen/npm-package-json-lint-config": "^8.0.0-alpha.33",
36+
"@trigen/npm-package-json-lint-config": "workspace:^",
3737
"argue-cli": "^2.1.0",
3838
"npm-package-json-lint": "^9.0.0"
3939
}

packages/lint-package-json/src/configs.cjs

Lines changed: 0 additions & 2 deletions
This file was deleted.

packages/lint-package-json/src/index.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import {
88
NpmPackageJsonLint,
99
write
1010
} from 'npm-package-json-lint'
11-
import configs from './configs.cjs'
11+
import baseConfig from '@trigen/npm-package-json-lint-config'
12+
import monorepoConfig from '@trigen/npm-package-json-lint-config/monorepo'
1213

1314
const {
1415
monorepo,
@@ -17,11 +18,9 @@ const {
1718
option(alias('monorepo', 'm'), Boolean),
1819
option(alias('ignore', 'i'), Array)
1920
)
20-
const config = {
21-
extends: monorepo
22-
? [configs.base, configs.monorepo]
23-
: configs.base
24-
}
21+
const config = monorepo
22+
? monorepoConfig
23+
: baseConfig
2524
const npmPackageJsonLint = new NpmPackageJsonLint({
2625
cwd: process.cwd(),
2726
config,
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
import commonjsConfig from '@trigen/eslint-config/commonjs'
1+
import moduleConfig from '@trigen/eslint-config/module'
22
import rootConfig from '../../eslint.config.js'
33

4-
export default [...rootConfig, ...commonjsConfig]
4+
export default [
5+
...rootConfig,
6+
...moduleConfig,
7+
{
8+
rules: {
9+
'import/no-default-export': 'off'
10+
}
11+
}
12+
]

packages/npm-package-json-lint-config/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "@trigen/npm-package-json-lint-config",
3+
"type": "module",
34
"version": "8.0.0",
45
"description": "Trigen's npm-package-json-lint config.",
56
"author": "dangreen",

packages/npm-package-json-lint-config/src/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
module.exports = {
1+
import { createRequire } from 'node:module'
2+
3+
const require = createRequire(import.meta.url)
4+
5+
export default {
26
extends: require.resolve('npm-package-json-lint-config-default'),
37
rules: {
48
'require-author': 'error',

packages/npm-package-json-lint-config/src/monorepo.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
const base = require('.')
1+
import base from './index.js'
22

3-
module.exports = {
3+
export default {
4+
...base,
45
rules: {
6+
...base.rules,
57
'require-version': 'off',
68
'require-keywords': 'off',
79
'require-private': 'error',
@@ -11,11 +13,11 @@ module.exports = {
1113
{
1214
patterns: ['packages/*/package.json'],
1315
rules: {
16+
...base.rules,
1417
'require-version': 'error',
1518
'require-private': 'off',
1619
'valid-values-private': 'off',
17-
'require-repository-directory': 'error',
18-
...base.rules
20+
'require-repository-directory': 'error'
1921
}
2022
}
2123
]

pnpm-lock.yaml

Lines changed: 2 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)