Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:msqd/harp into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
hartym committed Mar 20, 2024
2 parents caa4842 + f2d6f93 commit 842ef42
Show file tree
Hide file tree
Showing 4 changed files with 282 additions and 230 deletions.
10 changes: 5 additions & 5 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@heroicons/react": "^2.1.1",
"@sentry/browser": "^7.107.0",
"@tailwindcss/forms": "^0.5.7",
"date-fns": "^3.5.0",
"date-fns": "^3.6.0",
"http-status-codes": "^2.3.0",
"localforage": "^1.10.0",
"match-sorter": "^6.3.4",
Expand All @@ -39,9 +39,9 @@
"react-error-boundary": "^4.0.13",
"react-is": "18.2.0",
"react-query": "^3.39.3",
"react-router-dom": "^6.22.1",
"react-router-dom": "^6.22.3",
"react-syntax-highlighter": "^15.5.0",
"recharts": "^2.12.2",
"recharts": "^2.12.3",
"sort-by": "^1.2.0",
"url-join": "^5.0.0"
},
Expand All @@ -51,7 +51,7 @@
"@playwright/test": "^1.42.1",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@types/node": "^20.11.27",
"@types/node": "^20.11.28",
"@types/prismjs": "^1.26.3",
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.18",
Expand All @@ -75,7 +75,7 @@
"eslint-plugin-react-refresh": "^0.4.6",
"jsdom": "^24.0.0",
"json-schema-to-typescript": "^13.1.2",
"msw": "^2.2.3",
"msw": "^2.2.7",
"postcss": "^8.4.32",
"prettier": "^3.1.1",
"react-test-renderer": "^18.2.0",
Expand Down
88 changes: 44 additions & 44 deletions frontend/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendors/mkui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@emotion/babel-plugin-jsx-pragmatic": "^0.2.1",
"@ladle/react": "^4.0.2",
"@ladle/react": "^4.0.3",
"@playwright/test": "^1.42.1",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
Expand All @@ -35,12 +35,12 @@
"@types/react-dom": "^18.2.22",
"@types/sync-fetch": "^0.4.3",
"@vitejs/plugin-react": "^4.2.1",
"@vitest/coverage-v8": "^1.3.1",
"@vitest/coverage-v8": "^1.4.0",
"autoprefixer": "^10.4.18",
"cross-env": "^7.0.3",
"jest-environment-jsdom": "^29.7.0",
"jsdom": "^24.0.0",
"postcss": "^8.4.34",
"postcss": "^8.4.36",
"prettier": "^3.2.5",
"start-server-and-test": "^2.0.3",
"sync-fetch": "^0.5.2",
Expand All @@ -49,7 +49,7 @@
"twin.macro": "^3.4.1",
"typescript": "~5.3.3",
"vite": "^5.1.6",
"vitest": "^1.3.1"
"vitest": "^1.4.0"
},
"main": "./src/index.ts",
"exports": {
Expand Down
Loading

0 comments on commit 842ef42

Please sign in to comment.