From 0d96447d4bf7df8857ca7feca9b67b6f000f5a20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:38:51 +0000 Subject: [PATCH 01/18] Bump @sap/cds from 6.3.1 to 6.3.2 Bumps [@sap/cds](https://cap.cloud.sap/) from 6.3.1 to 6.3.2. --- updated-dependencies: - dependency-name: "@sap/cds" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2d3ab96d..b19a2d60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "./hello", "./media", "./orders", + "./loggers", "./reviews" ], "dependencies": { @@ -90,6 +91,13 @@ "typescript": "^4.3.5" } }, + "loggers": { + "version": "1.0.0", + "dependencies": { + "@sap/cds": ">=5.9", + "express": "^4.17.1" + } + }, "media": { "name": "@capire/media", "version": "1.0.0", @@ -227,6 +235,10 @@ "resolved": "hello", "link": true }, + "node_modules/@capire/loggers": { + "resolved": "loggers", + "link": true + }, "node_modules/@capire/media": { "resolved": "media", "link": true @@ -333,9 +345,9 @@ } }, "node_modules/@sap/cds": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.3.1.tgz", - "integrity": "sha512-EywUoV16yfYMMEgpY5M4NdNrdjw7dPcIK5c+pAVjio+16PDa7l2x81AhO/JNWD7g7j/POsNUc2ry+LtRxUuceQ==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.3.2.tgz", + "integrity": "sha512-cR3mMnnlsss2l8FMXiBjcfQHcG5X7Nc8JZR7t6K3Cd/rc94XPPUyGOSVOyI25H5rTM3J2dSGcYneX3PCOCl8aw==", "dependencies": { "@sap/cds-compiler": "^3.2.0", "@sap/cds-foss": "^4" @@ -3101,6 +3113,13 @@ "typescript": "^4.3.5" } }, + "@capire/loggers": { + "version": "file:loggers", + "requires": { + "@sap/cds": ">=5.9", + "express": "^4.17.1" + } + }, "@capire/media": { "version": "file:media", "requires": { @@ -3200,9 +3219,9 @@ } }, "@sap/cds": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.3.1.tgz", - "integrity": "sha512-EywUoV16yfYMMEgpY5M4NdNrdjw7dPcIK5c+pAVjio+16PDa7l2x81AhO/JNWD7g7j/POsNUc2ry+LtRxUuceQ==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.3.2.tgz", + "integrity": "sha512-cR3mMnnlsss2l8FMXiBjcfQHcG5X7Nc8JZR7t6K3Cd/rc94XPPUyGOSVOyI25H5rTM3J2dSGcYneX3PCOCl8aw==", "requires": { "@sap/cds-compiler": "^3.2.0", "@sap/cds-foss": "^4" From e9fbba9f468e74788c7f39253c805a99227e1e8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:40:32 +0000 Subject: [PATCH 02/18] Bump axios from 1.1.3 to 1.2.0 Bumps [axios](https://github.com/axios/axios) from 1.1.3 to 1.2.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.1.3...v1.2.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index b19a2d60..2572c7bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -92,6 +92,7 @@ } }, "loggers": { + "name": "@capire/loggers", "version": "1.0.0", "dependencies": { "@sap/cds": ">=5.9", @@ -622,9 +623,9 @@ "dev": true }, "node_modules/axios": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz", - "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz", + "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==", "dev": true, "dependencies": { "follow-redirects": "^1.15.0", @@ -3443,9 +3444,9 @@ "dev": true }, "axios": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz", - "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz", + "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==", "dev": true, "requires": { "follow-redirects": "^1.15.0", From 710c83aa1cffadcbfff65670f4ff6b9eb0530695 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 12:02:45 +0000 Subject: [PATCH 03/18] Bump axios from 1.2.0 to 1.2.1 Bumps [axios](https://github.com/axios/axios) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.2.0...v1.2.1) --- updated-dependencies: - dependency-name: axios dependency-type: direct:development update-type: version-update:semver-patch ... 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 2572c7bd..40856dfd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -623,9 +623,9 @@ "dev": true }, "node_modules/axios": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz", - "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz", + "integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==", "dev": true, "dependencies": { "follow-redirects": "^1.15.0", @@ -3444,9 +3444,9 @@ "dev": true }, "axios": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz", - "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz", + "integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==", "dev": true, "requires": { "follow-redirects": "^1.15.0", From 4f5f075697e1a2bd9c8902ce087c6312155b8059 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 12:05:17 +0000 Subject: [PATCH 04/18] Bump sqlite3 from 5.1.2 to 5.1.3 Bumps [sqlite3](https://github.com/TryGhost/node-sqlite3) from 5.1.2 to 5.1.3. - [Release notes](https://github.com/TryGhost/node-sqlite3/releases) - [Commits](https://github.com/TryGhost/node-sqlite3/compare/v5.1.2...v5.1.3) --- updated-dependencies: - dependency-name: sqlite3 dependency-type: direct:development update-type: version-update:semver-patch ... 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 40856dfd..6824d58d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2631,9 +2631,9 @@ } }, "node_modules/sqlite3": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.2.tgz", - "integrity": "sha512-D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.3.tgz", + "integrity": "sha512-z9sfEGGv/40WfvjhFxPkvTaK8ahYSW/chR735Eokrwz20tHbZEtQpRXQ20qDdCVNzOKAOQEy4B9L2bdwGoKtoQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -4980,9 +4980,9 @@ } }, "sqlite3": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.2.tgz", - "integrity": "sha512-D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.3.tgz", + "integrity": "sha512-z9sfEGGv/40WfvjhFxPkvTaK8ahYSW/chR735Eokrwz20tHbZEtQpRXQ20qDdCVNzOKAOQEy4B9L2bdwGoKtoQ==", "dev": true, "requires": { "@mapbox/node-pre-gyp": "^1.0.0", From b7e435d611a74a141fade0d56475498ed33d5820 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 12:02:48 +0000 Subject: [PATCH 05/18] Bump sqlite3 from 5.1.3 to 5.1.4 Bumps [sqlite3](https://github.com/TryGhost/node-sqlite3) from 5.1.3 to 5.1.4. - [Release notes](https://github.com/TryGhost/node-sqlite3/releases) - [Commits](https://github.com/TryGhost/node-sqlite3/compare/v5.1.3...v5.1.4) --- updated-dependencies: - dependency-name: sqlite3 dependency-type: direct:development update-type: version-update:semver-patch ... 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 6824d58d..bcc8d064 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2631,9 +2631,9 @@ } }, "node_modules/sqlite3": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.3.tgz", - "integrity": "sha512-z9sfEGGv/40WfvjhFxPkvTaK8ahYSW/chR735Eokrwz20tHbZEtQpRXQ20qDdCVNzOKAOQEy4B9L2bdwGoKtoQ==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.4.tgz", + "integrity": "sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -4980,9 +4980,9 @@ } }, "sqlite3": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.3.tgz", - "integrity": "sha512-z9sfEGGv/40WfvjhFxPkvTaK8ahYSW/chR735Eokrwz20tHbZEtQpRXQ20qDdCVNzOKAOQEy4B9L2bdwGoKtoQ==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.4.tgz", + "integrity": "sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA==", "dev": true, "requires": { "@mapbox/node-pre-gyp": "^1.0.0", From 879546829a705aeec722504510bf3487ff855e48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Dec 2022 12:03:57 +0000 Subject: [PATCH 06/18] Bump @sap/cds from 6.3.2 to 6.4.0 Bumps [@sap/cds](https://cap.cloud.sap/) from 6.3.2 to 6.4.0. --- updated-dependencies: - dependency-name: "@sap/cds" dependency-type: direct:production update-type: version-update:semver-minor ... 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 bcc8d064..aad6f956 100644 --- a/package-lock.json +++ b/package-lock.json @@ -346,9 +346,9 @@ } }, "node_modules/@sap/cds": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.3.2.tgz", - "integrity": "sha512-cR3mMnnlsss2l8FMXiBjcfQHcG5X7Nc8JZR7t6K3Cd/rc94XPPUyGOSVOyI25H5rTM3J2dSGcYneX3PCOCl8aw==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.4.0.tgz", + "integrity": "sha512-Z19veNd0lf+W3Q97Xzxi7cJ50NsYx42wiiRs+44Xp7DArQuose4XkrN3iZ7DdX+FxcJSYojPnuDdN22QnZPZbA==", "dependencies": { "@sap/cds-compiler": "^3.2.0", "@sap/cds-foss": "^4" @@ -3220,9 +3220,9 @@ } }, "@sap/cds": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.3.2.tgz", - "integrity": "sha512-cR3mMnnlsss2l8FMXiBjcfQHcG5X7Nc8JZR7t6K3Cd/rc94XPPUyGOSVOyI25H5rTM3J2dSGcYneX3PCOCl8aw==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.4.0.tgz", + "integrity": "sha512-Z19veNd0lf+W3Q97Xzxi7cJ50NsYx42wiiRs+44Xp7DArQuose4XkrN3iZ7DdX+FxcJSYojPnuDdN22QnZPZbA==", "requires": { "@sap/cds-compiler": "^3.2.0", "@sap/cds-foss": "^4" From 28cfceeaf01c2e26d8d11a09406f445ed1c0e545 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 20 Dec 2022 13:30:17 +0100 Subject: [PATCH 07/18] Avoid dangling IO resources --- test/registry.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/registry.test.js b/test/registry.test.js index 5c64c31e..e203e25b 100644 --- a/test/registry.test.js +++ b/test/registry.test.js @@ -20,7 +20,7 @@ describe('cap/samples - Local NPM registry', () => { axios = require('axios').create ({ baseURL: res.url, validateStatus: (status)=>status<500 }) }) - after(() => { registry.kill() }) + after(done => { registry.once('exit',done); registry.kill() }) for (const mod of ['bookshop', 'data-viewer', 'fiori','orders','reviews']) { it(`should serve ${mod}`, async () => { From 8a6a42f1095a7f39e55b77f7e02fa9da26f5c719 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Dec 2022 12:04:27 +0000 Subject: [PATCH 08/18] Bump axios from 1.2.1 to 1.2.2 Bumps [axios](https://github.com/axios/axios) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.2.1...1.2.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:development update-type: version-update:semver-patch ... 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 aad6f956..1830a416 100644 --- a/package-lock.json +++ b/package-lock.json @@ -623,9 +623,9 @@ "dev": true }, "node_modules/axios": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz", - "integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz", + "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==", "dev": true, "dependencies": { "follow-redirects": "^1.15.0", @@ -3444,9 +3444,9 @@ "dev": true }, "axios": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz", - "integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz", + "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==", "dev": true, "requires": { "follow-redirects": "^1.15.0", From a1c2f324082beec1c0df4a13ba58868ce3a1e921 Mon Sep 17 00:00:00 2001 From: Daniel Hutzel Date: Fri, 13 Jan 2023 09:08:20 +0100 Subject: [PATCH 09/18] Cleanup (#440) * Cleanup * minor cleanups --- .registry/.gitignore | 1 - .registry/server.js | 81 ---------------------------- .vscode/launch.json | 20 +++++-- .vscode/settings.json | 5 +- bookshop/db/init.js | 22 ++++---- fiori/server.js | 10 ++-- package.json | 8 +-- samples.md | 2 +- test/custom-handlers.test.js | 5 +- test/fiori.test.js | 4 +- test/localized-data/services.test.js | 10 ++-- test/messaging.test.js | 12 ++--- test/odata.test.js | 56 +++---------------- test/registry.test.js | 57 -------------------- 14 files changed, 66 insertions(+), 227 deletions(-) delete mode 100644 .registry/.gitignore delete mode 100644 .registry/server.js delete mode 100644 test/registry.test.js diff --git a/.registry/.gitignore b/.registry/.gitignore deleted file mode 100644 index aa1ec1ea..00000000 --- a/.registry/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.tgz diff --git a/.registry/server.js b/.registry/server.js deleted file mode 100644 index d3489325..00000000 --- a/.registry/server.js +++ /dev/null @@ -1,81 +0,0 @@ -const { exec } = require ('child_process') -const isWin = process.platform === 'win32' -const express = require ('express') -const fs = require ('fs') -const app = express() - -const { PORT=4444 } = process.env -const [,,port=PORT,scope='@capire'] = process.argv -const cwd = __dirname - -// clean up on start (exit handler might not complete on Windows) -exec(isWin ? 'del *.tgz' : 'rm *.tgz', {cwd}) - - -app.use('/-/:tarball', (req,res,next) => { - console.debug ('GET', req.params) - try { - const { tarball } = req.params - const pkgFull = tarball.substring(0, tarball.lastIndexOf('-')) - const [, pkg ] = /^\w+-(.+)/.exec(pkgFull) - fs.lstat(tarball,(err => { - if (err) console.debug (`npm pack ../${pkg}`) - if (err) exec(`npm pack ../${pkg}`,{cwd},next) - else next() - })) - } catch (e) { - console.error(e) - res.sendStatus(500) - } -}) - -app.use('/-', express.static(__dirname)) - -app.get('/*', (req,res)=>{ - const urlRegex = /^\/(@[\w-]+)\/(.+)/ - const url = decodeURIComponent(req.url) - console.debug ('GET',url) - try { - if (!urlRegex.test(url)) return res.sendStatus(404) - const [, scpe, pkg ] = urlRegex.exec(url) - const package = require (`${scpe}/${pkg}/package.json`) - const tarball = `${scpe.slice(1)}-${pkg}-${package.version}.tgz` - // https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md - res.json({ - "name": package.name, - "dist-tags": { - "latest": package.version - }, - "versions": { - [package.version]: { - "name": package.name, - "version": package.version, - "dist": { - "tarball": `${server.url}/-/${tarball}` - }, - } - }, - }) - } catch (e) { - if (e.code === 'MODULE_NOT_FOUND') return res.sendStatus(404) - console.error(e); throw e - } -}) - -const server = app.listen(port, ()=>{ - const url = server.url = `http://localhost:${server.address().port}` - console.log (`npm set ${scope}:registry=${url}`) - exec(`npm set ${scope}:registry=${url}`) - console.log (`${scope} registry listening on ${url}`) -}) - - -const _exit = ()=>{ - server.close() - exec(`npm conf rm "${scope}:registry"`, ()=> { process.exit() }) -} - -process.on ('SIGTERM',_exit) -process.on ('SIGHUP',_exit) -process.on ('SIGINT',_exit) -process.on ('SIGUSR2',_exit) diff --git a/.vscode/launch.json b/.vscode/launch.json index 40b41090..40d3ef3c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -13,7 +13,7 @@ "/**", "**/node_modules/**", "**/cds/lib/lazy.js", - "**/cds/lib/req/cls.js", + "**/cds/lib/req/cds-context.js", "**/odata-v4/okra/**" ] }, @@ -26,10 +26,24 @@ "/**", "**/node_modules/**", "**/cds/lib/lazy.js", - "**/cds/lib/req/cls.js", + "**/cds/lib/req/cds-context.js", "**/odata-v4/okra/**" ] - } + }, + { + "name": "Debug Mocha Tests", + "type": "node", + "request": "attach", + "port": 9229, + "continueOnAttach": true, + "skipFiles": [ + "/**", + "**/node_modules/**", + "**/cds/lib/lazy.js", + "**/cds/lib/req/cds-context.js", + "**/odata-v4/okra/**", + ] + }, ], "inputs": [ { diff --git a/.vscode/settings.json b/.vscode/settings.json index 44342b41..786fe8d4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,10 +10,11 @@ "/**", "**/node_modules/**", "**/cds/lib/lazy.js", - "**/cds/lib/req/cls.js", + "**/cds/lib/req/cds-context.js", "**/odata-v4/okra/**" ] }, + "mochaExplorer.debuggerConfig": "Debug Mocha Tests", "mochaExplorer.parallel": true, "eslint.validate": [ "cds", @@ -22,5 +23,5 @@ "csv (semicolon)", "tsv", "tab" - ] + ], } \ No newline at end of file diff --git a/bookshop/db/init.js b/bookshop/db/init.js index 0db736ca..bfa0fc89 100644 --- a/bookshop/db/init.js +++ b/bookshop/db/init.js @@ -4,21 +4,21 @@ * currencies, if not obtained through @capire/common. */ -module.exports = async (db)=>{ +module.exports = async (tx)=>{ - const has_common = db.model.definitions['sap.common.Currencies'].elements.numcode + const has_common = tx.model.definitions['sap.common.Currencies']?.elements.numcode if (has_common) return - const already_filled = await db.exists('sap.common.Currencies',{code:'EUR'}) + const already_filled = await tx.exists('sap.common.Currencies',{code:'EUR'}) if (already_filled) return - await INSERT.into ('sap.common.Currencies') .columns ( - 'code','symbol','name' + await tx.run (INSERT.into ('sap.common.Currencies') .columns ( + [ 'code', 'symbol', 'name' ] ) .rows ( - [ 'EUR','€','Euro' ], - [ 'USD','$','US Dollar' ], - [ 'GBP','£','British Pound' ], - [ 'ILS','₪','Shekel' ], - [ 'JPY','¥','Yen' ], - ) + [ 'EUR', '€', 'Euro' ], + [ 'USD', '$', 'US Dollar' ], + [ 'GBP', '£', 'British Pound' ], + [ 'ILS', '₪', 'Shekel' ], + [ 'JPY', '¥', 'Yen' ], + )) } diff --git a/fiori/server.js b/fiori/server.js index 70cf701b..b3ab5dde 100644 --- a/fiori/server.js +++ b/fiori/server.js @@ -1,8 +1,8 @@ -const cds = require("@sap/cds") - // install OData v2 adapter +const cds = require("@sap/cds") const proxy = require('@sap/cds-odata-v2-adapter-proxy') -const proxyOpts = global.it ? { target:'auto' } : {} // for tests, set 'auto' to detect port dynamically -cds.on('bootstrap', app => app.use(proxy(proxyOpts))) +const opts = global.it ? { target:'auto' } : {} // for tests, set 'auto' to detect port dynamically +cds.on('bootstrap', app => app.use(proxy(opts))) // install proxy +cds.log('cov2ap','silent') // suppress anoying log outpout, e.g. for `npm run mocha -- --reporter nyan` -module.exports = require('@capire/bookstore/server.js') \ No newline at end of file +module.exports = require('@capire/bookstore/server.js') diff --git a/package.json b/package.json index f2001e6f..10d0e3ea 100644 --- a/package.json +++ b/package.json @@ -29,13 +29,12 @@ }, "scripts": { "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules", - "registry": "node .registry/server.js", "bookshop": "cds watch bookshop", "fiori": "cds watch fiori", "hello": "cds watch hello", "media": "cds watch media", - "mocha": "npx mocha || echo", - "jest": "npx jest", + "mocha": "CDS_TEST_SILENT=y npx mocha", + "jest": "npx jest --silent", "start": "cds watch fiori", "test": "npm run jest -- --silent", "test:hello": "cd hello && npm test" @@ -48,7 +47,8 @@ }, "mocha": { "recursive": true, - "parallel": true + "parallel": true, + "timeout": 6666 }, "license": "SAP SAMPLE CODE LICENSE", "private": true diff --git a/samples.md b/samples.md index afaa083a..9caed0e8 100644 --- a/samples.md +++ b/samples.md @@ -1,7 +1,7 @@ # Overview of Samples The following list gives an overview of the samples provided in subdirectories. -Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](all-in-one-monorepo) umbrella setup. +Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](#all-in-one-monorepo) umbrella setup. ## [@capire/hello-world](hello) diff --git a/test/custom-handlers.test.js b/test/custom-handlers.test.js index ae2184d3..5bd8acda 100644 --- a/test/custom-handlers.test.js +++ b/test/custom-handlers.test.js @@ -3,8 +3,9 @@ const cds = require('@sap/cds/lib') describe('cap/samples - Custom Handlers', () => { const { GET, POST, expect } = cds.test(__dirname+'/../bookshop') - if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch - else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases + beforeAll(()=>{ + cds.User.default = cds.User.Privileged // hard core monkey patch + }) it('should reject out-of-stock orders', async () => { await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}` diff --git a/test/fiori.test.js b/test/fiori.test.js index 9da8eb5e..a48abc3c 100644 --- a/test/fiori.test.js +++ b/test/fiori.test.js @@ -1,10 +1,12 @@ const cds = require('@sap/cds/lib') -describe('cap/samples - Fiori APIs - v2', () => { +describe('cap/samples - Fiori APIs - v2', function() { const { GET, expect, axios } = cds.test ('@capire/fiori', '--with-mocks') axios.defaults.auth = { username: 'alice', password: 'admin' } + // if (this.timeout) this.timeout(1e6) + it('serves $metadata documents in v2', async () => { const { headers, data } = await GET `/v2/browse/$metadata` expect(headers).to.contain({ diff --git a/test/localized-data/services.test.js b/test/localized-data/services.test.js index a440e60e..8ec30485 100644 --- a/test/localized-data/services.test.js +++ b/test/localized-data/services.test.js @@ -1,8 +1,12 @@ +const cds = require('@sap/cds/lib') + describe('cap/samples - Localized Data', () => { - const { GET, expect, cds } = require('@sap/cds/lib').test (__dirname) - if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch - else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases + const { GET, expect } = cds.test (__dirname) + beforeAll(()=>{ + cds.User.default = cds.User.Privileged // hard core monkey patch + }) + it('serves localized $metadata documents', async () => { const { data } = await GET(`/browse/$metadata?sap-language=de`, { headers: { 'accept-language': 'de' }}) diff --git a/test/messaging.test.js b/test/messaging.test.js index f31f715a..9e9ab66c 100644 --- a/test/messaging.test.js +++ b/test/messaging.test.js @@ -1,16 +1,13 @@ const cds = require('@sap/cds/lib') -const {resolve} = require('path') describe('cap/samples - Messaging', ()=>{ - const { expect } = cds.test + const { expect } = cds.test.in(__dirname,'..') const _model = '@capire/reviews' const Reviews = 'sap.capire.reviews.Reviews' - if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch - else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases - - beforeAll(() => { cds.root = resolve(__dirname, '..') }) - afterAll(() => { cds.root = process.cwd() }) + beforeAll(()=>{ + cds.User.default = cds.User.Privileged // hard core monkey patch + }) it ('should bootstrap sqlite in-memory db', async()=>{ const db = await cds.deploy (_model) .to ('sqlite::memory:') @@ -35,6 +32,7 @@ describe('cap/samples - Messaging', ()=>{ it ('should add review', async ()=>{ const review = { subject: "201", title: "Captivating", rating: ++N } + cds._debug = 1 const response = await srv.create ('Reviews') .entries (review) expect (response) .to.containSubset (review) }) diff --git a/test/odata.test.js b/test/odata.test.js index c0987828..73ac0ff4 100644 --- a/test/odata.test.js +++ b/test/odata.test.js @@ -4,47 +4,6 @@ describe('cap/samples - Bookshop APIs', () => { const { GET, expect, axios } = cds.test ('@capire/bookshop') axios.defaults.auth = { username: 'alice', password: 'admin' } - // Genres - const Drama = { - "name": "Drama", - "descr": null, - "ID": 11, - "parent_ID": 10 - } - const Mystery = { - "name": "Mystery", - "descr": null, - "ID": 16, - "parent_ID": 10 - } - const Romance = { - "name": "Romance", - "descr": null, - "ID": 15, - "parent_ID": 10 - } - - // Currencies - const GBP = { - "name": "British Pound", - "descr": null, - "code": "GBP", - "symbol": "£" - } - const USD = { - "name": "US Dollar", - "descr": null, - "code": "USD", - "symbol": "$" - } - const JPY = { - "name": "Yen", - "descr": null, - "code": "JPY", - "symbol": "¥" - } - - it('serves $metadata documents in v4', async () => { const { headers, status, data } = await GET `/browse/$metadata` expect(status).to.equal(200) @@ -57,6 +16,9 @@ describe('cap/samples - Bookshop APIs', () => { }) it('serves ListOfBooks?$expand=genre,currency', async () => { + const Mystery = { ID: 16, name: 'Mystery', descr: null, parent_ID: 10 } + const Romance = { ID: 15, name: 'Romance', descr: null, parent_ID: 10 } + const USD = { code: 'USD', name: 'US Dollar', descr: null, symbol: '$' } const { data } = await GET `/browse/ListOfBooks ${{ params: { $search: 'Po', $select: `title,author`, $expand:`genre,currency` }, }}` @@ -126,14 +88,10 @@ describe('cap/samples - Bookshop APIs', () => { }) it('serves user info', async () => { - { - const { data } = await GET (`/user/me`) - expect(data).to.containSubset({ id: 'alice', locale:'en' }) - } - { - const { data } = await GET (`/user/me`, {auth: { username: 'joe' }}) - expect(data).to.containSubset({ id: 'joe', locale:'en' }) - } + const { data: alice } = await GET `/user/me` + expect(alice).to.containSubset({ id: 'alice', locale:'en' }) + const { data: joe } = await GET (`/user/me`, {auth: { username: 'joe' }}) + expect(joe).to.containSubset({ id: 'joe', locale:'en' }) }) }) diff --git a/test/registry.test.js b/test/registry.test.js deleted file mode 100644 index e203e25b..00000000 --- a/test/registry.test.js +++ /dev/null @@ -1,57 +0,0 @@ - -const cds = require('@sap/cds/lib') -const { fork } = require('child_process') -const { resolve } = require('path') -const verbose = process.env.CDS_TEST_VERBOSE - -describe('cap/samples - Local NPM registry', () => { - - const { expect } = cds.test - // ||true - - let registry - let axios - const cwd = resolve(__dirname, '..') - - before(async ()=> { - const env = Object.assign(process.env, {PORT:'0'}) - const res = await exec (resolve(cwd, '.registry/server.js'), {cwd, stdio: 'pipe', env}) - registry = res.cp - axios = require('axios').create ({ baseURL: res.url, validateStatus: (status)=>status<500 }) - }) - - after(done => { registry.once('exit',done); registry.kill() }) - - for (const mod of ['bookshop', 'data-viewer', 'fiori','orders','reviews']) { - it(`should serve ${mod}`, async () => { - const resp = await axios.get(`/@capire/${mod}`) - expect(resp.data).to.containSubset({name: `@capire/${mod}`, versions:{}}) - const versions = Object.values(resp.data.versions) - await axios.get(versions[0].dist.tarball) - }) - } - it(`should return 404 for unknown packages`, async () => { - let resp = await axios.get(`/@capire/foo`) - expect(resp.status).to.equal(404) - resp = await axios.get(`/foo`) - expect(resp.status).to.equal(404) - }) - -}) - -function exec (script, opts) { - return new Promise((resolve, reject)=> { - const cp = fork (script, [], opts) - .on('error', err => reject(new Error(err))) - cp.stdout.on('data', chunk => { - if (verbose) console.log(chunk.toString()) - if (chunk.toString().match(/listening.*(http:.*:\d+)/i)) { - resolve({cp, url:RegExp.$1}) - } - }) - cp.stderr.on('data', chunk => { - if (verbose) console.error(chunk.toString()) - }) - }) - -} From 2cd092be10f1b92908ef2ddd58fe4ffaca5c6478 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 12:03:34 +0000 Subject: [PATCH 10/18] Bump axios from 1.2.2 to 1.2.3 Bumps [axios](https://github.com/axios/axios) from 1.2.2 to 1.2.3. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/1.2.2...v1.2.3) --- updated-dependencies: - dependency-name: axios dependency-type: direct:development update-type: version-update:semver-patch ... 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 1830a416..d3efd995 100644 --- a/package-lock.json +++ b/package-lock.json @@ -623,9 +623,9 @@ "dev": true }, "node_modules/axios": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz", - "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz", + "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==", "dev": true, "dependencies": { "follow-redirects": "^1.15.0", @@ -3444,9 +3444,9 @@ "dev": true }, "axios": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz", - "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz", + "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==", "dev": true, "requires": { "follow-redirects": "^1.15.0", From f731a95bd19c7e8737840d7417e058c769983c96 Mon Sep 17 00:00:00 2001 From: Christian Georgi Date: Wed, 18 Jan 2023 14:55:20 +0100 Subject: [PATCH 11/18] Fix indentation --- test/hierarchical-data.test.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/test/hierarchical-data.test.js b/test/hierarchical-data.test.js index 3f12ff57..94741978 100644 --- a/test/hierarchical-data.test.js +++ b/test/hierarchical-data.test.js @@ -16,21 +16,21 @@ describe('cap/samples - Hierarchical Data', ()=>{ before ('bootstrap sqlite in-memory db...', async()=>{ await cds.deploy (model) .to ('sqlite::memory:') expect (cds.db) .to.exist - expect (cds.db.model) .to.exist + expect (cds.db.model) .to.exist }) it ('supports deeply nested inserts', ()=> INSERT.into (Cats, - { ID:100, name:'Some Cats...', children:[ - { ID:101, name:'Cat', children:[ - { ID:102, name:'Kitty', children:[ - { ID:103, name:'Kitty Cat', children:[ - { ID:104, name:'Aristocat' } ]}, - { ID:105, name:'Kitty Bat' } ]}, - { ID:106, name:'Catwoman', children:[ - { ID:107, name:'Catalina' } ]} ]}, - { ID:108, name:'Catweazle' } - ]} - )) + { ID:100, name:'Some Cats...', children:[ + { ID:101, name:'Cat', children:[ + { ID:102, name:'Kitty', children:[ + { ID:103, name:'Kitty Cat', children:[ + { ID:104, name:'Aristocat' } ]}, + { ID:105, name:'Kitty Bat' } ]}, + { ID:106, name:'Catwoman', children:[ + { ID:107, name:'Catalina' } ]} ]}, + { ID:108, name:'Catweazle' } + ]} + )) it ('supports nested reads', async()=>{ if (require('semver').gte(cds.version, '5.9.0')) { @@ -101,12 +101,12 @@ describe('cap/samples - Hierarchical Data', ()=>{ }) it ('supports cascaded deletes', async()=>{ - const affectedRows = await DELETE.from (Cats) .where ({ID:[102,106]}) - expect (affectedRows) .to.be.greaterThan (0) + const affectedRows = await DELETE.from (Cats) .where ({ID:[102,106]}) + expect (affectedRows) .to.be.greaterThan (0) const expected = [ - { ID:100, name:'Some Cats...' }, - { ID:101, name:'Cat' }, - { ID:108, name:'Catweazle' } + { ID:100, name:'Some Cats...' }, + { ID:101, name:'Cat' }, + { ID:108, name:'Catweazle' } ] expect ( await SELECT`ID,name`.from(Cats) ).to.eql (expected) }) From dc90cad8f4a7f8e3af33bdbb29301feb6b4681eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 12:03:09 +0000 Subject: [PATCH 12/18] Bump axios from 1.2.3 to 1.2.4 Bumps [axios](https://github.com/axios/axios) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.2.3...v1.2.4) --- updated-dependencies: - dependency-name: axios dependency-type: direct:development update-type: version-update:semver-patch ... 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 d3efd995..1718123e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -623,9 +623,9 @@ "dev": true }, "node_modules/axios": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz", - "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.4.tgz", + "integrity": "sha512-lIQuCfBJvZB/Bv7+RWUqEJqNShGOVpk9v7P0ZWx5Ip0qY6u7JBAU6dzQPMLasU9vHL2uD8av/1FDJXj7n6c39w==", "dev": true, "dependencies": { "follow-redirects": "^1.15.0", @@ -3444,9 +3444,9 @@ "dev": true }, "axios": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz", - "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.4.tgz", + "integrity": "sha512-lIQuCfBJvZB/Bv7+RWUqEJqNShGOVpk9v7P0ZWx5Ip0qY6u7JBAU6dzQPMLasU9vHL2uD8av/1FDJXj7n6c39w==", "dev": true, "requires": { "follow-redirects": "^1.15.0", From 0771fc06e6930ec1023b324f3a6ac6b7093ce113 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:07:09 +0000 Subject: [PATCH 13/18] Bump @sap/cds from 6.4.0 to 6.5.0 Bumps [@sap/cds](https://cap.cloud.sap/) from 6.4.0 to 6.5.0. --- updated-dependencies: - dependency-name: "@sap/cds" dependency-type: direct:production update-type: version-update:semver-minor ... 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 1718123e..a4bba176 100644 --- a/package-lock.json +++ b/package-lock.json @@ -346,9 +346,9 @@ } }, "node_modules/@sap/cds": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.4.0.tgz", - "integrity": "sha512-Z19veNd0lf+W3Q97Xzxi7cJ50NsYx42wiiRs+44Xp7DArQuose4XkrN3iZ7DdX+FxcJSYojPnuDdN22QnZPZbA==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.5.0.tgz", + "integrity": "sha512-xzlFEgm2On2/iztS5rj6200cN+6GrszlKGEOnFXDicJYk9SjDOjWgkWX+1j75c9t7qOSi7vidRSKAKjFyALRXg==", "dependencies": { "@sap/cds-compiler": "^3.2.0", "@sap/cds-foss": "^4" @@ -3220,9 +3220,9 @@ } }, "@sap/cds": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.4.0.tgz", - "integrity": "sha512-Z19veNd0lf+W3Q97Xzxi7cJ50NsYx42wiiRs+44Xp7DArQuose4XkrN3iZ7DdX+FxcJSYojPnuDdN22QnZPZbA==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.5.0.tgz", + "integrity": "sha512-xzlFEgm2On2/iztS5rj6200cN+6GrszlKGEOnFXDicJYk9SjDOjWgkWX+1j75c9t7qOSi7vidRSKAKjFyALRXg==", "requires": { "@sap/cds-compiler": "^3.2.0", "@sap/cds-foss": "^4" From e0c6b16b15345da7eee5620b103cec4f9df4e8ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 16:15:29 +0000 Subject: [PATCH 14/18] Bump axios from 1.2.4 to 1.2.6 Bumps [axios](https://github.com/axios/axios) from 1.2.4 to 1.2.6. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.2.4...v1.2.6) --- updated-dependencies: - dependency-name: axios dependency-type: direct:development update-type: version-update:semver-patch ... 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 a4bba176..204c647d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -623,9 +623,9 @@ "dev": true }, "node_modules/axios": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.4.tgz", - "integrity": "sha512-lIQuCfBJvZB/Bv7+RWUqEJqNShGOVpk9v7P0ZWx5Ip0qY6u7JBAU6dzQPMLasU9vHL2uD8av/1FDJXj7n6c39w==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz", + "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==", "dev": true, "dependencies": { "follow-redirects": "^1.15.0", @@ -3444,9 +3444,9 @@ "dev": true }, "axios": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.4.tgz", - "integrity": "sha512-lIQuCfBJvZB/Bv7+RWUqEJqNShGOVpk9v7P0ZWx5Ip0qY6u7JBAU6dzQPMLasU9vHL2uD8av/1FDJXj7n6c39w==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz", + "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==", "dev": true, "requires": { "follow-redirects": "^1.15.0", From 63c21c5a9642d75361d5a66bc24b76ea7223cafa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 12:06:50 +0000 Subject: [PATCH 15/18] Bump axios from 1.2.6 to 1.3.0 Bumps [axios](https://github.com/axios/axios) from 1.2.6 to 1.3.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.2.6...v1.3.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:development update-type: version-update:semver-minor ... 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 204c647d..3a9ff063 100644 --- a/package-lock.json +++ b/package-lock.json @@ -623,9 +623,9 @@ "dev": true }, "node_modules/axios": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz", - "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.0.tgz", + "integrity": "sha512-oCye5nHhTypzkdLIvF9SaHfr8UAquqCn1KY3j8vsrjeol8yohAdGxIpRPbF1bOLsx33HOAatdfMX1yzsj2cHwg==", "dev": true, "dependencies": { "follow-redirects": "^1.15.0", @@ -3444,9 +3444,9 @@ "dev": true }, "axios": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz", - "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.0.tgz", + "integrity": "sha512-oCye5nHhTypzkdLIvF9SaHfr8UAquqCn1KY3j8vsrjeol8yohAdGxIpRPbF1bOLsx33HOAatdfMX1yzsj2cHwg==", "dev": true, "requires": { "follow-redirects": "^1.15.0", From 703d45fab0edcf9d6d3ab33f5947c097976233be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 12:04:39 +0000 Subject: [PATCH 16/18] Bump axios from 1.3.0 to 1.3.1 Bumps [axios](https://github.com/axios/axios) from 1.3.0 to 1.3.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.3.0...v1.3.1) --- updated-dependencies: - dependency-name: axios dependency-type: direct:development update-type: version-update:semver-patch ... 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 3a9ff063..5bf9d8f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -623,9 +623,9 @@ "dev": true }, "node_modules/axios": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.0.tgz", - "integrity": "sha512-oCye5nHhTypzkdLIvF9SaHfr8UAquqCn1KY3j8vsrjeol8yohAdGxIpRPbF1bOLsx33HOAatdfMX1yzsj2cHwg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.1.tgz", + "integrity": "sha512-78pWJsQTceInlyaeBQeYZ/QgZeWS8hGeKiIJiDKQe3hEyBb7sEMq0K4gjx+Va6WHTYO4zI/RRl8qGRzn0YMadA==", "dev": true, "dependencies": { "follow-redirects": "^1.15.0", @@ -3444,9 +3444,9 @@ "dev": true }, "axios": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.0.tgz", - "integrity": "sha512-oCye5nHhTypzkdLIvF9SaHfr8UAquqCn1KY3j8vsrjeol8yohAdGxIpRPbF1bOLsx33HOAatdfMX1yzsj2cHwg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.1.tgz", + "integrity": "sha512-78pWJsQTceInlyaeBQeYZ/QgZeWS8hGeKiIJiDKQe3hEyBb7sEMq0K4gjx+Va6WHTYO4zI/RRl8qGRzn0YMadA==", "dev": true, "requires": { "follow-redirects": "^1.15.0", From 308e6b932a0b8b5c15cd1e297a712070b87df57c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 12:29:29 +0000 Subject: [PATCH 17/18] Bump http-cache-semantics from 4.1.0 to 4.1.1 Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/kornelski/http-cache-semantics/releases) - [Commits](https://github.com/kornelski/http-cache-semantics/commits) --- updated-dependencies: - dependency-name: http-cache-semantics 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 5bf9d8f5..d6334b3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1440,9 +1440,9 @@ "dev": true }, "node_modules/http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", "dev": true, "optional": true }, @@ -4077,9 +4077,9 @@ "dev": true }, "http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", "dev": true, "optional": true }, From 430d3a46c41a2ea177467490f4354a4556381b6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Feb 2023 12:06:59 +0000 Subject: [PATCH 18/18] Bump axios from 1.3.1 to 1.3.2 Bumps [axios](https://github.com/axios/axios) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.3.1...v1.3.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:development update-type: version-update:semver-patch ... 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 d6334b3c..7181eff4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -623,9 +623,9 @@ "dev": true }, "node_modules/axios": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.1.tgz", - "integrity": "sha512-78pWJsQTceInlyaeBQeYZ/QgZeWS8hGeKiIJiDKQe3hEyBb7sEMq0K4gjx+Va6WHTYO4zI/RRl8qGRzn0YMadA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.2.tgz", + "integrity": "sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==", "dev": true, "dependencies": { "follow-redirects": "^1.15.0", @@ -3444,9 +3444,9 @@ "dev": true }, "axios": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.1.tgz", - "integrity": "sha512-78pWJsQTceInlyaeBQeYZ/QgZeWS8hGeKiIJiDKQe3hEyBb7sEMq0K4gjx+Va6WHTYO4zI/RRl8qGRzn0YMadA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.2.tgz", + "integrity": "sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==", "dev": true, "requires": { "follow-redirects": "^1.15.0",