chore(deps): bump select2 to npm versions (backport #9763) (#9828)

* chore(deps): use select2 version from NPM

(cherry picked from commit deee318)

# Conflicts:
#	packages/core/package.json

* chore(deps): bump select2 to npm versions (backport #9763)

* chore(deps): switch to Source Sans 3 package (#9673)

Co-authored-by: mattgogerly <matthewgogerly@gmail.com>
Co-authored-by: Matt <6519811+mattgogerly@users.noreply.github.com>

app/scripts/modules/app/index.deck

@@ -26,7 +26,7 @@
     }
 
     .loading-placeholder h1, .loading-placeholder h2 {
-      font-family: 'Source Sans Pro', sans-serif;
+      font-family: 'Source Sans 3', sans-serif;
       font-weight: 400;
       margin: 8px 0;
       font-size: 18px;

app/scripts/modules/app/index.html

@@ -27,7 +27,7 @@
 
       .loading-placeholder h1,
       .loading-placeholder h2 {
-        font-family: 'Source Sans Pro', sans-serif;
+        font-family: 'Source Sans 3', sans-serif;
         font-weight: 400;
         margin: 8px 0;
         font-size: 18px;

packages/core/package.json

@@ -25,7 +25,7 @@
     "@uirouter/react-hybrid": "1.0.2",
     "@uirouter/rx": "0.6.5",
     "@uirouter/visualizer": "7.2.1",
-    "Select2": "git://github.com/select2/select2.git#3.4.8",
+    "select2": "3.5.1",
     "angular": "1.6.10",
     "angular-messages": "1.6.10",
     "angular-sanitize": "1.6.10",
@@ -77,8 +77,8 @@
     "react2angular": "3.2.1",
     "recoil": "0.0.10",
     "rxjs": "6.6.7",
-    "select2-bootstrap-css": "git://github.com/t0m/select2-bootstrap-css.git#v1.3.1",
-    "source-sans-pro": "2.0.10",
+    "select2-bootstrap-css": "1.4.6",
+    "source-sans": "3.46.0",
     "spel2js": "0.2.6",
     "ui-select": "0.19.8"
   },

packages/core/src/core.module.ts

@@ -12,9 +12,9 @@ import 'react-virtualized/styles.css';
 import 'react-virtualized-select/styles.css';
 import 'ui-select/dist/select.css';
 import '@spinnaker/styleguide/public/styleguide.min.css';
-import 'Select2/select2.css';
+import 'select2/select2.css';
 import 'select2-bootstrap-css/select2-bootstrap.css';
-import 'source-sans-pro/source-sans-pro.css';
+import 'source-sans/source-sans-3.css';
 import './fonts/icons.css';
 
 import UI_ROUTER from '@uirouter/angularjs';

packages/core/src/modal/modals.less

@@ -222,7 +222,7 @@ html .select2-container-multi {
         display: inline-block;
         border: 1px solid var(--color-alto);
         background-color: var(--color-white);
-        font-family: 'Source Sans Pro', sans-serif;
+        font-family: 'Source Sans 3', sans-serif;
         border-radius: 4px;
       }
       .select2-search-choice-close {

packages/core/src/presentation/main.less

@@ -35,7 +35,7 @@ html {
 
 /* Space out content a bit */
 body {
-  font-family: 'Source Sans Pro', sans-serif;
+  font-family: 'Source Sans 3', sans-serif;
   padding-left: 10px;
   padding-right: 10px;
   padding-bottom: 20px;
@@ -126,7 +126,7 @@ html {
   .select2-container .select2-choices .select2-search-field input,
   .select2-container .select2-choice,
   .select2-container .select2-choices {
-    font-family: 'Source Sans Pro', sans-serif;
+    font-family: 'Source Sans 3', sans-serif;
   }
 }
 
@@ -1400,7 +1400,7 @@ body > .select2-container.open {
 
 .tooltip,
 .popover {
-  font-family: 'Source Sans Pro', sans-serif;
+  font-family: 'Source Sans 3', sans-serif;
   z-index: 10004;
 }
 

packages/google/src/serverGroup/configure/wizard/loadBalancers/elSevenOptions/backendServiceSelector.component.html

@@ -1,6 +1,6 @@
 <div class="row">
   <div class="col-md-4 sm-label-right">
-    <b style="font-family: 'Source Sans Pro', sans-serif; font-size: 14px; color: #333">Backend services</b>
+    <b style="font-family: 'Source Sans 3', sans-serif; font-size: 14px; color: #333">Backend services</b>
   </div>
   <div class="col-md-8">
     <ui-select

packages/google/src/serverGroup/configure/wizard/securityGroups/tagSelector.component.html

@@ -1,6 +1,6 @@
 <div class="row">
   <div class="col-md-4 sm-label-right">
-    <b style="font-family: 'Source Sans Pro', sans-serif; font-size: 14px; color: #333"
+    <b style="font-family: 'Source Sans 3', sans-serif; font-size: 14px; color: #333"
       >Target Tags
       <help-field
         ng-if="!$ctrl.securityGroup.selectedTags.length"

yarn.lock

@@ -4538,10 +4538,6 @@ JSONStream@^1.0.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-"Select2@git://github.com/select2/select2.git#3.4.8":
-  version "3.4.8"
-  resolved "git://github.com/select2/select2.git#b5f3b2839c48c53f9641d6bb1bccafc5260c7620"
-
 abab@^2.0.3, abab@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
@@ -16906,9 +16902,15 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-"select2-bootstrap-css@git://github.com/t0m/select2-bootstrap-css.git#v1.3.1":
-  version "1.3.1"
-  resolved "git://github.com/t0m/select2-bootstrap-css.git#c3cb2590a6947e006df761071cd4bd83ed05730c"
+select2-bootstrap-css@1.4.6:
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/select2-bootstrap-css/-/select2-bootstrap-css-1.4.6.tgz#5cfb68246f5299ca1858e01efd788804c734997e"
+  integrity sha1-XPtoJG9SmcoYWOAe/XiIBMc0mX4=
+
+select2@3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.1.tgz#f2819489bbc65fd6d328be72bbe2b95dd7e87cfe"
+  integrity sha1-8oGUibvGX9bTKL5yu+K5XdfofP4=
 
 select@^1.1.2:
   version "1.1.2"
@@ -17447,10 +17449,10 @@ source-map@^0.7.3, source-map@~0.7.2:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-source-sans-pro@2.0.10:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/source-sans-pro/-/source-sans-pro-2.0.10.tgz#c1ca859cf164a088944c5e83745085e87cd533a9"
-  integrity sha1-wcqFnPFkoIiUTF6DdFCF6HzVM6k=
+source-sans@3.46.0:
+  version "3.46.0"
+  resolved "https://registry.yarnpkg.com/source-sans/-/source-sans-3.46.0.tgz#6af0a47ead682fa8971f0c83e9692e75ef3cbb86"
+  integrity sha512-bVC2YX4VNiv5vMcy77dL0XKsNp794ThfynNsr+FqSAwk8TGG0pZsg7eUQi6yHwaRBMVmZ3Aaf4FY46dxIIGgsg==
 
 sourcemap-codec@^1.4.4:
   version "1.4.8"