Skip to content

Commit

Permalink
(chore) Fix Prettier glob patterns (#244)
Browse files Browse the repository at this point in the history
  • Loading branch information
denniskigen authored Apr 8, 2024
1 parent fb7744b commit 07d2a85
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 36 deletions.
6 changes: 3 additions & 3 deletions e2e/support/bamboo/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This docker compose file is used to create a dockerized environment when running E2E tests on Bamboo.
version: "3.7"
version: '3.7'

services:
playwright:
Expand All @@ -23,7 +23,7 @@ services:
- frontend
- backend
ports:
- "80:80"
- '80:80'
networks:
- test

Expand All @@ -34,7 +34,7 @@ services:
API_URL: /openmrs
SPA_CONFIG_URLS:
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost/" ]
test: ['CMD', 'curl', '-f', 'http://localhost/']
timeout: 5s
depends_on:
- backend
Expand Down
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
"browser": "dist/openmrs-esm-form-builder-app.js",
"main": "src/index.ts",
"source": true,
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
"eslint --cache --fix",
"prettier --cache --write --ignore-unknown --list-different"
]
},
"scripts": {
"start": "openmrs develop",
"serve": "webpack serve --mode=development",
Expand Down Expand Up @@ -86,7 +80,7 @@
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@types/webpack-env": "^1.18.1",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/eslint-plugin": "^7.5.0",
"@typescript-eslint/parser": "^6.7.0",
"css-loader": "^6.8.1",
"eslint": "^8.49.0",
Expand All @@ -113,5 +107,9 @@
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4"
},
"lint-staged": {
"*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
"*.{css,scss,ts,tsx}": "prettier --write --list-different"
},
"packageManager": "[email protected]"
}
107 changes: 81 additions & 26 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3252,7 +3252,7 @@ __metadata:
"@types/react": "npm:^18.2.21"
"@types/react-dom": "npm:^18.2.7"
"@types/webpack-env": "npm:^1.18.1"
"@typescript-eslint/eslint-plugin": "npm:^6.7.0"
"@typescript-eslint/eslint-plugin": "npm:^7.5.0"
"@typescript-eslint/parser": "npm:^6.7.0"
css-loader: "npm:^6.8.1"
dotenv: "npm:^16.3.1"
Expand Down Expand Up @@ -5514,28 +5514,28 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/eslint-plugin@npm:^6.7.0":
version: 6.7.0
resolution: "@typescript-eslint/eslint-plugin@npm:6.7.0"
"@typescript-eslint/eslint-plugin@npm:^7.5.0":
version: 7.5.0
resolution: "@typescript-eslint/eslint-plugin@npm:7.5.0"
dependencies:
"@eslint-community/regexpp": "npm:^4.5.1"
"@typescript-eslint/scope-manager": "npm:6.7.0"
"@typescript-eslint/type-utils": "npm:6.7.0"
"@typescript-eslint/utils": "npm:6.7.0"
"@typescript-eslint/visitor-keys": "npm:6.7.0"
"@typescript-eslint/scope-manager": "npm:7.5.0"
"@typescript-eslint/type-utils": "npm:7.5.0"
"@typescript-eslint/utils": "npm:7.5.0"
"@typescript-eslint/visitor-keys": "npm:7.5.0"
debug: "npm:^4.3.4"
graphemer: "npm:^1.4.0"
ignore: "npm:^5.2.4"
natural-compare: "npm:^1.4.0"
semver: "npm:^7.5.4"
ts-api-utils: "npm:^1.0.1"
peerDependencies:
"@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
eslint: ^7.0.0 || ^8.0.0
"@typescript-eslint/parser": ^7.0.0
eslint: ^8.56.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10/14123d3a73b70d122f3d58ae5a3d6888974d9cb1507ae3492870976aa8c01bf430dde1c18073f284de42be0720e1f081bdb7fc85f2c4bff146e23b2f75cb2979
checksum: 10/5469900a0c2f485dcae10fc8509e2e1d981538d4c90a13330672fbd10cb7b9bb6d55445d6edea876e2c1719f1f0e25f6af0eb2d413e0c458a8930a371481b9e6
languageName: node
linkType: hard

Expand Down Expand Up @@ -5567,20 +5567,30 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:6.7.0":
version: 6.7.0
resolution: "@typescript-eslint/type-utils@npm:6.7.0"
"@typescript-eslint/scope-manager@npm:7.5.0":
version: 7.5.0
resolution: "@typescript-eslint/scope-manager@npm:7.5.0"
dependencies:
"@typescript-eslint/typescript-estree": "npm:6.7.0"
"@typescript-eslint/utils": "npm:6.7.0"
"@typescript-eslint/types": "npm:7.5.0"
"@typescript-eslint/visitor-keys": "npm:7.5.0"
checksum: 10/9446c07290a7f7f539a0bdaaf2fb97ae57095a01cd0baad9ecac532da88e7d0d207e5180131c0608542aee2fd1270caf700a2788fa460ffc6e65e966baf34135
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:7.5.0":
version: 7.5.0
resolution: "@typescript-eslint/type-utils@npm:7.5.0"
dependencies:
"@typescript-eslint/typescript-estree": "npm:7.5.0"
"@typescript-eslint/utils": "npm:7.5.0"
debug: "npm:^4.3.4"
ts-api-utils: "npm:^1.0.1"
peerDependencies:
eslint: ^7.0.0 || ^8.0.0
eslint: ^8.56.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10/48367ad1a3b5845584502209a750ab1a666dc325db29df68cb231df8405663ffb5f72241dd5102545a298ce4666ae1572225e537cb7e832347e8fd19dd3e1e62
checksum: 10/257730553760fa943538db9648a11f4253efb722ab3394cd325bd775ee0c9d93af84c62540dee9377d4a669eb1cd801faed5e1bcb673d1606c9225eee82b420a
languageName: node
linkType: hard

