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.

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

merged 1 commit into from
Oct 10, 2018

Conversation

ChristophWurst
Copy link
Member

So I want to update some Bower versions but as soon as I bower install it will automagically pull in new versions of unrelated packages because of their version specification. This pins the currently installed version.

There are (surprisingly, to some extend) changes in these libs, even though I haven't updated. @rullzer @juliushaertl @MorrisJobke please check if that is all good. From what I can tell no real code was changed, but just package information.

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

didn't test extensively. But makes sense

@ChristophWurst
Copy link
Member Author

didn't test extensively. But makes sense

You test pull requests?

@@ -1 +1,2 @@
!function(n){"use strict";function t(n,t){var r=(65535&n)+(65535&t),e=(n>>16)+(t>>16)+(r>>16);return e<<16|65535&r}function r(n,t){return n<<t|n>>>32-t}function e(n,e,o,u,c,f){return t(r(t(t(e,n),t(u,f)),c),o)}function o(n,t,r,o,u,c,f){return e(t&r|~t&o,n,t,u,c,f)}function u(n,t,r,o,u,c,f){return e(t&o|r&~o,n,t,u,c,f)}function c(n,t,r,o,u,c,f){return e(t^r^o,n,t,u,c,f)}function f(n,t,r,o,u,c,f){return e(r^(t|~o),n,t,u,c,f)}function i(n,r){n[r>>5]|=128<<r%32,n[(r+64>>>9<<4)+14]=r;var e,i,a,h,d,l=1732584193,g=-271733879,v=-1732584194,m=271733878;for(e=0;e<n.length;e+=16)i=l,a=g,h=v,d=m,l=o(l,g,v,m,n[e],7,-680876936),m=o(m,l,g,v,n[e+1],12,-389564586),v=o(v,m,l,g,n[e+2],17,606105819),g=o(g,v,m,l,n[e+3],22,-1044525330),l=o(l,g,v,m,n[e+4],7,-176418897),m=o(m,l,g,v,n[e+5],12,1200080426),v=o(v,m,l,g,n[e+6],17,-1473231341),g=o(g,v,m,l,n[e+7],22,-45705983),l=o(l,g,v,m,n[e+8],7,1770035416),m=o(m,l,g,v,n[e+9],12,-1958414417),v=o(v,m,l,g,n[e+10],17,-42063),g=o(g,v,m,l,n[e+11],22,-1990404162),l=o(l,g,v,m,n[e+12],7,1804603682),m=o(m,l,g,v,n[e+13],12,-40341101),v=o(v,m,l,g,n[e+14],17,-1502002290),g=o(g,v,m,l,n[e+15],22,1236535329),l=u(l,g,v,m,n[e+1],5,-165796510),m=u(m,l,g,v,n[e+6],9,-1069501632),v=u(v,m,l,g,n[e+11],14,643717713),g=u(g,v,m,l,n[e],20,-373897302),l=u(l,g,v,m,n[e+5],5,-701558691),m=u(m,l,g,v,n[e+10],9,38016083),v=u(v,m,l,g,n[e+15],14,-660478335),g=u(g,v,m,l,n[e+4],20,-405537848),l=u(l,g,v,m,n[e+9],5,568446438),m=u(m,l,g,v,n[e+14],9,-1019803690),v=u(v,m,l,g,n[e+3],14,-187363961),g=u(g,v,m,l,n[e+8],20,1163531501),l=u(l,g,v,m,n[e+13],5,-1444681467),m=u(m,l,g,v,n[e+2],9,-51403784),v=u(v,m,l,g,n[e+7],14,1735328473),g=u(g,v,m,l,n[e+12],20,-1926607734),l=c(l,g,v,m,n[e+5],4,-378558),m=c(m,l,g,v,n[e+8],11,-2022574463),v=c(v,m,l,g,n[e+11],16,1839030562),g=c(g,v,m,l,n[e+14],23,-35309556),l=c(l,g,v,m,n[e+1],4,-1530992060),m=c(m,l,g,v,n[e+4],11,1272893353),v=c(v,m,l,g,n[e+7],16,-155497632),g=c(g,v,m,l,n[e+10],23,-1094730640),l=c(l,g,v,m,n[e+13],4,681279174),m=c(m,l,g,v,n[e],11,-358537222),v=c(v,m,l,g,n[e+3],16,-722521979),g=c(g,v,m,l,n[e+6],23,76029189),l=c(l,g,v,m,n[e+9],4,-640364487),m=c(m,l,g,v,n[e+12],11,-421815835),v=c(v,m,l,g,n[e+15],16,530742520),g=c(g,v,m,l,n[e+2],23,-995338651),l=f(l,g,v,m,n[e],6,-198630844),m=f(m,l,g,v,n[e+7],10,1126891415),v=f(v,m,l,g,n[e+14],15,-1416354905),g=f(g,v,m,l,n[e+5],21,-57434055),l=f(l,g,v,m,n[e+12],6,1700485571),m=f(m,l,g,v,n[e+3],10,-1894986606),v=f(v,m,l,g,n[e+10],15,-1051523),g=f(g,v,m,l,n[e+1],21,-2054922799),l=f(l,g,v,m,n[e+8],6,1873313359),m=f(m,l,g,v,n[e+15],10,-30611744),v=f(v,m,l,g,n[e+6],15,-1560198380),g=f(g,v,m,l,n[e+13],21,1309151649),l=f(l,g,v,m,n[e+4],6,-145523070),m=f(m,l,g,v,n[e+11],10,-1120210379),v=f(v,m,l,g,n[e+2],15,718787259),g=f(g,v,m,l,n[e+9],21,-343485551),l=t(l,i),g=t(g,a),v=t(v,h),m=t(m,d);return[l,g,v,m]}function a(n){var t,r="",e=32*n.length;for(t=0;t<e;t+=8)r+=String.fromCharCode(n[t>>5]>>>t%32&255);return r}function h(n){var t,r=[];for(r[(n.length>>2)-1]=void 0,t=0;t<r.length;t+=1)r[t]=0;var e=8*n.length;for(t=0;t<e;t+=8)r[t>>5]|=(255&n.charCodeAt(t/8))<<t%32;return r}function d(n){return a(i(h(n),8*n.length))}function l(n,t){var r,e,o=h(n),u=[],c=[];for(u[15]=c[15]=void 0,o.length>16&&(o=i(o,8*n.length)),r=0;r<16;r+=1)u[r]=909522486^o[r],c[r]=1549556828^o[r];return e=i(u.concat(h(t)),512+8*t.length),a(i(c.concat(e),640))}function g(n){var t,r,e="0123456789abcdef",o="";for(r=0;r<n.length;r+=1)t=n.charCodeAt(r),o+=e.charAt(t>>>4&15)+e.charAt(15&t);return o}function v(n){return unescape(encodeURIComponent(n))}function m(n){return d(v(n))}function p(n){return g(m(n))}function s(n,t){return l(v(n),v(t))}function C(n,t){return g(s(n,t))}function A(n,t,r){return t?r?s(t,n):C(t,n):r?m(n):p(n)}"function"==typeof define&&define.amd?define(function(){return A}):"object"==typeof module&&module.exports?module.exports=A:n.md5=A}(this);
//# sourceMappingURL=md5.min.js.map
Copy link
Member

