From d5cdb3560a857c28d6408b15fc5ce176346939f8 Mon Sep 17 00:00:00 2001 From: fisker Date: Thu, 30 Nov 2023 14:37:41 +0800 Subject: [PATCH] Renamed `@prettier/cli` --- bin/prettier.cjs | 2 +- package.json | 2 +- scripts/build/build-package-json.js | 4 ++-- scripts/build/config.js | 2 +- yarn.lock | 22 +++++++++++----------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bin/prettier.cjs b/bin/prettier.cjs index 3ba7e379a..8d3b8eaa5 100755 --- a/bin/prettier.cjs +++ b/bin/prettier.cjs @@ -14,5 +14,5 @@ if (process.env.PRETTIER_LEGACY_CLI) { }); module.exports.__promise = promise; } else { - dynamicImport("@prettier/next/bin"); + dynamicImport("@prettier/cli/bin"); } diff --git a/package.json b/package.json index 6418bee81..6f8d28774 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "@babel/types": "7.23.3", "@glimmer/syntax": "0.85.13", "@iarna/toml": "2.2.5", + "@prettier/cli": "0.1.2", "@prettier/is-es5-identifier-name": "0.2.0", - "@prettier/next": "0.1.2", "@prettier/parse-srcset": "3.1.0", "@typescript-eslint/typescript-estree": "6.10.0", "@typescript-eslint/visitor-keys": "6.10.0", diff --git a/scripts/build/build-package-json.js b/scripts/build/build-package-json.js index e3b5d2e97..94c888a42 100644 --- a/scripts/build/build-package-json.js +++ b/scripts/build/build-package-json.js @@ -97,8 +97,8 @@ async function buildPackageJson({ file, files }) { "node -e \"assert.equal(require('.').version, require('..').version)\"", }, dependencies: { - "@prettier/next": `^${packageJson.dependencies["@prettier/next"]}` - } + "@prettier/cli": `^${packageJson.dependencies["@prettier/cli"]}`, + }, }; await writeJson( diff --git a/scripts/build/config.js b/scripts/build/config.js index 0e9d6bf8f..acc6af59d 100644 --- a/scripts/build/config.js +++ b/scripts/build/config.js @@ -627,7 +627,7 @@ const nodejsFiles = [ text.replace("../src/cli/index.js", "../internal/cli.mjs"), }, ], - external: ["@prettier/next"], + external: ["@prettier/cli"], }, { input: "src/cli/index.js", diff --git a/yarn.lock b/yarn.lock index cf4612a7b..d84672d62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1721,16 +1721,9 @@ __metadata: languageName: node linkType: hard -"@prettier/is-es5-identifier-name@npm:0.2.0": - version: 0.2.0 - resolution: "@prettier/is-es5-identifier-name@npm:0.2.0" - checksum: 3752dd93b9f0cf4e46c2e6ffb54f52ea3b5d49b3da3e8263eb6b481cdd369596cbbea8884d32d91dc33e4476ab8ca36b41ee60c27cf5570b361a4465bb243f36 - languageName: node - linkType: hard - -"@prettier/next@npm:0.1.2": +"@prettier/cli@npm:0.1.2": version: 0.1.2 - resolution: "@prettier/next@npm:0.1.2" + resolution: "@prettier/cli@npm:0.1.2" dependencies: atomically: ^2.0.2 ignore: ^5.3.0 @@ -1747,7 +1740,14 @@ __metadata: prettier: ^3.1.0 || ^4.0.0 bin: prettier-next: dist/bin.js - checksum: 1538b29d4c60a3111e61fff29b7af33754b871b92562b0e062826578f537f52ed8690214810d4665fc647405bf192601db6cb210e6b1e2593d2a701401b7b2ef + checksum: 6f8ab7d89ec696934d39acc969f574e63e2b88469bf6003856bfd89ca9ec9b3d3584f60bcc08d3786e247f05a844dc6fc4d9d6ea9f2106a8f0323ccc18f6b388 + languageName: node + linkType: hard + +"@prettier/is-es5-identifier-name@npm:0.2.0": + version: 0.2.0 + resolution: "@prettier/is-es5-identifier-name@npm:0.2.0" + checksum: 3752dd93b9f0cf4e46c2e6ffb54f52ea3b5d49b3da3e8263eb6b481cdd369596cbbea8884d32d91dc33e4476ab8ca36b41ee60c27cf5570b361a4465bb243f36 languageName: node linkType: hard @@ -7526,8 +7526,8 @@ __metadata: "@glimmer/reference": 0.85.13 "@glimmer/syntax": 0.85.13 "@iarna/toml": 2.2.5 + "@prettier/cli": 0.1.2 "@prettier/is-es5-identifier-name": 0.2.0 - "@prettier/next": 0.1.2 "@prettier/parse-srcset": 3.1.0 "@types/estree": 1.0.5 "@types/file-entry-cache": 5.0.4