Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pin Bower versions #11701

Merged
merged 1 commit into from
Oct 10, 2018
Merged

Pin Bower versions #11701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@
"tests"
],
"dependencies": {
"autosize": "^4.0.0",
"backbone": "~1.2.3",
"base64": "~0.3.0",
"blueimp-md5": "^2.7.0",
"bootstrap": "~3.3.6",
"autosize": "4.0.2",
"backbone": "1.2.3",
"base64": "0.3.0",
"blueimp-md5": "2.7.0",
"bootstrap": "3.3.7",
"clipboard": "1.7.1",
"davclient.js": "https://github.com/evert/davclient.js.git#0.1.2",
"es6-promise": "https://github.com/jakearchibald/es6-promise.git#~2.3.0",
"handlebars": "^4.0.5",
"jcrop": "~0.9.12",
"jquery": "~2.2.0",
"jquery-migrate": "~1.4.0",
"es6-promise": "https://github.com/jakearchibald/es6-promise.git#2.3.0",
"handlebars": "4.0.5",
"jcrop": "0.9.12",
"jquery": "2.1.4",
"jquery-migrate": "1.4.0",
"jquery-ui": "1.10.0",
"jsTimezoneDetect": "~1.0.5",
"marked": "^0.3.6",
"moment": "^2.15.0",
"select2": "~3.4.8",
"snapjs": "~2.0.0-rc1",
"strengthify": "^0.5.5",
"underscore": "~1.8.0",
"zxcvbn": "*"
"jsTimezoneDetect": "1.0.6",
"marked": "0.3.6",
"moment": "2.18.1",
"select2": "3.4.8",
"snapjs": "2.0.0-rc1",
"strengthify": "0.5.5",
"underscore": "1.8.3",
"zxcvbn": "4.4.2"
}
}
2 changes: 1 addition & 1 deletion core/vendor/autosize/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"commit": "e394a257cc1e059eadc4198f56c301702289dd88"
},
"_source": "https://github.com/jackmoore/autosize.git",
"_target": "^4.0.0",
"_target": "4.0.2",
"_originalSource": "autosize"
}
4 changes: 2 additions & 2 deletions core/vendor/backbone/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"tag": "1.2.3",
"commit": "05fde9e201f7e2137796663081105cd6dad12a98"
},
"_source": "git://github.com/jashkenas/backbone.git",
"_target": "~1.2.3",
"_source": "https://github.com/jashkenas/backbone.git",
"_target": "1.2.3",
"_originalSource": "backbone"
}
7 changes: 3 additions & 4 deletions core/vendor/base64/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
"tag": "0.3.0",
"commit": "772df096a5ffe983f40202684ad45eed1e0e2d59"
},
"_source": "git://github.com/davidchambers/Base64.js.git",
"_target": "~0.3.0",
"_originalSource": "base64",
"_direct": true
"_source": "https://github.com/davidchambers/Base64.js.git",
"_target": "0.3.0",
"_originalSource": "base64"
}
2 changes: 1 addition & 1 deletion core/vendor/blueimp-md5/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"commit": "31cbd8e463b43882c7b0cf461508ddf1c8f14154"
},
"_source": "https://github.com/blueimp/JavaScript-MD5.git",
"_target": "^2.2.7",
"_target": "2.7.0",
"_originalSource": "blueimp-md5"
}
2 changes: 1 addition & 1 deletion core/vendor/bootstrap/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@
"commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86"
},
"_source": "https://github.com/twbs/bootstrap.git",
"_target": "~3.3.6",
"_target": "3.3.7",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an actual upgrade. Maybe pin it for now and upgrade in a followup PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it? On master I ran

