Skip to content

Commit fc2b129

Browse files
antfuantfu
committed
fix(pnpm): move pnpm-workspace.yaml sorting config from yaml to pnpm 
1 parent 7c9e2d0 commit fc2b129

File tree

4 files changed

+102
-116
lines changed

4 files changed

+102
-116
lines changed

‎pnpm-lock.yaml‎

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

‎pnpm-workspace.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ cleanupUnusedCatalogs: true
33
ignoreWorkspaceRootCheck: true
44
shamefullyHoist: true
55
shellEmulator: true
6-
strictPeerDependencies: false
76
trustPolicy: no-downgrade
87

98
packages:
@@ -27,7 +26,7 @@ catalogs:
2726
execa: ^9.6.1
2827
jiti: ^2.6.1
2928
lint-staged: ^16.2.7
30-
pnpm-workspace-yaml: ^1.4.0
29+
pnpm-workspace-yaml: ^1.4.1
3130
simple-git-hooks: ^2.13.1
3231
tinyglobby: ^0.2.15
3332
tsdown: ^0.15.12
@@ -79,7 +78,7 @@ catalogs:
7978
eslint-plugin-n: ^17.23.1
8079
eslint-plugin-no-only-tests: ^3.3.0
8180
eslint-plugin-perfectionist: ^4.15.1
82-
eslint-plugin-pnpm: ^1.4.0
81+
eslint-plugin-pnpm: ^1.4.1
8382
eslint-plugin-regexp: ^2.10.0
8483
eslint-plugin-toml: ^0.12.0
8584
eslint-plugin-unicorn: ^62.0.0
@@ -99,3 +98,5 @@ onlyBuiltDependencies:
9998
- esbuild
10099
- simple-git-hooks
101100
- unrs-resolver
101+
102+
strictPeerDependencies: false

‎src/configs/pnpm.ts‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,90 @@ export async function pnpm(
6565
'pnpm/yaml-no-unused-catalog-item': 'error',
6666
},
6767
},
68+
{
69+
files: ['pnpm-workspace.yaml'],
70+
name: 'antfu/pnpm/pnpm-workspace-yaml-sort',
71+
rules: {
72+
'yaml/sort-keys': [
73+
'error',
74+
{
75+
order: [
76+
// Settings
77+
// @keep-sorted
78+
...[
79+
'cacheDir',
80+
'catalogMode',
81+
'cleanupUnusedCatalogs',
82+
'dedupeDirectDeps',
83+
'deployAllFiles',
84+
'enablePrePostScripts',
85+
'engineStrict',
86+
'extendNodePath',
87+
'hoist',
88+
'hoistPattern',
89+
'hoistWorkspacePackages',
90+
'ignoreCompatibilityDb',
91+
'ignoreDepScripts',
92+
'ignoreScripts',
93+
'ignoreWorkspaceRootCheck',
94+
'managePackageManagerVersions',
95+
'minimumReleaseAge',
96+
'minimumReleaseAgeExclude',
97+
'modulesDir',
98+
'nodeLinker',
99+
'nodeVersion',
100+
'optimisticRepeatInstall',
101+
'packageManagerStrict',
102+
'packageManagerStrictVersion',
103+
'preferSymlinkedExecutables',
104+
'preferWorkspacePackages',
105+
'publicHoistPattern',
106+
'registrySupportsTimeField',
107+
'requiredScrpts',
108+
'resolutionMode',
109+
'savePrefix',
110+
'scriptShell',
111+
'shamefullyHoist',
112+
'shellEmulator',
113+
'stateDir',
114+
'supportedArchitectures',
115+
'symlink',
116+
'tag',
117+
'trustPolicy',
118+
'trustPolicyExclude',
119+
'updateNotifier',
120+
],
121+
122+
// Packages and dependencies
123+
'packages',
124+
'overrides',
125+
'patchedDependencies',
126+
'catalog',
127+
'catalogs',
128+
129+
// Other
130+
// @keep-sorted
131+
...[
132+
'allowedDeprecatedVersions',
133+
'allowNonAppliedPatches',
134+
'configDependencies',
135+
'ignoredBuiltDependencies',
136+
'ignoredOptionalDependencies',
137+
'neverBuiltDependencies',
138+
'onlyBuiltDependencies',
139+
'onlyBuiltDependenciesFile',
140+
'packageExtensions',
141+
'peerDependencyRules',
142+
],
143+
],
144+
pathPattern: '^$',
145+
},
146+
{
147+
order: { type: 'asc' },
148+
pathPattern: '.*',
149+
},
150+
],
151+
},
152+
},
68153
]
69154
}

‎src/configs/yaml.ts‎

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -69,90 +69,5 @@ export async function yaml(
6969
...overrides,
7070
},
7171
},
72-
{
73-
files: ['pnpm-workspace.yaml'],
74-
name: 'antfu/yaml/pnpm-workspace',
75-
rules: {
76-
'yaml/sort-keys': [
77-
'error',
78-
{
79-
order: [
80-
// Settings
81-
// @keep-sorted
82-
...[
83-
'cacheDir',
84-
'catalogMode',
85-
'cleanupUnusedCatalogs',
86-
'dedupeDirectDeps',
87-
'deployAllFiles',
88-
'enablePrePostScripts',
89-
'engineStrict',
90-
'extendNodePath',
91-
'hoist',
92-
'hoistPattern',
93-
'hoistWorkspacePackages',
94-
'ignoreCompatibilityDb',
95-
'ignoreDepScripts',
96-
'ignoreScripts',
97-
'ignoreWorkspaceRootCheck',
98-
'managePackageManagerVersions',
99-
'minimumReleaseAge',
100-
'minimumReleaseAgeExclude',
101-
'modulesDir',
102-
'nodeLinker',
103-
'nodeVersion',
104-
'optimisticRepeatInstall',
105-
'packageManagerStrict',
106-
'packageManagerStrictVersion',
107-
'preferSymlinkedExecutables',
108-
'preferWorkspacePackages',
109-
'publicHoistPattern',
110-
'registrySupportsTimeField',
111-
'requiredScrpts',
112-
'resolutionMode',
113-
'savePrefix',
114-
'scriptShell',
115-
'shamefullyHoist',
116-
'shellEmulator',
117-
'stateDir',
118-
'supportedArchitectures',
119-
'symlink',
120-
'tag',
121-
'trustPolicy',
122-
'trustPolicyExclude',
123-
'updateNotifier',
124-
],
125-
126-
// Packages and dependencies
127-
'packages',
128-
'overrides',
129-
'patchedDependencies',
130-
'catalog',
131-
'catalogs',
132-
133-
// Other
134-
// @keep-sorted
135-
...[
136-
'allowedDeprecatedVersions',
137-
'allowNonAppliedPatches',
138-
'configDependencies',
139-
'ignoredBuiltDependencies',
140-
'ignoredOptionalDependencies',
141-
'neverBuiltDependencies',
142-
'onlyBuiltDependencies',
143-
'onlyBuiltDependenciesFile',
144-
'packageExtensions',
145-
'peerDependencyRules',
146-
],
147-
],
148-
pathPattern: '^$',
149-
},
150-
{
151-
order: { type: 'asc' },
152-
pathPattern: '.*',
153-
},
154-
],
155-
},
156-
},
15772
]
15873
}

0 commit comments

Comments
 (0)