From f154a4cd52cd64f51ccaceca2b5708c7a758bed4 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 12 Dec 2023 21:54:24 +0000 Subject: [PATCH 01/13] Update required node.js version in README (#6067) (#6068) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 83342f986..04ae0623d 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ We're looking for maintainers and have some funding available. Please contact J ### Requirements -[Node.js](https://nodejs.org/) >= **16.20.1**. +[Node.js](https://nodejs.org/) >= **18.18.2**. ### GNU/Linux and other UNIX-like systems From 6882df385dbbab0b47cf3b0cc96f65eecd0765ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 18:19:39 +0100 Subject: [PATCH 02/13] build(deps): bump github/codeql-action from 2 to 3 (#6069) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 353217598..eaf004e54 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -35,10 +35,10 @@ jobs: if: ${{ github.event_name == 'pull_request' }} - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 From 315f25f496b14623a48efbd9ab70e19dab0ca99e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 18:19:48 +0100 Subject: [PATCH 03/13] build(deps): bump marked from 11.0.1 to 11.1.0 in /src/bin/doc (#6066) Bumps [marked](https://github.com/markedjs/marked) from 11.0.1 to 11.1.0. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v11.0.1...v11.1.0) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/bin/doc/package-lock.json | 6 +++--- src/bin/doc/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/doc/package-lock.json b/src/bin/doc/package-lock.json index f4bf5c4e7..786aa1e21 100644 --- a/src/bin/doc/package-lock.json +++ b/src/bin/doc/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "marked": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-11.0.1.tgz", - "integrity": "sha512-P4kDhFEMlvLePBPRwOcMOv6+lYUbhfbSxJFs3Jb4Qx7v6K7l+k8Dxh9CEGfRvK71tL+qIFz5y7Pe4uzt4+/A3A==" + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-11.1.0.tgz", + "integrity": "sha512-fvKJWAPEafVj1dwGwcPI5mBB/0pvViL6NlCbNDG1HOIRwwAU/jeMoFxfbRLuirO1wRH7m4yPvBqD/O1wyWvayw==" } } } diff --git a/src/bin/doc/package.json b/src/bin/doc/package.json index eed10e225..1ca0fa87c 100644 --- a/src/bin/doc/package.json +++ b/src/bin/doc/package.json @@ -7,7 +7,7 @@ "node": ">=12.17.0" }, "dependencies": { - "marked": "^11.0.1" + "marked": "^11.1.0" }, "devDependencies": {}, "optionalDependencies": {}, From bfa55e6523184281528cceb95e02a809362f8279 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Fri, 15 Dec 2023 21:32:43 +0100 Subject: [PATCH 04/13] Always install npm@6 for correct package-lock.json version. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 6c45683f0..0f42ab832 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,6 +77,7 @@ RUN mkdir -p "${EP_DIR}" && chown etherpad:etherpad "${EP_DIR}" # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199 RUN \ mkdir -p /usr/share/man/man1 && \ + npm install npm@6 -g && \ apk update && apk upgrade && \ apk add \ ca-certificates \ From d12119d3beb7635506b92ae00f85af54c1be2c0d Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 17 Dec 2023 11:05:32 +0000 Subject: [PATCH 05/13] Handle exception during loading of plugins (#6074) --- src/static/js/pluginfw/installer.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js index 6c5784b00..d0e9dab6c 100644 --- a/src/static/js/pluginfw/installer.js +++ b/src/static/js/pluginfw/installer.js @@ -15,6 +15,10 @@ const onAllTasksFinished = async () => { await hooks.aCallAll('restartServer'); }; +const headers = { + 'User-Agent': 'Etherpad/' + settings.getEpVersion(), +} + let tasks = 0; const wrapTaskCb = (cb) => { @@ -77,12 +81,15 @@ exports.getAvailablePlugins = (maxCacheAge) => { return resolve(exports.availablePlugins); } - await axios.get('https://static.etherpad.org/plugins.json') - .then(pluginsLoaded => { - exports.availablePlugins = pluginsLoaded.data; - cacheTimestamp = nowTimestamp; - resolve(exports.availablePlugins); - }) + await axios.get('https://static.etherpad.org/plugins.json', {headers: headers}) + .then(pluginsLoaded => { + exports.availablePlugins = pluginsLoaded.data; + cacheTimestamp = nowTimestamp; + resolve(exports.availablePlugins); + }) + .catch(async err => { + return reject(err); + }); }) } From 51def0eba6eba7e168e469255426c5e56a8c5b61 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+SamTV12345@users.noreply.github.com> Date: Sun, 17 Dec 2023 22:13:13 +0100 Subject: [PATCH 06/13] fix: The log level is now respected again. (#6076) --- src/node/utils/Settings.js | 43 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 9646c1f89..7125607ea 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -50,15 +50,14 @@ const nonSettings = [ // This is a function to make it easy to create a new instance. It is important to not reuse a // config object after passing it to log4js.configure() because that method mutates the object. :( -const defaultLogConfig = () => ({appenders: {console: {type: 'console'}}, +const defaultLogConfig = (level) => ({appenders: {console: {type: 'console'}}, categories: { - default: {appenders: ['console'], level: 'info'}, + default: {appenders: ['console'], level}, }}); const defaultLogLevel = 'INFO'; const initLogging = (logLevel, config) => { // log4js.configure() modifies exports.logconfig so check for equality first. - const logConfigIsDefault = deepEqual(config, defaultLogConfig()); log4js.configure(config); log4js.getLogger('console'); @@ -67,19 +66,16 @@ const initLogging = (logLevel, config) => { console.log = logger.info.bind(logger); console.warn = logger.warn.bind(logger); console.error = logger.error.bind(logger); - - // Log the warning after configuring log4js to increase the chances the user will see it. - if (!logConfigIsDefault) logger.warn('The logconfig setting is deprecated.'); }; // Initialize logging as early as possible with reasonable defaults. Logging will be re-initialized // with the user's chosen log level and logger config after the settings have been loaded. -initLogging(defaultLogLevel, defaultLogConfig()); +initLogging(defaultLogLevel, defaultLogConfig(defaultLogLevel)); /* Root path of the installation */ exports.root = absolutePaths.findEtherpadRoot(); logger.info('All relative paths will be interpreted relative to the identified ' + - `Etherpad base dir: ${exports.root}`); + `Etherpad base dir: ${exports.root}`); exports.settingsFilename = absolutePaths.makeAbsolute(argv.settings || 'settings.json'); exports.credentialsFilename = absolutePaths.makeAbsolute(argv.credentials || 'credentials.json'); @@ -160,7 +156,7 @@ exports.defaultPadText = [ 'Welcome to Etherpad!', '', 'This pad text is synchronized as you type, so that everyone viewing this page sees the same ' + - 'text. This allows you to collaborate seamlessly on documents!', + 'text. This allows you to collaborate seamlessly on documents!', '', 'Etherpad on Github: https://github.com/ether/etherpad-lite', ].join('\n'); @@ -298,7 +294,7 @@ exports.indentationOnNewLine = true; /* * log4js appender configuration */ -exports.logconfig = defaultLogConfig(); +exports.logconfig = null; /* * Deprecated cookie signing key. @@ -646,9 +642,9 @@ const lookupEnvironmentVariables = (obj) => { if ((envVarValue === undefined) && (defaultValue === undefined)) { logger.warn(`Environment variable "${envVarName}" does not contain any value for ` + - `configuration key "${key}", and no default was given. Using null. ` + - 'THIS BEHAVIOR MAY CHANGE IN A FUTURE VERSION OF ETHERPAD; you should ' + - 'explicitly use "null" as the default if you want to continue to use null.'); + `configuration key "${key}", and no default was given. Using null. ` + + 'THIS BEHAVIOR MAY CHANGE IN A FUTURE VERSION OF ETHERPAD; you should ' + + 'explicitly use "null" as the default if you want to continue to use null.'); /* * We have to return null, because if we just returned undefined, the @@ -659,7 +655,7 @@ const lookupEnvironmentVariables = (obj) => { if ((envVarValue === undefined) && (defaultValue !== undefined)) { logger.debug(`Environment variable "${envVarName}" not found for ` + - `configuration key "${key}". Falling back to default value.`); + `configuration key "${key}". Falling back to default value.`); return coerceValue(defaultValue); } @@ -726,7 +722,7 @@ const parseSettings = (settingsFilename, isSettings) => { return replacedSettings; } catch (e) { logger.error(`There was an error processing your ${settingsType} ` + - `file from ${settingsFilename}: ${e.message}`); + `file from ${settingsFilename}: ${e.message}`); process.exit(1); } @@ -738,11 +734,13 @@ exports.reloadSettings = () => { storeSettings(settings); storeSettings(credentials); + // Init logging config + exports.logconfig = defaultLogConfig(exports.loglevel ? exports.loglevel : defaultLogLevel); initLogging(exports.loglevel, exports.logconfig); if (!exports.skinName) { logger.warn('No "skinName" parameter found. Please check out settings.json.template and ' + - 'update your settings.json. Falling back to the default "colibris".'); + 'update your settings.json. Falling back to the default "colibris".'); exports.skinName = 'colibris'; } @@ -753,7 +751,7 @@ exports.reloadSettings = () => { if (countPieces !== 1) { logger.error(`skinName must be the name of a directory under "${skinBasePath}". This is ` + - `not valid: "${exports.skinName}". Falling back to the default "colibris".`); + `not valid: "${exports.skinName}". Falling back to the default "colibris".`); exports.skinName = 'colibris'; } @@ -764,7 +762,7 @@ exports.reloadSettings = () => { // what if someone sets skinName == ".." or "."? We catch him! if (absolutePaths.isSubdir(skinBasePath, skinPath) === false) { logger.error(`Skin path ${skinPath} must be a subdirectory of ${skinBasePath}. ` + - 'Falling back to the default "colibris".'); + 'Falling back to the default "colibris".'); exports.skinName = 'colibris'; skinPath = path.join(skinBasePath, exports.skinName); @@ -825,9 +823,9 @@ exports.reloadSettings = () => { } } else { logger.warn('Declaring the sessionKey in the settings.json is deprecated. ' + - 'This value is auto-generated now. Please remove the setting from the file. -- ' + - 'If you are seeing this error after restarting using the Admin User ' + - 'Interface then you can ignore this message.'); + 'This value is auto-generated now. Please remove the setting from the file. -- ' + + 'If you are seeing this error after restarting using the Admin User ' + + 'Interface then you can ignore this message.'); } if (exports.sessionKey) { logger.warn(`The sessionKey setting and ${sessionkeyFilename} file are deprecated; ` + @@ -847,7 +845,7 @@ exports.reloadSettings = () => { if (exports.ip === '') { // using Unix socket for connectivity logger.warn('The settings file contains an empty string ("") for the "ip" parameter. The ' + - '"port" parameter will be interpreted as the path to a Unix socket to bind at.'); + '"port" parameter will be interpreted as the path to a Unix socket to bind at.'); } /* @@ -871,3 +869,4 @@ exports.exportedForTestingOnly = { // initially load settings exports.reloadSettings(); + From fdd1750ac953fc226b5e9df2116c6925d14d8975 Mon Sep 17 00:00:00 2001 From: XSpielinbox <55600187+XSpielinbox@users.noreply.github.com> Date: Mon, 18 Dec 2023 17:05:40 +0100 Subject: [PATCH 07/13] Correct Node.js install instructions (#6077) --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 04ae0623d..41da517af 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,8 @@ We're looking for maintainers and have some funding available. Please contact J #### Quick install on Debian/Ubuntu +Install the latest Node.js LTS per [official install instructions](https://github.com/nodesource/distributions#installation-instructions), then: ```sh -curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash - -sudo apt install -y nodejs git clone --branch master https://github.com/ether/etherpad-lite.git && cd etherpad-lite && src/bin/run.sh From 37935c78afc47356836f33835c6c2008b4ad4ef1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 17:05:48 +0100 Subject: [PATCH 08/13] build(deps): bump actions/upload-artifact from 3 to 4 (#6070) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3971cec1d..637f18a28 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -47,7 +47,7 @@ jobs: run: src/bin/buildForWindows.sh - name: Archive production artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: etherpad-win.zip path: etherpad-win.zip @@ -80,7 +80,7 @@ jobs: script-file: 'src/bin/nsis/etherpad.nsi' - name: Archive production artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: etherpad-win.exe path: etherpad-win.exe From 641ca06abcf8644c9b824bedfbce125c42c10209 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 17:19:32 +0100 Subject: [PATCH 09/13] build(deps): bump actions/download-artifact from 3 to 4 (#6071) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 637f18a28..8dbd03339 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -65,7 +65,7 @@ jobs: uses: actions/checkout@v4 - name: Download .zip - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: etherpad-win.zip path: .. @@ -99,7 +99,7 @@ jobs: steps: - name: Download zip - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: etherpad-win.zip - From 9b462c97f5bd02e9eb9a7ce09cacb6a6342d0c40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 17:19:51 +0100 Subject: [PATCH 10/13] build(deps-dev): bump eslint from 8.55.0 to 8.56.0 in /src (#6079) Bumps [eslint](https://github.com/eslint/eslint) from 8.55.0 to 8.56.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.55.0...v8.56.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 14 +++++++------- src/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 54474c1cd..12c48964a 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -90,9 +90,9 @@ } }, "@eslint/js": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", - "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", + "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", "dev": true }, "@humanwhocodes/config-array": { @@ -1374,15 +1374,15 @@ "dev": true }, "eslint": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", - "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", + "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.55.0", + "@eslint/js": "8.56.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", diff --git a/src/package.json b/src/package.json index 34b9e5954..5c49610d1 100644 --- a/src/package.json +++ b/src/package.json @@ -78,7 +78,7 @@ "etherpad-lite": "node/server.js" }, "devDependencies": { - "eslint": "^8.55.0", + "eslint": "^8.56.0", "eslint-config-etherpad": "^3.0.22", "etherpad-cli-client": "^2.0.2", "mocha": "^10.0.0", From 83246cd070977233345da37ee225a4086aef9bb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 17:20:00 +0100 Subject: [PATCH 11/13] build(deps): bump rate-limiter-flexible from 3.0.6 to 4.0.0 in /src (#6078) Bumps [rate-limiter-flexible](https://github.com/animir/node-rate-limiter-flexible) from 3.0.6 to 4.0.0. - [Release notes](https://github.com/animir/node-rate-limiter-flexible/releases) - [Commits](https://github.com/animir/node-rate-limiter-flexible/compare/v3.0.6...v4.0.0) --- updated-dependencies: - dependency-name: rate-limiter-flexible dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 12c48964a..e647ce16a 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -7038,9 +7038,9 @@ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "rate-limiter-flexible": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-3.0.6.tgz", - "integrity": "sha512-tlvbee6lyse/XTWmsuBDS4MT8N65FyM151bPmQlFyfhv9+RIHs7d3rSTXoz0j35H910dM01mH0yTIeWYo8+aAw==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-4.0.0.tgz", + "integrity": "sha512-SkA18LEPqJJKHixi6E7tzBKTXbj9gu5wPyfTykPVRZR5JGSw0dMCjtZsjlfuabVY940pu28Wu87NZN4FhztnyQ==" }, "raw-body": { "version": "2.5.1", diff --git a/src/package.json b/src/package.json index 5c49610d1..70d600342 100644 --- a/src/package.json +++ b/src/package.json @@ -56,7 +56,7 @@ "npm": "^6.14.18", "openapi-backend": "^5.10.5", "proxy-addr": "^2.0.7", - "rate-limiter-flexible": "^3.0.6", + "rate-limiter-flexible": "^4.0.0", "rehype": "^13.0.1", "rehype-minify-whitespace": "^6.0.0", "resolve": "1.22.8", From 5f679966a7198b1c71fc89ef987b880004c6b5ff Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Sun, 24 Dec 2023 19:49:49 +0100 Subject: [PATCH 12/13] Added 1.9.6 changelog. --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15a526784..ce90415c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# 1.9.6 + +### Notable enhancements and fixes + +* Prevent etherpad crash when update server is not reachable +* Use npm@6 in Docker build +* Fix setting the log level in settings.json + + # 1.9.5 ### Compability changes From 2ecb78b5049e37a919fe7199fe94c7cc8a2c66ba Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Sun, 24 Dec 2023 19:50:05 +0100 Subject: [PATCH 13/13] bump version --- src/package-lock.json | 2 +- src/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index e647ce16a..346177459 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -1,6 +1,6 @@ { "name": "ep_etherpad-lite", - "version": "1.9.5", + "version": "1.9.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/package.json b/src/package.json index 70d600342..a3aa49de1 100644 --- a/src/package.json +++ b/src/package.json @@ -105,6 +105,6 @@ "test": "mocha --timeout 120000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs", "test-container": "mocha --timeout 5000 tests/container/specs/api" }, - "version": "1.9.5", + "version": "1.9.6", "license": "Apache-2.0" }