Merge branch 'master' into login-type-catchup

CHANGELOG.md

@@ -1,3 +1,29 @@
+## [11.1.1](https://github.com/dhis2/app-platform/compare/v11.1.0...v11.1.1) (2024-04-09)
+
+
+### Bug Fixes
+
+* **deps:** upgrade @dhis2/app-runtime and @dhis2/ui for peer deps fixes ([#842](https://github.com/dhis2/app-platform/issues/842)) ([2804527](https://github.com/dhis2/app-platform/commit/280452785ab1404e124d7ae6c9b886e241f2e826))
+
+# [11.1.0](https://github.com/dhis2/app-platform/compare/v11.0.0...v11.1.0) (2024-03-25)
+
+
+### Features
+
+* support core-injected base url ([#836](https://github.com/dhis2/app-platform/issues/836)) ([3f1ca71](https://github.com/dhis2/app-platform/commit/3f1ca71a871037316f130f960108c689c36365ba))
+
+# [11.0.0](https://github.com/dhis2/app-platform/compare/v10.5.0...v11.0.0) (2024-03-05)
+
+
+### chore
+
+* **deps:** update shell to ui@9 ([#824](https://github.com/dhis2/app-platform/issues/824)) ([b6a12fa](https://github.com/dhis2/app-platform/commit/b6a12faee7e48764a341dfadc36c991fbab37ec2))
+
+
+### BREAKING CHANGES
+
+* **deps:** Updated major version of UI
+
 # [10.6.0-alpha.3](https://github.com/dhis2/app-platform/compare/v10.6.0-alpha.2...v10.6.0-alpha.3) (2024-03-21)
 
 

adapter/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-adapter",
-    "version": "10.6.0-alpha.3",
+    "version": "11.1.1",
     "repository": {
         "type": "git",
         "url": "https://github.com/amcgee/dhis2-app-platform",
@@ -21,11 +21,11 @@
         "build"
     ],
     "dependencies": {
-        "@dhis2/pwa": "10.6.0-alpha.3",
+        "@dhis2/pwa": "11.1.1",
         "moment": "^2.24.0"
     },
     "devDependencies": {
-        "@dhis2/cli-app-scripts": "10.6.0-alpha.3",
+        "@dhis2/cli-app-scripts": "11.1.1",
         "@testing-library/react": "^12.0.0",
         "@testing-library/react-hooks": "^8.0.1",
         "enzyme": "^3.11.0",
@@ -38,9 +38,9 @@
         "test": "d2-app-scripts test"
     },
     "peerDependencies": {
-        "@dhis2/app-runtime": "^3.10.2",
+        "@dhis2/app-runtime": "^3.10.4",
         "@dhis2/d2-i18n": "^1",
-        "@dhis2/ui": ">=8.5",
+        "@dhis2/ui": ">=9.4.4",
         "classnames": "^2",
         "moment": "^2",
         "prop-types": "^15",

cli/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/cli-app-scripts",
-    "version": "10.6.0-alpha.3",
+    "version": "11.1.1",
     "engines": {
         "node": ">=14"
     },
@@ -28,7 +28,7 @@
         "@babel/preset-env": "^7.14.7",
         "@babel/preset-react": "^7.0.0",
         "@babel/preset-typescript": "^7.6.0",
-        "@dhis2/app-shell": "10.6.0-alpha.3",
+        "@dhis2/app-shell": "11.1.1",
         "@dhis2/cli-helpers-engine": "^3.2.0",
         "@jest/core": "^27.0.6",
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",

examples/pwa-app/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pwa-app",
-    "version": "10.6.0-alpha.3",
+    "version": "11.1.1",
     "description": "",
     "license": "BSD-3-Clause",
     "private": true,

examples/simple-app/package.json

@@ -1,6 +1,6 @@
 {
     "name": "simple-app",
-    "version": "10.6.0-alpha.3",
+    "version": "11.1.1",
     "repository": "https://github.com/amcgee/dhis2-app-platform",
     "author": "Austin McGee <austin@dhis2.org>",
     "license": "BSD-3-Clause",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "root",
-    "version": "10.6.0-alpha.3",
+    "version": "11.1.1",
     "private": true,
     "repository": {
         "type": "git",

pwa/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/pwa",
-    "version": "10.6.0-alpha.3",
+    "version": "11.1.1",
     "description": "",
     "license": "BSD-3-Clause",
     "publishConfig": {
@@ -13,7 +13,7 @@
         "deploy": "d2-app-scripts deploy"
     },
     "devDependencies": {
-        "@dhis2/cli-app-scripts": "10.6.0-alpha.3"
+        "@dhis2/cli-app-scripts": "11.1.1"
     },
     "dependencies": {
         "idb": "^6.0.0",

shell/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-shell",
-    "version": "10.6.0-alpha.3",
+    "version": "11.1.1",
     "engines": {
         "node": ">=14"
     },
@@ -15,11 +15,11 @@
         "access": "public"
     },
     "dependencies": {
-        "@dhis2/app-adapter": "10.6.0-alpha.3",
-        "@dhis2/app-runtime": "^3.10.2",
+        "@dhis2/app-adapter": "11.1.1",
+        "@dhis2/app-runtime": "^3.10.4",
         "@dhis2/d2-i18n": "^1.1.1",
-        "@dhis2/pwa": "10.6.0-alpha.3",
-        "@dhis2/ui": "^8.12.3",
+        "@dhis2/pwa": "11.1.1",
+        "@dhis2/ui": "^9.4.4",
         "classnames": "^2.2.6",
         "moment": "^2.29.1",
         "post-robot": "^10.0.46",

shell/public/index.html

@@ -7,6 +7,9 @@
             content="width=device-width, initial-scale=1, shrink-to-fit=no"
         />
         <meta name="theme-color" content="#ffffff" />
+
+        <!-- Injection point for base URL from backend -->
+        <meta name="dhis2-base-url" content="__DHIS2_BASE_URL__" />
         <!--
             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/

shell/public/plugin.html

@@ -6,6 +6,8 @@
             name="viewport"
             content="width=device-width, initial-scale=1, shrink-to-fit=no"
         />
+        <!-- Injection point for base URL from backend -->
+        <meta name="dhis2-base-url" content="__DHIS2_BASE_URL__" />
         <title>Plugin</title>
     </head>
     <body>

shell/src/App.js

@@ -9,6 +9,18 @@ const D2App = React.lazy(() =>
     import(/*webpackChunkName: 'app'*/ './D2App/app')
 ) // Automatic bundle splitting!
 
+// Injected by backend when serving index or plugin HTML
+// https://github.com/dhis2/dhis2-core/pull/16703
+const getInjectedBaseUrl = () => {
+    const baseUrl = document
+        .querySelector('meta[name="dhis2-base-url"]')
+        ?.getAttribute('content')
+    if (baseUrl && baseUrl !== '__DHIS2_BASE_URL__') {
+        return baseUrl
+    }
+    return null
+}
+
 const parseRequiredProps = (propsEnvVariable) => {
     if (!propsEnvVariable || propsEnvVariable === '') {
         return []
@@ -22,7 +34,7 @@ const requiredPluginProps = parseRequiredProps(
 )
 
 const appConfig = {
-    url: process.env.REACT_APP_DHIS2_BASE_URL,
+    url: getInjectedBaseUrl() || process.env.REACT_APP_DHIS2_BASE_URL,
     appName: process.env.REACT_APP_DHIS2_APP_NAME || '',
     appVersion: process.env.REACT_APP_DHIS2_APP_VERSION || '',
     apiVersion: parseInt(process.env.REACT_APP_DHIS2_API_VERSION),