Merge pull request #2284 from o1-labs/dw/bump-up-prettier-to-latest

Deps: bump up prettier to the latest version

Author: dannywillems

.prettierrc.md.cjs

@@ -14,4 +14,4 @@ module.exports = {
       },
     },
   ],
-};
+};

flake.lock

@@ -1 +1 @@
-sha256-/fDyJgVntjRTCzH3smHa9UvUqDTcxtl9qB7J4FgDbJs=
+sha256-Mw7ibGb8ljvls5AqkPPgvMRcz5LWvuWz2KZv2Sdby3I=

npmDepsHash

@@ -103,7 +103,7 @@
     "minimist": "^1.2.7",
     "oxlint": "^1.0.0",
     "pkg-pr-new": "^0.0.9",
-    "prettier": "^2.8.4",
+    "prettier": "^3.6.2",
     "replace-in-file": "^6.3.5",
     "rimraf": "^3.0.2",
     "ts-jest": "^28.0.8",
@@ -116,9 +116,9 @@
     "blakejs": "1.2.1",
     "cachedir": "^2.4.0",
     "js-sha256": "^0.9.0",
-    "reflect-metadata": "^0.1.13",
-    "tslib": "^2.3.0",
     "libsodium-wrappers-sumo": "^0.7.15",
-    "stacktrace-js": "^2.0.2"
+    "reflect-metadata": "^0.1.13",
+    "stacktrace-js": "^2.0.2",
+    "tslib": "^2.3.0"
   }
 }

package-lock.json

@@ -11,6 +11,7 @@
   (:script ../../../../build/js-layout-to-types.mjs)
   ../../../ocaml/jsLayout.json
   ../../../../../.prettierrc.cjs
-  (glob_files ../../../../../node_modules/prettier/*))
+  ../../../../../node_modules/prettier/standalone.js
+  (glob_files ../../../../../node_modules/prettier/plugins/*))
  (action
   (run node %{script})))

package.json

@@ -8,6 +8,7 @@
   (:script ../../../../build/js-layout-to-types-v2.mjs)
   (:data ../../../ocaml/jsLayout.json)
   ../../../../../.prettierrc.cjs
-  (glob_files ../../../../../node_modules/prettier/*))
+  ../../../../../node_modules/prettier/standalone.js
+  (glob_files ../../../../../node_modules/prettier/plugins/*))
  (action
   (run node %{script} %{data} js-layout.ts)))

src/bindings/mina-transaction/gen/v1/dune

@@ -39,7 +39,6 @@ fi
 dune b src/bindings/mina-transaction/gen/v1/js-layout.ts \
   src/bindings/mina-transaction/gen/v2/js-layout.ts \
   src/bindings/crypto/constants.ts \
-  src/bindings/crypto/test-vectors/poseidon-kimchi.ts \
 || exit 1
 
 # Cleanup mina config files

src/bindings/mina-transaction/gen/v2/dune

@@ -2,8 +2,10 @@
 
 import assert from 'node:assert';
 import fs from 'node:fs/promises';
-import prettier from 'prettier';
+import prettier from 'prettier/standalone.js';
 import prettierRc from '../../.prettierrc.cjs';
+import parserTypeScript from 'prettier/plugins/typescript.js';
+import prettierPluginEstree from 'prettier/plugins/estree.js';
 
 const leafTypes = {
   number: 'number',
@@ -341,8 +343,9 @@ for (const typeName of depOrderTypeNames) {
 out += `\
   \ const Types: {[key: string]: BindingsType<any>} = {${Object.keys(jsTypes).join(', ')}};\n`;
 
-const prettyOut = prettier.format(out, {
+const prettyOut = await prettier.format(out, {
   parser: 'typescript',
+  plugins: [parserTypeScript, prettierPluginEstree],
   ...prettierRc,
 });
 

src/bindings/scripts/build-o1js-node-artifacts.sh

@@ -1,7 +1,10 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import prettier from 'prettier';
+import prettier from 'prettier/standalone.js';
+import parserTypeScript from 'prettier/plugins/typescript.js';
+import prettierPluginEstree from 'prettier/plugins/estree.js';
+
 import prettierRc from '../../.prettierrc.cjs';
 
 // let jsLayout = JSON.parse(process.argv[2]);
@@ -216,8 +219,9 @@ ${output}`;
 
 async function writeTsFile(content, relPath) {
   let absPath = path.resolve(selfPath, relPath);
-  content = prettier.format(content, {
+  content = await prettier.format(content, {
     filepath: absPath,
+    plugins: [parserTypeScript, prettierPluginEstree],
     ...prettierRc,
   });
   await fs.writeFile(absPath, content);