$ bower ls
bower invalid-meta  for:/home/christoph/workspace/nextcloud/bower.json
bower invalid-meta  The "name" is recommended to be lowercase, can contain digits, dots, dashes
bower check-new     Checking for new versions of the project dependencies...
Nextcloud#11 alpha /home/christoph/workspace/nextcloud
├── DOMPurify#1.0.4 extraneous (1.0.8 available)
├── autosize#4.0.2
├─┬ backbone#1.2.3 (latest is 1.3.3)
│ └── underscore#1.8.3 (1.9.1 available)
├── base64#0.3.0 (latest is 1.0.1)
├── blueimp-md5#2.7.0 (2.10.0 available)
├─┬ bootstrap#3.3.7 (latest is 4.1.3)
│ └── jquery#2.1.4 (3.3.1 available)
├── clipboard#1.7.1 (latest is 2.0.1)
├── davclient.js#0.1.2 (latest is 0.1.3)
├── es6-promise#2.3.0 (latest is 4.2.5)
├── handlebars#4.0.5 (4.0.12 available)
├── jcrop#0.9.12 (0.9.15 available, latest is 2.0.4)
├── jquery#2.1.4 incompatible with ~2.2.0 (2.2.4 available, latest is 3.3.1)
├── jquery-migrate#1.4.0 (latest is 3.0.0)
├─┬ jquery-ui#1.10.0 (latest is 1.12.1)
│ └── jquery#2.1.4 (3.3.1 available)
├── jsTimezoneDetect#1.0.6
├── marked#0.3.6 (0.3.19 available, latest is 0.5.1)
├── moment#2.18.1 (2.22.2 available)
├─┬ select2#3.4.8 (latest is 4.0.6-rc.1)
│ └── jquery#2.1.4 (3.3.1 available)
├── snapjs#2.0.0-rc1
├── strengthify#0.5.5
├── underscore#1.8.3 (latest is 1.9.1)
└── zxcvbn#4.4.2

… from what I take that 3.3.7 is the installed version.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I read the bower file correctly, _target specifies the previously targeted version via our bower file. That was ~3.3.6, which allowed 3.3.7 and eventually resolved to.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See L34, the version stays the same 👍

"_originalSource": "bootstrap"
}
20 changes: 13 additions & 7 deletions core/vendor/bootstrap/js/tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* ========================================================================
* Bootstrap: tooltip.js v3.3.6
* Bootstrap: tooltip.js v3.3.7
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */

Expand All @@ -26,7 +26,7 @@
this.init('tooltip', element, options)
}

Tooltip.VERSION = '3.3.6'
Tooltip.VERSION = '3.3.7'

Tooltip.TRANSITION_DURATION = 150

Expand Down Expand Up @@ -317,9 +317,11 @@

function complete() {
if (that.hoverState != 'in') $tip.detach()
that.$element
.removeAttr('aria-describedby')
.trigger('hidden.bs.' + that.type)
if (that.$element) { // TODO: Check whether guarding this code with this `if` is really necessary.
that.$element
.removeAttr('aria-describedby')
.trigger('hidden.bs.' + that.type)
}
callback && callback()
}

Expand Down Expand Up @@ -362,7 +364,10 @@
// width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
}
var elOffset = isBody ? { top: 0, left: 0 } : $element.offset()
var isSvg = window.SVGElement && el instanceof window.SVGElement
// Avoid using $.offset() on SVGs since it gives incorrect results in jQuery 3.
// See https://github.com/twbs/bootstrap/issues/20280
var elOffset = isBody ? { top: 0, left: 0 } : (isSvg ? null : $element.offset())
var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null

Expand Down Expand Up @@ -478,6 +483,7 @@
that.$tip = null
that.$arrow = null
that.$viewport = null
that.$element = null
})
}

