remove matchboxv3 base-href #128

ahdis · Sep 6, 2023 · 9f94f6d · 9f94f6d
1 parent c4230cd
commit 9f94f6d
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 54 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -29,6 +29,15 @@
       "vmArgs": "-Dspring.config.additional-location=file:with-postgres/application.yaml",
       "cwd": "${workspaceFolder}/matchbox-server"
     },
+    {
+      "type": "java",
+      "name": "Launch Matchbox-Server (preload)",
+      "request": "launch",
+      "mainClass": "ca.uhn.fhir.jpa.starter.Application",
+      "projectName": "matchbox-server",
+      "vmArgs": "-Dspring.config.additional-location=file:with-preload/application.yaml",
+      "cwd": "${workspaceFolder}/matchbox-server"
+    },
     {
       "type": "java",
       "name": "Launch Matchbox-Server",

diff --git a/matchbox-engine/pom.xml b/matchbox-engine/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>matchbox</artifactId>
         <groupId>health.matchbox</groupId>
-        <version>3.4.2</version>
+        <version>3.4.3</version>
     </parent>
 
     <artifactId>matchbox-engine</artifactId>

diff --git a/matchbox-frontend/Dockerfile b/matchbox-frontend/Dockerfile
diff --git a/matchbox-frontend/README.md b/matchbox-frontend/README.md
@@ -50,7 +50,7 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 this angular app is directly provided with matchbox
 
 ```
-ng build --configuration production --base-href /matchboxv3/
+ng build --configuration production
 rm -rf ../matchbox-server/src/main/resources/static/*
 cp -r dist/* ../matchbox-server/src/main/resources/static
 ```

diff --git a/matchbox-frontend/default.conf b/matchbox-frontend/default.conf
diff --git a/matchbox-frontend/docker-entrypoint.sh b/matchbox-frontend/docker-entrypoint.sh
diff --git a/matchbox-frontend/package-lock.json b/matchbox-frontend/package-lock.json
diff --git a/matchbox-frontend/package.json b/matchbox-frontend/package.json
@@ -1,12 +1,12 @@
 {
   "name": "matchboxv3",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build --configuration production --base-href /matchboxv3/",
-    "build-matchbox": "ng build --configuration production --base-href /matchboxv3/ --output-path ../matchbox-server/src/main/resources/static",
+    "build": "ng build --configuration production",
+    "build-matchbox": "ng build --configuration production --output-path ../matchbox-server/src/main/resources/static",
     "test": "ng test",
     "test-ci": "ng test --no-watch --no-progress --browsers=ChromeHeadlessNoSandbox --code-coverage",
     "lint": "ng lint",

diff --git a/matchbox-server/pom.xml b/matchbox-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matchbox</artifactId>
         <groupId>health.matchbox</groupId>
-        <version>3.4.2</version>
+        <version>3.4.3</version>
     </parent>
 
     <artifactId>matchbox-server</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>health.matchbox</groupId>
     <artifactId>matchbox</artifactId>
-    <version>3.4.2</version>
+    <version>3.4.3</version>
     <packaging>pom</packaging>
     <name>matchbox</name>
     <description>An open-source implementation to support testing and implementation of FHIR based solutions and map or