NoLog.cz/decide.nolog.cz
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

deps: upgrade ember-cli-bootstrap-datepicker

Browse source 
Drops another bower dependency. 🎉
This commit is contained in:
Jeldrik Hanschke 2018-12-28 23:11:48 +01:00 committed by jelhan
parent 6592102837
commit 78ddf381c1
5 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/styles/app.less
View file

@ -1,5 +1,4 @@
@import "ember-bootstrap/bootstrap";
@import "bower_components/bootstrap-datepicker/less/datepicker3.less";
table tr td .form-group {
margin-bottom:0;

1
bower.json
View file

@ -2,7 +2,6 @@
"name": "croodle",
"dependencies": {
"sjcl": "~1.0.6",
"bootstrap-datepicker": "~1.4.0",
"floatThead": "^1.4.3"
}
}

17
ember-cli-build.js
View file

@ -4,10 +4,6 @@
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
module.exports = function(defaults) {
const Funnel = require('broccoli-funnel');
const unwatchedTree = require('broccoli-unwatched-tree');
const trees = [];
let app = new EmberApp(defaults, {
'buildInfoOptions': {
'metaTemplate': 'version={SEMVER}'
@ -35,12 +31,11 @@ module.exports = function(defaults) {
// please specify an object with the list of modules as keys
// along with the exports of each module as its value.
app.import('bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js');
app.import('bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.ca.js');
app.import('bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.de.js');
app.import('bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.en-GB.js');
app.import('bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.es.js');
app.import('bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.it.js');
app.import('vendor/bootstrap-datepicker-locales/bootstrap-datepicker.ca.min.js');
app.import('vendor/bootstrap-datepicker-locales/bootstrap-datepicker.de.min.js');
app.import('vendor/bootstrap-datepicker-locales/bootstrap-datepicker.en-GB.min.js');
app.import('vendor/bootstrap-datepicker-locales/bootstrap-datepicker.es.min.js');
app.import('vendor/bootstrap-datepicker-locales/bootstrap-datepicker.it.min.js');
app.import({
development: 'bower_components/floatThead/dist/jquery.floatThead.js',
@ -53,5 +48,5 @@ module.exports = function(defaults) {
]
});
return app.toTree(trees);
return app.toTree();
};

2
package.json
View file

@ -30,7 +30,7 @@
"ember-cli-acceptance-test-helpers": "^1.0.0",
"ember-cli-app-version": "^3.0.0",
"ember-cli-babel": "^6.3.0",
"ember-cli-bootstrap-datepicker": "^0.5.5",
"ember-cli-bootstrap-datepicker": "^0.6.1",
"ember-cli-browser-navigation-button-test-helper": "^0.0.4",
"ember-cli-build-info": "^0.3.0",
"ember-cli-chart": "^3.3.1",

25
yarn.lock
View file

@ -1844,6 +1844,13 @@ boom@2.x.x:
dependencies:
hoek "2.x.x"
bootstrap-datepicker@^1.7.1:
version "1.8.0"
resolved "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.8.0.tgz#c63513931e6f09f16ae9f11b62f32d950df3958e"
integrity sha512-213St/G8KT3mjs4qu4qwww74KWysMaIeqgq5OhrboZjIjemIpyuxlSo9FNNI5+KzpkkxkRRba+oewiRGV42B1A==
dependencies:
jquery ">=1.7.1 <4.0.0"
bootstrap@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71"
@ -3939,12 +3946,15 @@ ember-cli-babel@^6.9.2:
ember-cli-version-checker "^2.1.2"
semver "^5.5.0"
ember-cli-bootstrap-datepicker@^0.5.5:
version "0.5.6"
resolved "https://registry.yarnpkg.com/ember-cli-bootstrap-datepicker/-/ember-cli-bootstrap-datepicker-0.5.6.tgz#efa86a5d4a8b6883ee749c9bd50e1f70f17fe0a5"
integrity sha1-76hqXUqLaIPudJyb1Q4fcPF/4KU=
ember-cli-bootstrap-datepicker@^0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/ember-cli-bootstrap-datepicker/-/ember-cli-bootstrap-datepicker-0.6.1.tgz#73ee152e9b3e4e5ff872d8c8a2ca87c544c9e8b5"
integrity sha512-imo+NTPhpDuO4WBr02iU6bAXniNqO6zilvXbp2/4lz6K3/+ilg2MRorOmEgfTIt5wLiQJk+Fvky0s2p1GmiRvA==
dependencies:
ember-cli-babel "^5.1.5"
bootstrap-datepicker "^1.7.1"
broccoli-funnel "^2.0.1"
broccoli-merge-trees "^2.0.0"
ember-cli-babel "^6.6.0"
ember-cli-broccoli-sane-watcher@^2.0.4:
version "2.0.4"
@ -6896,6 +6906,11 @@ jodid25519@^1.0.0:
dependencies:
jsbn "~0.1.0"
"jquery@>=1.7.1 <4.0.0":
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
jquery@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"