Skip to content

Commit

Permalink
Merge branch '#136-yarn-integrity' of github.com:psu-libraries/psulib…
Browse files Browse the repository at this point in the history
…_blacklight into #136-yarn-integrity
  • Loading branch information
Charlie Morris committed Oct 17, 2018
2 parents 45a8b78 + 930e22d commit aaa7e6e
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 9 deletions.
2 changes: 0 additions & 2 deletions app/javascript/psulib_blacklight/index.js
Original file line number Diff line number Diff line change
@@ -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');

Expand All @@ -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')
Expand Down
1 change: 0 additions & 1 deletion app/javascript/psulib_blacklight/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 0 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit aaa7e6e

Please sign in to comment.