From bafe49b65cf102baa72d99619bd94002eecc8d24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Feb 2024 21:44:17 +0000 Subject: [PATCH 1/4] Bump nodemailer from 6.6.1 to 6.9.9 Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.6.1 to 6.9.9. - [Release notes](https://github.com/nodemailer/nodemailer/releases) - [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodemailer/nodemailer/compare/v6.6.1...v6.9.9) --- updated-dependencies: - dependency-name: nodemailer dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac6e756c..6fc49b3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "mongoose": "5.13.20", "ms": "2.1.2", "mv": "2.1.1", - "nodemailer": "6.6.1", + "nodemailer": "6.9.9", "postcss-less": "6.0.0", "pug": "3.0.2", "semver": "7.5.2", @@ -15870,9 +15870,9 @@ } }, "node_modules/nodemailer": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.6.1.tgz", - "integrity": "sha512-1xzFN3gqv+/qJ6YRyxBxfTYstLNt0FCtZaFRvf4Sg9wxNGWbwFmGXVpfSi6ThGK6aRxAo+KjHtYSW8NvCsNSAg==", + "version": "6.9.9", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.9.tgz", + "integrity": "sha512-dexTll8zqQoVJEZPwQAKzxxtFn0qTnjdQTchoU6Re9BUUGBJiOy3YMn/0ShTW6J5M0dfQ1NeDeRTTl4oIWgQMA==", "engines": { "node": ">=6.0.0" } @@ -31750,9 +31750,9 @@ } }, "nodemailer": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.6.1.tgz", - "integrity": "sha512-1xzFN3gqv+/qJ6YRyxBxfTYstLNt0FCtZaFRvf4Sg9wxNGWbwFmGXVpfSi6ThGK6aRxAo+KjHtYSW8NvCsNSAg==" + "version": "6.9.9", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.9.tgz", + "integrity": "sha512-dexTll8zqQoVJEZPwQAKzxxtFn0qTnjdQTchoU6Re9BUUGBJiOy3YMn/0ShTW6J5M0dfQ1NeDeRTTl4oIWgQMA==" }, "nopt": { "version": "3.0.6", diff --git a/package.json b/package.json index 76db4928..7a47b535 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "mongoose": "5.13.20", "ms": "2.1.2", "mv": "2.1.1", - "nodemailer": "6.6.1", + "nodemailer": "6.9.9", "postcss-less": "6.0.0", "pug": "3.0.2", "semver": "7.5.2", From 617acce633e0a9d1d3def11e9ffde6b0dfea1492 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 20:42:35 +0000 Subject: [PATCH 2/4] Bump ip from 2.0.0 to 2.0.1 Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1. - [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac6e756c..5d5ac1e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11821,9 +11821,9 @@ } }, "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "dev": true }, "node_modules/ipaddr.js": { @@ -28750,9 +28750,9 @@ } }, "ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "dev": true }, "ipaddr.js": { From 6b493864a5085c24b6520d5ddec443e9d6f03084 Mon Sep 17 00:00:00 2001 From: Egor Kuzmichev Date: Tue, 5 Mar 2024 00:54:25 +0300 Subject: [PATCH 3/4] Disable Sentry --- .github/workflows/docker-image.yml | 10 +++++----- views/app.pug | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index eb961bdd..2b8c2b15 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -33,11 +33,11 @@ jobs: npm ci npm run build - - name: Sentry - env: - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - run: | - npm run sentry:sourcemaps + #- name: Sentry + # env: + # SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} + # run: | + # npm run sentry:sourcemaps - name: Login to ghcr.io uses: docker/login-action@v3 diff --git a/views/app.pug b/views/app.pug index ece96b3c..4ba4782d 100644 --- a/views/app.pug +++ b/views/app.pug @@ -20,8 +20,8 @@ html include ../public/js/lib/require/require.js include ../public/js/_mainConfig.js | - else - script(src="https://js.sentry-cdn.com/9584509fc9bc1edf71474b8460b41d65.min.js", crossorigin="anonymous") + // else + // script(src="https://js.sentry-cdn.com/9584509fc9bc1edf71474b8460b41d65.min.js", crossorigin="anonymous") body if nojsShow From 6968a40a1eacde4c407e0ef410bbb63322b428d2 Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Mon, 4 Mar 2024 21:46:53 +0000 Subject: [PATCH 4/4] Remove Stamen map layer. This is not free any more, https://maps.stamen.com/stadia-partnership/ --- public/js/module/map/map.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/public/js/module/map/map.js b/public/js/module/map/map.js index aa7178d7..93c0fc5c 100644 --- a/public/js/module/map/map.js +++ b/public/js/module/map/map.js @@ -226,16 +226,6 @@ define([ attribution: '© участники сообщества OpenStreetMap | SRTM | Стиль карты: © OpenTopoMap (CC-BY-SA)', }, }, - { - id: 'stamen_bw', - desc: 'Стамен ч/б', - selected: ko.observable(false), - options: { - urlTemplate: 'https://tiles.stadiamaps.com/tiles/stamen_toner/{z}/{x}/{y}.png', - attribution: 'Map tiles by Stamen Design, CC BY 3.0 | © участники сообщества OpenStreetMap', - maxZoom: 21, - }, - }, ]), });