-
Notifications
You must be signed in to change notification settings - Fork 23
BB-750: Integrate shared prettier #2742
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.
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
Open
benzekrimaha
wants to merge
3
commits into
development/9.5
Choose a base branch
from
improvement/BB-750-integrate-shared-prettier
base: development/9.5
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| --- | ||
| name: lint | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches-ignore: | ||
| - q/*/** | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| prettier: | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| - uses: actions/setup-node@v6 | ||
| with: | ||
| node-version: '22' | ||
| cache: yarn | ||
| - name: Install dependencies | ||
| run: yarn install --ignore-engines --frozen-lockfile --network-concurrency 1 | ||
| - name: Prettier (changed files) | ||
| shell: bash | ||
| env: | ||
| BASE_REF: ${{ github.event.pull_request.base.ref }} | ||
| run: | | ||
| MERGE_BASE=$(git merge-base HEAD "origin/${BASE_REF}") | ||
| yarn run --silent prettier:diff --check "${MERGE_BASE}..HEAD" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| node_modules/ | ||
| coverage/ | ||
| bucket-scanner/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,103 +1,106 @@ | ||
| { | ||
| "name": "backbeat", | ||
| "version": "9.4.0", | ||
| "description": "Asynchronous queue and job manager", | ||
| "main": "index.js", | ||
| "scripts": { | ||
| "queue_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=replication,lifecycle node bin/queuePopulator.js", | ||
| "queue_processor": "node extensions/replication/queueProcessor/task.js", | ||
| "replication_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=replication node bin/queuePopulator.js", | ||
| "ingestion_populator": "node bin/ingestion.js", | ||
| "replication_status_processor": "node extensions/replication/replicationStatusProcessor/task.js", | ||
| "lifecycle_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=lifecycle node bin/queuePopulator.js", | ||
| "lifecycle_conductor": "node extensions/lifecycle/conductor/service.js", | ||
| "lifecycle_bucket_processor": "node extensions/lifecycle/bucketProcessor/task.js", | ||
| "lifecycle_object_processor": "node extensions/lifecycle/objectProcessor/task.js", | ||
| "lifecycle_object_transition_processor": "LIFECYCLE_OBJECT_PROCESSOR_TYPE=transition node extensions/lifecycle/objectProcessor/task.js", | ||
| "oplog_populator": "node extensions/oplogPopulator/OplogPopulatorTask.js", | ||
| "mongo_queue_processor": "node extensions/mongoProcessor/mongoProcessorTask.js", | ||
| "garbage_collector": "node extensions/gc/service.js", | ||
| "test": "mocha --recursive tests/unit --timeout 30000 --exit", | ||
| "cover": "cross-env TEST_SUITE=${TEST_SUITE:-test} nyc --clean --silent yarn run $TEST_SUITE && nyc report --reporter=lcov --report-dir ./coverage/$TEST_SUITE", | ||
| "ft_test": "mocha --recursive $(find tests/functional -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:notification": "mocha --recursive $(find tests/functional/notification -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:replication": "mocha --recursive $(find tests/functional/replication -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:lib": "mocha --recursive $(find tests/functional/lib -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:lifecycle": "mocha --recursive $(find tests/functional/lifecycle -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:ingestion": "mocha --recursive $(find tests/functional/ingestion -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:oplogPopulator": "mocha --recursive $(find tests/functional/oplogPopulator -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:api:routes": "mocha tests/functional/api/routes.js --timeout 30000 --exit", | ||
| "ft_test:api:retry": "mocha tests/functional/api/retry.js --timeout 30000 --exit", | ||
| "ft_test:queuepopulator": "mocha --recursive $(find tests/functional/queuePopulator -name '*.js') --timeout 30000 --exit", | ||
| "bh_test": "mocha --recursive tests/behavior --exit", | ||
| "lint": "eslint $(git ls-files '*.js')", | ||
| "lint_md": "mdlint $(git ls-files '[^bucket-scanner/]*.md')", | ||
| "start": "node bin/backbeat.js", | ||
| "notification_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=notification node bin/queuePopulator.js", | ||
| "notification_processor": "node extensions/notification/queueProcessor/task.js" | ||
| }, | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "git+https://github.com/scality/backbeat.git" | ||
| }, | ||
| "author": "Scality Inc.", | ||
| "license": "Apache-2.0", | ||
| "bugs": { | ||
| "url": "https://github.com/scality/backbeat/issues" | ||
| }, | ||
| "homepage": "https://github.com/scality/backbeat#readme", | ||
| "dependencies": { | ||
| "@aws-sdk/client-iam": "^3.921.0", | ||
| "@aws-sdk/client-s3": "^3.921.0", | ||
| "@aws-sdk/client-sts": "^3.921.0", | ||
| "@aws-sdk/credential-providers": "^3.921.0", | ||
| "@scality/cloudserverclient": "^1.0.8", | ||
| "@smithy/node-http-handler": "^3.3.3", | ||
| "JSONStream": "^1.3.5", | ||
| "arsenal": "git+https://github.com/scality/arsenal#8.3.9", | ||
| "async": "^2.3.0", | ||
| "backo": "^1.1.0", | ||
| "breakbeat": "scality/breakbeat#v1.0.3", | ||
| "bucketclient": "scality/bucketclient#8.2.4", | ||
| "commander": "^13.0.0", | ||
| "fcntl": "github:scality/node-fcntl#0.2.2", | ||
| "httpagent": "git+https://github.com/scality/httpagent#1.0.6", | ||
| "ioredis": "^5.4.2", | ||
| "joi": "^17.13.3", | ||
| "minimatch": "^10.0.1", | ||
| "mongodb": "^6.11.0", | ||
| "node-forge": "^1.3.1", | ||
| "node-rdkafka": "^3.6.0", | ||
| "node-rdkafka-prometheus": "^1.0.0", | ||
| "node-schedule": "^2.1.1", | ||
| "node-zookeeper-client": "^1.1.3", | ||
| "prom-client": "^15.1.3", | ||
| "semver": "^7.6.3", | ||
| "uuid": "^11.0.4", | ||
| "vaultclient": "scality/vaultclient#8.5.4", | ||
| "werelogs": "scality/werelogs#8.2.1" | ||
| }, | ||
| "resolutions": { | ||
| "node-rdkafka-prometheus/prom-client": "^15.1.3" | ||
| }, | ||
| "devDependencies": { | ||
| "@types/node": "^20.11.20", | ||
| "@zenko/cloudserver": "git+https://github.com/scality/cloudserver#9.1.4", | ||
| "c8": "^10.1.3", | ||
| "cross-env": "^7.0.3", | ||
| "eslint": "^9.12.0", | ||
| "eslint-config-airbnb-base": "^13.1.0", | ||
| "eslint-config-scality": "scality/Guidelines#8.3.0", | ||
| "eslint-plugin-import": "^2.31.0", | ||
| "eslint-plugin-mocha": "^10.5.0", | ||
| "lolex": "^6.0.0", | ||
| "mocha": "^11.0.1", | ||
| "nyc": "^17.1.0", | ||
| "sinon": "^10.0.0", | ||
| "typescript": "^5.7.3", | ||
| "zookeeper-mock": "^1.2.0" | ||
| }, | ||
| "engines": { | ||
| "node": ">=20" | ||
| } | ||
| "name": "backbeat", | ||
| "version": "9.4.0", | ||
| "description": "Asynchronous queue and job manager", | ||
| "main": "index.js", | ||
| "scripts": { | ||
| "queue_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=replication,lifecycle node bin/queuePopulator.js", | ||
| "queue_processor": "node extensions/replication/queueProcessor/task.js", | ||
| "replication_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=replication node bin/queuePopulator.js", | ||
| "ingestion_populator": "node bin/ingestion.js", | ||
| "replication_status_processor": "node extensions/replication/replicationStatusProcessor/task.js", | ||
| "lifecycle_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=lifecycle node bin/queuePopulator.js", | ||
| "lifecycle_conductor": "node extensions/lifecycle/conductor/service.js", | ||
| "lifecycle_bucket_processor": "node extensions/lifecycle/bucketProcessor/task.js", | ||
| "lifecycle_object_processor": "node extensions/lifecycle/objectProcessor/task.js", | ||
| "lifecycle_object_transition_processor": "LIFECYCLE_OBJECT_PROCESSOR_TYPE=transition node extensions/lifecycle/objectProcessor/task.js", | ||
| "oplog_populator": "node extensions/oplogPopulator/OplogPopulatorTask.js", | ||
| "mongo_queue_processor": "node extensions/mongoProcessor/mongoProcessorTask.js", | ||
| "garbage_collector": "node extensions/gc/service.js", | ||
| "test": "mocha --recursive tests/unit --timeout 30000 --exit", | ||
| "cover": "cross-env TEST_SUITE=${TEST_SUITE:-test} nyc --clean --silent yarn run $TEST_SUITE && nyc report --reporter=lcov --report-dir ./coverage/$TEST_SUITE", | ||
| "ft_test": "mocha --recursive $(find tests/functional -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:notification": "mocha --recursive $(find tests/functional/notification -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:replication": "mocha --recursive $(find tests/functional/replication -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:lib": "mocha --recursive $(find tests/functional/lib -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:lifecycle": "mocha --recursive $(find tests/functional/lifecycle -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:ingestion": "mocha --recursive $(find tests/functional/ingestion -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:oplogPopulator": "mocha --recursive $(find tests/functional/oplogPopulator -name '*.js') --timeout 30000 --exit", | ||
| "ft_test:api:routes": "mocha tests/functional/api/routes.js --timeout 30000 --exit", | ||
| "ft_test:api:retry": "mocha tests/functional/api/retry.js --timeout 30000 --exit", | ||
| "ft_test:queuepopulator": "mocha --recursive $(find tests/functional/queuePopulator -name '*.js') --timeout 30000 --exit", | ||
| "bh_test": "mocha --recursive tests/behavior --exit", | ||
| "lint": "eslint $(git ls-files '*.js')", | ||
| "lint_md": "mdlint $(git ls-files '[^bucket-scanner/]*.md')", | ||
| "prettier": "prettier", | ||
| "prettier:diff": "scality-prettier-diff", | ||
| "start": "node bin/backbeat.js", | ||
| "notification_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=notification node bin/queuePopulator.js", | ||
| "notification_processor": "node extensions/notification/queueProcessor/task.js" | ||
| }, | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "git+https://github.com/scality/backbeat.git" | ||
| }, | ||
| "author": "Scality Inc.", | ||
| "license": "Apache-2.0", | ||
| "bugs": { | ||
| "url": "https://github.com/scality/backbeat/issues" | ||
| }, | ||
| "homepage": "https://github.com/scality/backbeat#readme", | ||
| "dependencies": { | ||
| "@aws-sdk/client-iam": "^3.921.0", | ||
| "@aws-sdk/client-s3": "^3.921.0", | ||
| "@aws-sdk/client-sts": "^3.921.0", | ||
| "@aws-sdk/credential-providers": "^3.921.0", | ||
| "@scality/cloudserverclient": "^1.0.8", | ||
| "@smithy/node-http-handler": "^3.3.3", | ||
| "JSONStream": "^1.3.5", | ||
| "arsenal": "git+https://github.com/scality/arsenal#8.3.9", | ||
| "async": "^2.3.0", | ||
| "backo": "^1.1.0", | ||
| "breakbeat": "scality/breakbeat#v1.0.3", | ||
| "bucketclient": "scality/bucketclient#8.2.4", | ||
| "commander": "^13.0.0", | ||
| "fcntl": "github:scality/node-fcntl#0.2.2", | ||
| "httpagent": "git+https://github.com/scality/httpagent#1.0.6", | ||
| "ioredis": "^5.4.2", | ||
| "joi": "^17.13.3", | ||
| "minimatch": "^10.0.1", | ||
| "mongodb": "^6.11.0", | ||
| "node-forge": "^1.3.1", | ||
| "node-rdkafka": "^3.6.0", | ||
| "node-rdkafka-prometheus": "^1.0.0", | ||
| "node-schedule": "^2.1.1", | ||
| "node-zookeeper-client": "^1.1.3", | ||
| "prom-client": "^15.1.3", | ||
| "semver": "^7.6.3", | ||
| "uuid": "^11.0.4", | ||
| "vaultclient": "scality/vaultclient#8.5.4", | ||
| "werelogs": "scality/werelogs#8.2.1" | ||
| }, | ||
| "resolutions": { | ||
| "node-rdkafka-prometheus/prom-client": "^15.1.3" | ||
| }, | ||
| "devDependencies": { | ||
| "@types/node": "^20.11.20", | ||
| "@zenko/cloudserver": "git+https://github.com/scality/cloudserver#9.1.4", | ||
| "c8": "^10.1.3", | ||
| "cross-env": "^7.0.3", | ||
| "eslint": "^9.12.0", | ||
| "eslint-config-airbnb-base": "^13.1.0", | ||
| "eslint-config-scality": "scality/Guidelines#8.3.2", | ||
| "eslint-plugin-import": "^2.31.0", | ||
| "eslint-plugin-mocha": "^10.5.0", | ||
| "lolex": "^6.0.0", | ||
| "mocha": "^11.0.1", | ||
| "nyc": "^17.1.0", | ||
| "prettier": "^3.8.3", | ||
| "sinon": "^10.0.0", | ||
| "typescript": "^5.7.3", | ||
| "zookeeper-mock": "^1.2.0" | ||
| }, | ||
| "engines": { | ||
| "node": ">=20" | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| // Reuse the shared Prettier rules from the eslint-config-scality package. | ||
| module.exports = require('eslint-config-scality/prettier.config.cjs'); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note for
package.json: most of this diff is formatting-only from applying the shared Prettier config, similar to what was done in Arsenal.The functional changes are limited to:
eslint-config-scalityto the Guidelines version that ships the shared Prettier configprettierprettier/prettier:diffscriptsThe indentation churn is expected so
package.jsonis aligned with the new Prettier baseline. Reviewing with “Hide whitespace” should make the actual dependency/script changes easier to see.