Skip to content

Commit 6c922f0

Browse files
committed
Some dep updates
* Bump project version... shouldn't be going back from this point DB wise. We have a few days of backups already with most changes made. * Official change to odd numbered *node* version to partially work-around mitigate OpenUserJS#1548 . Somewhere around May 2019 is when 12 becomes current. 10 just "isn't doing it" for the moment. This should be reversible but not a guarantee. We are still having timeouts to AWS/mLabs. * Official mitigation of *mongoose* See Automattic/mongoose#7355 (comment) . This may be helping a little but not much. Declining slope in mLabs but could be decline in user interaction too. * Please read their CHANGELOGs * Delete op retested * Repair, yet to be documented, *diff* breaking change with `JsDiff` to `Diff` Object reference. See kpdecker/jsdiff#199 (comment)
1 parent b2c69c6 commit 6c922f0

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

app.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ if (isPro) {
7171
dbOptions = {
7272
useNewUrlParser: true,
7373
secondaryAcceptableLatencyMS: 15,
74-
poolSize: defaultPoolSize
74+
poolSize: defaultPoolSize,
75+
socketTimeoutMS: 90000 // Mitigation of #1548
7576
}
7677
} else {
7778
dbOptions = {

package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"name": "OpenUserJS.org",
33
"description": "An open source user scripts repo built using Node.js",
4-
"version": "0.2.4",
4+
"version": "0.2.5",
55
"main": "app",
66
"dependencies": {
77
"ace-builds": "git://github.com/ajaxorg/ace-builds.git#0d62c26",
88
"ansi-colors": "3.2.3",
99
"async": "2.6.1",
10-
"aws-sdk": "2.382.0",
10+
"aws-sdk": "2.384.0",
1111
"base62": "2.0.0",
1212
"body-parser": "1.18.3",
1313
"bootstrap": "3.3.7",
1414
"bootstrap-markdown": "2.10.0",
1515
"clipboard": "2.0.4",
1616
"compression": "1.7.3",
1717
"connect-mongo": "2.0.3",
18-
"diff": "3.5.0",
18+
"diff": "4.0.1",
1919
"express": "4.16.4",
2020
"express-minify": "1.0.0",
2121
"express-rate-limit": "3.3.2",
@@ -32,14 +32,14 @@
3232
"jsdom": "13.1.0",
3333
"jwt-simple": "0.5.5",
3434
"less-middleware": "3.0.1",
35-
"marked": "0.5.2",
35+
"marked": "0.6.0",
3636
"media-type": "0.3.1",
3737
"method-override": "3.0.0",
3838
"mime-db": "1.37.0",
3939
"moment": "2.23.0",
4040
"moment-duration-format": "2.2.2",
4141
"mongodb": "3.1.10",
42-
"mongoose": "5.4.1",
42+
"mongoose": "5.4.2",
4343
"morgan": "1.9.1",
4444
"mu2": "0.5.21",
4545
"octicons": "4.4.0",
@@ -63,7 +63,7 @@
6363
"select2-bootstrap-css": "1.4.6",
6464
"serve-favicon": "2.5.0",
6565
"spdx-license-ids": "3.0.3",
66-
"terser": "3.13.1",
66+
"terser": "3.14.1",
6767
"toobusy-js": "0.5.1",
6868
"underscore": "1.9.1",
6969
"useragent": "2.3.0"
@@ -83,8 +83,8 @@
8383
"clean": "node dev/clean.js"
8484
},
8585
"engines": {
86-
"node": ">=10.5.0 <11.0.0",
87-
"npm": ">=6.1.0"
86+
"node": ">=11.6.0 <12.0.0",
87+
"npm": ">=6.5.0"
8888
},
8989
"private": true
9090
}

views/includes/scripts/scriptEditor.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
editor.renderer.setShowGutter(false);
195195

196196
editor.getSession().setValue(
197-
JsDiff.createTwoFilesPatch(
197+
Diff.createTwoFilesPatch(
198198
'{{script.scriptViewSourcePageUrl}}'
199199
+ '@{{script.meta.UserScript.version.0.value}}+{{script.hashShort}}',
200200
'{{script.scriptViewSourcePageUrl}}',

0 commit comments

Comments
 (0)