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.

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

Migrate to Vite.js #207

Merged
merged 8 commits into from
Nov 21, 2022
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
3 changes: 2 additions & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
NEXT_PUBLIC_API_SERVER=http://localhost:9090/v1.0
VITE_PUBLIC_API_SERVER=http://localhost:9090/v1.0
VITE_BASE_PATH=/
3 changes: 2 additions & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
NEXT_PUBLIC_API_SERVER=http://localhost:9090/v1.0
VITE_PUBLIC_API_SERVER=http://localhost:9090/v1.0
VITE_BASE_PATH=/
27 changes: 25 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
{
"plugins": ["react", "prettier"],
"extends": ["next/core-web-vitals", "prettier"]
"env": {
"browser": true,
"es2021": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/jsx-runtime"
],
"overrides": [],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"rules": {
"@typescript-eslint/no-explicit-any": "off"
},
"settings": {
"react": {
"version": "detect"
}
}
}
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
BRANCH: ${{ github.ref_name }}
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
Expand All @@ -44,7 +45,7 @@ jobs:
run: yarn prettier --check .

- name: Build distribution
run: yarn build-static
run: yarn build

-
name: Docker meta
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ db
/specification.yml
.vscode
tsconfig.tsbuildinfo
dist
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.github
node_modules
out
dist
public
tmp
openapi
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM nginx
COPY ./out /usr/share/nginx/html
COPY ./dist /usr/share/nginx/html
COPY ./docker-entrypoint.sh /docker-entrypoint.d
COPY ./nginx-spa.conf /etc/nginx/conf.d/default.conf

Expand Down
32 changes: 0 additions & 32 deletions Dockerfile.nextjs

This file was deleted.

14 changes: 14 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Process Optimizer Frontend</title>
<script type="module" src="/src/jquery-shim.ts"></script>
langdal marked this conversation as resolved.
Show resolved Hide resolved
<script type="module" src="/src/main.tsx"></script>
</head>
<body>
<div id="root"></div>
</body>
</html>
14 changes: 0 additions & 14 deletions jest.config.js

This file was deleted.

2 changes: 0 additions & 2 deletions jest.setup.ts

This file was deleted.

5 changes: 0 additions & 5 deletions next-env.d.ts

This file was deleted.

23 changes: 0 additions & 23 deletions next.config.js

This file was deleted.

43 changes: 22 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"build-static": "next build && next export",
"start": "next start",
"lint": "eslint .",
"dev": "vite",
"build": "tsc && vite build",
"start": "vite preview",
"lint": "eslint src",
"formatAll": "prettier --write .",
"test": "jest",
"prettier": "prettier --check .",
"test": "vitest",
"prepare": "husky install",
"openapi": "openapi-generator-cli generate -i https://raw.githubusercontent.com/BoostV/process-optimizer-api/v2.1.0/optimizerapi/openapi/specification.yml -g typescript-fetch -o ./openapi --additional-properties=nullSafeAdditionalProps && prettier --write ./openapi"
},
Expand All @@ -25,45 +25,46 @@
"@mui/icons-material": "^5.8.4",
"@mui/lab": "^5.0.0-alpha.87",
"@mui/material": "^5.8.6",
"@mui/styles": "^5.8.6",
"@types/recharts": "^1.8.23",
"compare-versions": "^4.1.3",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-prettier": "4.1.0",
"immer": "^9.0.15",
"next": "^12.1.6",
"prettier": "2.7.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.1",
"react-hook-form": "^7.33.0",
"react-router-dom": "^6.4.3",
"recharts": "^2.1.12",
"swr": "^1.3.0",
"tss-react": "^4.4.4",
"uuid": "^8.3.2"
},
"devDependencies": {
"@openapitools/openapi-generator-cli": "2.5.1",
"@swc/jest": "^0.2.21",
"@testing-library/dom": "^8.13.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^14.2.0",
"@types/node": "^18.0.0",
"@types/react": "^18.0.14",
"@types/rimraf": "^3.0.0",
"@types/uuid": "^8.3.4",
"@typescript-eslint/eslint-plugin": "^5.43.0",
"@typescript-eslint/parser": "^5.43.0",
"@vitejs/plugin-react": "^2.2.0",
"eslint": "8.18.0",
"eslint-config-next": "12.1.6",
"git-revision-webpack-plugin": "^5.0.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-jest-dom": "^4.0.3",
"eslint-plugin-prettier": "4.1.0",
"eslint-plugin-react": "^7.31.10",
"eslint-plugin-testing-library": "^5.9.1",
"husky": "^8.0.1",
"identity-obj-proxy": "^3.0.0",
"jest": "^28.1.1",
"jest-dom": "^4.0.0",
"jest-environment-jsdom": "^28.1.1",
"jsdom": "^20.0.2",
"lint-staged": "^13.0.3",
"node-mocks-http": "^1.10.1",
"prettier": "2.7.1",
"react-devtools": "^4.24.7",
"rimraf": "^3.0.2",
"typescript": "^4.7.4"
"typescript": "^4.7.4",
"vite": "^3.2.4",
"vitest": "^0.25.2"
}
}
39 changes: 0 additions & 39 deletions pages/_app.tsx

This file was deleted.

84 changes: 0 additions & 84 deletions pages/_document.tsx

This file was deleted.

8 changes: 0 additions & 8 deletions pages/index.tsx

This file was deleted.

Loading