Skip to content

Commit

Permalink
Merge pull request #1265 from Arnei/migrate-to-vite
Browse files Browse the repository at this point in the history
Replace CRA with Vite
  • Loading branch information
geichelberger authored Mar 1, 2024
2 parents 7f07f60 + 8eaa396 commit 0445864
Show file tree
Hide file tree
Showing 16 changed files with 7,926 additions and 15,323 deletions.
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module.exports = {
extends: [
"@opencast/eslint-config-ts-react",
"react-app/jest",
],
rules: {
// Currently 120 warnings.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/playwright-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Prepare configuration
run: >
sed -i
's_https://develop.opencast.org_http://localhost:3000_'
's_https://develop.opencast.org_http://localhost:5173_'
public/editor-settings.toml
- name: Prepare mock files
Expand All @@ -46,7 +46,7 @@ jobs:
cp public/editor-settings.toml build/
- name: Use production build for testing
run: sed -i 's/npm run start/python -m http.server --bind 127.0.0.1 --directory build 3000/' playwright.config.ts
run: sed -i 's/npm run start/python -m http.server --bind 127.0.0.1 --directory build 5173/' playwright.config.ts

- name: Run playwright-test
run: npx playwright test --config=playwright.config.ts
Expand Down
6 changes: 0 additions & 6 deletions config-overrides.js

This file was deleted.

7 changes: 4 additions & 3 deletions public/index.html → index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta name="git-commit" content="%REACT_APP_GIT_SHA%">
<meta name="build-date" content="%REACT_APP_BUILD_DATE%">
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description"
Expand All @@ -13,7 +13,7 @@
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="manifest" href="/manifest.json" />
<title>Opencast Editor</title>
<style>
/* These styles are only used for the initial loading indicator */
Expand Down Expand Up @@ -52,11 +52,12 @@
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<script type="module" src="/src/index.tsx"></script>
<div id="root">
<!-- Loading indicator, shown until React starts rendering -->
<div class="loading-indicator">
<svg viewbox="0 0 100 100">
<circle cx="50"cy="50"r="40" />
<circle cx="50" cy="50" r="40" />
</svg>
</div>
</div>
Expand Down
Loading

0 comments on commit 0445864

Please sign in to comment.