From 1c87a9ea4d14b2ccd802b734f32f8ceb7dc8c352 Mon Sep 17 00:00:00 2001
From: Nicolas Ventura <ventura@lbl.gov>
Date: Tue, 6 Feb 2024 13:44:44 -0800
Subject: [PATCH] With update command

---
 .config/.cprc.json                |  2 +-
 .config/Dockerfile                |  2 +-
 .config/webpack/webpack.config.ts | 30 ++++++++++++++----------------
 package.json                      |  5 +++--
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.config/.cprc.json b/.config/.cprc.json
index cbcd0c6..80fb8d1 100644
--- a/.config/.cprc.json
+++ b/.config/.cprc.json
@@ -1,3 +1,3 @@
 {
-  "version": "3.1.3"
+  "version": "3.5.0"
 }
diff --git a/.config/Dockerfile b/.config/Dockerfile
index 35d89bd..e0f1b2d 100644
--- a/.config/Dockerfile
+++ b/.config/Dockerfile
@@ -13,4 +13,4 @@ ENV GF_DEFAULT_APP_MODE "development"
 
 # Inject livereload script into grafana index.html
 USER root
-RUN sed -i 's/<\/body><\/html>/<script src=\"http:\/\/localhost:35729\/livereload.js\"><\/script><\/body><\/html>/g' /usr/share/grafana/public/views/index.html
\ No newline at end of file
+RUN sed -i 's|</body>|<script src="http://localhost:35729/livereload.js"></script></body>|g' /usr/share/grafana/public/views/index.html
diff --git a/.config/webpack/webpack.config.ts b/.config/webpack/webpack.config.ts
index 59e1963..2865de0 100644
--- a/.config/webpack/webpack.config.ts
+++ b/.config/webpack/webpack.config.ts
@@ -179,22 +179,20 @@ const config = async (env): Promise<Configuration> => {
           ],
         },
       ]),
-      ...(env.development
-        ? [
-            new LiveReloadPlugin(),
-            new ForkTsCheckerWebpackPlugin({
-              async: Boolean(env.development),
-              issue: {
-                include: [{ file: '**/*.{ts,tsx}' }],
-              },
-              typescript: { configFile: path.join(process.cwd(), 'tsconfig.json') },
-            }),
-            new ESLintPlugin({
-              extensions: ['.ts', '.tsx'],
-              lintDirtyModulesOnly: Boolean(env.development), // don't lint on start, only lint changed files
-            }),
-          ]
-        : []),
+      ...(env.development ? [
+        new LiveReloadPlugin(),
+        new ForkTsCheckerWebpackPlugin({
+          async: Boolean(env.development),
+          issue: {
+            include: [{ file: '**/*.{ts,tsx}' }],
+          },
+          typescript: { configFile: path.join(process.cwd(), 'tsconfig.json') },
+        }),
+        new ESLintPlugin({
+          extensions: ['.ts', '.tsx'],
+          lintDirtyModulesOnly: Boolean(env.development), // don't lint on start, only lint changed files
+        }),
+      ] : []),
     ],
 
     resolve: {
diff --git a/package.json b/package.json
index 5c31c59..8816f5e 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "test:ci": "jest --passWithNoTests --maxWorkers 4",
     "typecheck": "tsc --noEmit",
     "lint": "eslint --cache --ignore-path ./.gitignore --ignore-pattern psychrolib.js --ext .js,.jsx,.ts,.tsx .",
-    "lint:fix": "npm run lint -- --fix",
+    "lint:fix": "npm run lint --fix",
     "e2e": "npm exec cypress install && npm exec grafana-e2e run",
     "e2e:update": "npm exec cypress install && npm exec grafana-e2e run --update-screenshots",
     "server": "docker-compose up --build",
@@ -55,7 +55,8 @@
     "typescript": "4.8.4",
     "webpack": "^5.86.0",
     "webpack-cli": "^5.1.4",
-    "webpack-livereload-plugin": "^3.0.2"
+    "webpack-livereload-plugin": "^3.0.2",
+    "@types/react-router-dom": "^6.22.0"
   },
   "engines": {
     "node": ">=20"