From 08a7b8c4a3f6e33abe6c4ffb70d677eec530db8a Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 15 Mar 2022 15:02:48 -0600
Subject: [PATCH] fix scss imports
---
angular.json | 10 ++++++++--
.../terminate-job-dialog.component.scss | 2 +-
.../components/content/content.component.scss | 2 +-
.../config-example/config-example.component.scss | 2 +-
.../components/config/config.component.scss | 2 +-
.../nshmp-apps/src/app/services/app.component.scss | 2 +-
.../src/app/source-models/data/app.component.scss | 4 ++--
projects/nshmp-apps/src/styles/_code-block.scss | 2 +-
projects/nshmp-apps/src/styles/_dashboards.scss | 2 +-
projects/nshmp-apps/src/styles/styles.scss | 6 +++---
.../src/lib/components/error/error.component.scss | 2 +-
11 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/angular.json b/angular.json
index c6576c948..60dcb4138 100644
--- a/angular.json
+++ b/angular.json
@@ -104,12 +104,18 @@
"configurations": {
"development": {
"stylePreprocessorOptions": {
- "includePaths": ["projects/nshmp-apps/src/environments/scss"]
+ "includePaths": [
+ "projects/nshmp-apps/src/environments/scss",
+ "node_modules"
+ ]
}
},
"production": {
"stylePreprocessorOptions": {
- "includePaths": ["projects/nshmp-apps/src/environments/scss-prod"]
+ "includePaths": [
+ "projects/nshmp-apps/src/environments/scss-prod",
+ "node_modules"
+ ]
},
"fileReplacements": [
{
diff --git a/projects/aws-lib/src/lib/components/terminate-job-dialog/terminate-job-dialog.component.scss b/projects/aws-lib/src/lib/components/terminate-job-dialog/terminate-job-dialog.component.scss
index 2a29b2769..afb47f388 100644
--- a/projects/aws-lib/src/lib/components/terminate-job-dialog/terminate-job-dialog.component.scss
+++ b/projects/aws-lib/src/lib/components/terminate-job-dialog/terminate-job-dialog.component.scss
@@ -1,4 +1,4 @@
-@import '~@ghsc/nshmp-template/styles/uswds-functions';
+@import '@ghsc/nshmp-template/styles/uswds-functions';
.job-info .mat-list-item {
height: 1.5em;
diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.scss b/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.scss
index e821ebfc6..cd1207142 100644
--- a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.scss
+++ b/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.scss
@@ -1,4 +1,4 @@
-@import '~@ghsc/nshmp-template/styles/uswds-functions';
+@import '@ghsc/nshmp-template/styles/uswds-functions';
$toolbarHeight: 3.5em;
diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.scss b/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.scss
index 64467ca5c..3065c6f5d 100644
--- a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.scss
+++ b/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.scss
@@ -1,4 +1,4 @@
-@import '~@ghsc/nshmp-template/styles/uswds-functions';
+@import '@ghsc/nshmp-template/styles/uswds-functions';
.example-config {
margin: 1em;
diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.scss b/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.scss
index 3497e36fd..234661dbc 100644
--- a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.scss
+++ b/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.scss
@@ -1,4 +1,4 @@
-@import '~@ghsc/nshmp-template/styles/uswds-functions';
+@import '@ghsc/nshmp-template/styles/uswds-functions';
table {
height: 100%;
diff --git a/projects/nshmp-apps/src/app/services/app.component.scss b/projects/nshmp-apps/src/app/services/app.component.scss
index bf8a0e0ad..e429ad858 100644
--- a/projects/nshmp-apps/src/app/services/app.component.scss
+++ b/projects/nshmp-apps/src/app/services/app.component.scss
@@ -1,4 +1,4 @@
-@import '~@ghsc/nshmp-template/styles/uswds-functions';
+@import '@ghsc/nshmp-template/styles/uswds-functions';
@import url('https://unpkg.com/swagger-ui-dist/swagger-ui.css');
@import url('https://unpkg.com/swagger-ui-themes@3.0.0/themes/3.x/theme-material.css');
diff --git a/projects/nshmp-apps/src/app/source-models/data/app.component.scss b/projects/nshmp-apps/src/app/source-models/data/app.component.scss
index b0d069936..966ceef48 100644
--- a/projects/nshmp-apps/src/app/source-models/data/app.component.scss
+++ b/projects/nshmp-apps/src/app/source-models/data/app.component.scss
@@ -1,3 +1,3 @@
-@import '~mapbox-gl/dist/mapbox-gl.css';
-@import '~@mapbox/mapbox-gl-geocoder/lib/mapbox-gl-geocoder.css';
+@import 'mapbox-gl/dist/mapbox-gl.css';
+@import '@mapbox/mapbox-gl-geocoder/lib/mapbox-gl-geocoder.css';
@import '../../../styles/mapbox';
diff --git a/projects/nshmp-apps/src/styles/_code-block.scss b/projects/nshmp-apps/src/styles/_code-block.scss
index f9abce4f1..39c7443c4 100644
--- a/projects/nshmp-apps/src/styles/_code-block.scss
+++ b/projects/nshmp-apps/src/styles/_code-block.scss
@@ -1,4 +1,4 @@
-@import '~@ghsc/nshmp-template/styles/uswds-functions';
+@import '@ghsc/nshmp-template/styles/uswds-functions';
.code-block {
@include u-bg('base-lightest');
diff --git a/projects/nshmp-apps/src/styles/_dashboards.scss b/projects/nshmp-apps/src/styles/_dashboards.scss
index e656ea5bf..e3f54c7f5 100644
--- a/projects/nshmp-apps/src/styles/_dashboards.scss
+++ b/projects/nshmp-apps/src/styles/_dashboards.scss
@@ -2,7 +2,7 @@
* Styling for the dashboards
*/
-@import '~@ghsc/nshmp-template/styles/uswds-functions';
+@import '@ghsc/nshmp-template/styles/uswds-functions';
/* ---- Dashboards ---- */
.dashboard {
diff --git a/projects/nshmp-apps/src/styles/styles.scss b/projects/nshmp-apps/src/styles/styles.scss
index 6334584df..96f0d8911 100644
--- a/projects/nshmp-apps/src/styles/styles.scss
+++ b/projects/nshmp-apps/src/styles/styles.scss
@@ -1,8 +1,8 @@
@import './uswds-theme';
-@import '~@ghsc/nshmp-template/styles/styles.scss';
-@import '~@ghsc/nshmp-template/styles/uswds-functions';
-@import '~@ghsc/disagg-d3/styles/disagg-d3.scss';
+@import '@ghsc/nshmp-template/styles/styles.scss';
+@import '@ghsc/nshmp-template/styles/uswds-functions';
+@import '@ghsc/disagg-d3/styles/disagg-d3.scss';
@import './code-block';
@import './data-table';
diff --git a/projects/nshmp-lib/src/lib/components/error/error.component.scss b/projects/nshmp-lib/src/lib/components/error/error.component.scss
index 685fb04f1..dd15ae840 100644
--- a/projects/nshmp-lib/src/lib/components/error/error.component.scss
+++ b/projects/nshmp-lib/src/lib/components/error/error.component.scss
@@ -1,5 +1,5 @@
@use '@angular/material' as mat;
-@import '~@ghsc/nshmp-template/styles/material-theme';
+@import '@ghsc/nshmp-template/styles/material-theme';
mat-card {
padding: 0;
--
GitLab