Expand Down
2 changes: 1 addition & 1 deletion core/vendor/es6-promise/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
"commit": "fcbab11a1a981eb2290bfff89017cb764335a2a5"
},
"_source": "https://github.com/jakearchibald/es6-promise.git",
"_target": "~2.3.0",
"_target": "2.3.0",
"_originalSource": "https://github.com/jakearchibald/es6-promise.git"
}
2 changes: 1 addition & 1 deletion core/vendor/handlebars/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"commit": "9b7adf2df23cf0ecc7bd60b43d43989e63222f5a"
},
"_source": "https://github.com/components/handlebars.js.git",
"_target": "^4.0.5",
"_target": "4.0.5",
"_originalSource": "handlebars"
}
4 changes: 2 additions & 2 deletions core/vendor/jcrop/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"tag": "v0.9.12",
"commit": "1902fbc6afa14481dc019a17e0dcb7d62b808a98"
},
"_source": "git://github.com/tapmodo/Jcrop.git",
"_target": "~0.9.12",
"_source": "https://github.com/tapmodo/Jcrop.git",
"_target": "0.9.12",
"_originalSource": "jcrop"
}
2 changes: 1 addition & 1 deletion core/vendor/jquery-migrate/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"commit": "d70e5a532864fdc2263f0d15030ef84671fc5807"
},
"_source": "https://github.com/appleboy/jquery-migrate.git",
"_target": "~1.4.0",
"_target": "1.4.0",
"_originalSource": "jquery-migrate"
}
2 changes: 1 addition & 1 deletion core/vendor/jquery/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"commit": "7751e69b615c6eca6f783a81e292a55725af6b85"
},
"_source": "https://github.com/jquery/jquery-dist.git",
"_target": "~2.1.0",
"_target": "2.1.4",
"_originalSource": "jquery"
}
4 changes: 2 additions & 2 deletions core/vendor/jsTimezoneDetect/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"tag": "v1.0.6",
"commit": "bd595ed253292934991a414979007f3d51a1547d"
},
"_source": "git://github.com/HenningM/jstimezonedetect.git",
"_target": "~1.0.5",
"_source": "https://github.com/HenningM/jstimezonedetect.git",
"_target": "1.0.6",
"_originalSource": "jsTimezoneDetect"
}
2 changes: 1 addition & 1 deletion core/vendor/moment/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"commit": "0af7d4f5f25f911c2eaab2a7ccb534c17e65c536"
},
"_source": "https://github.com/moment/moment.git",
"_target": "^2.15.0",
"_target": "2.18.1",
"_originalSource": "moment"
}
4 changes: 2 additions & 2 deletions core/vendor/select2/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"tag": "3.4.8",
"commit": "ee0f36a47e2133b23330fbec740b2d3a17a0d9c2"
},
"_source": "git://github.com/ivaynberg/select2.git",
"_target": "~3.4.8",
"_source": "https://github.com/ivaynberg/select2.git",
"_target": "3.4.8",
"_originalSource": "select2"
}
4 changes: 2 additions & 2 deletions core/vendor/snapjs/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"tag": "v2.0.0-rc1",
"commit": "15c77da330d9e8ca580a922bc748d88553838a73"
},
"_source": "git://github.com/jakiestfu/Snap.js.git",
"_target": "~2.0.0-rc1",
"_source": "https://github.com/jakiestfu/Snap.js.git",
"_target": "2.0.0-rc1",
"_originalSource": "snapjs"
}
6 changes: 1 addition & 5 deletions core/vendor/snapjs/dist/latest/snap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,13 +744,9 @@

/**
* Disables Snap.js events
* @param {Boolean} endCurrentDrag Whether to end the current drag (if any) or not.
*/
disable: function(endCurrentDrag) {
disable: function() {
utils.dispatchEvent('disable');
if (endCurrentDrag) {
this.action.drag.endDrag();
}
this.action.drag.stopListening();
},

Expand Down
4 changes: 2 additions & 2 deletions core/vendor/strengthify/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"_resolution": {
"type": "version",
"tag": "0.5.5",
"commit": "5fa214146e2c7760046fb6c2e01aa9b02759e7d6"
"commit": "54553d678d7894beff368ce4b4393bcc1f387037"
},
"_source": "https://github.com/MorrisJobke/strengthify.git",
"_target": "^0.5.5",
"_target": "0.5.5",
"_originalSource": "strengthify"
}
4 changes: 2 additions & 2 deletions core/vendor/underscore/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"tag": "1.8.3",
"commit": "e4743ab712b8ab42ad4ccb48b155034d02394e4d"
},
"_source": "git://github.com/jashkenas/underscore.git",
"_target": "~1.8.0",
"_source": "https://github.com/jashkenas/underscore.git",
"_target": "1.8.3",
"_originalSource": "underscore"
}
2 changes: 1 addition & 1 deletion core/vendor/zxcvbn/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@
"commit": "0b7f691c370d922399fe60927433338c062dde23"
},
"_source": "https://github.com/dropbox/zxcvbn.git",
"_target": "*",
"_target": "4.4.2",
"_originalSource": "zxcvbn"
}