Revert "Work with Prettier 2"

This reverts commit 0d41869.
rivethealth · Jul 28, 2023 · 00e71b3 · 00e71b3
1 parent 0d41869
commit 00e71b3
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 90 deletions.
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "long": "~4.0.0",
     "node-fetch": "^2.0.0",
     "npm-registry-fetch": "~14.0.2",
-    "prettier": "^3",
+    "prettier": "~2.5.0",
     "prettier-plugin-organize-imports": "^3.0.0",
     "protobufjs": "~6.11.2",
     "reflect-metadata": "0.1.13",
@@ -52,7 +52,7 @@
     "@types/long": "~4.0.0",
     "@types/node": "^18",
     "@types/node-fetch": "^2.0.0",
-    "@types/prettier": "^2",
+    "@types/prettier": "~2.4.0",
     "@types/react": "~15.0.0",
     "@types/tar-stream": "~2.2.0"
   },

diff --git a/prettier/format/BUILD.bazel b/prettier/format/BUILD.bazel
@@ -25,16 +25,9 @@ ts_library(
     root = ":root",
     visibility = ["//visibility:public"],
     deps = [
-        ":lib_js",
         "@better_rules_javascript//bazel/worker:lib",
         "@better_rules_javascript_npm//@types/argparse:lib",
         "@better_rules_javascript_npm//@types/node:lib",
         "@better_rules_javascript_npm//argparse:lib",
     ],
 )
-
-js_library(
-    name = "lib_js",
-    srcs = glob(["src/**/*.mjs"]),
-    root = ":root",
-)
diff --git a/prettier/format/src/index.ts b/prettier/format/src/index.ts
@@ -1,26 +1,22 @@
 import { workerMain } from "@better-rules-javascript/bazel-worker";
 import { ArgumentParser } from "argparse";
