Skip to content

Commit 97cedcc

Browse files
authored
fix: PRETTIER_EXPERIMENTAL_CLI env is already supported by prettier itself (#386)
1 parent 1203256 commit 97cedcc

File tree

9 files changed

+59
-46
lines changed

9 files changed

+59
-46
lines changed

.changeset/proud-clowns-check.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@1stg/nano-staged": patch
3+
"@1stg/config": patch
4+
---
5+
6+
fix: `PRETTIER_EXPERIMENTAL_CLI` env is already supported by prettier itself

.changeset/thin-dolls-tap.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@1stg/prettier-config": patch
3+
---
4+
5+
chore(deps): bump `prettier-plugin-sh` v0.18

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"version": "changeset version && yarn --no-immutable"
2626
},
2727
"devDependencies": {
28-
"@angular/compiler": "^20.0.4",
29-
"@angular/compiler-cli": "^20.0.4",
30-
"@angular/core": "^20.0.4",
28+
"@angular/compiler": "^20.0.5",
29+
"@angular/compiler-cli": "^20.0.5",
30+
"@angular/core": "^20.0.5",
3131
"@babel/eslint-parser": "^7.27.5",
3232
"@babel/eslint-plugin": "^7.27.1",
3333
"@changesets/changelog-github": "^0.5.1",

packages/config/index.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ export const jsoncFiles: string[]
55
export const isEnvEnabled: (env: string) => boolean
66
export const isEnvDisabled: (env: string) => boolean
77
export const preferPrettier: boolean
8-
export const prettierCli: string
98
export const isCI: boolean

packages/config/index.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,4 @@ export const isEnvDisabled = env =>
4444

4545
export const preferPrettier = isEnvEnabled('CONFIG_PREFER_PRETTIER')
4646

47-
export const prettierCli = isEnvEnabled('PRETTIER_EXPERIMENTAL_CLI')
48-
? 'prettier --experimental-cli'
49-
: 'prettier'
50-
5147
export const isCI = isEnvEnabled('CI')

packages/eslint-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"@typescript-eslint/eslint-plugin": "^8.35.0",
7878
"@typescript-eslint/parser": "^8.35.0",
7979
"eslint-config-prettier": "^10.1.5",
80-
"eslint-import-resolver-typescript": "^4.4.3",
80+
"eslint-import-resolver-typescript": "^4.4.4",
8181
"eslint-plugin-css": "^0.11.0",
8282
"eslint-plugin-import-x": "^4.16.0",
8383
"eslint-plugin-jsdoc": "^50.8.0 || ^51.2.3",

packages/nano-staged/base.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { preferPrettier, prettierCli } from '@1stg/config'
1+
import { preferPrettier } from '@1stg/config'
22
import { isPkgAvailable } from '@pkgr/core'
33

44
const isEslintAvailable = isPkgAvailable('eslint')
@@ -29,15 +29,15 @@ if (isEslintAvailable) {
2929
Object.assign(config, {
3030
[`*.{${ESLINT_PRETTIER_FILES}}`]: [
3131
'eslint --cache --fix',
32-
...(useEslintPrettier ? [] : [`${prettierCli} --write`]),
32+
...(useEslintPrettier ? [] : ['prettier --write']),
3333
],
3434
})
3535
}
3636

3737
if (isStylelintAvailable) {
3838
config[`*.{${STYLELINT_PRETTIER_FILES}}`] = [
3939
'stylelint --allow-empty-input --cache --fix',
40-
...(useStylelintPrettier ? [] : [`${prettierCli} --write`]),
40+
...(useStylelintPrettier ? [] : ['prettier --write']),
4141
]
4242
}
4343

packages/prettier-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"prettier-plugin-jsdoc-type": "^0.1.12",
3939
"prettier-plugin-pkg": "^0.21.1",
4040
"prettier-plugin-properties": "^0.3.0",
41-
"prettier-plugin-sh": "^0.17.4",
41+
"prettier-plugin-sh": "^0.18.0",
4242
"prettier-plugin-stylus": "^0.1.0",
4343
"prettier-plugin-toml": "^2.0.5"
4444
},

