Fix web pack

ngageoint · Sep 6, 2024 · 6bddff0 · 6bddff0
1 parent 61235cc
commit 6bddff0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/build_test.web-app.yaml b/.github/workflows/build_test.web-app.yaml
@@ -39,7 +39,7 @@ jobs:
       - name: pack
         run: |
           npm pack ./web-app/dist/core-lib
-          npm pack ./web-app/dist/app
+          npm pack ./web-app/dist
       - name: upload packages
         uses: actions/upload-artifact@v3
         with:

diff --git a/web-app/angular.json b/web-app/angular.json
@@ -183,7 +183,6 @@
               }
             ],
             "styles": [
-              "admin/src/ng1/vendor/bootstrap/css/bootstrap.min.css",
               "node_modules/swagger-ui/dist/swagger-ui.css",
               "node_modules/@ngageoint/md-date-time-picker/dist/css/mdDateTimePicker.css",
               "admin/src/ng1/vendor/material-design-icons/icons.css",
@@ -199,7 +198,6 @@
               "node_modules/jquery/dist/jquery.min.js",
               "node_modules/jquery-minicolors/jquery.minicolors.min.js",
               "node_modules/jquery-file-download/src/Scripts/jquery.fileDownload.js",
-              "admin/src/ng1/vendor/bootstrap/js/bootstrap.min.js",
               "node_modules/systemjs/dist/system.js",
               "node_modules/systemjs/dist/extras/amd.js",
               "node_modules/systemjs/dist/extras/named-register.js",

diff --git a/web-app/package.json b/web-app/package.json
@@ -29,8 +29,8 @@
   "scripts": {
     "start:app": "ng serve --project=app --configuration development",
     "start:admin": "ng serve --project=admin --configuration development",
-    "build": "npm-run-all clean build:core-lib build:app:dev combine",
-    "build:prod": "npm-run-all clean build:core-lib build:app:prod",
+    "build": "npm-run-all clean build:core-lib build:app:dev build:admin:dev combine",
+    "build:prod": "npm-run-all clean build:core-lib build:app:prod build:admin:prod combine",
     "build:app:dev": "ng build --project=app --configuration development",
     "build:admin:dev": "ng build --project=admin --configuration development",
     "build:app:prod": "ng build --project=app --configuration production",
@@ -48,13 +48,13 @@
     "test:admin": "ng test --project=admin --code-coverage=false",
     "test:core-lib": "ng test --project=core-lib",
     "test-headless": "npm-run-all test-headless:app test-headless:admin",
-    "test-headless:app": "ng test --watch=false --browsers=ChromeHeadless --project=admin",
+    "test-headless:app": "ng test --watch=false --browsers=ChromeHeadless --project=app",
     "test-headless:admin": "ng test --watch=false --browsers=ChromeHeadless --project=admin",
     "test-headless:core-lib": "ng test --watch=false --browsers=ChromeHeadless --project=core-lib",
     "ci:test": "npm-run-all test-headless:core-lib test-headless",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "pack:app": "npm pack ./dist/app",
+    "pack:app": "npm pack ./dist",
     "pack:core-lib": "npm pack ./dist/core-lib",
     "bundle-report": "webpack-bundle-analyzer dist/stats.json"
   },

diff --git a/web-app/src/app/filter/filter.component.spec.ts b/web-app/src/app/filter/filter.component.spec.ts
@@ -3,7 +3,7 @@ import { FilterComponent } from './filter.component';
 import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatAutocomplete, MatAutocompleteModule } from '@angular/material/autocomplete';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
 
 describe('FilterComponent', () => {
   let component: FilterComponent;