Skip to content

Commit 93a3924

Browse files
authored
Merge pull request #2297 from o1-labs/dw/stop-running-prettier-js-layout
Delegate call to prettier from js-layout to the user
2 parents b395615 + adfa690 commit 93a3924

File tree

5 files changed

+4
-31
lines changed

5 files changed

+4
-31
lines changed

.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ benchmark/
44
dist/
55
node_modules/
66
o1js-reference/
7-
src/bindings/mina-transaction/gen/
87
src/bindings/compiled/
98
src/mina/
109
**/*.d.ts

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
(<> %{env:NO_JS_BUILD=0} 1))
1010
(deps
1111
(:script ../../../../build/js-layout-to-types.mjs)
12-
../../../ocaml/jsLayout.json
13-
../../../../../.prettierrc.cjs
14-
../../../../../node_modules/prettier/standalone.js
15-
(glob_files ../../../../../node_modules/prettier/plugins/*))
12+
../../../ocaml/jsLayout.json)
1613
(action
1714
(run node %{script})))

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
(<> %{env:NO_JS_BUILD=0} 1))
77
(deps
88
(:script ../../../../build/js-layout-to-types-v2.mjs)
9-
(:data ../../../ocaml/jsLayout.json)
10-
../../../../../.prettierrc.cjs
11-
../../../../../node_modules/prettier/standalone.js
12-
(glob_files ../../../../../node_modules/prettier/plugins/*))
9+
(:data ../../../ocaml/jsLayout.json))
1310
(action
1411
(run node %{script} %{data} js-layout.ts)))

src/build/js-layout-to-types-v2.mjs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
import assert from 'node:assert';
44
import fs from 'node:fs/promises';
5-
import prettier from 'prettier/standalone.js';
6-
import prettierRc from '../../.prettierrc.cjs';
7-
import parserTypeScript from 'prettier/plugins/typescript.js';
8-
import prettierPluginEstree from 'prettier/plugins/estree.js';
95

106
const leafTypes = {
117
number: 'number',
@@ -343,14 +339,8 @@ for (const typeName of depOrderTypeNames) {
343339
out += `\
344340
\ const Types: {[key: string]: BindingsType<any>} = {${Object.keys(jsTypes).join(', ')}};\n`;
345341

346-
const prettyOut = await prettier.format(out, {
347-
parser: 'typescript',
348-
plugins: [parserTypeScript, prettierPluginEstree],
349-
...prettierRc,
350-
});
351-
352342
if (outputFilepath !== null) {
353-
await fs.writeFile(outputFilepath, prettyOut);
343+
await fs.writeFile(outputFilepath, out);
354344
} else {
355-
console.log(prettyOut);
345+
console.log(out);
356346
}

src/build/js-layout-to-types.mjs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
import fs from 'node:fs/promises';
22
import path from 'node:path';
33
import { fileURLToPath } from 'node:url';
4-
import prettier from 'prettier/standalone.js';
5-
import parserTypeScript from 'prettier/plugins/typescript.js';
6-
import prettierPluginEstree from 'prettier/plugins/estree.js';
7-
8-
import prettierRc from '../../.prettierrc.cjs';
94

105
// let jsLayout = JSON.parse(process.argv[2]);
116
let selfPath = fileURLToPath(import.meta.url);
@@ -219,11 +214,6 @@ ${output}`;
219214

220215
async function writeTsFile(content, relPath) {
221216
let absPath = path.resolve(selfPath, relPath);
222-
content = await prettier.format(content, {
223-
filepath: absPath,
224-
plugins: [parserTypeScript, prettierPluginEstree],
225-
...prettierRc,
226-
});
227217
await fs.writeFile(absPath, content);
228218
}
229219
let genPath = '../../bindings/mina-transaction/gen/v1';

0 commit comments

Comments
 (0)