(fix) PWA Manifest should respect the OpenMRS public path

openmrs · Nov 1, 2023 · e88efa2 · e88efa2
1 parent 1ad5b21
commit e88efa2
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/packages/shell/esm-app-shell/webpack.config.js b/packages/shell/esm-app-shell/webpack.config.js
@@ -279,20 +279,6 @@ module.exports = (env, argv = {}) => {
     },
     plugins: [
       openmrsCleanBeforeBuild && new CleanWebpackPlugin(),
-      new WebpackPwaManifest({
-        name: "OpenMRS",
-        short_name: "OpenMRS",
-        description:
-          "Open source Health IT by and for the entire planet, starting with the developing world.",
-        background_color: "#ffffff",
-        theme_color: "#000000",
-        icons: [
-          {
-            src: resolve(__dirname, "src/assets/logo-512.png"),
-            sizes: [96, 128, 144, 192, 256, 384, 512],
-          },
-        ],
-      }),
       new HtmlWebpackPlugin({
         inject: false,
         scriptLoading: "blocking",
@@ -317,6 +303,21 @@ module.exports = (env, argv = {}) => {
             Object.keys(coreRoutes).length > 0 && JSON.stringify(coreRoutes),
         },
       }),
+      new WebpackPwaManifest({
+        name: "OpenMRS",
+        short_name: "OpenMRS",
+        publicPath: openmrsPublicPath,
+        description:
+          "Open source Health IT by and for the entire planet, starting with the developing world.",
+        background_color: "#ffffff",
+        theme_color: "#000000",
+        icons: [
+          {
+            src: resolve(__dirname, "src/assets/logo-512.png"),
+            sizes: [96, 128, 144, 192, 256, 384, 512],
+          },
+        ],
+      }),
       new CopyWebpackPlugin({
         patterns: [{ from: resolve(__dirname, "src/assets") }, ...appPatterns],
       }),