+import prettier from "prettier";
 
 workerMain(async (a) => {
   const parser = new ArgumentParser();
   parser.add_argument("--config");
   const args = parser.parse_args(a);
 
-  const prettier = await import("prettier");
-  const { default: resolve } = await eval("import('./resolve.mjs')");
   const { PrettierWorker } = await import("./worker");
 
   const options =
     args.config &&
-    (await prettier.resolveConfig(args.config, { config: args.config }));
-  if (options && options.plugins) {
-    options.plugins = options.plugins.map((plugin: string) => resolve(plugin));
-  }
+    prettier.resolveConfig.sync(args.config, { config: args.config });
   const worker = new PrettierWorker(options);
 
   return async (a) => {
     try {
-      await worker.run(a);
+      worker.run(a);
     } catch (error) {
       return {
         exitCode: 1,

diff --git a/prettier/format/src/resolve.mjs b/prettier/format/src/resolve.mjs
diff --git a/prettier/format/src/worker.ts b/prettier/format/src/worker.ts
@@ -1,20 +1,20 @@
 import { ArgumentParser } from "argparse";
-import { readFile, writeFile } from "node:fs/promises";
+import * as fs from "node:fs";
 import prettier from "prettier";
 
 export class PrettierWorker {
   constructor(private readonly options: any) {}
 
-  async run(a: string[]) {
+  run(a: string[]) {
     const parser = new ArgumentParser();
     parser.add_argument("input");
     parser.add_argument("output");
     const args = parser.parse_args(a);
-    const input = await readFile(args.input, "utf8");
-    const output = await prettier.format(input, {
+    const input = fs.readFileSync(args.input, "utf8");
+    const output = prettier.format(input, {
       ...this.options,
       filepath: args.input,
     });
-    await writeFile(args.output, output, "utf8");
+    fs.writeFileSync(args.output, output, "utf8");
   }
 }
diff --git a/rules/npm_data.bzl b/rules/npm_data.bzl
@@ -872,14 +872,14 @@ PACKAGES = {
         "name": "@types/node",
         "url": "https://registry.npmjs.org/@types/node/-/node-17.0.17.tgz",
     },
-    "@types/prettier@2.7.3": {
+    "@types/prettier@2.4.4": {
         "deps": [
         ],
         "extra_deps": {
         },
-        "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
+        "integrity": "sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA==",
         "name": "@types/prettier",
-        "url": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
+        "url": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.4.tgz",
     },
     "@types/qs@6.9.7": {
         "deps": [
@@ -9089,14 +9089,14 @@ PACKAGES = {
         "name": "prelude-ls",
         "url": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
     },
-    "prettier@3.0.0": {
+    "prettier@2.8.1": {
         "deps": [
         ],
         "extra_deps": {
         },
-        "integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==",
+        "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==",
         "name": "prettier",
-        "url": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz",
+        "url": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz",
     },
     "pretty-bytes@5.6.0": {
         "deps": [
@@ -11518,7 +11518,7 @@ ROOTS = [
         "name": "@types/node",
     },
     {
-        "id": "@types/prettier@2.7.3",
+        "id": "@types/prettier@2.4.4",
         "name": "@types/prettier",
     },
     {
@@ -11570,7 +11570,7 @@ ROOTS = [
         "name": "node-fetch",
     },
     {
-        "id": "prettier@3.0.0",
+        "id": "prettier@2.8.1",
         "name": "prettier",
     },
     {

diff --git a/rules/package.json b/rules/package.json
@@ -8,7 +8,7 @@
     "@types/long": "~4.0.0",
     "@types/node": "~16.11.0",
     "@types/node-fetch": "^2.0.0",
-    "@types/prettier": "^2",
+    "@types/prettier": "~2.4.0",
     "@types/tar-stream": "~2.2.0",
     "@yarnpkg/cli": "^3.0.0",
     "@yarnpkg/cli-dist": "^3.0.0",
@@ -21,7 +21,7 @@
     "eslint": "^8.0.0",
     "long": "~4.0.0",
     "node-fetch": "^2.0.0",
-    "prettier": "^3",
+    "prettier": "^2.0.0",
     "protobufjs": "~7.1.0",
     "rollup": "~3.21.0",
     "rxjs": "~7.5.0",

diff --git a/rules/yarn.lock b/rules/yarn.lock
@@ -616,10 +616,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/prettier@npm:^2":
-  version: 2.7.3
-  resolution: "@types/prettier@npm:2.7.3"
-  checksum: 705384209cea6d1433ff6c187c80dcc0b95d99d5c5ce21a46a9a58060c527973506822e428789d842761e0280d25e3359300f017fbe77b9755bc772ab3dc2f83
+"@types/prettier@npm:~2.4.0":
+  version: 2.4.4
+  resolution: "@types/prettier@npm:2.4.4"
+  checksum: 2c2cc57efd49c7d8907415a72f96c84a6dd8696dd3bf8aa4ca3a667427bebf71cbfbc912673624bdfc935d272d1c008c639cf155f6449315990a4dc110f0d216
   languageName: node
   linkType: hard
 
@@ -4563,12 +4563,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3":
-  version: 3.0.0
-  resolution: "prettier@npm:3.0.0"
+"prettier@npm:^2.0.0":
+  version: 2.8.1
+  resolution: "prettier@npm:2.8.1"
   bin:
-    prettier: bin/prettier.cjs
-  checksum: 6a832876a1552dc58330d2467874e5a0b46b9ccbfc5d3531eb69d15684743e7f83dc9fbd202db6270446deba9c82b79d24383d09924c462b457136a759425e33
+    prettier: bin-prettier.js
+  checksum: 4f21a0f1269f76fb36f54e9a8a1ea4c11e27478958bf860661fb4b6d7ac69aac1581f8724fa98ea3585e56d42a2ea317a17ff6e3324f40cb11ff9e20b73785cc
   languageName: node
   linkType: hard
 
@@ -4945,7 +4945,7 @@ __metadata:
     "@types/long": ~4.0.0
     "@types/node": ~16.11.0
     "@types/node-fetch": ^2.0.0
-    "@types/prettier": ^2
+    "@types/prettier": ~2.4.0
     "@types/tar-stream": ~2.2.0
     "@yarnpkg/cli": ^3.0.0
     "@yarnpkg/cli-dist": ^3.0.0
@@ -4958,7 +4958,7 @@ __metadata:
     eslint: ^8.0.0
     long: ~4.0.0
     node-fetch: ^2.0.0
-    prettier: ^3
+    prettier: ^2.0.0
     protobufjs: ~7.1.0
     rollup: ~3.21.0
     rxjs: ~7.5.0

diff --git a/tools/npm/npm.bzl b/tools/npm/npm.bzl
@@ -5386,14 +5386,14 @@ PACKAGES = {
         "name": "@types/prettier",
         "url": "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz",
     },
-    "@types/prettier@2.7.3": {
+    "@types/prettier@2.4.2": {
         "deps": [
         ],
         "extra_deps": {
         },
-        "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
+        "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
         "name": "@types/prettier",
-        "url": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
+        "url": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
     },
     "@types/react@15.0.39": {
         "deps": [
@@ -13481,7 +13481,7 @@ PACKAGES = {
                 "id": "@types/babel__traverse@7.14.2",
             },
             {
-                "id": "@types/prettier@2.7.3",
+                "id": "@types/prettier@2.4.2",
             },
             {
                 "id": "babel-preset-current-node-syntax@1.0.1-532d5ba1",
@@ -15275,41 +15275,32 @@ PACKAGES = {
         "name": "prelude-ls",
         "url": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
     },
-    "prettier-plugin-organize-imports@3.2.3-dc3fc578": {
+    "prettier-plugin-organize-imports@3.2.1-dc3fc578": {
         "deps": [
             {
-                "id": "@types/prettier@2.7.3",
+                "id": "@types/prettier@2.4.2",
             },
             {
-                "id": "prettier@3.0.0",
+                "id": "prettier@2.5.1",
             },
             {
                 "id": "typescript@5.0.4-6832550a",
             },
         ],
         "extra_deps": {
         },
-        "integrity": "sha512-KFvk8C/zGyvUaE3RvxN2MhCLwzV6OBbFSkwZ2OamCrs9ZY4i5L77jQ/w4UmUr+lqX8qbaqVq6bZZkApn+IgJSg==",
+        "integrity": "sha512-bty7C2Ecard5EOXirtzeCAqj4FU4epeuWrQt/Z+sh8UVEpBlBZ3m3KNPz2kFu7KgRTQx/C9o4/TdquPD1jOqjQ==",
         "name": "prettier-plugin-organize-imports",
-        "url": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.3.tgz",
+        "url": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.1.tgz",
     },
-    "prettier@2.8.8": {
+    "prettier@2.5.1": {
         "deps": [
         ],
         "extra_deps": {
         },
-        "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+        "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
         "name": "prettier",
-        "url": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-    },
-    "prettier@3.0.0": {
-        "deps": [
-        ],
-        "extra_deps": {
-        },
-        "integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==",
-        "name": "prettier",
-        "url": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz",
+        "url": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
     },
     "pretty-bytes@5.6.0": {
         "deps": [
@@ -16862,7 +16853,7 @@ PACKAGES = {
                 "id": "lodash@4.17.21",
             },
             {
-                "id": "prettier@2.8.8",
+                "id": "prettier@2.5.1",
             },
         ],
         "extra_deps": {
@@ -17761,7 +17752,7 @@ ROOTS = [
         "name": "@types/node",
     },
     {
-        "id": "@types/prettier@2.7.3",
+        "id": "@types/prettier@2.4.2",
         "name": "@types/prettier",
     },
     {
@@ -17849,11 +17840,11 @@ ROOTS = [
         "name": "npm-registry-fetch",
     },
     {
-        "id": "prettier-plugin-organize-imports@3.2.3-dc3fc578",
+        "id": "prettier-plugin-organize-imports@3.2.1-dc3fc578",
         "name": "prettier-plugin-organize-imports",
     },
     {
-        "id": "prettier@3.0.0",
+        "id": "prettier@2.5.1",
         "name": "prettier",
     },
     {

diff --git a/yarn.lock b/yarn.lock
@@ -2920,10 +2920,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/prettier@npm:^2, @types/prettier@npm:^2.1.5":
-  version: 2.7.3
-  resolution: "@types/prettier@npm:2.7.3"
-  checksum: 705384209cea6d1433ff6c187c80dcc0b95d99d5c5ce21a46a9a58060c527973506822e428789d842761e0280d25e3359300f017fbe77b9755bc772ab3dc2f83
+"@types/prettier@npm:^2.1.5, @types/prettier@npm:~2.4.0":
+  version: 2.4.2
+  resolution: "@types/prettier@npm:2.4.2"
+  checksum: 76e230b2d11028af11fe12e09b2d5b10b03738e9abf819ae6ebb0f78cac13d39f860755ce05ac3855b608222518d956628f5d00322dc206cc6d1f2d8d1519f1e
   languageName: node
   linkType: hard
 
@@ -7792,8 +7792,8 @@ __metadata:
   linkType: hard
 
 "prettier-plugin-organize-imports@npm:^3.0.0":
-  version: 3.2.3
-  resolution: "prettier-plugin-organize-imports@npm:3.2.3"
+  version: 3.2.1
+  resolution: "prettier-plugin-organize-imports@npm:3.2.1"
   peerDependencies:
     "@volar/vue-language-plugin-pug": ^1.0.4
     "@volar/vue-typescript": ^1.0.4
@@ -7804,25 +7804,16 @@ __metadata:
       optional: true
     "@volar/vue-typescript":
       optional: true
-  checksum: e97dd707ce88960885df9598c2c0b8187169ff4664e7a5083a8603eabfb457aa0a0eafdf5cb60877a1085e2da5f9cb19fa441061227aa23524e5fe1709bae0cf
+  checksum: 57d0539e26ed6a1f5de6bdf390f8371a5637824bf6bb269d3a50c5c77ed4bdc3cdb97a797243baf6c2d65aa1bbda0b2307e55ab67dc639331c187b8d183bcdaa
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.0.2":
-  version: 2.8.8
-  resolution: "prettier@npm:2.8.8"
+"prettier@npm:^2.0.2, prettier@npm:~2.5.0":
+  version: 2.5.1
+  resolution: "prettier@npm:2.5.1"
   bin:
     prettier: bin-prettier.js
-  checksum: b49e409431bf129dd89238d64299ba80717b57ff5a6d1c1a8b1a28b590d998a34e083fa13573bc732bb8d2305becb4c9a4407f8486c81fa7d55100eb08263cf8
-  languageName: node
-  linkType: hard
-
-"prettier@npm:^3":
-  version: 3.0.0
-  resolution: "prettier@npm:3.0.0"
-  bin:
-    prettier: bin/prettier.cjs
-  checksum: 6a832876a1552dc58330d2467874e5a0b46b9ccbfc5d3531eb69d15684743e7f83dc9fbd202db6270446deba9c82b79d24383d09924c462b457136a759425e33
+  checksum: 21b9408476ea1c544b0e45d51ceb94a84789ff92095abb710942d780c862d0daebdb29972d47f6b4d0f7ebbfb0ffbf56cc2cfa3e3e9d1cca54864af185b15b66
   languageName: node
   linkType: hard
 
@@ -8324,7 +8315,7 @@ __metadata:
     "@types/long": ~4.0.0
     "@types/node": ^18
     "@types/node-fetch": ^2.0.0
-    "@types/prettier": ^2
+    "@types/prettier": ~2.4.0
     "@types/react": ~15.0.0
     "@types/tar-stream": ~2.2.0
     "@typescript-eslint/eslint-plugin": ^5.59.0
@@ -8346,7 +8337,7 @@ __metadata:
     long: ~4.0.0
     node-fetch: ^2.0.0
     npm-registry-fetch: ~14.0.2
-    prettier: ^3
+    prettier: ~2.5.0
     prettier-plugin-organize-imports: ^3.0.0
     protobufjs: ~6.11.2
     reflect-metadata: 0.1.13