Skip to content

Commit

Permalink
feat: upgrade mantine v7 & ui changes
Browse files Browse the repository at this point in the history
  • Loading branch information
AykutSarac committed Dec 24, 2023
1 parent ecb825e commit 9133475
Show file tree
Hide file tree
Showing 62 changed files with 5,748 additions and 6,508 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
- name: Detect package manager
id: detect-package-manager
run: |
echo "manager=yarn" >> $GITHUB_OUTPUT
echo "manager=pnpm" >> $GITHUB_OUTPUT
echo "command=install --frozen-lockfile" >> $GITHUB_OUTPUT
echo "runner=yarn" >> $GITHUB_OUTPUT
echo "runner=pnpm" >> $GITHUB_OUTPUT
exit 0
- name: Setup Node
uses: actions/setup-node@v3
Expand All @@ -40,8 +40,8 @@ jobs:
with:
path: |
~/.npm
~/.cache/yarn
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}
~/.cache/pnpm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json', '**/pnpm-lock.yaml') }}
restore-keys: ${{ runner.os }}-node-
- name: Setup Pages
uses: actions/configure-pages@v3
Expand All @@ -52,9 +52,9 @@ jobs:
with:
path: |
.next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/pnpm-lock.yaml') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
restore-keys: |
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/pnpm-lock.yaml') }}-
- name: Install dependencies
run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
- name: Build with Next.js
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: yarn install
- run: yarn lint
- run: yarn build
cache: 'pnpm'
- run: pnpm install
- run: pnpm lint
- run: pnpm build
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env.local
Expand Down
2 changes: 2 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
"importOrder": [
"^(react/(.*)$)|^(react$)",
"^(next/(.*)$)|^(next$)",
"^@mantine/core",
"^@mantine",
"styled",
"<THIRD_PARTY_MODULES>",
"^src/(.*)$",
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ git clone https://github.com/AykutSarac/jsoncrack.com.git
After cloning the repository, you can install the required dependencies by running the following command:

```bash
yarn install
pnpm install
```

To run the development server, you can run the following command:

```bash
yarn dev
pnpm dev
```

## Contributing Guidelines
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ FROM node:18-alpine as builder
WORKDIR /src

# Cache dependencies first
COPY package.json yarn.lock ./
RUN yarn install --frozen-lockfile
COPY package.json pnpm-lock.yaml ./
RUN pnpm install

# Copy other files and build
COPY . /src/
RUN yarn build
RUN pnpm build

# App
FROM nginxinc/nginx-unprivileged
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ If you like the project, you can become a sponsor at [GitHub Sponsors](https://g
After cloning the repository, run the following commands:
```console
# Install the packages
yarn install
pnpm install

# Start development server
# Then the development server will run at http://localhost:3000
yarn dev
pnpm dev
```

### Docker
Expand Down
23 changes: 10 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,14 @@
"analyze": "ANALYZE=true npm run build"
},
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/server": "^11.11.0",
"@mantine/core": "^6.0.17",
"@mantine/hooks": "^6.0.17",
"@mantine/next": "^6.0.21",
"@mantine/prism": "^6.0.21",
"@mantine/code-highlight": "^7.3.2",
"@mantine/core": "^7.3.2",
"@mantine/hooks": "^7.3.2",
"@monaco-editor/react": "^4.5.2",
"@sentry/nextjs": "^7.72.0",
"@sentry/nextjs": "^7.91.0",
"@supabase/auth-helpers-nextjs": "^0.8.1",
"@supabase/auth-helpers-react": "^0.4.2",
"@supabase/supabase-js": "^2.36.0",
"@supabase/supabase-js": "^2.39.1",
"@tanstack/react-query": "^4.35.3",
"allotment": "^1.19.3",
"axios": "^1.5.0",
Expand All @@ -42,7 +39,7 @@
"lodash.get": "^4.4.2",
"lodash.set": "^4.3.2",
"maketypes": "^1.1.2",
"next": "13.4.12",
"next": "14.0.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-ga4": "^2.1.0",
Expand All @@ -53,7 +50,7 @@
"react-simple-typewriter": "^5.0.1",
"react-zoomable-ui": "^0.11.0",
"reaflow": "5.2.8",
"styled-components": "^6.1.1",
"styled-components": "^6.1.3",
"toml": "^3.0.0",
"use-long-press": "^3.1.5",
"zustand": "^4.4.7"
Expand All @@ -67,14 +64,14 @@
"@types/lodash.get": "^4.4.9",
"@types/lodash.set": "^4.3.9",
"@types/node": "^20.4.7",
"@types/react": "18.2.18",
"@types/react": "18.2.45",
"eslint": "8.56.0",
"eslint-config-next": "13.4.12",
"eslint-config-next": "14.0.4",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-unused-imports": "^3.0.0",
"prettier": "^3.1.1",
"ts-node": "^10.9.1",
"typescript": "5.1.6"
"typescript": "5.3.3"
}
}
Loading

0 comments on commit 9133475

Please sign in to comment.