Merge branch 'master' into #136-yarn-integrity

app/javascript/psulib_blacklight/index.js

@@ -1,7 +1,6 @@
 import './images'
 import './styles/app';
 // Vendor
-require('twitter-typeahead-rails/vendor/assets/javascripts/twitter/typeahead/typeahead.bundle');
 require('popper.js/dist/umd/popper');
 require('bootstrap/dist/js/bootstrap');
 
@@ -10,7 +9,6 @@ Turbolinks.start()
 
 // Local
 require('blacklight-frontend/app/javascript/blacklight/core')
-require('blacklight-frontend/app/javascript/blacklight/autocomplete')
 require('blacklight-frontend/app/javascript/blacklight/checkbox_submit')
 require('blacklight-frontend/app/javascript/blacklight/modal')
 require('blacklight-frontend/app/javascript/blacklight/bookmark_toggle')

app/javascript/psulib_blacklight/styles/app.scss

@@ -20,7 +20,6 @@ $logo-image: url('../images/logo.png');
 @import '~blacklight-frontend/app/assets/stylesheets/blacklight/facets';
 @import '~blacklight-frontend/app/assets/stylesheets/blacklight/search_history';
 @import '~blacklight-frontend/app/assets/stylesheets/blacklight/modal';
-@import '~blacklight-frontend/app/assets/stylesheets/blacklight/twitter_typeahead';
 @import '~blacklight-frontend/app/assets/stylesheets/blacklight/icons';
 
 // blacklight-marc overridden

package.json

@@ -7,8 +7,7 @@
  "blacklight-marc": "https://github.com/projectblacklight/blacklight-marc.git#v6.2.0",
  "caniuse-lite": "^1.0.30000697",
  "popper.js": "^1.14.3",
- "turbolinks": "^5.2.0",
- "twitter-typeahead-rails": "https://github.com/yourabi/twitter-typeahead-rails.git#v0.11.1.pre.corejavascript"
+ "turbolinks": "^5.2.0"
  },
  "devDependencies": {
  "webpack": "^3.0.0",

yarn.lock

@@ -6381,10 +6381,6 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
-"twitter-typeahead-rails@https://github.com/yourabi/twitter-typeahead-rails.git#v0.11.1.pre.corejavascript":
- version "0.0.0"
- resolved "https://github.com/yourabi/twitter-typeahead-rails.git#fc343ac2f026589117bad0b7234c8bc69ef8bd6a"
-
 type-is@~1.6.16:
  version "1.6.16"
  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"