Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: same prettier in boxes and everywhere else #3025

Merged
merged 3 commits into from
Oct 25, 2023
Merged

chore: same prettier in boxes and everywhere else #3025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
680a500
same prettier and eslint versions
benesjan Oct 25, 2023
90389c5
formatting
benesjan Oct 25, 2023
ad15150
Merge branch 'master' into janb/boxes-prettier-fix
benesjan Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions yarn-project/boxes/blank-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@
"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",
"eslint-plugin-react-refresh": "^0.4.3",
"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",
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/boxes/blank-react/src/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
Expand Down
4 changes: 2 additions & 2 deletions yarn-project/boxes/blank/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/boxes/blank/src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
Expand Down
4 changes: 2 additions & 2 deletions yarn-project/boxes/token/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@
"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",
"eslint-plugin-react-refresh": "^0.4.3",
"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",
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/boxes/token/src/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
Expand Down
6 changes: 1 addition & 5 deletions yarn-project/boxes/token/src/tests/token_simulator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ export class TokenSimulator {
private balancePublic: Map<AztecAddress, bigint> = 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;
Expand Down
99 changes: 6 additions & 93 deletions yarn-project/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down