BN-35 | Refactor. Build to use public path as /bahnew

mohan-13 · mohan-13 · commit 673d6084b8ea · 2025-03-20T21:06:39.000+05:30
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "start": "webpack serve --mode development --open",
-    "build": "webpack --mode production",
+    "build": "webpack --mode production --env PUBLIC_PATH='/bahnew/'",
     "preview": "webpack serve --mode production --open",
     "lint": "eslint --ext .ts,.tsx src/",
     "lint:fix": "eslint --ext .ts,.tsx src/ --fix",
@@ -86,4 +86,4 @@
       "yarn prettier:fix"
     ]
   }
-}
+}
diff --git a/public/index.html b/public/index.html
@@ -2,15 +2,12 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#0f62fe" />
     <meta
       name="description"
       content="Bahmni Clinical Frontend Application"
     />
-    <link rel="apple-touch-icon" href="/logo192.png" />
-    <link rel="manifest" href="/manifest.json" />
     <title>Bahmni Clinical</title>
   </head>
   <body>
diff --git a/src/index.tsx b/src/index.tsx
@@ -4,11 +4,17 @@ import { BrowserRouter } from 'react-router-dom';
 import App from './App';
 import './styles/index.scss';
 
+const getBasename = () => {
+  const pathname = window.location.pathname;
+  const basePath = pathname.split('/').slice(0, 2).join('/');
+  return basePath || '/';
+};
+
 // Register service worker for PWA
 if ('serviceWorker' in navigator) {
   window.addEventListener('load', () => {
     // Use a relative path that will work regardless of the base URL
-    const swUrl = new URL('/service-worker.js', window.location.origin)
+    const swUrl = new URL('./service-worker.js', window.location.href)
       .pathname;
 
     navigator.serviceWorker
@@ -28,7 +34,7 @@ const root = createRoot(container);
 
 root.render(
   <React.StrictMode>
-    <BrowserRouter>
+    <BrowserRouter basename={getBasename()}>
       <App />
     </BrowserRouter>
   </React.StrictMode>,
diff --git a/webpack.config.js b/webpack.config.js
@@ -8,14 +8,16 @@ const { GenerateSW } = require('workbox-webpack-plugin');
 
 module.exports = (env, argv) => {
   const isProduction = argv.mode === 'production';
+  // Allow configuring the public path via environment variable
+  const publicPath = env.PUBLIC_PATH || '/';
   
   return {
     entry: './src/index.tsx',
     output: {
       path: path.resolve(__dirname, 'dist'),
       filename: isProduction ? 'static/js/[name].[contenthash:8].js' : 'static/js/[name].js',
       chunkFilename: isProduction ? 'static/js/[name].[contenthash:8].chunk.js' : 'static/js/[name].chunk.js',
-      publicPath: '/',
+      publicPath: publicPath,
       clean: true,
     },
     devtool: isProduction ? 'source-map' : 'cheap-module-source-map',
@@ -113,8 +115,8 @@ module.exports = (env, argv) => {
         theme_color: '#0f62fe', // Carbon blue
         display: 'standalone',
         orientation: 'portrait',
-        scope: '/',
-        start_url: '/',
+        scope: publicPath,
+        start_url: publicPath,
         icons: [
           {
             src: path.resolve('public/logo512.png'),

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"start": "webpack serve --mode development --open",`
`7`		`- "build": "webpack --mode production",`
	`7`	`+ "build": "webpack --mode production --env PUBLIC_PATH='/bahnew/'",`
`8`	`8`	`"preview": "webpack serve --mode production --open",`
`9`	`9`	`"lint": "eslint --ext .ts,.tsx src/",`
`10`	`10`	`"lint:fix": "eslint --ext .ts,.tsx src/ --fix",`
`@@ -86,4 +86,4 @@`
`86`	`86`	`"yarn prettier:fix"`
`87`	`87`	`]`
`88`	`88`	`}`
`89`		`-}`
	`89`	`+}`