Skip to content

Commit

Permalink
Merge v3 into PMM-12802-update-grafana-plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
YashSartanpara1 committed Jan 17, 2024
2 parents 4b9c7f8 + cee24e1 commit c36fb5e
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 181 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ That environment bundles a number of tools to help you populate the panels with
```
cd pmm-app
docker-compose up -d
npm run dev
yarn dev
```

For a much simpler development environment you could create a local file `docker-compose.local.yml` inside of `pmm-app` folder:
Expand Down Expand Up @@ -71,7 +71,7 @@ Then to run it:
```bash
cd pmm-app
docker-compose -f ./docker-compose.local.yml up -d
npm run dev
yarn dev
```

## Submitting a Pull Request
Expand Down
10 changes: 5 additions & 5 deletions pmm-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"coverage": "codecov",
"dev": "webpack -w -c ./.config/webpack/webpack.config.ts --env development",
"jest": "jest",
"lint": "npm run lint:dev",
"lint": "yarn lint:dev",
"lint:dev": "eslint --ext .tsx,.ts --fix src/",
"lint:fix": "yarn run lint --fix",
"server": "docker-compose up --build",
Expand All @@ -36,10 +36,10 @@
"dependencies": {
"@ant-design/icons": "^4.0.6",
"@emotion/css": "11.10.6",
"@grafana/data": "10.2.0",
"@grafana/runtime": "10.2.0",
"@grafana/schema": "10.2.0",
"@grafana/ui": "10.2.0",
"@grafana/data": "10.2.3",
"@grafana/runtime": "10.2.3",
"@grafana/schema": "10.2.3",
"@grafana/ui": "10.2.3",
"@tippyjs/react": "^4.2.6",
"antd": "^3.24.3",
"axios": "^0.26.0",
Expand Down
Loading

0 comments on commit c36fb5e

Please sign in to comment.