Merge pull request #2082 from ChristianMurphy/chore/update-node-modules

chore: update eslint and remark linters
uPortal-Project · Jun 9, 2020 · 9693438 · 9693438
2 parents 7582242 + 1dac9a7
commit 9693438
Show file tree

Hide file tree

Showing 15 changed files with 2,658 additions and 1,161 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,14 +2,14 @@
   "name": "uportal",
   "private": true,
   "devDependencies": {
-    "eslint": "^6.0.0",
-    "eslint-config-google": "^0.13.0",
+    "eslint": "^7.0.0",
+    "eslint-config-google": "^0.14.0",
     "prettier-eslint-cli": "^5.0.0",
     "prettier-stylelint": "^0.4.2",
-    "remark-cli": "^7.0.0",
-    "remark-preset-lint-consistent": "^2.0.3",
-    "remark-preset-lint-recommended": "^3.0.3",
-    "remark-validate-links": "^9.0.0",
+    "remark-cli": "^8.0.0",
+    "remark-preset-lint-consistent": "^3.0.0",
+    "remark-preset-lint-recommended": "^4.0.0",
+    "remark-validate-links": "^10.0.0",
     "stylelint": "^13.0.0",
     "stylelint-config-standard": "^20.0.0"
   },

diff --git a/uPortal-webapp/package-lock.json b/uPortal-webapp/package-lock.json
diff --git a/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/entity-selector.js b/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/entity-selector.js
@@ -347,9 +347,9 @@ var up = up || {};
         if (breadcrumbs.find('span').length > 0) {
             // Breadcrumbs do exist.
             isKey =
-                breadcrumbs.find('span a[key="' + key + '"]').length > 0
-                    ? true
-                    : false;
+                breadcrumbs.find('span a[key="' + key + '"]').length > 0 ?
+                    true :
+                    false;
             if (!isKey) {
                 buildBreadCrumb(that, key, entity.name, breadcrumbs, browseFn);
             } // end:if.

diff --git a/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/up-config-lightbox.js b/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/up-config-lightbox.js
@@ -38,7 +38,7 @@ up.lightboxConfig =
          * retain that.  Otherwise, it will switch back the normal state.
          *
          * @param url the url to update
-         * @returns the updated URL as a string.
+         * @return the updated URL as a string.
          */
         convertExclusiveUrlToPageUrl = function(url) {
             var newUrl;

diff --git a/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/up-favorite.js b/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/up-favorite.js
@@ -132,17 +132,17 @@ var up = up || {};
         };
         var sourceID = $(item).attr('sourceid');
         var nextId =
-            $(item).next().length != 0
-                ? $(item)
+            $(item).next().length != 0 ?
+                $(item)
                     .next()
-                    .attr('sourceid')
-                : '';
+                    .attr('sourceid') :
+                '';
         var prevId =
-            $(item).prev().length != 0
-                ? $(item)
+            $(item).prev().length != 0 ?
+                $(item)
                     .prev()
-                    .attr('sourceid')
-                : '';
+                    .attr('sourceid') :
+                '';
 
         if ('Tab' === tabOrPortlet) {
             moveFavoriteGroup(sourceID, prevId, nextId);

diff --git a/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/up-layout-gallery.js b/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/up-layout-gallery.js
@@ -188,12 +188,12 @@ var up = up || {};
             portlets = [];
             members =
                 overallThat.state.currentCategory &&
-                overallThat.state.currentCategory !== ''
-                    ? overallThat.registry.getMemberPortlets(
+                overallThat.state.currentCategory !== '' ?
+                    overallThat.registry.getMemberPortlets(
                         overallThat.state.currentCategory,
                         true
-                    )
-                    : overallThat.registry.getAllPortlets();
+                    ) :
+                    overallThat.registry.getAllPortlets();
             $(members).each(function(idx, portlet) {
                 if (
                     !overallThat.state.portletRegex ||

diff --git a/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/up-layout-selector.js b/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/up-layout-selector.js
@@ -73,9 +73,9 @@ var up = up || {};
                             layout.columns.length +
                             ' ' +
                             that.options.strings[
-                                layout.columns.length == 1
-                                    ? 'column'
-                                    : 'columns'
+                                layout.columns.length == 1 ?
+                                    'column' :
+                                    'columns'
                             ],
                     },
                     {

diff --git a/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/up-portlet-browser.js b/uPortal-webapp/src/main/webapp/media/skins/common/javascript/uportal/up-portlet-browser.js
@@ -293,9 +293,9 @@ var up = up || {};
             onPortletSearch: function(that, searchTerm, submitted) {
                 searchTerm = $.trim(searchTerm);
                 that.state.portletRegex =
-                    searchTerm.length > 0
-                        ? new RegExp(up.escapeSpecialChars(searchTerm), 'i')
-                        : undefined;
+                    searchTerm.length > 0 ?
+                        new RegExp(up.escapeSpecialChars(searchTerm), 'i') :
+                        undefined;
                 that.portletListView.refresh();
             },
             onPortletSelect: function(that, portlet) {