yarn.lock

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ __metadata:
9191
version: 0.0.0-use.local
9292
resolution: "@1stg/configs@workspace:."
9393
dependencies:
94-
"@angular/compiler": "npm:^20.0.4"
95-
"@angular/compiler-cli": "npm:^20.0.4"
96-
"@angular/core": "npm:^20.0.4"
94+
"@angular/compiler": "npm:^20.0.5"
95+
"@angular/compiler-cli": "npm:^20.0.5"
96+
"@angular/core": "npm:^20.0.5"
9797
"@babel/eslint-parser": "npm:^7.27.5"
9898
"@babel/eslint-plugin": "npm:^7.27.1"
9999
"@changesets/changelog-github": "npm:^0.5.1"
@@ -149,7 +149,7 @@ __metadata:
149149
"@typescript-eslint/eslint-plugin": "npm:^8.35.0"
150150
"@typescript-eslint/parser": "npm:^8.35.0"
151151
eslint-config-prettier: "npm:^10.1.5"
152-
eslint-import-resolver-typescript: "npm:^4.4.3"
152+
eslint-import-resolver-typescript: "npm:^4.4.4"
153153
eslint-plugin-css: "npm:^0.11.0"
154154
eslint-plugin-import-x: "npm:^4.16.0"
155155
eslint-plugin-jsdoc: "npm:^50.8.0 || ^51.2.3"
@@ -268,7 +268,7 @@ __metadata:
268268
prettier-plugin-jsdoc-type: "npm:^0.1.12"
269269
prettier-plugin-pkg: "npm:^0.21.1"
270270
prettier-plugin-properties: "npm:^0.3.0"
271-
prettier-plugin-sh: "npm:^0.17.4"
271+
prettier-plugin-sh: "npm:^0.18.0"
272272
prettier-plugin-stylus: "npm:^0.1.0"
273273
prettier-plugin-toml: "npm:^2.0.5"
274274
peerDependencies:
@@ -482,9 +482,9 @@ __metadata:
482482
languageName: node
483483
linkType: hard
484484

485-
"@angular/compiler-cli@npm:^20.0.4":
486-
version: 20.0.4
487-
resolution: "@angular/compiler-cli@npm:20.0.4"
485+
"@angular/compiler-cli@npm:^20.0.5":
486+
version: 20.0.5
487+
resolution: "@angular/compiler-cli@npm:20.0.5"
488488
dependencies:
489489
"@babel/core": "npm:7.27.4"
490490
"@jridgewell/sourcemap-codec": "npm:^1.4.14"
@@ -495,42 +495,42 @@ __metadata:
495495
tslib: "npm:^2.3.0"
496496
yargs: "npm:^18.0.0"
497497
peerDependencies:
498-
"@angular/compiler": 20.0.4
498+
"@angular/compiler": 20.0.5
499499
typescript: ">=5.8 <5.9"
500500
peerDependenciesMeta:
501501
typescript:
502502
optional: true
503503
bin:
504504
ng-xi18n: bundles/src/bin/ng_xi18n.js
505505
ngc: bundles/src/bin/ngc.js
506-
checksum: 10c0/af6c7a986d1232132e93a33453ce28428cd06ba7f3121b4d20e81b2f905c5c962e9d40d20076eb302f52c4effd9e5c8d83c53e6a6f91c2d23024846d7ffdeebb
506+
checksum: 10c0/219a1a5db601507af59b335c0ccb37fabbdd389b64ddc1a835414a87a9dc10b30827e0c76b86121b03f96b38d46db86c876d544d53f6e442dba4632d2ddd42b0
507507
languageName: node
508508
linkType: hard
509509

510-
"@angular/compiler@npm:^20.0.4":
511-
version: 20.0.4
512-
resolution: "@angular/compiler@npm:20.0.4"
510+
"@angular/compiler@npm:^20.0.5":
511+
version: 20.0.5
512+
resolution: "@angular/compiler@npm:20.0.5"
513513
dependencies:
514514
tslib: "npm:^2.3.0"
515-
checksum: 10c0/86cba10132e2620f58c2ec4dafc4b98c871b78a3853ac12cfedc71c0abcdef513c8cb0787c552db18698dec69318e380c82c603fa5bbfa74c2a82f6793e19b04
515+
checksum: 10c0/fcf106f28c29b262f4e0a9774c00a4ad9a671df0e55abcfa9a40f27327d85aca13093e52ba3ed5f68aa962a1aa6aa08792e34a43f5088a65bd5cf0f52986a510
516516
languageName: node
517517
linkType: hard
518518

519-
"@angular/core@npm:^20.0.4":
520-
version: 20.0.4
521-
resolution: "@angular/core@npm:20.0.4"
519+
"@angular/core@npm:^20.0.5":
520+
version: 20.0.5
521+
resolution: "@angular/core@npm:20.0.5"
522522
dependencies:
523523
tslib: "npm:^2.3.0"
524524
peerDependencies:
525-
"@angular/compiler": 20.0.4
525+
"@angular/compiler": 20.0.5
526526
rxjs: ^6.5.3 || ^7.4.0
527527
zone.js: ~0.15.0
528528
peerDependenciesMeta:
529529
"@angular/compiler":
530530
optional: true
531531
zone.js:
532532
optional: true
533-
checksum: 10c0/a5f2929d84f907038e7bf1050cbe5456eff2ca035eed83bf521a4fd619f6defff7c7429d99541daa8521708bf534f64b6db96e241a21afeee1272cace726d5f7
533+
checksum: 10c0/0c77d18163335253687f1ea885789657ed818f1ff81a9a776153ee60601674c332a27f733ddcd7ac7bea511d38dd5ee43f12de91f14f2635ff9c1b905e5b4ce9
534534
languageName: node
535535
linkType: hard
536536

