Merge pull request #7213 from ORNL-AMO/develop

MEASUR 1.5.5 into master

.github/workflows/web.yml

@@ -30,7 +30,12 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Build
-        run: npm run build-prod-web
+        run: |
+          if [[ "${{ github.ref_name }}" == "master" ]]; then
+            npm run build-prod-web
+          elif [[ "${{ github.ref_name }}" == "develop" ]]; then
+            npm run build-dev-web
+          fi
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:

angular.json

@@ -66,7 +66,7 @@
             "ngswConfigPath": "ngsw-config.json"
           },
           "configurations": {
-            "web": {
+            "production-web": {
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -78,7 +78,23 @@
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.web.ts"
+                  "with": "src/environments/environment.production-web.ts"
+                }
+              ]
+            },
+            "development-web": {
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.development-web.ts"
                 }
               ]
             },
@@ -115,8 +131,11 @@
             "buildTarget": "amo-tools-desktop:build"
           },
           "configurations": {
-            "web": {
-              "buildTarget": "amo-tools-desktop:build:web"
+            "production-web": {
+              "buildTarget": "amo-tools-desktop:build:production-web"
+            },
+            "development-web": {
+              "buildTarget": "amo-tools-desktop:build:development-web"
             },
             "development": {
               "buildTarget": "amo-tools-desktop:build:development"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "amo-tools-desktop",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "main": "main.js",
   "license": "MIT",
   "description": "MEASUR",
@@ -17,7 +17,8 @@
     "build-watch": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --base-href . --watch",
     "build-prod-desktop": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --base-href . --configuration desktop",
     "build-prod-desktop-ci": "node --max_old_space_size=16000 ./node_modules/@angular/cli/bin/ng build --base-href . --configuration desktop",
-    "build-prod-web": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --base-href / --configuration web",
+    "build-prod-web": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --base-href / --configuration production-web",
+    "build-dev-web": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --base-href / --configuration development-web",
     "clean": "rm -rf node_modules && rm -rf dist && rm -f package-lock.json",
     "windows-clean": "powershell Remove-Item -Path \"package-lock.json\" && powershell Remove-Item -Path \"node_modules\", \"dist\" -Recurse",
     "electron": "electron .",
@@ -26,8 +27,7 @@
     "test": "ng test",
     "postinstall": "electron-builder install-app-deps",
     "pack": "electron-builder --dir",
-    "dist": "electron-builder",
-    "download-stats": "node scripts/download-stats.js"
+    "dist": "electron-builder"
   },
   "private": true,
   "dependencies": {
@@ -132,7 +132,6 @@
     "@types/lodash": "4.14.100",
     "@types/node": "^14.18.12",
     "angular-plotly.js": "^5.2.1",
-    "axios": "^1.7.4",
     "electron": "^27.1.3",
     "electron-builder": "^24.13.3",
     "electron-download-tf": "^4.3.4",