Expand All @@ -5591,6 +5601,13 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/types@npm:7.5.0":
version: 7.5.0
resolution: "@typescript-eslint/types@npm:7.5.0"
checksum: 10/12eac46d0dfbbeb1db7d0658b841d554d38365420f42b699dea531e0c475b77d6fd838ac4046b7672e53d9bb76a021eaf6198cf3210fe1ecf1056ea44b6699a9
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:6.7.0":
version: 6.7.0
resolution: "@typescript-eslint/typescript-estree@npm:6.7.0"
Expand All @@ -5609,20 +5626,39 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:6.7.0":
version: 6.7.0
resolution: "@typescript-eslint/utils@npm:6.7.0"
"@typescript-eslint/typescript-estree@npm:7.5.0":
version: 7.5.0
resolution: "@typescript-eslint/typescript-estree@npm:7.5.0"
dependencies:
"@typescript-eslint/types": "npm:7.5.0"
"@typescript-eslint/visitor-keys": "npm:7.5.0"
debug: "npm:^4.3.4"
globby: "npm:^11.1.0"
is-glob: "npm:^4.0.3"
minimatch: "npm:9.0.3"
semver: "npm:^7.5.4"
ts-api-utils: "npm:^1.0.1"
peerDependenciesMeta:
typescript:
optional: true
checksum: 10/7487293a9ab9459b133322e695435b4540ffcad89f2bea917c3389676d68283297a663c77d6bda298144d3581361733ae4af632213fa7ef48be67e9aa792b4cc
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:7.5.0":
version: 7.5.0
resolution: "@typescript-eslint/utils@npm:7.5.0"
dependencies:
"@eslint-community/eslint-utils": "npm:^4.4.0"
"@types/json-schema": "npm:^7.0.12"
"@types/semver": "npm:^7.5.0"
"@typescript-eslint/scope-manager": "npm:6.7.0"
"@typescript-eslint/types": "npm:6.7.0"
"@typescript-eslint/typescript-estree": "npm:6.7.0"
"@typescript-eslint/scope-manager": "npm:7.5.0"
"@typescript-eslint/types": "npm:7.5.0"
"@typescript-eslint/typescript-estree": "npm:7.5.0"
semver: "npm:^7.5.4"
peerDependencies:
eslint: ^7.0.0 || ^8.0.0
checksum: 10/0095227ff4aeedb529a98db648411b3731be70b5abd1e56dbec98d1decf4a2270ca4aa354555e54a6ea6c9245b5662196bc10e4618719dfebdafb8327e036e99
eslint: ^8.56.0
checksum: 10/a0b2f206a1c35dd77b292d1cd385443f42d00ccf8a5151811fe6bdd6b5f3a450372bf99b8757c307988d14d99587424c59ed59e78cf56c17b43c9c3fd8932871
languageName: node
linkType: hard

Expand All @@ -5636,6 +5672,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:7.5.0":
version: 7.5.0
resolution: "@typescript-eslint/visitor-keys@npm:7.5.0"
dependencies:
"@typescript-eslint/types": "npm:7.5.0"
eslint-visitor-keys: "npm:^3.4.1"
checksum: 10/ba83113110b13bc65120ea3d1e21e1dcea6010b0a1a3d07da2fd274bb0feb552a92276b6052e659d2fe40178938b17368ede64752c4937f41685c53bdf9d2634
languageName: node
linkType: hard

"@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5":
version: 1.11.6
resolution: "@webassemblyjs/ast@npm:1.11.6"
Expand Down Expand Up @@ -13344,6 +13390,15 @@ __metadata:
languageName: node
linkType: hard

"minimatch@npm:9.0.3":
version: 9.0.3
resolution: "minimatch@npm:9.0.3"
dependencies:
brace-expansion: "npm:^2.0.1"
checksum: 10/c81b47d28153e77521877649f4bab48348d10938df9e8147a58111fe00ef89559a2938de9f6632910c4f7bf7bb5cd81191a546167e58d357f0cfb1e18cecc1c5
languageName: node
linkType: hard

"minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
version: 3.1.2
resolution: "minimatch@npm:3.1.2"
Expand Down

0 comments on commit 07d2a85

Please sign in to comment.