@@ -4339,7 +4339,7 @@ __metadata:
43394339
languageName: node
43404340
linkType: hard
43414341

4342-
"@reteps/dockerfmt@npm:^0.3.5":
4342+
"@reteps/dockerfmt@npm:^0.3.6":
43434343
version: 0.3.6
43444344
resolution: "@reteps/dockerfmt@npm:0.3.6"
43454345
checksum: 10c0/b6ca467ba97ea49071c44d0fbecf131fc8045165e950d0d01372c1834000c58d53f62bff42f09b851f7a9d91899047f071cd8fe57e1fc88fc27e2a3d2bdb214d
@@ -7983,15 +7983,15 @@ __metadata:
79837983
languageName: node
79847984
linkType: hard
79857985

7986-
"eslint-import-resolver-typescript@npm:^4.4.3":
7987-
version: 4.4.3
7988-
resolution: "eslint-import-resolver-typescript@npm:4.4.3"
7986+
"eslint-import-resolver-typescript@npm:^4.4.4":
7987+
version: 4.4.4
7988+
resolution: "eslint-import-resolver-typescript@npm:4.4.4"
79897989
dependencies:
79907990
debug: "npm:^4.4.1"
79917991
eslint-import-context: "npm:^0.1.8"
79927992
get-tsconfig: "npm:^4.10.1"
79937993
is-bun-module: "npm:^2.0.0"
7994-
stable-hash-x: "npm:^0.1.1"
7994+
stable-hash-x: "npm:^0.2.0"
79957995
tinyglobby: "npm:^0.2.14"
79967996
unrs-resolver: "npm:^1.7.11"
79977997
peerDependencies:
@@ -8003,7 +8003,7 @@ __metadata:
80038003
optional: true
80048004
eslint-plugin-import-x:
80058005
optional: true
8006-
checksum: 10c0/c00c5e422e71fa3448007509ff49ac44c6917eabfeca72094f67d8dd5202f1aa7d8ec12344cf502268b71d3a9104e7b0072ed97e6301966115d02f3cce6f61d7
8006+
checksum: 10c0/3bf8ad77c21660f77a0e455555ab179420f68ae7a132906c85a217ccce51cb6680cf70027cab32a358d193e5b9e476f6ba2e595585242aa97d4f6435ca22104e
80078007
languageName: node
80088008
linkType: hard
80098009

@@ -14728,15 +14728,15 @@ __metadata:
1472814728
languageName: node
1472914729
linkType: hard
1473014730

14731-
"prettier-plugin-sh@npm:^0.17.4":
14732-
version: 0.17.4
14733-
resolution: "prettier-plugin-sh@npm:0.17.4"
14731+
"prettier-plugin-sh@npm:^0.18.0":
14732+
version: 0.18.0
14733+
resolution: "prettier-plugin-sh@npm:0.18.0"
1473414734
dependencies:
14735-
"@reteps/dockerfmt": "npm:^0.3.5"
14736-
sh-syntax: "npm:^0.5.6"
14735+
"@reteps/dockerfmt": "npm:^0.3.6"
14736+
sh-syntax: "npm:^0.5.8"
1473714737
peerDependencies:
14738-
prettier: ^3.0.3
14739-
checksum: 10c0/a9619c34a3fdd32684d15518ca4ee7791410fa3784a10f310f199f5a2083cab03f4f9d95f1d1ba069f105eee632d386c39396d9dd60169259c77aef1f30c735c
14738+
prettier: ^3.6.0
14739+
checksum: 10c0/d8946440abaab1c0f32cee270e0ad285e1f4bba0008aff7c55a9a1c8639032aa8b397aef8f8387a5b88c3f4fb657f1d4d1ab7ae6a1f5c4599875080fb951b9b1
1474014740
languageName: node
1474114741
linkType: hard
1474214742

@@ -16394,7 +16394,7 @@ __metadata:
1639416394
languageName: node
1639516395
linkType: hard
1639616396

16397-
"sh-syntax@npm:^0.5.6":
16397+
"sh-syntax@npm:^0.5.8":
1639816398
version: 0.5.8
1639916399
resolution: "sh-syntax@npm:0.5.8"
1640016400
dependencies:
@@ -16689,6 +16689,13 @@ __metadata:
1668916689
languageName: node
1669016690
linkType: hard
1669116691

16692+
"stable-hash-x@npm:^0.2.0":
16693+
version: 0.2.0
16694+
resolution: "stable-hash-x@npm:0.2.0"
16695+
checksum: 10c0/c757df58366ee4bb266a9486b8932eab7c1ba730469eaf4b68d2dee404814e9f84089c44c9b5205f8c7d99a0ab036cce2af69139ce5ed44b635923c011a8aea8
16696+
languageName: node
16697+
linkType: hard
16698+
1669216699
"stack-utils@npm:^2.0.6":
1669316700
version: 2.0.6
1669416701
resolution: "stack-utils@npm:2.0.6"

0 commit comments

Comments
 (0)