Merge pull request #38 from RailtownAI/tom/3999/bootstrap-vuln-v5upgrade

Tom/3999/bootstrap vuln v5upgrade
RailtownAI · Sep 13, 2024 · a0a43bc · a0a43bc
2 parents 912186b + 724327c
commit a0a43bc
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 33 deletions.
diff --git a/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/ClientApp/package-lock.json b/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/ClientApp/package-lock.json
diff --git a/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/ClientApp/package.json b/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/ClientApp/package.json
@@ -3,14 +3,14 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "bootstrap": "~4.6.1",
+    "bootstrap": "^5.0.0",
     "jquery": "~3.6.0",
     "merge": "^2.1.1",
     "oidc-client": "~1.11.5",
     "react": "~16.14.0",
     "react-dom": "~16.14.0",
-    "react-router-bootstrap": "^0.25.0",
     "react-router": "~5.2.1",
+    "react-router-bootstrap": "^0.25.0",
     "react-router-dom": "~5.3.0",
     "reactstrap": "~8.10.1",
     "rimraf": "^3.0.2"
@@ -28,7 +28,7 @@
     "extends": "react-app"
   },
   "overrides": {
-  "react-scripts": {
+    "react-scripts": {
       "@svgr/webpack": "8.1.0",
       "postcss": "8.4.38"
     }

diff --git a/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/ClientApp/public/index.html b/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/ClientApp/public/index.html
@@ -11,6 +11,7 @@
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <link rel="stylesheet" href="%PUBLIC_URL%/style.css">
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

diff --git a/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/ClientApp/public/style.css b/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/ClientApp/public/style.css
@@ -0,0 +1 @@
+#webpack-dev-server-client-overlay { display: none; } 
diff --git a/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/ClientApp/src/App.js b/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/ClientApp/src/App.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Route } from 'react-router';
+import { Route } from 'react-router-dom';
 import { Layout } from './components/Layout';
 import { Home } from './components/Home';
 

diff --git a/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/appsettings.Development.json b/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/appsettings.Development.json
diff --git a/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/readme.md b/ReactAppWithProxy/Railtown.Samples.Javascript.ReactWithProxy/readme.md
@@ -5,8 +5,10 @@
 ## Getting started
 - This project must be run with Visual Studio
 - Go to app.railtown.ai to get your Railtown Key
-- Open appsettings.json and paste your railtown key
-- Run the app and see the results in [app.railtown.ai](https://www.railtown.ai/)
+- Open appsettings.json and paste your railtown key 
+- Run the app at /Railtown.Samples.Javascript.ReactWithProxy with `dotnet run` 
+- View https://localhost:5001/ and trigger some errors
+- See the errors in [app.railtown.ai](https://app.railtown.ai/)
 
 ## License
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#webpack-dev-server-client-overlay { display: none; }