Bump the node dependencies (#2389)

grampelberg · web-flow · commit a1df5b6f4162 · 2020-05-18T15:25:36.000-07:00
Signed-off-by: grampelberg &lt;thomas@saunter.org&gt;
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -57,11 +57,11 @@ jobs:
           name: Install Node.js
           command: |
             set -x
-            if [ ! -f node-v6.10.2-linux-x64.tar.xz ]; then
-              curl -sLO https://nodejs.org/dist/v6.10.2/node-v6.10.2-linux-x64.tar.xz
+            if [ ! -f node-v14.2.0-linux-x64.tar.xz ]; then
+              curl -sLO https://nodejs.org/dist/v14.2.0/node-v14.2.0-linux-x64.tar.xz
             fi
-            tar -xf node-v6.10.2-linux-x64.tar.xz
-            cp -a node-v6.10.2-linux-x64/* /usr/
+            tar -xf node-v14.2.0-linux-x64.tar.xz
+            cp -a node-v14.2.0-linux-x64/* /usr/
 
       # Run ./sbt update, optionally run ./ci/twitter-develop.sh if
       # $TWITTER_DEVELOP is set. Dependencies may already be in cache.
@@ -103,7 +103,7 @@ jobs:
           key: linkerd-{{ checksum "/tmp/project-seed.txt" }}
           paths:
             - "docker-17.03.0-ce.tgz"
-            - "node-v6.10.2-linux-x64.tar.xz"
+            - "node-v14.2.0-linux-x64.tar.xz"
             - "~/.gitshas"
             - "~/.ivy2"
             - "~/.sbt"
diff --git a/admin/src/main/resources/io/buoyant/admin/js/spec/BarChartSpec.js b/admin/src/main/resources/io/buoyant/admin/js/spec/BarChartSpec.js
@@ -63,18 +63,22 @@ define([
     it("updates the bar's color when new data is added", function() {
       lbBarChart.update(generateData(21, 30));
       var $barContainer = getBarContainer($lbContainer);
+
       expect($barContainer.attr('class')).toContain("green");
 
       lbBarChart.update(generateData(19, 30));
       $barContainer = getBarContainer($lbContainer);
+
       expect($barContainer.attr('class')).toContain("orange");
 
       lbBarChart.update(generateData(6, 30));
       $barContainer = getBarContainer($lbContainer);
+
       expect($barContainer.attr('class')).toContain("red");
 
       lbBarChart.update(generateData(40, 30));
       $barContainer = getBarContainer($lbContainer);
+
       expect($barContainer.attr('class')).toContain("green");
     });
 
diff --git a/admin/src/main/resources/io/buoyant/admin/js/spec/RouterClientsSpec.js b/admin/src/main/resources/io/buoyant/admin/js/spec/RouterClientsSpec.js
@@ -192,6 +192,7 @@ define([
       _.each(clientContainers, function(clientContainer) {
         expect($(clientContainer).hasClass("hidden")).toBe(false);
       });
+
       expect(clientContainers.length).toBe(3);
 
       realCollector.__update__(expiredMetricsJson);
@@ -239,6 +240,7 @@ define([
 
       clientContainers = $clientsEl.find(".client-container");
       contentContainers = $clientsEl.find(".client-content-container");
+
       expect(clientContainers.length).toBe(9);
       expect(contentContainers.length).toBe(9);
 
@@ -286,6 +288,7 @@ define([
 
       clientContainers = $clientsEl.find(".client-container");
       contentContainers = $clientsEl.find(".client-content-container");
+
       expect(clientContainers.length).toBe(9);
       expect(contentContainers.length).toBe(9);
 
diff --git a/admin/src/main/resources/io/buoyant/admin/js/spec/UtilsSpec.js b/admin/src/main/resources/io/buoyant/admin/js/spec/UtilsSpec.js
@@ -138,9 +138,11 @@ define(['jQuery', 'src/utils'], function($, Utils) {
 
       it("adds metrics to track", function() {
         chart.setMetrics([{ name: "successRate" }]);
+
         expect(chart.metrics).toEqual(["successRate"]);
 
         chart.addMetrics([{ name: "failureRate" }]);
+
         expect(chart.metrics).toEqual(["successRate", "failureRate"]);
       });
 
@@ -153,13 +155,15 @@ define(['jQuery', 'src/utils'], function($, Utils) {
         expect(chart.metrics).toEqual(["successRate"]);
 
         chart.updateMetrics([{name: "successRate", delta: 999}]);
+
         expect(chart.tsMap.successRate.data[0][1]).toBe(999);
       });
 
       it("updates timeseries options", function() {
         expect(chart.tsOpts("foo").strokeStyle).toBe("black");
         var timeseriesParams = function(_name) { return { strokeStyle: "white" }; }
         chart.updateTsOpts(timeseriesParams);
+
         expect(chart.tsOpts("foo").strokeStyle).toBe("white");
       });
     });
diff --git a/admin/src/main/resources/io/buoyant/admin/js/src/router_clients.js b/admin/src/main/resources/io/buoyant/admin/js/src/router_clients.js
@@ -19,7 +19,7 @@ define([
     var clientContainerTemplate = templates.router_client_container;
     var rateMetricPartial = templates["rate_metric.partial"];
     var EXPAND_CLIENT_THRESHOLD = 6;
-    var TRANSFORMER_RE = /(\/%\/[^\$#]*)?(\/[\$#]\/.*)/;
+    var TRANSFORMER_RE = /(\/%\/[^$#]*)?(\/[$#]\/.*)/;
     var activeClients = {};
 
     /*
diff --git a/admin/src/main/resources/io/buoyant/admin/package-lock.json b/admin/src/main/resources/io/buoyant/admin/package-lock.json
diff --git a/admin/src/main/resources/io/buoyant/admin/package.json b/admin/src/main/resources/io/buoyant/admin/package.json
