Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

fix: update ui to use ts build #442

Merged
merged 3 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@

#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install commitlint --edit "$1"
4 changes: 0 additions & 4 deletions .husky/post-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@

#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

git status
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn pre-commit
3 changes: 0 additions & 3 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn lint
yarn build
6 changes: 3 additions & 3 deletions cypress/support/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { StatusCodes } from 'http-status-codes';

import { API_ROUTES } from '@graasp/query-client';

const { buildGetMember, GET_CURRENT_MEMBER_ROUTE } = API_ROUTES;
const { buildGetMemberRoute, buildGetCurrentMemberRoute } = API_ROUTES;

// use simple id format for tests
export const ID_FORMAT = '(?=.*[0-9])(?=.*[a-zA-Z])([a-z0-9-]+)';
Expand All @@ -22,7 +22,7 @@ export const mockGetCurrentMember = (
cy.intercept(
{
method: 'get',
url: `${API_HOST}/${GET_CURRENT_MEMBER_ROUTE}`,
url: `${API_HOST}/${buildGetCurrentMemberRoute()}`,
},
({ reply }) => {
if (shouldThrowError) {
Expand All @@ -42,7 +42,7 @@ export const mockGetMember = (members) => {
cy.intercept(
{
method: 'get',
url: new RegExp(`${API_HOST}/${buildGetMember(ID_FORMAT)}$`),
url: new RegExp(`${API_HOST}/${buildGetMemberRoute(ID_FORMAT)}$`),
},
({ url, reply }) => {
const memberId = url.slice(API_HOST.length).split('/')[2];
Expand Down
54 changes: 28 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,27 @@
],
"type": "module",
"dependencies": {
"@emotion/cache": "11.11.0",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@graasp/query-client": "3.15.0",
"@graasp/sdk": "4.17.0",
"@graasp/translations": "1.32.0",
"@graasp/ui": "4.21.0",
"@mui/icons-material": "5.16.1",
"@emotion/cache": "11.13.1",
"@emotion/react": "11.13.3",
"@emotion/styled": "11.13.0",
"@graasp/query-client": "3.22.0",
"@graasp/sdk": "4.25.1",
"@graasp/stylis-plugin-rtl": "2.2.0",
"@graasp/translations": "1.35.0",
"@graasp/ui": "4.26.2",
"@mui/icons-material": "5.16.7",
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "5.16.1",
"@sentry/react": "7.118.0",
"@mui/material": "5.16.7",
"@sentry/react": "7.119.0",
"http-status-codes": "2.3.0",
"i18next": "23.12.1",
"i18next": "23.14.0",
"lucide-react": "0.429.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-ga4": "2.1.0",
"react-i18next": "15.0.1",
"react-router": "6.24.1",
"react-router-dom": "6.24.1",
"react-router": "6.26.1",
"react-router-dom": "6.26.1",
"react-toastify": "10.0.5",
"stylis": "4.3.2",
"stylis-plugin-rtl": "2.1.1",
Expand Down Expand Up @@ -75,37 +77,37 @@
]
},
"devDependencies": {
"@commitlint/cli": "19.3.0",
"@commitlint/cli": "19.4.0",
"@commitlint/config-conventional": "19.2.2",
"@cypress/code-coverage": "3.12.40",
"@testing-library/jest-dom": "6.4.6",
"@cypress/code-coverage": "3.12.45",
"@testing-library/jest-dom": "6.4.8",
"@testing-library/react": "16.0.0",
"@testing-library/user-event": "14.5.2",
"@trivago/prettier-plugin-sort-imports": "4.3.0",
"@types/node": "20.14.9",
"@types/react": "^18.3.3",
"@types/node": "20.16.1",
"@types/react": "^18.3.4",
"@types/react-dom": "18.3.0",
"@types/react-router-dom": "5.3.3",
"@types/validator": "13.12.0",
"@typescript-eslint/eslint-plugin": "7.16.0",
"@typescript-eslint/parser": "7.16.0",
"@typescript-eslint/eslint-plugin": "8.2.0",
"@typescript-eslint/parser": "8.2.0",
"@vitejs/plugin-react": "4.3.1",
"concurrently": "8.2.2",
"cypress": "13.13.0",
"cypress": "13.13.3",
"cypress-vite": "1.5.0",
"env-cmd": "10.1.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-config-react-app": "7.0.1",
"eslint-import-resolver-typescript": "3.6.1",
"husky": "9.0.11",
"husky": "9.1.5",
"istanbul-lib-coverage": "3.2.2",
"nyc": "17.0.0",
"prettier": "3.3.2",
"prettier": "3.3.3",
"standard-version": "9.5.0",
"typescript": "5.5.3",
"vite": "5.3.3",
"vite-plugin-checker": "0.7.0",
"typescript": "5.5.4",
"vite": "5.4.2",
"vite-plugin-checker": "0.7.2",
"vite-plugin-istanbul": "6.0.2"
},
"packageManager": "yarn@4.3.1"
Expand Down
Loading