Choose a reason for hiding this comment

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

We removed this on purpose to avoid unnecessary warnings and network requests when open the console.

Copy link
Member Author

Choose a reason for hiding this comment

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

Warnings about what? Was the map file available or not?

Copy link
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

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

Looks good and tooltips/snap.js/strengthify where it seemed to change some code still work fine 👍

@@ -0,0 +1 @@
.strengthify-wrapper{position:relative}.strengthify-wrapper>*{-ms-filter:"alpha(opacity=0)";filter:alpha(opacity=0);opacity:0;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;transition:all .5s ease-in-out}.strengthify-bg,.strengthify-container,.strengthify-separator{height:3px}.strengthify-bg,.strengthify-container{display:block;position:absolute;width:100%}.strengthify-bg{background-color:#BBB}.strengthify-separator{display:inline-block;position:absolute;background-color:#FFF;width:1px;z-index:10}.password-bad{background-color:#C33}.password-medium{background-color:#F80}.password-good{background-color:#3C3}div[data-strengthifyMessage]{padding:3px 8px}.strengthify-tiles{float:right}
Copy link
Member

Choose a reason for hiding this comment

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

We didn't shipped the minified version but the unminified back in times. Don't know if this should be changed, because we also ship other minified versions. We just should do some unified way. Maybe for now add it to the .gitignore to avoid it being added.

@@ -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 👍

@ChristophWurst ChristophWurst force-pushed the dependachristoph/bower/pin-versions branch from 8cfd555 to e7a1df7 Compare October 9, 2018 12:36
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst ChristophWurst force-pushed the dependachristoph/bower/pin-versions branch from e7a1df7 to f83c7bd Compare October 10, 2018 12:33
@ChristophWurst
Copy link
Member Author

One failing acceptence test run stopped at exactly 40min, so I guess this was the timeout. @MorrisJobke @rullzer is this OK to merge*?

*I don't have permissions anyway, so it's up to you 😉

@rullzer rullzer merged commit 793f53c into master Oct 10, 2018
@rullzer rullzer deleted the dependachristoph/bower/pin-versions branch October 10, 2018 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants