Skip to content

Commit 06e37fb

Browse files
thisconnectthisconnect
committed
Merge branch 'frontend-with-vitejs'
2 parents 4b81f99 + 70b4f21 commit 06e37fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+5374
-13852
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ buildweb:
5353
node --version
5454
npm --version
5555
rm -rf ${WEBROOT}/build
56-
cd ${WEBROOT} && npm ci --ignore-scripts
56+
cd ${WEBROOT} && npm ci
5757
cd ${WEBROOT} && npm run build
5858
webdev:
5959
cd ${WEBROOT} && $(MAKE) dev

‎frontends/web/__mocks__/react-i18next.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
/* global jest */
17+
import { vi } from 'vitest';
1818

1919
// When a module imports 'react-i18next', it gets replaced with this mock
2020
// by Jest in tests.
2121
// It allows for mounting components with stubs covering lifecycle methods.
22-
const reactI18next = jest.genMockFromModule('react-i18next');
22+
const reactI18next = vi.genMockFromModule('react-i18next');
2323
reactI18next.translate = () => (k) => k;
2424

2525
module.exports = reactI18next;

‎frontends/web/index.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1" />
6+
<meta name="theme-color" content="#000000" />
7+
<title>BitBoxApp</title>
8+
</head>
9+
<body>
10+
<div id="root"></div>
11+
<script type="module" src="/src/index.tsx"></script>
12+
</body>
13+
</html>

0 commit comments

Comments
 (0)