diff --git a/.prettierignore b/.prettierignore index 9f95507f7b3..524e01209cd 100644 --- a/.prettierignore +++ b/.prettierignore @@ -12,6 +12,7 @@ node_modules pkg public/lib/monaco public/sass/*.generated.scss +scripts/cli/bettererIssueTemplate.md scripts/grafana-server/tmp vendor @@ -37,4 +38,5 @@ kinds/report.json # Generated schema docs docs/sources/developers/kinds/ -scripts/cli/bettererIssueTemplate.md +# Crowdin files +public/locales/**/*.json diff --git a/package.json b/package.json index 95c29e024d9..5b61c7f3aed 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ "packages:prepare": "lerna version --no-push --no-git-tag-version --force-publish --exact", "packages:pack": "mkdir -p ./npm-artifacts && lerna exec --no-private -- yarn pack --out \"../../npm-artifacts/%s-%v.tgz\"", "packages:typecheck": "lerna run typecheck", - "prettier:check": "prettier --check --list-different=false --log-level=warn \"**/*.{ts,tsx,scss,md,mdx}\"", - "prettier:checkDocs": "prettier --check --list-different=false --log-level=warn \"docs/**/*.md\" \"*.md\" \"packages/**/*.{ts,tsx,scss,md,mdx}\"", - "prettier:write": "prettier --list-different \"**/*.{js,ts,tsx,scss,md,mdx}\" --write", + "prettier:check": "prettier --check --list-different=false --log-level=warn \"**/*.{ts,tsx,scss,md,mdx,json}\"", + "prettier:checkDocs": "prettier --check --list-different=false --log-level=warn \"docs/**/*.md\" \"*.md\" \"packages/**/*.{ts,tsx,scss,md,mdx,json}\"", + "prettier:write": "prettier --list-different \"**/*.{js,ts,tsx,scss,md,mdx,json}\" --write", "start": "yarn themes:generate && yarn dev --watch", "start:noTsCheck": "yarn start --env noTsCheck=1", "start:noLint": "yarn start --env noTsCheck=1 --env noLint=1", diff --git a/packages/grafana-e2e/cypress/fixtures/exemplars-query-response.json b/packages/grafana-e2e/cypress/fixtures/exemplars-query-response.json index c90d2c8457e..6c26a9fbf7d 100644 --- a/packages/grafana-e2e/cypress/fixtures/exemplars-query-response.json +++ b/packages/grafana-e2e/cypress/fixtures/exemplars-query-response.json @@ -23,50 +23,16 @@ "data": { "values": [ [ - 1633619595000, - 1633619610000, - 1633619625000, - 1633619640000, - 1633619655000, - 1633619670000, - 1633619685000, - 1633619700000, - 1633619715000, - 1633619730000, - 1633619745000, - 1633619760000, - 1633619775000, - 1633619790000, - 1633619805000, - 1633619820000, - 1633619835000, - 1633619850000, - 1633619865000, - 1633619880000, - 1633619895000 + 1633619595000, 1633619610000, 1633619625000, 1633619640000, 1633619655000, 1633619670000, 1633619685000, + 1633619700000, 1633619715000, 1633619730000, 1633619745000, 1633619760000, 1633619775000, 1633619790000, + 1633619805000, 1633619820000, 1633619835000, 1633619850000, 1633619865000, 1633619880000, 1633619895000 ], [ - 0.07245212135073513, - 0.07253198890830721, - 0.07247862573797707, - 0.07238248338231042, - 0.07221687487740913, - 0.07223291298743946, - 0.07225427016727755, - 0.024531677091864545, - 0.02317081920915543, - 0.07548902139580993, - 0.0777721702857508, - 0.07768649905047344, - 0.07782257603228229, - 0.07788810213200052, - 0.07791835055437593, - 0.07798387201529966, - 0.07790826751849372, - 0.07794858648610933, - 0.07778729925797964, - 0.07769657495236215, - 0.077550401329267 + 0.07245212135073513, 0.07253198890830721, 0.07247862573797707, 0.07238248338231042, 0.07221687487740913, + 0.07223291298743946, 0.07225427016727755, 0.024531677091864545, 0.02317081920915543, + 0.07548902139580993, 0.0777721702857508, 0.07768649905047344, 0.07782257603228229, 0.07788810213200052, + 0.07791835055437593, 0.07798387201529966, 0.07790826751849372, 0.07794858648610933, 0.07778729925797964, + 0.07769657495236215, 0.077550401329267 ] ] } @@ -113,54 +79,15 @@ "data": { "values": [ [ - 1633619598000, - 1633619622000, - 1633619625000, - 1633619646000, - 1633619658000, - 1633619682000, - 1633619695000, - 1633619712000, - 1633619712000, - 1633619724000, - 1633619717000, - 1633619742000, - 1633619757000, - 1633619771000, - 1633619784000, - 1633619801000, - 1633619806000, - 1633619833000, - 1633619833000, - 1633619845000, - 1633619862000, - 1633619877000, - 1633619889000 + 1633619598000, 1633619622000, 1633619625000, 1633619646000, 1633619658000, 1633619682000, 1633619695000, + 1633619712000, 1633619712000, 1633619724000, 1633619717000, 1633619742000, 1633619757000, 1633619771000, + 1633619784000, 1633619801000, 1633619806000, 1633619833000, 1633619833000, 1633619845000, 1633619862000, + 1633619877000, 1633619889000 ], [ - 0.0146153, - 0.0118506, - 0.0473847, - 0.026997, - 0.0164318, - 0.0113532, - 0.0105197, - 0.162789, - 0.0556026, - 0.148856, - 0.0433809, - 0.0117758, - 0.0114496, - 0.0114099, - 0.0421927, - 0.0134148, - 0.0152827, - 0.6975967, - 0.0394788, - 0.0137441, - 0.0110939, - 0.0104496, - 0.0101284 + 0.0146153, 0.0118506, 0.0473847, 0.026997, 0.0164318, 0.0113532, 0.0105197, 0.162789, 0.0556026, + 0.148856, 0.0433809, 0.0117758, 0.0114496, 0.0114099, 0.0421927, 0.0134148, 0.0152827, 0.6975967, + 0.0394788, 0.0137441, 0.0110939, 0.0104496, 0.0101284 ], [ "app:80", diff --git a/packages/grafana-o11y-ds-frontend/tsconfig.json b/packages/grafana-o11y-ds-frontend/tsconfig.json index 8cafcb9c417..03aa83f469f 100644 --- a/packages/grafana-o11y-ds-frontend/tsconfig.json +++ b/packages/grafana-o11y-ds-frontend/tsconfig.json @@ -4,9 +4,9 @@ "declarationDir": "./compiled", "emitDeclarationOnly": true, "isolatedModules": true, - "rootDirs": ["."], + "rootDirs": ["."] }, "exclude": ["dist/**/*"], "extends": "@grafana/tsconfig", - "include": ["src/**/*.ts*", "../../public/app/types/*.d.ts", "../grafana-ui/src/types/*.d.ts"], + "include": ["src/**/*.ts*", "../../public/app/types/*.d.ts", "../grafana-ui/src/types/*.d.ts"] } diff --git a/packages/grafana-sql/tsconfig.json b/packages/grafana-sql/tsconfig.json index 5840ddbcdb5..a2f6548df35 100644 --- a/packages/grafana-sql/tsconfig.json +++ b/packages/grafana-sql/tsconfig.json @@ -5,9 +5,9 @@ "emitDeclarationOnly": true, "isolatedModules": true, "strict": true, - "rootDirs": ["."], + "rootDirs": ["."] }, "exclude": ["dist/**/*"], "extends": "@grafana/tsconfig", - "include": ["src/**/*.ts*", "../../public/app/types/*.d.ts", "../grafana-ui/src/types/*.d.ts"], + "include": ["src/**/*.ts*", "../../public/app/types/*.d.ts", "../grafana-ui/src/types/*.d.ts"] } diff --git a/public/app/plugins/datasource/azuremonitor/tsconfig.json b/public/app/plugins/datasource/azuremonitor/tsconfig.json index 9ace7d78dbf..7daf2ee8aba 100644 --- a/public/app/plugins/datasource/azuremonitor/tsconfig.json +++ b/public/app/plugins/datasource/azuremonitor/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "@grafana/plugin-configs/tsconfig.json", - "include": ["."], + "include": ["."] } diff --git a/public/app/plugins/datasource/cloud-monitoring/tsconfig.json b/public/app/plugins/datasource/cloud-monitoring/tsconfig.json index 9ace7d78dbf..7daf2ee8aba 100644 --- a/public/app/plugins/datasource/cloud-monitoring/tsconfig.json +++ b/public/app/plugins/datasource/cloud-monitoring/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "@grafana/plugin-configs/tsconfig.json", - "include": ["."], + "include": ["."] } diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/tsconfig.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/tsconfig.json index 9ace7d78dbf..7daf2ee8aba 100644 --- a/public/app/plugins/datasource/grafana-pyroscope-datasource/tsconfig.json +++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "@grafana/plugin-configs/tsconfig.json", - "include": ["."], + "include": ["."] } diff --git a/public/app/plugins/datasource/parca/tsconfig.json b/public/app/plugins/datasource/parca/tsconfig.json index 9ace7d78dbf..7daf2ee8aba 100644 --- a/public/app/plugins/datasource/parca/tsconfig.json +++ b/public/app/plugins/datasource/parca/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "@grafana/plugin-configs/tsconfig.json", - "include": ["."], + "include": ["."] } diff --git a/public/app/plugins/datasource/tempo/tsconfig.json b/public/app/plugins/datasource/tempo/tsconfig.json index 334e3949dfb..6dc8a770cba 100644 --- a/public/app/plugins/datasource/tempo/tsconfig.json +++ b/public/app/plugins/datasource/tempo/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { - "types": ["node", "jest", "@testing-library/jest-dom"], + "types": ["node", "jest", "@testing-library/jest-dom"] }, "extends": "@grafana/plugin-configs/tsconfig.json", - "include": ["."], + "include": ["."] } diff --git a/tsconfig.json b/tsconfig.json index 5f95b68a673..4949f581e7a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,8 +11,8 @@ "incremental": true, "tsBuildInfoFile": "./tsconfig.tsbuildinfo", "paths": { - "@grafana/schema/dist/esm/*": ["../packages/grafana-schema/src/*"], - }, + "@grafana/schema/dist/esm/*": ["../packages/grafana-schema/src/*"] + } }, "extends": "@grafana/tsconfig/base.json", "include": [ @@ -21,7 +21,7 @@ "public/test/**/*.ts", "public/vendor/**/*.ts", "packages/grafana-data/typings", - "packages/grafana-ui/src/types", + "packages/grafana-ui/src/types" ], - "exclude": ["public/app/**/webpack.config.ts"], + "exclude": ["public/app/**/webpack.config.ts"] }