mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 16:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

deps: Bump js-cookie to 3.0.0

Browse source
This commit is contained in:
Richard Hansen 2021-08-29 20:34:07 -04:00
parent ea43c92fe9
commit 7dbd278d1d
5 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/node/utils/tar.json
View file

@ -2,7 +2,7 @@
"pad.js": [ "pad.js": [
"pad.js" "pad.js"
, "pad_utils.js" , "pad_utils.js"
, "$js-cookie/src/js.cookie.js" , "$js-cookie/dist/js.cookie.js"
, "security.js" , "security.js"
, "$security.js" , "$security.js"
, "vendors/browser.js" , "vendors/browser.js"
@ -21,7 +21,7 @@
, "pad_connectionstatus.js" , "pad_connectionstatus.js"
, "chat.js" , "chat.js"
, "vendors/gritter.js" , "vendors/gritter.js"
, "$js-cookie/src/js.cookie.js" , "$js-cookie/dist/js.cookie.js"
, "$tinycon/tinycon.js" , "$tinycon/tinycon.js"
, "vendors/farbtastic.js" , "vendors/farbtastic.js"
, "skin_variants.js" , "skin_variants.js"
@ -33,7 +33,7 @@
, "colorutils.js" , "colorutils.js"
, "draggable.js" , "draggable.js"
, "pad_utils.js" , "pad_utils.js"
, "$js-cookie/src/js.cookie.js" , "$js-cookie/dist/js.cookie.js"
, "vendors/browser.js" , "vendors/browser.js"
, "pad_cookie.js" , "pad_cookie.js"
, "pad_editor.js" , "pad_editor.js"
@ -73,7 +73,7 @@
, "scroll.js" , "scroll.js"
, "caretPosition.js" , "caretPosition.js"
, "pad_utils.js" , "pad_utils.js"
, "$js-cookie/src/js.cookie.js" , "$js-cookie/dist/js.cookie.js"
, "security.js" , "security.js"
, "$security.js" , "$security.js"
] ]

6
src/package-lock.json generated
View file

@ -3372,9 +3372,9 @@
} }
}, },
"js-cookie": { "js-cookie": {
"version": "2.2.1", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz", "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.0.tgz",
"integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==" "integrity": "sha512-oUbbplKuH07/XX2YD2+Q+GMiPpnVXaRz8npE7suhBH9QEkJe2W7mQ6rwuMXHue3fpfcftQwzgyvGzIHyfCSngQ=="
}, },
"js-tokens": { "js-tokens": {
"version": "4.0.0", "version": "4.0.0",

2
src/package.json
View file

@ -45,7 +45,7 @@
"find-root": "1.1.0", "find-root": "1.1.0",
"formidable": "1.2.2", "formidable": "1.2.2",
"http-errors": "1.8.0", "http-errors": "1.8.0",
"js-cookie": "^2.2.1", "js-cookie": "^3.0.0",
"jsdom": "^16.7.0", "jsdom": "^16.7.0",
"jsonminify": "0.4.1", "jsonminify": "0.4.1",
"languages4translatewiki": "0.1.3", "languages4translatewiki": "0.1.3",

23
src/static/js/pad_utils.js
View file

@ -383,17 +383,18 @@ const inThirdPartyIframe = () => {
// This file is included from Node so that it can reuse randomString, but Node doesn't have a global // This file is included from Node so that it can reuse randomString, but Node doesn't have a global
// window object. // window object.
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
exports.Cookies = require('js-cookie/src/js.cookie'); exports.Cookies = require('js-cookie/dist/js.cookie').withAttributes({
// Use `SameSite=Lax`, unless Etherpad is embedded in an iframe from another site in which case // Use `SameSite=Lax`, unless Etherpad is embedded in an iframe from another site in which case
// use `SameSite=None`. For iframes from another site, only `None` has a chance of working // use `SameSite=None`. For iframes from another site, only `None` has a chance of working
// because the cookies are third-party (not same-site). Many browsers/users block third-party // because the cookies are third-party (not same-site). Many browsers/users block third-party
// cookies, but maybe blocked is better than definitely blocked (which would happen with `Lax` // cookies, but maybe blocked is better than definitely blocked (which would happen with `Lax`
// or `Strict`). Note: `None` will not work unless secure is true. // or `Strict`). Note: `None` will not work unless secure is true.
// //
// `Strict` is not used because it has few security benefits but significant usability drawbacks // `Strict` is not used because it has few security benefits but significant usability drawbacks
// vs. `Lax`. See https://stackoverflow.com/q/41841880 for discussion. // vs. `Lax`. See https://stackoverflow.com/q/41841880 for discussion.
exports.Cookies.defaults.sameSite = inThirdPartyIframe() ? 'None' : 'Lax'; sameSite: inThirdPartyIframe() ? 'None' : 'Lax',
exports.Cookies.defaults.secure = window.location.protocol === 'https:'; secure: window.location.protocol === 'https:',
});
} }
exports.randomString = randomString; exports.randomString = randomString;
exports.padutils = padutils; exports.padutils = padutils;

2
src/tests/frontend/index.html
View file

@ -18,7 +18,7 @@
<script src="../../static/js/vendors/jquery.js"></script> <script src="../../static/js/vendors/jquery.js"></script>
<script src="lib/sendkeys.js"></script> <script src="lib/sendkeys.js"></script>
<script src="../../static/js/vendors/browser.js"></script> <script src="../../static/js/vendors/browser.js"></script>
<script src="../../static/plugins/js-cookie/src/js.cookie.js"></script> <script src="../../static/plugins/js-cookie/dist/js.cookie.js"></script>
<script src="lib/underscore.js"></script> <script src="lib/underscore.js"></script>
<script src="lib/mocha.js"></script> <script src="lib/mocha.js"></script>