Bumping all NPM dependencies to their latest versions and removing al…

…l current know vulnerabilities.
code-for-chapel-hill · Feb 1, 2021 · 839898c · 839898c
1 parent d71cf84
commit 839898c
Show file tree

Hide file tree

Showing 7 changed files with 4,128 additions and 5,705 deletions.
diff --git a/covid-19-support/package-lock.json b/covid-19-support/package-lock.json
diff --git a/covid-19-support/package.json b/covid-19-support/package.json
@@ -12,36 +12,40 @@
     "lint": "eslint src && prettier --check .",
     "serve": "cross-env vue-cli-service serve",
     "serve-demo": "cross-env VUE_APP_THEME=CodeForAmericaDemoTheme vue-cli-service serve",
-    "test:unit": "vue-cli-service test:unit"
+    "test:unit": "vue-cli-service test:unit",
+    "preinstall": "npx npm-force-resolutions"
+  },
+  "resolutions": {
+    "yargs-parser": "15.0.1"
   },
   "dependencies": {
     "@kazupon/vue-i18n-loader": "^0.5.0",
     "bootstrap": "^4.4.1",
     "bootstrap-vue": "^2.13.0",
-    "leaflet": "^1.6.0",
+    "leaflet": "^1.7.1",
     "leaflet.markercluster": "^1.4.1",
-    "vue": "^2.6.11",
-    "vue-cli-plugin-i18n": "^0.6.1",
-    "vue-i18n": "^8.17.4",
-    "vue2-leaflet": "^2.5.2",
+    "vue": "^2.6.12",
+    "vue-cli-plugin-i18n": "^1.0.1",
+    "vue-i18n": "^8.22.4",
+    "vue2-leaflet": "^2.6.0",
     "vue2-leaflet-markercluster": "^3.1.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.3.1",
-    "@vue/cli-plugin-eslint": "^3.12.1",
-    "@vue/cli-plugin-unit-jest": "^4.3.1",
-    "@vue/cli-service": "^4.3.1",
-    "@vue/test-utils": "^1.0.0-beta.33",
+    "@vue/cli-plugin-babel": "^4.5.11",
+    "@vue/cli-plugin-eslint": "^4.5.11",
+    "@vue/cli-plugin-unit-jest": "^4.5.11",
+    "@vue/cli-service": "^4.5.11",
+    "@vue/test-utils": "^1.1.2",
     "babel-eslint": "^10.1.0",
-    "cross-env": "^7.0.2",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-prettier": "^3.1.3",
-    "eslint-plugin-vue": "^6.2.2",
-    "prettier": "^2.0.5",
-    "sass": "^1.26.5",
-    "sass-loader": "^8.0.2",
-    "vue-template-compiler": "^2.6.11"
+    "cross-env": "^7.0.3",
+    "eslint": "^7.19.0",
+    "eslint-config-prettier": "^7.2.0",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-vue": "^7.5.0",
+    "prettier": "^2.2.1",
+    "sass": "^1.32.5",
+    "sass-loader": "^10.1.1",
+    "vue-template-compiler": "^2.6.12"
   },
   "eslintConfig": {
     "root": true,

diff --git a/covid-19-support/public/index.html b/covid-19-support/public/index.html
@@ -89,9 +89,7 @@
   </head>
   <body>
     <noscript>
-      <strong>
-        We're sorry but this website doesn't work properly without JavaScript enabled. Please enable it to continue.
-      </strong>
+      <strong> We're sorry but this website doesn't work properly without JavaScript enabled. Please enable it to continue. </strong>
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->

diff --git a/covid-19-support/src/components/ResourceMap.vue b/covid-19-support/src/components/ResourceMap.vue
@@ -7,7 +7,7 @@
         :zoom="zoom"
         :center="center"
         :options="mapOptions"
-        style="height: 100%; width: 100%;"
+        style="height: 100%; width: 100%"
         @update:center="centerUpdated"
         @update:zoom="(val) => (zoom = val)"
         @update:bounds="boundsUpdated"

diff --git a/covid-19-support/src/components/Sidebar.vue b/covid-19-support/src/components/Sidebar.vue
@@ -8,7 +8,7 @@
       <div class="sidebar-top">
         <search-filters class="search-filters" :need="need" @need-selected="(opt) => $emit('need-selected', opt)" />
 
-        <info-panel :infotype="'note'" :icon="'fa-info-circle'" v-if="location.currentBusiness == null || showList">
+        <info-panel :infotype="'note'" :icon="'fa-info-circle'" v-if="location.currentBusiness == null || showLists">
           {{ $t('sidebar.info-about-us') }} <a href="#" @click="$bvModal.show('about-us')">{{ $t('sidebar.info-link-text') }}</a
           >{{ $t('sidebar.info-end-text') }}
         </info-panel>
@@ -29,7 +29,7 @@
           :infotype="'green'"
           :icon="'fa-tractor'"
           :business="location.currentBusiness"
-          v-if="location.currentBusiness != null && showList !== true"
+          v-if="location.currentBusiness != null && showLists !== true"
           @close-details="$emit('close-details')"
         ></business-details>
       </div>
@@ -39,7 +39,7 @@
       :filteredMarkers="highlightFilteredMarkers"
       :location="location"
       @location-selected="(val) => $emit('location-selected', val)"
-      v-if="showList"
+      v-if="showLists"
     />
   </div>
 </template>
@@ -68,15 +68,16 @@ export default {
   },
   data() {
     return {
-      showExpandedDetails: false
+      showExpandedDetails: false,
+      showLists: this.showList
     }
   },
   methods: {
     toggleExpandingDetails() {
       this.showExpandedDetails = !this.showExpandedDetails
     },
     showListing() {
-      this.showList = true
+      this.showLists = true
       this.showExpandedDetails = true
     },
     expandedDetails() {

diff --git a/covid-19-support/src/constants.js b/covid-19-support/src/constants.js
@@ -61,11 +61,6 @@ export const needCategories = {
       id: 1001,
       name: 'Food Resources',
       subcategories: [
-        {
-          code: 'restaurant',
-          id: 1002,
-          name: 'Restaurants'
-        },
         {
           code: 'meal',
           id: 1004,
@@ -76,23 +71,13 @@ export const needCategories = {
           id: 1006,
           name: 'Prepared family meals'
         },
-        {
-          code: 'food_bev',
-          id: 1003,
-          name: 'Specialty food & beverage'
-        },
         {
           code: 'grocery',
           id: 1005,
           name: 'Groceries'
         }
       ]
     },
-    {
-      code: 'farm',
-      id: 1007,
-      name: 'Farms & farmers markets'
-    },
     {
       code: 'pharmacy',
       id: 1008,

diff --git a/covid-19-support/vue.config.js b/covid-19-support/vue.config.js
@@ -43,7 +43,7 @@ module.exports = {
   css: {
     loaderOptions: {
       sass: {
-        prependData: `
+        additionalData: `
        @import "./node_modules/bootstrap/scss/_functions.scss";
        @import "~bootstrap/scss/variables";
        @import "~bootstrap/scss/mixins";