Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace CreateReactApp with Vite #153

Merged
merged 19 commits into from
Jun 25, 2024
Merged

Replace CreateReactApp with Vite #153

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4f316bc
Replace CreateReactApp with Vite
hackerwins Jun 24, 2024
7a5f871
Bump up Node to 18
hackerwins Jun 24, 2024
cedf1f1
Fix invalid types
hackerwins Jun 24, 2024
883f07f
Add any to implicit statements
hackerwins Jun 24, 2024
cc05e1a
Add type
hackerwins Jun 24, 2024
b3df0e7
Remove @ based path
hackerwins Jun 24, 2024
0d11881
Use useAppDispatch instead of useDispatch
hackerwins Jun 24, 2024
a3a162e
Remove unnecessary setup
hackerwins Jun 24, 2024
6551e4e
Add type checking for rejected actions in middleware
chacha912 Jun 24, 2024
6da62d7
Refactor imports in SignupForm component
chacha912 Jun 24, 2024
7882bd6
Update CodeBlock component
chacha912 Jun 24, 2024
69f0f54
Remove unused code related to CRA
chacha912 Jun 24, 2024
1e23a8e
Update to import the ESM build of Vite
chacha912 Jun 24, 2024
ab214d8
Specify event type
chacha912 Jun 24, 2024
7a84ccb
Revert ESM build of Vite
chacha912 Jun 25, 2024
c6dfc4b
Update VITE_SITE_URL in development environment configuration
hackerwins Jun 25, 2024
9e19e0a
Update og:image URLs to use VITE_SITE_URL
hackerwins Jun 25, 2024
729d076
Use import.meta.env.Dev instead of NODE_ENV
chacha912 Jun 25, 2024
ee62e08
Apply coderabbit review
chacha912 Jun 25, 2024
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
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Common Environment Variables
REACT_APP_JS_SDK_VERSION=0.4.23
VITE_JS_SDK_VERSION=0.4.23
6 changes: 3 additions & 3 deletions .env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Development Environment Variables
REACT_APP_SERVICE_URL=https://yorkie.dev
REACT_APP_API_ADDR=http://localhost:8080
REACT_APP_SITE_URL=https://localhost:3000/dashboard/
VITE_SERVICE_URL=https://yorkie.dev
VITE_API_ADDR=http://localhost:8080
VITE_SITE_URL=http://localhost:3000/dashboard/
6 changes: 3 additions & 3 deletions .env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Production Environment Variables
REACT_APP_SERVICE_URL=https://yorkie.dev
REACT_APP_API_ADDR=https://api.yorkie.dev
REACT_APP_SITE_URL=https://yorkie.dev/dashboard/
VITE_SERVICE_URL=https://yorkie.dev
VITE_API_ADDR=https://api.yorkie.dev
VITE_SITE_URL=https://yorkie.dev/dashboard/
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup Node 🔧
uses: actions/setup-node@v2
with:
node-version: '16'
node-version: '18'
cache: 'npm'
cache-dependency-path: package-lock.json

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ghpages-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: GitHub Page Publish
on:
push:
branches: [ main ]
branches: [main]
jobs:
build-and-deploy:
runs-on: ubuntu-latest
Expand All @@ -12,16 +12,16 @@ jobs:
- name: Setup Node 🔧
uses: actions/setup-node@v2
with:
node-version: '16'
node-version: '18'
cache: 'npm'
cache-dependency-path: package-lock.json

- name: Install and Build 🔧
- name: Install and Build 🔧
run: |
npm install
npm run build
- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@4.1.0
with:
branch: gh-pages
folder: build
folder: dist
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

# production
/build
/dist

# misc
.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
### Updating and Deploying Dashboard

1. Update `version` in [package.json](https://github.com/yorkie-team/dashboard/blob/main/package.json#L36).
2. Update `REACT_APP_JS_SDK_VERSION` in [.env](https://github.com/yorkie-team/dashboard/blob/main/.env#L2).
2. Update `VITE_JS_SDK_VERSION` in [.env](https://github.com/yorkie-team/dashboard/blob/main/.env#L2).
hackerwins marked this conversation as resolved.
Show resolved Hide resolved
3. Update version of Yorkie image in [docker/docker-compose.yml](https://github.com/yorkie-team/dashboard/blob/main/docker/docker-compose.yml#L26).
4. Check that there are no errors when running the dashboard, and review the sample code for any necessary modifications.
5. Create Pull Request and merge it into main.
19 changes: 10 additions & 9 deletions public/index.html → index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/favicon-16x16.png" />
<link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/favicon-32x32.png" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/favicon-512x512.png" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="apple-touch-icon" href="/favicon-512x512.png" />
<link rel="manifest" href="/manifest.json" />
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
<meta name="theme-color" content="#000000" />
<title>Dashboard · Yorkie</title>
Expand All @@ -15,16 +15,16 @@
content="Yorkie Dashboard is an administrative tool that allows user to manage projects and documents."
/>
<meta property="og:type" content="website" />
<meta property="og:image" content="%PUBLIC_URL%/og.png" />
<meta property="og:url" content="%REACT_APP_SITE_URL%" />
<meta property="og:image" content="%VITE_SITE_URL%og.png" />
<meta property="og:url" content="%VITE_SITE_URL%" />
<meta property="og:title" content="Yorkie Dashboard" />
<meta
property="og:description"
content="Yorkie Dashboard is an administrative tool that allows user to manage projects and documents."
/>
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:site" content="@team_yorkie" />
<meta property="twitter:image" content="%PUBLIC_URL%/og.png" />
<meta property="twitter:image" content="%VITE_SITE_URL%og.png" />
<meta property="twitter:title" content="Yorkie Dashboard" />
<meta
property="twitter:description"
Expand Down Expand Up @@ -71,5 +71,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
Loading
Loading