Skip to content

Commit 0dfc986

Browse files
authored
Merge pull request #1422 from dhis2/upgrade-vite-react
fix(app-platform): upgrade platform tools to use vite and react 18
2 parents 3ab4040 + 1a03583 commit 0dfc986

21 files changed

+3967
-5422
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
![React 18](https://img.shields.io/badge/react-18-blue)
12
This project was bootstrapped with [DHIS2 Application Platform](https://github.com/dhis2/app-platform).
23

34
## Available Scripts

d2.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const config = {
77
minDHIS2Version: '2.41',
88

99
entryPoints: {
10-
app: './src/App.js',
10+
app: './src/App.jsx',
1111
},
1212
}
1313

i18n/en.pot

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ msgstr ""
55
"Content-Type: text/plain; charset=utf-8\n"
66
"Content-Transfer-Encoding: 8bit\n"
77
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
8-
"POT-Creation-Date: 2025-03-05T20:30:30.881Z\n"
9-
"PO-Revision-Date: 2025-03-05T20:30:30.890Z\n"
8+
"POT-Creation-Date: 2025-03-19T09:22:40.114Z\n"
9+
"PO-Revision-Date: 2025-03-19T09:22:40.115Z\n"
1010

1111
msgid "Failed to load: {{error}}"
1212
msgstr "Failed to load: {{error}}"
@@ -877,3 +877,11 @@ msgid ""
877877
msgstr ""
878878
"Job execution interval (seconds) below which a job will be logged at debug "
879879
"(rather than info) level (20+)"
880+
881+
msgctxt "Application title"
882+
msgid "__MANIFEST_APP_TITLE"
883+
msgstr "System Settings"
884+
885+
msgctxt "Application description"
886+
msgid "__MANIFEST_APP_DESCRIPTION"
887+
msgstr ""

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818
"format": "yarn format:js && yarn format:text"
1919
},
2020
"devDependencies": {
21-
"@dhis2/cli-app-scripts": "^11.7.1",
22-
"@dhis2/cli-style": "^10.7.3"
21+
"@dhis2/cli-app-scripts": "^12.3.0",
22+
"@dhis2/cli-style": "^10.7.6"
2323
},
2424
"dependencies": {
25-
"@dhis2/app-runtime": "^3.2.0",
25+
"@dhis2/app-runtime": "^3.13.1",
2626
"@dhis2/app-runtime-adapter-d2": "^1.0.2",
2727
"@dhis2/d2-i18n": "^1.1.0",
28-
"@dhis2/ui": "^9.11.3",
28+
"@dhis2/ui": "^10.1.11",
2929
"d2": "^31.9.0",
3030
"d2-ui": "^29.0.35",
31-
"fixed-data-table": "0.6.5",
3231
"history": "4.7.2",
3332
"loglevel": "^1.9.2",
3433
"material-design-icons-iconfont": "^6.1.0",

src/App.js renamed to src/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import React from 'react'
55
// to ensure that i18n is first imported from locales/index, i18n is imported before App
66
// eslint-disable-next-line import/order
77
import i18n from './locales/index.js'
8-
import App from './app.component.js'
8+
import App from './app.component.jsx'
99
import 'material-design-icons-iconfont'
1010
import configOptionStore from './configOptionStore.js'
1111

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
filterCategoriesByApiVersion,
1616
filterSettingsByApiVersion,
1717
} from './settingsCategories.js'
18-
import SettingsFields from './settingsFields.component.js'
18+
import SettingsFields from './settingsFields.component.jsx'
1919
import appTheme from './theme.js'
2020

2121
class AppComponent extends React.Component {

0 commit comments

Comments
 (0)