From 680a5002d6df15b5a2d3f8c064750de399eb0d01 Mon Sep 17 00:00:00 2001 From: benesjan Date: Wed, 25 Oct 2023 09:30:42 +0000 Subject: [PATCH 1/2] same prettier and eslint versions --- yarn-project/boxes/blank-react/package.json | 4 +- yarn-project/boxes/blank/package.json | 4 +- yarn-project/boxes/token/package.json | 4 +- yarn-project/yarn.lock | 99 ++------------------- 4 files changed, 12 insertions(+), 99 deletions(-) diff --git a/yarn-project/boxes/blank-react/package.json b/yarn-project/boxes/blank-react/package.json index fb98458103a..d8d97c6ba6e 100644 --- a/yarn-project/boxes/blank-react/package.json +++ b/yarn-project/boxes/blank-react/package.json @@ -60,7 +60,7 @@ "autoprefixer": "^10.4.15", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.8.1", - "eslint": "^8.45.0", + "eslint": "^8.21.0", "eslint-import-resolver-typescript": "^3.5.5", "eslint-plugin-import": "^2.27.5", "eslint-plugin-react-hooks": "^4.6.0", @@ -68,7 +68,7 @@ "jest": "^29.6.4", "postcss": "^8.4.29", "postcss-loader": "^7.3.3", - "prettier": "^3.0.3", + "prettier": "^2.8.8", "resolve-typescript-plugin": "^2.0.1", "stream-browserify": "^3.0.0", "style-loader": "^3.3.3", diff --git a/yarn-project/boxes/blank/package.json b/yarn-project/boxes/blank/package.json index bb9633069f8..dd7928c6d36 100644 --- a/yarn-project/boxes/blank/package.json +++ b/yarn-project/boxes/blank/package.json @@ -47,11 +47,11 @@ "@typescript-eslint/eslint-plugin": "^6.0.0", "@typescript-eslint/parser": "^6.0.0", "copy-webpack-plugin": "^11.0.0", - "eslint": "^8.45.0", + "eslint": "^8.21.0", "eslint-import-resolver-typescript": "^3.5.5", "eslint-plugin-import": "^2.27.5", "jest": "^29.6.4", - "prettier": "^3.0.3", + "prettier": "^2.8.8", "resolve-typescript-plugin": "^2.0.1", "stream-browserify": "^3.0.0", "ts-jest": "^29.1.1", diff --git a/yarn-project/boxes/token/package.json b/yarn-project/boxes/token/package.json index d6830d533e3..d80c4536a6e 100644 --- a/yarn-project/boxes/token/package.json +++ b/yarn-project/boxes/token/package.json @@ -61,7 +61,7 @@ "autoprefixer": "^10.4.15", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.8.1", - "eslint": "^8.45.0", + "eslint": "^8.21.0", "eslint-import-resolver-typescript": "^3.5.5", "eslint-plugin-import": "^2.27.5", "eslint-plugin-react-hooks": "^4.6.0", @@ -69,7 +69,7 @@ "jest": "^29.6.4", "postcss": "^8.4.29", "postcss-loader": "^7.3.3", - "prettier": "^3.0.3", + "prettier": "^2.8.8", "resolve-typescript-plugin": "^2.0.1", "stream-browserify": "^3.0.0", "style-loader": "^3.3.3", diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index 9c4d07a7cda..5ea2717994a 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -1642,30 +1642,6 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.2": - version: 2.1.2 - resolution: "@eslint/eslintrc@npm:2.1.2" - dependencies: - ajv: ^6.12.4 - debug: ^4.3.2 - espree: ^9.6.0 - globals: ^13.19.0 - ignore: ^5.2.0 - import-fresh: ^3.2.1 - js-yaml: ^4.1.0 - minimatch: ^3.1.2 - strip-json-comments: ^3.1.1 - checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7 - languageName: node - linkType: hard - -"@eslint/js@npm:8.48.0": - version: 8.48.0 - resolution: "@eslint/js@npm:8.48.0" - checksum: b2755f9c0ee810c886eba3c50dcacb184ba5a5cd1cbc01988ee506ad7340653cae0bd55f1d95c64b56dfc6d25c2caa7825335ffd2c50165bae9996fe0f396851 - languageName: node - linkType: hard - "@eslint/js@npm:^8.46.0": version: 8.46.0 resolution: "@eslint/js@npm:8.46.0" @@ -7053,7 +7029,7 @@ __metadata: classnames: ^2.3.2 copy-webpack-plugin: ^11.0.0 css-loader: ^6.8.1 - eslint: ^8.45.0 + eslint: ^8.21.0 eslint-import-resolver-typescript: ^3.5.5 eslint-plugin-import: ^2.27.5 eslint-plugin-react-hooks: ^4.6.0 @@ -7063,7 +7039,7 @@ __metadata: node-sass: ^9.0.0 postcss: ^8.4.29 postcss-loader: ^7.3.3 - prettier: ^3.0.3 + prettier: ^2.8.8 react: ^18.2.0 react-dom: ^18.2.0 resolve-typescript-plugin: ^2.0.1 @@ -7097,11 +7073,11 @@ __metadata: "@typescript-eslint/eslint-plugin": ^6.0.0 "@typescript-eslint/parser": ^6.0.0 copy-webpack-plugin: ^11.0.0 - eslint: ^8.45.0 + eslint: ^8.21.0 eslint-import-resolver-typescript: ^3.5.5 eslint-plugin-import: ^2.27.5 jest: ^29.6.4 - prettier: ^3.0.3 + prettier: ^2.8.8 resolve-typescript-plugin: ^2.0.1 serve: ^14.2.1 stream-browserify: ^3.0.0 @@ -9480,13 +9456,6 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.4.3": - version: 3.4.3 - resolution: "eslint-visitor-keys@npm:3.4.3" - checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60 - languageName: node - linkType: hard - "eslint@npm:^8.21.0, eslint@npm:^8.35.0, eslint@npm:^8.37.0": version: 8.46.0 resolution: "eslint@npm:8.46.0" @@ -9534,53 +9503,6 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.45.0": - version: 8.48.0 - resolution: "eslint@npm:8.48.0" - dependencies: - "@eslint-community/eslint-utils": ^4.2.0 - "@eslint-community/regexpp": ^4.6.1 - "@eslint/eslintrc": ^2.1.2 - "@eslint/js": 8.48.0 - "@humanwhocodes/config-array": ^0.11.10 - "@humanwhocodes/module-importer": ^1.0.1 - "@nodelib/fs.walk": ^1.2.8 - ajv: ^6.12.4 - chalk: ^4.0.0 - cross-spawn: ^7.0.2 - debug: ^4.3.2 - doctrine: ^3.0.0 - escape-string-regexp: ^4.0.0 - eslint-scope: ^7.2.2 - eslint-visitor-keys: ^3.4.3 - espree: ^9.6.1 - esquery: ^1.4.2 - esutils: ^2.0.2 - fast-deep-equal: ^3.1.3 - file-entry-cache: ^6.0.1 - find-up: ^5.0.0 - glob-parent: ^6.0.2 - globals: ^13.19.0 - graphemer: ^1.4.0 - ignore: ^5.2.0 - imurmurhash: ^0.1.4 - is-glob: ^4.0.0 - is-path-inside: ^3.0.3 - js-yaml: ^4.1.0 - json-stable-stringify-without-jsonify: ^1.0.1 - levn: ^0.4.1 - lodash.merge: ^4.6.2 - minimatch: ^3.1.2 - natural-compare: ^1.4.0 - optionator: ^0.9.3 - strip-ansi: ^6.0.1 - text-table: ^0.2.0 - bin: - eslint: bin/eslint.js - checksum: f20b359a4f8123fec5c033577368cc020d42978b1b45303974acd8da7a27063168ee3fe297ab5b35327162f6a93154063e3ce6577102f70f9809aff793db9bd0 - languageName: node - linkType: hard - "espree@npm:^9.6.0, espree@npm:^9.6.1": version: 9.6.1 resolution: "espree@npm:9.6.1" @@ -15651,15 +15573,6 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^3.0.3": - version: 3.0.3 - resolution: "prettier@npm:3.0.3" - bin: - prettier: bin/prettier.cjs - checksum: e10b9af02b281f6c617362ebd2571b1d7fc9fb8a3bd17e371754428cda992e5e8d8b7a046e8f7d3e2da1dcd21aa001e2e3c797402ebb6111b5cd19609dd228e0 - languageName: node - linkType: hard - "pretty-format@npm:^29.0.0, pretty-format@npm:^29.6.2": version: 29.6.2 resolution: "pretty-format@npm:29.6.2" @@ -17986,7 +17899,7 @@ __metadata: classnames: ^2.3.2 copy-webpack-plugin: ^11.0.0 css-loader: ^6.8.1 - eslint: ^8.45.0 + eslint: ^8.21.0 eslint-import-resolver-typescript: ^3.5.5 eslint-plugin-import: ^2.27.5 eslint-plugin-react-hooks: ^4.6.0 @@ -17996,7 +17909,7 @@ __metadata: node-sass: ^9.0.0 postcss: ^8.4.29 postcss-loader: ^7.3.3 - prettier: ^3.0.3 + prettier: ^2.8.8 react: ^18.2.0 react-dom: ^18.2.0 resolve-typescript-plugin: ^2.0.1 From 90389c56f7859827955669db83650989008879fa Mon Sep 17 00:00:00 2001 From: benesjan Date: Wed, 25 Oct 2023 09:31:19 +0000 Subject: [PATCH 2/2] formatting --- yarn-project/boxes/blank-react/src/app/index.html | 2 +- yarn-project/boxes/blank/src/index.html | 2 +- yarn-project/boxes/token/src/app/index.html | 2 +- yarn-project/boxes/token/src/tests/token_simulator.ts | 6 +----- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/yarn-project/boxes/blank-react/src/app/index.html b/yarn-project/boxes/blank-react/src/app/index.html index 57ece0ccf91..c9522dd01f9 100644 --- a/yarn-project/boxes/blank-react/src/app/index.html +++ b/yarn-project/boxes/blank-react/src/app/index.html @@ -1,4 +1,4 @@ - + diff --git a/yarn-project/boxes/blank/src/index.html b/yarn-project/boxes/blank/src/index.html index 84f225fe8a9..f87ccadb3bd 100644 --- a/yarn-project/boxes/blank/src/index.html +++ b/yarn-project/boxes/blank/src/index.html @@ -1,4 +1,4 @@ - + diff --git a/yarn-project/boxes/token/src/app/index.html b/yarn-project/boxes/token/src/app/index.html index a81c17f2a87..6fedf6b23a6 100644 --- a/yarn-project/boxes/token/src/app/index.html +++ b/yarn-project/boxes/token/src/app/index.html @@ -1,4 +1,4 @@ - + diff --git a/yarn-project/boxes/token/src/tests/token_simulator.ts b/yarn-project/boxes/token/src/tests/token_simulator.ts index 94f9fe887f2..c91d8554773 100644 --- a/yarn-project/boxes/token/src/tests/token_simulator.ts +++ b/yarn-project/boxes/token/src/tests/token_simulator.ts @@ -6,11 +6,7 @@ export class TokenSimulator { private balancePublic: Map = new Map(); public totalSupply: bigint = 0n; - constructor( - protected token: TokenContract, - protected logger: DebugLogger, - protected accounts: AztecAddress[], - ) {} + constructor(protected token: TokenContract, protected logger: DebugLogger, protected accounts: AztecAddress[]) {} public mintPrivate(amount: bigint) { this.totalSupply += amount;