From 5c9d86c3464c6aed729e566bc1cbeffdb8200be5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 19:32:40 +0000 Subject: [PATCH 01/19] Bump decode-uri-component from 0.2.0 to 0.2.2 in /src/ng-lightquery Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/ng-lightquery/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ng-lightquery/package-lock.json b/src/ng-lightquery/package-lock.json index b29b4e2..db1e723 100644 --- a/src/ng-lightquery/package-lock.json +++ b/src/ng-lightquery/package-lock.json @@ -5064,9 +5064,9 @@ } }, "node_modules/decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", "dev": true, "engines": { "node": ">=0.10" @@ -16383,9 +16383,9 @@ } }, "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", "dev": true }, "deepmerge": { From 6f63395eceaca22679b2eb990c6041167c3b2668 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:07:07 +0000 Subject: [PATCH 02/19] Bump http-cache-semantics from 4.1.0 to 4.1.1 in /src/ng-lightquery 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/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/ng-lightquery/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ng-lightquery/package-lock.json b/src/ng-lightquery/package-lock.json index db1e723..391d82c 100644 --- a/src/ng-lightquery/package-lock.json +++ b/src/ng-lightquery/package-lock.json @@ -6680,9 +6680,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 }, "node_modules/http-deceiver": { @@ -17535,9 +17535,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 }, "http-deceiver": { From e005efc03537d41fb8fdb800d7a3494a46ebf24a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:12:14 +0000 Subject: [PATCH 03/19] Bump json5 from 2.2.1 to 2.2.3 in /src/ng-lightquery Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.3. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v2.2.1...v2.2.3) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/ng-lightquery/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ng-lightquery/package-lock.json b/src/ng-lightquery/package-lock.json index 391d82c..719b34d 100644 --- a/src/ng-lightquery/package-lock.json +++ b/src/ng-lightquery/package-lock.json @@ -7481,9 +7481,9 @@ "dev": true }, "node_modules/json5": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, "bin": { "json5": "lib/cli.js" @@ -18140,9 +18140,9 @@ "dev": true }, "json5": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true }, "jsonc-parser": { From 8462d52c9b2ab765d3a7ea69a8209c48e137186f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:14:37 +0000 Subject: [PATCH 04/19] Bump ua-parser-js from 0.7.31 to 0.7.37 in /src/ng-lightquery Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.31 to 0.7.37. - [Release notes](https://github.com/faisalman/ua-parser-js/releases) - [Changelog](https://github.com/faisalman/ua-parser-js/blob/0.7.37/changelog.md) - [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.31...0.7.37) --- updated-dependencies: - dependency-name: ua-parser-js dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/ng-lightquery/package-lock.json | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/ng-lightquery/package-lock.json b/src/ng-lightquery/package-lock.json index 719b34d..5fd8c58 100644 --- a/src/ng-lightquery/package-lock.json +++ b/src/ng-lightquery/package-lock.json @@ -11967,9 +11967,9 @@ } }, "node_modules/ua-parser-js": { - "version": "0.7.31", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz", - "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==", + "version": "0.7.37", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.37.tgz", + "integrity": "sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==", "dev": true, "funding": [ { @@ -11979,6 +11979,10 @@ { "type": "paypal", "url": "https://paypal.me/faisalman" + }, + { + "type": "github", + "url": "https://github.com/sponsors/faisalman" } ], "engines": { @@ -21430,9 +21434,9 @@ "dev": true }, "ua-parser-js": { - "version": "0.7.31", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz", - "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==", + "version": "0.7.37", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.37.tgz", + "integrity": "sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==", "dev": true }, "unicode-canonical-property-names-ecmascript": { From f8bfc084ad319ae11432a099bb03103acc62914a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:15:27 +0000 Subject: [PATCH 05/19] Bump socket.io-parser from 4.2.1 to 4.2.4 in /src/ng-lightquery Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.2.1 to 4.2.4. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io-parser/compare/4.2.1...4.2.4) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/ng-lightquery/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ng-lightquery/package-lock.json b/src/ng-lightquery/package-lock.json index 5fd8c58..416f607 100644 --- a/src/ng-lightquery/package-lock.json +++ b/src/ng-lightquery/package-lock.json @@ -11153,9 +11153,9 @@ "dev": true }, "node_modules/socket.io-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", - "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", + "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", "dev": true, "dependencies": { "@socket.io/component-emitter": "~3.1.0", @@ -20815,9 +20815,9 @@ "dev": true }, "socket.io-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", - "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", + "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", "dev": true, "requires": { "@socket.io/component-emitter": "~3.1.0", From b6891adc0d76da62bb672c28dc6989a80f507842 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:18:46 +0000 Subject: [PATCH 06/19] Bump @babel/traverse from 7.18.6 to 7.23.3 in /src/ng-lightquery Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.18.6 to 7.23.3. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.3/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/ng-lightquery/package-lock.json | 411 ++++++++++++++++++---------- 1 file changed, 273 insertions(+), 138 deletions(-) diff --git a/src/ng-lightquery/package-lock.json b/src/ng-lightquery/package-lock.json index 416f607..7e0c441 100644 --- a/src/ng-lightquery/package-lock.json +++ b/src/ng-lightquery/package-lock.json @@ -628,17 +628,80 @@ "dev": true }, "node_modules/@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/code-frame/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/code-frame/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/@babel/code-frame/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/compat-data": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.6.tgz", @@ -843,9 +906,9 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz", - "integrity": "sha512-8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true, "engines": { "node": ">=6.9.0" @@ -864,39 +927,39 @@ } }, "node_modules/@babel/helper-function-name": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz", - "integrity": "sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "dependencies": { - "@babel/template": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name/node_modules/@babel/template": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", - "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1051,21 +1114,30 @@ } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/helper-string-parser": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", - "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, "engines": { "node": ">=6.9.0" @@ -1138,13 +1210,13 @@ } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -1214,9 +1286,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.6.tgz", - "integrity": "sha512-uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", + "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -2383,19 +2455,19 @@ } }, "node_modules/@babel/traverse": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.6.tgz", - "integrity": "sha512-zS/OKyqmD7lslOtFqbscH6gMLFYOfG1YPqCKfAW5KrTeolKqvB8UelR49Fpr6y93kYkW2Ik00mT1LOGiAGvizw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.6", - "@babel/helper-function-name": "^7.18.6", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz", + "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.3", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.3", + "@babel/types": "^7.23.3", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -2404,13 +2476,14 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.18.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.7.tgz", - "integrity": "sha512-shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", + "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==", "dev": true, "dependencies": { - "@babel/types": "^7.18.7", + "@babel/types": "^7.23.3", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" }, "engines": { @@ -2418,9 +2491,9 @@ } }, "node_modules/@babel/traverse/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", @@ -2432,12 +2505,13 @@ } }, "node_modules/@babel/types": { - "version": "7.18.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.7.tgz", - "integrity": "sha512-QG3yxTcTIBoAcQmkCs+wAPYZhu7Dk9rXKacINfNbdJDNERTbLQbHGyVG8q/YGMPeCJRIhSY0+fTc5+xuh6WPSQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz", + "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -2690,9 +2764,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.8.tgz", - "integrity": "sha512-YK5G9LaddzGbcucK4c8h5tWFmMPBvRZ/uyWmN1/SbBdIvqGUdWGkJ5BAaccgs6XbzVLsqbPJrBSFwKv3kT9i7w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, "engines": { "node": ">=6.0.0" @@ -2714,13 +2788,13 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@leichtgewicht/ip-codec": { @@ -13063,12 +13137,65 @@ "dev": true }, "@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, "requires": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, "@babel/compat-data": { @@ -13230,9 +13357,9 @@ } }, "@babel/helper-environment-visitor": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz", - "integrity": "sha512-8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true }, "@babel/helper-explode-assignable-expression": { @@ -13245,35 +13372,35 @@ } }, "@babel/helper-function-name": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz", - "integrity": "sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "requires": { - "@babel/template": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "dependencies": { "@babel/template": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", - "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" } } } }, "@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, "@babel/helper-member-expression-to-functions": { @@ -13393,18 +13520,24 @@ } }, "@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, + "@babel/helper-string-parser": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "dev": true + }, "@babel/helper-validator-identifier": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", - "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true }, "@babel/helper-validator-option": { @@ -13463,13 +13596,13 @@ } }, "@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "dependencies": { @@ -13526,9 +13659,9 @@ } }, "@babel/parser": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.6.tgz", - "integrity": "sha512-uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", + "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", "dev": true }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { @@ -14319,38 +14452,39 @@ } }, "@babel/traverse": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.6.tgz", - "integrity": "sha512-zS/OKyqmD7lslOtFqbscH6gMLFYOfG1YPqCKfAW5KrTeolKqvB8UelR49Fpr6y93kYkW2Ik00mT1LOGiAGvizw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.6", - "@babel/helper-function-name": "^7.18.6", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz", + "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.3", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.3", + "@babel/types": "^7.23.3", "debug": "^4.1.0", "globals": "^11.1.0" }, "dependencies": { "@babel/generator": { - "version": "7.18.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.7.tgz", - "integrity": "sha512-shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", + "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==", "dev": true, "requires": { - "@babel/types": "^7.18.7", + "@babel/types": "^7.23.3", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" } }, "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "requires": { "@jridgewell/set-array": "^1.0.1", @@ -14361,12 +14495,13 @@ } }, "@babel/types": { - "version": "7.18.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.7.tgz", - "integrity": "sha512-QG3yxTcTIBoAcQmkCs+wAPYZhu7Dk9rXKacINfNbdJDNERTbLQbHGyVG8q/YGMPeCJRIhSY0+fTc5+xuh6WPSQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz", + "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } }, @@ -14511,9 +14646,9 @@ } }, "@jridgewell/resolve-uri": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.8.tgz", - "integrity": "sha512-YK5G9LaddzGbcucK4c8h5tWFmMPBvRZ/uyWmN1/SbBdIvqGUdWGkJ5BAaccgs6XbzVLsqbPJrBSFwKv3kT9i7w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true }, "@jridgewell/set-array": { @@ -14529,13 +14664,13 @@ "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "@leichtgewicht/ip-codec": { From e32d5571ef498c2dad0302e3b85e4cd50176e298 Mon Sep 17 00:00:00 2001 From: Georg Dangl Date: Fri, 17 Nov 2023 17:19:55 +0100 Subject: [PATCH 07/19] Update NUKE and update feed sources --- Jenkinsfile | 1 + build.ps1 | 9 +++-- build.sh | 9 +++-- build/.build.csproj | 10 +++--- build/Build.cs | 80 ++++++++++++++++++++++----------------------- 5 files changed, 60 insertions(+), 49 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 89708a8..46a5d96 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,6 +9,7 @@ pipeline { KeyVaultBaseUrl = credentials('AzureCiKeyVaultBaseUrl') KeyVaultClientId = credentials('AzureCiKeyVaultClientId') KeyVaultClientSecret = credentials('AzureCiKeyVaultClientSecret') + KeyVaultTenantId = credentials('AzureKeyVaultTenantId') } stages { stage ('Test') { diff --git a/build.ps1 b/build.ps1 index 012ccb7..41c76ce 100644 --- a/build.ps1 +++ b/build.ps1 @@ -18,7 +18,7 @@ $TempDirectory = "$PSScriptRoot\\.nuke\temp" $DotNetGlobalFile = "$PSScriptRoot\\global.json" $DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1" -$DotNetChannel = "Current" +$DotNetChannel = "STS" $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 $env:DOTNET_CLI_TELEMETRY_OPTOUT = 1 @@ -63,7 +63,12 @@ else { $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe" } -Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)" +Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)" + +if (Test-Path env:NUKE_ENTERPRISE_TOKEN) { + & $env:DOTNET_EXE nuget remove source "nuke-enterprise" > $null + & $env:DOTNET_EXE nuget add source "https://f.feedz.io/nuke/enterprise/nuget" --name "nuke-enterprise" --username "PAT" --password $env:NUKE_ENTERPRISE_TOKEN > $null +} ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet } ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments } diff --git a/build.sh b/build.sh index f943f4c..d942b4b 100755 --- a/build.sh +++ b/build.sh @@ -14,7 +14,7 @@ TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp" DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json" DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh" -DOTNET_CHANNEL="Current" +DOTNET_CHANNEL="STS" export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 @@ -56,7 +56,12 @@ else export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet" fi -echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)" +echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)" + +if [[ ! -z ${NUKE_ENTERPRISE_TOKEN+x} && "NUKE_ENTERPRISE_TOKEN" != "" ]]; then + "$DOTNET_EXE" nuget remove source "nuke-enterprise" &>/dev/null || true + "$DOTNET_EXE" nuget add source "https://f.feedz.io/nuke/enterprise/nuget" --name "nuke-enterprise" --username "PAT" --password "$NUKE_ENTERPRISE_TOKEN" --store-password-in-clear-text &>/dev/null || true +fi "$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet "$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@" diff --git a/build/.build.csproj b/build/.build.csproj index 03beddb..c01ad28 100644 --- a/build/.build.csproj +++ b/build/.build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 false False @@ -11,10 +11,10 @@ - - - - + + + + build diff --git a/build/Build.cs b/build/Build.cs index c3f4819..1b2c19b 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -5,7 +5,6 @@ using Nuke.Common.ProjectModel; using Nuke.Common.Tooling; using Nuke.Common.Tools.AzureKeyVault; -using Nuke.Common.Tools.AzureKeyVault.Attributes; using Nuke.Common.Tools.Coverlet; using Nuke.Common.Tools.DocFX; using Nuke.Common.Tools.DotNet; @@ -24,8 +23,6 @@ using System.Xml.Linq; using System.Xml.XPath; using static Nuke.Common.ChangeLog.ChangelogTasks; -using static Nuke.Common.IO.FileSystemTasks; -using static Nuke.Common.IO.PathConstruction; using static Nuke.Common.IO.XmlTasks; using static Nuke.Common.Tools.DocFX.DocFXTasks; using static Nuke.Common.Tools.DotNet.DotNetTasks; @@ -34,34 +31,35 @@ using static Nuke.GitHub.ChangeLogExtensions; using static Nuke.GitHub.GitHubTasks; using static Nuke.WebDocu.WebDocuTasks; -using static Nuke.Common.IO.TextTasks; class Build : NukeBuild { public static int Main () => Execute(x => x.Compile); - [KeyVaultSettings( - BaseUrlParameterName = nameof(KeyVaultBaseUrl), - ClientIdParameterName = nameof(KeyVaultClientId), - ClientSecretParameterName = nameof(KeyVaultClientSecret))] - readonly KeyVaultSettings KeyVaultSettings; + [AzureKeyVaultConfiguration( + BaseUrlParameterName = nameof(KeyVaultBaseUrl), + ClientIdParameterName = nameof(KeyVaultClientId), + ClientSecretParameterName = nameof(KeyVaultClientSecret), + TenantIdParameterName = nameof(KeyVaultTenantId))] + readonly AzureKeyVaultConfiguration KeyVaultSettings; - [KeyVault] readonly KeyVault KeyVault; + [AzureKeyVault] readonly AzureKeyVault KeyVault; [Parameter] readonly string KeyVaultBaseUrl; [Parameter] readonly string KeyVaultClientId; [Parameter] readonly string KeyVaultClientSecret; + [Parameter] readonly string KeyVaultTenantId; [GitVersion(Framework = "net6.0")] readonly GitVersion GitVersion; [GitRepository] readonly GitRepository GitRepository; - [KeyVaultSecret] readonly string DocuBaseUrl; - [KeyVaultSecret] readonly string PublicMyGetSource; - [KeyVaultSecret] readonly string PublicMyGetApiKey; - [KeyVaultSecret] readonly string NuGetApiKey; - [KeyVaultSecret("LightQuery-DocuApiKey")] readonly string DocuApiKey; - [KeyVaultSecret] readonly string GitHubAuthenticationToken; - [KeyVaultSecret] readonly string DanglCiCdTeamsWebhookUrl; + [AzureKeyVaultSecret] readonly string DocuBaseUrl; + [AzureKeyVaultSecret] readonly string DanglPublicFeedSource; + [AzureKeyVaultSecret] readonly string FeedzAccessToken; + [AzureKeyVaultSecret] readonly string NuGetApiKey; + [AzureKeyVaultSecret("LightQuery-DocuApiKey")] readonly string DocuApiKey; + [AzureKeyVaultSecret] readonly string GitHubAuthenticationToken; + [AzureKeyVaultSecret] readonly string DanglCiCdTeamsWebhookUrl; [Parameter] readonly string Configuration = IsLocalBuild ? "Debug" : "Release"; @@ -100,14 +98,14 @@ void SendTeamsMessage(string title, string message, bool isError) Target Clean => _ => _ .Executes(() => { - GlobDirectories(SourceDirectory / "LightQuery", "**/bin", "**/obj").ForEach(DeleteDirectory); - GlobDirectories(SourceDirectory / "LightQuery.Client", "**/bin", "**/obj").ForEach(DeleteDirectory); - GlobDirectories(SourceDirectory / "LightQuery.EntityFrameworkCore", "**/bin", "**/obj").ForEach(DeleteDirectory); - GlobDirectories(SourceDirectory / "LightQuery.Shared", "**/bin", "**/obj").ForEach(DeleteDirectory); - GlobDirectories(SourceDirectory / "LightQuery.NSwag", "**/bin", "**/obj").ForEach(DeleteDirectory); - GlobDirectories(SourceDirectory / "LightQuery.Swashbuckle", "**/bin", "**/obj").ForEach(DeleteDirectory); - GlobDirectories(RootDirectory / "test", "**/bin", "**/obj").ForEach(DeleteDirectory); - EnsureCleanDirectory(OutputDirectory); + (SourceDirectory / "LightQuery").GlobDirectories("**/bin", "**/obj").ForEach(d => d.DeleteDirectory()); + (SourceDirectory / "LightQuery.Client").GlobDirectories("**/bin", "**/obj").ForEach(d => d.DeleteDirectory()); + (SourceDirectory / "LightQuery.EntityFrameworkCore").GlobDirectories("**/bin", "**/obj").ForEach(d => d.DeleteDirectory()); + (SourceDirectory / "LightQuery.Shared").GlobDirectories("**/bin", "**/obj").ForEach(d => d.DeleteDirectory()); + (SourceDirectory / "LightQuery.NSwag").GlobDirectories("**/bin", "**/obj").ForEach(d => d.DeleteDirectory()); + (SourceDirectory / "LightQuery.Swashbuckle").GlobDirectories("**/bin", "**/obj").ForEach(d => d.DeleteDirectory()); + (RootDirectory / "test").GlobDirectories("**/bin", "**/obj").ForEach(d => d.DeleteDirectory()); + OutputDirectory.CreateOrCleanDirectory(); }); Target Restore => _ => _ @@ -149,7 +147,8 @@ void SendTeamsMessage(string title, string message, bool isError) .DependsOn(Compile) .Executes(() => { - var testProjects = GlobFiles(SolutionDirectory / "test", "**/*.csproj") + var testProjects = (SolutionDirectory / "test").GlobFiles("**/*.csproj") + .Select(t => t.ToString()) .Where(t => !t.EndsWith("LightQuery.IntegrationTestsServer.csproj")) .ToList(); @@ -211,9 +210,9 @@ void SendTeamsMessage(string title, string message, bool isError) } }); - private void MakeSourceEntriesRelativeInCoberturaFormat(string coberturaReportPath) + private void MakeSourceEntriesRelativeInCoberturaFormat(AbsolutePath coberturaReportPath) { - var originalText = ReadAllText(coberturaReportPath); + var originalText = coberturaReportPath.ReadAllText(); var xml = XDocument.Parse(originalText); var xDoc = XDocument.Load(coberturaReportPath); @@ -275,15 +274,16 @@ IEnumerable GetTestFrameworksForProjectFile(string projectFile) Target Push => _ => _ .DependsOn(Pack) - .Requires(() => PublicMyGetSource) - .Requires(() => PublicMyGetApiKey) + .Requires(() => DanglPublicFeedSource) + .Requires(() => FeedzAccessToken) .Requires(() => NuGetApiKey) .Requires(() => Configuration.EqualsOrdinalIgnoreCase("Release")) .OnlyWhenDynamic(() => Jenkins.Instance == null || Jenkins.Instance.ChangeId == null) .Executes(() => { - var packages = GlobFiles(OutputDirectory, "*.nupkg") + var packages = OutputDirectory.GlobFiles("*.nupkg") + .Select(p => p.ToString()) .Where(x => !x.EndsWith("symbols.nupkg")) .ToList(); Assert.NotEmpty(packages); @@ -292,8 +292,8 @@ IEnumerable GetTestFrameworksForProjectFile(string projectFile) { DotNetNuGetPush(s => s .SetTargetPath(x) - .SetSource(PublicMyGetSource) - .SetApiKey(PublicMyGetApiKey)); + .SetSource(DanglPublicFeedSource) + .SetApiKey(FeedzAccessToken)); if (GitVersion.BranchName.Equals("master") || GitVersion.BranchName.Equals("origin/master")) { @@ -376,7 +376,7 @@ IEnumerable GetTestFrameworksForProjectFile(string projectFile) var completeChangeLog = $"## {releaseTag}" + Environment.NewLine + latestChangeLog; var repositoryInfo = GetGitHubRepositoryInfo(GitRepository); - var nuGetPackages = GlobFiles(OutputDirectory, "*.nupkg").ToArray(); + var nuGetPackages = OutputDirectory.GlobFiles("*.nupkg").Select(f => f.ToString()).ToArray(); Assert.NotEmpty(nuGetPackages); await PublishRelease(x => x @@ -391,7 +391,7 @@ await PublishRelease(x => x void PrependFrameworkToTestresults() { - var testResults = GlobFiles(OutputDirectory, "*testresults*.xml").ToList(); + var testResults = OutputDirectory.GlobFiles("*testresults*.xml").ToList(); Serilog.Log.Debug($"Found {testResults.Count} test result files on which to append the framework."); foreach (var testResultFile in testResults) { @@ -438,7 +438,7 @@ void PrependFrameworkToTestresults() } firstXdoc.Save(OutputDirectory / "testresults.xml"); - testResults.ForEach(DeleteFile); + testResults.ForEach(d => d.DeleteFile()); } string GetFrameworkNameFromFilename(string filename) @@ -454,9 +454,9 @@ string GetFrameworkNameFromFilename(string filename) .Executes(() => { var ngAppDir = SourceDirectory / "ng-lightquery"; - DeleteDirectory(ngAppDir / "dist"); - DeleteDirectory(ngAppDir / "coverage"); - DeleteFile(ngAppDir / "karma-results.xml"); + (ngAppDir / "dist").DeleteDirectory(); + (ngAppDir / "coverage").DeleteDirectory(); + (ngAppDir / "karma-results.xml").DeleteFile(); Npm("ci", ngAppDir); Npm("run test:ci", ngAppDir); @@ -469,7 +469,7 @@ string GetFrameworkNameFromFilename(string filename) { var ngAppDir = SourceDirectory / "ng-lightquery"; var ngLibraryDir = ngAppDir / "dist" / "ng-lightquery"; - DeleteDirectory(ngAppDir / "dist"); + (ngAppDir / "dist").DeleteDirectory(); Npm("ci", ngAppDir); From 6123b50d273b3c68392a03ab89fb528f1337f8c7 Mon Sep 17 00:00:00 2001 From: Georg Dangl Date: Fri, 17 Nov 2023 17:29:51 +0100 Subject: [PATCH 08/19] Update to .NET 8 and add tests +semver: minor --- CHANGELOG.md | 4 ++++ src/LightQuery.Client/LightQuery.Client.csproj | 2 +- .../LightQuery.EntityFrameworkCore.csproj | 3 ++- src/LightQuery.NSwag/LightQuery.NSwag.csproj | 6 ++++-- src/LightQuery.Shared/LightQuery.Shared.csproj | 4 ++-- .../LightQuery.Swashbuckle.csproj | 2 +- src/LightQuery/LightQuery.csproj | 2 +- .../LightQuery.Client.Tests.Integration.csproj | 2 +- .../LightQuery.Client.Tests.csproj | 2 +- ...Query.EntityFrameworkCore.Tests.Integration.csproj | 2 +- .../LightQuery.EntityFrameworkCore.Tests.csproj | 2 +- .../LightQuery.IntegrationTestsServer.csproj | 11 ++++++++--- .../LightQuery.Shared.Tests.csproj | 10 +++++++--- .../LightQuery.Tests.Integration.csproj | 9 +++++++-- test/LightQuery.Tests/LightQuery.Tests.csproj | 2 +- 15 files changed, 42 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d00d27c..567f0a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to **LightQuery** are documented here. +## v2.4.0: +- Added a dedicated target for .NET 8 +- Added tests for .NET 8 + ## v2.3.0: - Added a dedicated target for .NET 7 - Added tests for .NET 7 diff --git a/src/LightQuery.Client/LightQuery.Client.csproj b/src/LightQuery.Client/LightQuery.Client.csproj index 24bb60a..41c5f70 100644 --- a/src/LightQuery.Client/LightQuery.Client.csproj +++ b/src/LightQuery.Client/LightQuery.Client.csproj @@ -1,7 +1,7 @@  - net7.0;netstandard2.0;net461 + net8.0;net7.0;netstandard2.0;net461 True Georg Dangl diff --git a/src/LightQuery.EntityFrameworkCore/LightQuery.EntityFrameworkCore.csproj b/src/LightQuery.EntityFrameworkCore/LightQuery.EntityFrameworkCore.csproj index 33bad91..9a024e4 100644 --- a/src/LightQuery.EntityFrameworkCore/LightQuery.EntityFrameworkCore.csproj +++ b/src/LightQuery.EntityFrameworkCore/LightQuery.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.0;net461 + net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.0;net461 True Georg Dangl @@ -25,6 +25,7 @@ + diff --git a/src/LightQuery.NSwag/LightQuery.NSwag.csproj b/src/LightQuery.NSwag/LightQuery.NSwag.csproj index 22ed539..0f21de8 100644 --- a/src/LightQuery.NSwag/LightQuery.NSwag.csproj +++ b/src/LightQuery.NSwag/LightQuery.NSwag.csproj @@ -1,7 +1,7 @@  - net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 + net8.0;net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 True Georg Dangl @@ -20,7 +20,9 @@ - + + + diff --git a/src/LightQuery.Shared/LightQuery.Shared.csproj b/src/LightQuery.Shared/LightQuery.Shared.csproj index 60bb0c0..769f813 100644 --- a/src/LightQuery.Shared/LightQuery.Shared.csproj +++ b/src/LightQuery.Shared/LightQuery.Shared.csproj @@ -1,7 +1,7 @@  - net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 + net8.0;net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 True Georg Dangl @@ -19,7 +19,7 @@ false - + diff --git a/src/LightQuery.Swashbuckle/LightQuery.Swashbuckle.csproj b/src/LightQuery.Swashbuckle/LightQuery.Swashbuckle.csproj index b228395..a068c81 100644 --- a/src/LightQuery.Swashbuckle/LightQuery.Swashbuckle.csproj +++ b/src/LightQuery.Swashbuckle/LightQuery.Swashbuckle.csproj @@ -1,7 +1,7 @@ - net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 + net8.0;net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 True Georg Dangl, Berkay AKÇAY diff --git a/src/LightQuery/LightQuery.csproj b/src/LightQuery/LightQuery.csproj index 340814b..7504ace 100644 --- a/src/LightQuery/LightQuery.csproj +++ b/src/LightQuery/LightQuery.csproj @@ -1,7 +1,7 @@  - net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 + net8.0;net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 True Georg Dangl diff --git a/test/LightQuery.Client.Tests.Integration/LightQuery.Client.Tests.Integration.csproj b/test/LightQuery.Client.Tests.Integration/LightQuery.Client.Tests.Integration.csproj index 4a10802..ae4817c 100644 --- a/test/LightQuery.Client.Tests.Integration/LightQuery.Client.Tests.Integration.csproj +++ b/test/LightQuery.Client.Tests.Integration/LightQuery.Client.Tests.Integration.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 false false diff --git a/test/LightQuery.Client.Tests/LightQuery.Client.Tests.csproj b/test/LightQuery.Client.Tests/LightQuery.Client.Tests.csproj index 5dc5beb..d3d51bd 100644 --- a/test/LightQuery.Client.Tests/LightQuery.Client.Tests.csproj +++ b/test/LightQuery.Client.Tests/LightQuery.Client.Tests.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 false false diff --git a/test/LightQuery.EntityFrameworkCore.Tests.Integration/LightQuery.EntityFrameworkCore.Tests.Integration.csproj b/test/LightQuery.EntityFrameworkCore.Tests.Integration/LightQuery.EntityFrameworkCore.Tests.Integration.csproj index 58bb21f..5f13668 100644 --- a/test/LightQuery.EntityFrameworkCore.Tests.Integration/LightQuery.EntityFrameworkCore.Tests.Integration.csproj +++ b/test/LightQuery.EntityFrameworkCore.Tests.Integration/LightQuery.EntityFrameworkCore.Tests.Integration.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 false false diff --git a/test/LightQuery.EntityFrameworkCore.Tests/LightQuery.EntityFrameworkCore.Tests.csproj b/test/LightQuery.EntityFrameworkCore.Tests/LightQuery.EntityFrameworkCore.Tests.csproj index 48f410d..5f7fd7a 100644 --- a/test/LightQuery.EntityFrameworkCore.Tests/LightQuery.EntityFrameworkCore.Tests.csproj +++ b/test/LightQuery.EntityFrameworkCore.Tests/LightQuery.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 false false diff --git a/test/LightQuery.IntegrationTestsServer/LightQuery.IntegrationTestsServer.csproj b/test/LightQuery.IntegrationTestsServer/LightQuery.IntegrationTestsServer.csproj index 49275f6..75cf5a0 100644 --- a/test/LightQuery.IntegrationTestsServer/LightQuery.IntegrationTestsServer.csproj +++ b/test/LightQuery.IntegrationTestsServer/LightQuery.IntegrationTestsServer.csproj @@ -1,14 +1,14 @@  - net7.0;net6.0;net5.0;netcoreapp3.1;net461 - NETCORE3 + net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 + NETCORE3 false false - + @@ -33,6 +33,11 @@ + + + + + diff --git a/test/LightQuery.Shared.Tests/LightQuery.Shared.Tests.csproj b/test/LightQuery.Shared.Tests/LightQuery.Shared.Tests.csproj index a17a2b1..1f7e017 100644 --- a/test/LightQuery.Shared.Tests/LightQuery.Shared.Tests.csproj +++ b/test/LightQuery.Shared.Tests/LightQuery.Shared.Tests.csproj @@ -1,9 +1,9 @@  - net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 false - NETCORE3 + NETCORE3 false @@ -22,7 +22,7 @@ - + @@ -42,6 +42,10 @@ + + + + diff --git a/test/LightQuery.Tests.Integration/LightQuery.Tests.Integration.csproj b/test/LightQuery.Tests.Integration/LightQuery.Tests.Integration.csproj index d586622..04f89af 100644 --- a/test/LightQuery.Tests.Integration/LightQuery.Tests.Integration.csproj +++ b/test/LightQuery.Tests.Integration/LightQuery.Tests.Integration.csproj @@ -1,13 +1,13 @@  - net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 false false - + @@ -31,6 +31,11 @@ + + + + + diff --git a/test/LightQuery.Tests/LightQuery.Tests.csproj b/test/LightQuery.Tests/LightQuery.Tests.csproj index b1e3306..6501424 100644 --- a/test/LightQuery.Tests/LightQuery.Tests.csproj +++ b/test/LightQuery.Tests/LightQuery.Tests.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 false false From da38c591195334100969df9631001b4ba60b0bff Mon Sep 17 00:00:00 2001 From: Georg Dangl Date: Fri, 17 Nov 2023 20:00:38 +0100 Subject: [PATCH 09/19] Update jasmine-core dependency --- src/ng-lightquery/package-lock.json | 14 +++++++------- src/ng-lightquery/package.json | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ng-lightquery/package-lock.json b/src/ng-lightquery/package-lock.json index 7e0c441..e4cd65b 100644 --- a/src/ng-lightquery/package-lock.json +++ b/src/ng-lightquery/package-lock.json @@ -29,7 +29,7 @@ "@types/jasminewd2": "~2.0.3", "@types/node": "^12.11.1", "codelyzer": "^6.0.0", - "jasmine-core": "~3.6.0", + "jasmine-core": "~3.8.0", "jasmine-spec-reporter": "~5.0.0", "karma": "~6.3.14", "karma-chrome-launcher": "~3.1.0", @@ -7468,9 +7468,9 @@ } }, "node_modules/jasmine-core": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz", - "integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.8.0.tgz", + "integrity": "sha512-zl0nZWDrmbCiKns0NcjkFGYkVTGCPUgoHypTaj+G2AzaWus7QGoXARSlYsSle2VRpSdfJmM+hzmFKzQNhF2kHg==", "dev": true }, "node_modules/jasmine-spec-reporter": { @@ -18208,9 +18208,9 @@ } }, "jasmine-core": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz", - "integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.8.0.tgz", + "integrity": "sha512-zl0nZWDrmbCiKns0NcjkFGYkVTGCPUgoHypTaj+G2AzaWus7QGoXARSlYsSle2VRpSdfJmM+hzmFKzQNhF2kHg==", "dev": true }, "jasmine-spec-reporter": { diff --git a/src/ng-lightquery/package.json b/src/ng-lightquery/package.json index 4679f7d..44e1430 100644 --- a/src/ng-lightquery/package.json +++ b/src/ng-lightquery/package.json @@ -34,7 +34,7 @@ "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", "codelyzer": "^6.0.0", - "jasmine-core": "~3.6.0", + "jasmine-core": "~3.8.0", "jasmine-spec-reporter": "~5.0.0", "karma": "~6.3.14", "karma-chrome-launcher": "~3.1.0", @@ -46,4 +46,4 @@ "typescript": "~4.7.4", "karma-junit-reporter": "~2.0.1" } -} \ No newline at end of file +} From e144ff89ff62fa099dbbca80198d07649e11b84c Mon Sep 17 00:00:00 2001 From: Georg Dangl Date: Fri, 17 Nov 2023 20:04:24 +0100 Subject: [PATCH 10/19] Parallelize backend and frontend stages --- Jenkinsfile | 116 +++++++++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 52 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 46a5d96..9c6e8ad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,61 +12,73 @@ pipeline { KeyVaultTenantId = credentials('AzureKeyVaultTenantId') } stages { - stage ('Test') { - steps { - powershell './build.ps1 Coverage -configuration Debug' - } - post { - always { - recordIssues( - tools: [ - msBuild(), - taskScanner( - excludePattern: '**/*node_modules/**/*', - highTags: 'HACK, FIXME', - ignoreCase: true, - includePattern: '**/*.cs, **/*.g4, **/*.ts, **/*.js', - normalTags: 'TODO') - ]) - xunit( - testTimeMargin: '3000', - thresholdMode: 1, - thresholds: [ - failed(failureNewThreshold: '0', failureThreshold: '0', unstableNewThreshold: '0', unstableThreshold: '0'), - skipped(failureNewThreshold: '0', failureThreshold: '0', unstableNewThreshold: '0', unstableThreshold: '0') - ], - tools: [ - xUnitDotNet(deleteOutputFiles: true, failIfNotNew: true, pattern: '**/*testresults.xml', stopProcessingIfError: false) - ]) - cobertura( - coberturaReportFile: 'output/Cobertura.xml', - failUnhealthy: false, - failUnstable: false, - maxNumberOfBuilds: 0, - onlyStable: false, - zoomCoverageChart: false) + stage ('CI') { + parallel { + stage ('Backend') { + stages { + stage ('Test') { + steps { + powershell './build.ps1 Coverage -configuration Debug' + } + post { + always { + recordIssues( + tools: [ + msBuild(), + taskScanner( + excludePattern: '**/*node_modules/**/*', + highTags: 'HACK, FIXME', + ignoreCase: true, + includePattern: '**/*.cs, **/*.g4, **/*.ts, **/*.js', + normalTags: 'TODO') + ]) + xunit( + testTimeMargin: '3000', + thresholdMode: 1, + thresholds: [ + failed(failureNewThreshold: '0', failureThreshold: '0', unstableNewThreshold: '0', unstableThreshold: '0'), + skipped(failureNewThreshold: '0', failureThreshold: '0', unstableNewThreshold: '0', unstableThreshold: '0') + ], + tools: [ + xUnitDotNet(deleteOutputFiles: true, failIfNotNew: true, pattern: '**/*testresults.xml', stopProcessingIfError: false) + ]) + cobertura( + coberturaReportFile: 'output/Cobertura.xml', + failUnhealthy: false, + failUnstable: false, + maxNumberOfBuilds: 0, + onlyStable: false, + zoomCoverageChart: false) + } + } } - } - } - stage ('Deploy') { - steps { - powershell './build.ps1 UploadDocumentation+PublishGitHubRelease' - } - } - stage ('Angular Library Test') { - steps { - powershell './build.ps1 NgLibraryTest' - } - post { - always { - junit '**/*karma-results.xml' + stage ('Deploy') { + steps { + powershell './build.ps1 UploadDocumentation+PublishGitHubRelease' + } } + } } - } - stage ('Angular Library Publish') { - steps { - powershell './build.ps1 NgLibraryPublish' - } + stage ('Frontend') { + stages { + stage ('Angular Library Test') { + steps { + powershell './build.ps1 NgLibraryTest' + } + post { + always { + junit '**/*karma-results.xml' + } + } + } + stage ('Angular Library Publish') { + steps { + powershell './build.ps1 NgLibraryPublish' + } + } + } + } + } } } post { From 34f6ab9282ae98238dfaa59316dd6e1e9eb7aa2d Mon Sep 17 00:00:00 2001 From: Georg Dangl Date: Fri, 17 Nov 2023 20:18:21 +0100 Subject: [PATCH 11/19] Don't force refresh if no base url is configured, closes #50 --- CHANGELOG.md | 1 + .../src/lib/pagination-base.service.spec.ts | 19 +++++++++++++++++++ .../src/lib/pagination-base.service.ts | 4 ++++ 3 files changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 567f0a1..ecf1aac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to **LightQuery** are documented here. ## v2.4.0: - Added a dedicated target for .NET 8 - Added tests for .NET 8 +- `forceRefresh` on the Angular client no longer causes a request if now base url for the service is configured ## v2.3.0: - Added a dedicated target for .NET 7 diff --git a/src/ng-lightquery/projects/ng-lightquery/src/lib/pagination-base.service.spec.ts b/src/ng-lightquery/projects/ng-lightquery/src/lib/pagination-base.service.spec.ts index b96e9f6..4010123 100644 --- a/src/ng-lightquery/projects/ng-lightquery/src/lib/pagination-base.service.spec.ts +++ b/src/ng-lightquery/projects/ng-lightquery/src/lib/pagination-base.service.spec.ts @@ -130,6 +130,25 @@ describe('PaginationBaseService', () => { httpMock.verify(); })); + it('does not requery on forceRefresh if no base url set', async(async () => { + let service = getService(); + service.baseUrl = '/users'; + await delay(1); + let httpMock = getHttpMock(); + const req = httpMock.expectOne('/users?page=1&pageSize=20'); + expect(req.request.method).toBe('GET'); + httpMock.verify(); + service.forceRefresh(); + await delay(1); + httpMock.expectOne('/users?page=1&pageSize=20'); + httpMock.verify(); + service.baseUrl = ''; + service.forceRefresh(); + await delay(1); + httpMock.expectNone('?page=1&pageSize=20'); + httpMock.verify(); + })); + it('calls the correct url', async(async () => { let service = getService(); service.baseUrl = '/users'; diff --git a/src/ng-lightquery/projects/ng-lightquery/src/lib/pagination-base.service.ts b/src/ng-lightquery/projects/ng-lightquery/src/lib/pagination-base.service.ts index b4562ee..72488ac 100644 --- a/src/ng-lightquery/projects/ng-lightquery/src/lib/pagination-base.service.ts +++ b/src/ng-lightquery/projects/ng-lightquery/src/lib/pagination-base.service.ts @@ -59,6 +59,10 @@ export abstract class PaginationBaseService implements OnDestroy { } public forceRefresh() { + if (!this.baseUrl) { + return; + } + const url = this.buildUrl(); this.forceRefreshUrl.next(url); } From 8d4d21f7ad8d52fbe7906cb824ee650be3092587 Mon Sep 17 00:00:00 2001 From: Georg Dangl Date: Fri, 17 Nov 2023 20:19:21 +0100 Subject: [PATCH 12/19] Disable custom workspace in Jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9c6e8ad..2b65934 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,6 @@ pipeline { agent { node { label 'master' - customWorkspace 'workspace/LightQuery' } } environment { From 36dfaae94d7b125f054a8fa06a999d339a883531 Mon Sep 17 00:00:00 2001 From: Georg Dangl Date: Fri, 17 Nov 2023 20:20:50 +0100 Subject: [PATCH 13/19] Revert "Disable custom workspace in Jenkinsfile" This reverts commit 8d4d21f7ad8d52fbe7906cb824ee650be3092587. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2b65934..9c6e8ad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,6 +2,7 @@ pipeline { agent { node { label 'master' + customWorkspace 'workspace/LightQuery' } } environment { From 65a27ad38a7a5acd66ee33dac62fcf2b52197226 Mon Sep 17 00:00:00 2001 From: Georg Dangl Date: Fri, 17 Nov 2023 20:20:56 +0100 Subject: [PATCH 14/19] Revert "Parallelize backend and frontend stages" This reverts commit e144ff89ff62fa099dbbca80198d07649e11b84c. --- Jenkinsfile | 116 +++++++++++++++++++++++----------------------------- 1 file changed, 52 insertions(+), 64 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9c6e8ad..46a5d96 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,73 +12,61 @@ pipeline { KeyVaultTenantId = credentials('AzureKeyVaultTenantId') } stages { - stage ('CI') { - parallel { - stage ('Backend') { - stages { - stage ('Test') { - steps { - powershell './build.ps1 Coverage -configuration Debug' - } - post { - always { - recordIssues( - tools: [ - msBuild(), - taskScanner( - excludePattern: '**/*node_modules/**/*', - highTags: 'HACK, FIXME', - ignoreCase: true, - includePattern: '**/*.cs, **/*.g4, **/*.ts, **/*.js', - normalTags: 'TODO') - ]) - xunit( - testTimeMargin: '3000', - thresholdMode: 1, - thresholds: [ - failed(failureNewThreshold: '0', failureThreshold: '0', unstableNewThreshold: '0', unstableThreshold: '0'), - skipped(failureNewThreshold: '0', failureThreshold: '0', unstableNewThreshold: '0', unstableThreshold: '0') - ], - tools: [ - xUnitDotNet(deleteOutputFiles: true, failIfNotNew: true, pattern: '**/*testresults.xml', stopProcessingIfError: false) - ]) - cobertura( - coberturaReportFile: 'output/Cobertura.xml', - failUnhealthy: false, - failUnstable: false, - maxNumberOfBuilds: 0, - onlyStable: false, - zoomCoverageChart: false) - } - } - } - stage ('Deploy') { - steps { - powershell './build.ps1 UploadDocumentation+PublishGitHubRelease' - } - } - } + stage ('Test') { + steps { + powershell './build.ps1 Coverage -configuration Debug' } - stage ('Frontend') { - stages { - stage ('Angular Library Test') { - steps { - powershell './build.ps1 NgLibraryTest' - } - post { - always { - junit '**/*karma-results.xml' - } - } + post { + always { + recordIssues( + tools: [ + msBuild(), + taskScanner( + excludePattern: '**/*node_modules/**/*', + highTags: 'HACK, FIXME', + ignoreCase: true, + includePattern: '**/*.cs, **/*.g4, **/*.ts, **/*.js', + normalTags: 'TODO') + ]) + xunit( + testTimeMargin: '3000', + thresholdMode: 1, + thresholds: [ + failed(failureNewThreshold: '0', failureThreshold: '0', unstableNewThreshold: '0', unstableThreshold: '0'), + skipped(failureNewThreshold: '0', failureThreshold: '0', unstableNewThreshold: '0', unstableThreshold: '0') + ], + tools: [ + xUnitDotNet(deleteOutputFiles: true, failIfNotNew: true, pattern: '**/*testresults.xml', stopProcessingIfError: false) + ]) + cobertura( + coberturaReportFile: 'output/Cobertura.xml', + failUnhealthy: false, + failUnstable: false, + maxNumberOfBuilds: 0, + onlyStable: false, + zoomCoverageChart: false) } - stage ('Angular Library Publish') { - steps { - powershell './build.ps1 NgLibraryPublish' - } + } + } + stage ('Deploy') { + steps { + powershell './build.ps1 UploadDocumentation+PublishGitHubRelease' + } + } + stage ('Angular Library Test') { + steps { + powershell './build.ps1 NgLibraryTest' + } + post { + always { + junit '**/*karma-results.xml' } - } - } - } + } + } + stage ('Angular Library Publish') { + steps { + powershell './build.ps1 NgLibraryPublish' + } } } post { From f74824aa7ff13507e0c48fb082ea3eb5ba73371f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 18:29:00 +0000 Subject: [PATCH 15/19] Bump follow-redirects from 1.14.9 to 1.15.4 in /src/ng-lightquery Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.9 to 1.15.4. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.9...v1.15.4) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/ng-lightquery/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ng-lightquery/package-lock.json b/src/ng-lightquery/package-lock.json index e4cd65b..9ef59f1 100644 --- a/src/ng-lightquery/package-lock.json +++ b/src/ng-lightquery/package-lock.json @@ -6352,9 +6352,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.14.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", - "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "dev": true, "funding": [ { @@ -17368,9 +17368,9 @@ "dev": true }, "follow-redirects": { - "version": "1.14.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", - "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "dev": true }, "forwarded": { From 75aa6ce98397e5f372964b68b36c1e25efa47300 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:33:36 +0000 Subject: [PATCH 16/19] Bump ip from 1.1.8 to 1.1.9 in /src/ng-lightquery Bumps [ip](https://github.com/indutny/node-ip) from 1.1.8 to 1.1.9. - [Commits](https://github.com/indutny/node-ip/compare/v1.1.8...v1.1.9) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/ng-lightquery/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ng-lightquery/package-lock.json b/src/ng-lightquery/package-lock.json index 9ef59f1..88fe29d 100644 --- a/src/ng-lightquery/package-lock.json +++ b/src/ng-lightquery/package-lock.json @@ -7110,9 +7110,9 @@ } }, "node_modules/ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", + "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==", "dev": true }, "node_modules/ipaddr.js": { @@ -17948,9 +17948,9 @@ } }, "ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", + "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==", "dev": true }, "ipaddr.js": { From 4355c2c90e200b524e3b8ee4844175ec0cbbaf98 Mon Sep 17 00:00:00 2001 From: Georg Dangl Date: Wed, 21 Feb 2024 11:34:59 +0100 Subject: [PATCH 17/19] Update NUKE --- build/.build.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/.build.csproj b/build/.build.csproj index c01ad28..4b86744 100644 --- a/build/.build.csproj +++ b/build/.build.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 false False @@ -12,10 +12,10 @@ - - - - + + + + build all From 1a02259dbbaa44deb6c33f14c8fe8f4a246f853f Mon Sep 17 00:00:00 2001 From: Georg Dangl Date: Wed, 21 Feb 2024 11:56:09 +0100 Subject: [PATCH 18/19] Drop net461, net5.0 and netcoreapp3.1 targets and tests --- CHANGELOG.md | 3 +- .../LightQuery.Client.csproj | 8 ++--- .../LightQuery.EntityFrameworkCore.csproj | 6 ++-- src/LightQuery.NSwag/LightQuery.NSwag.csproj | 6 ++-- .../LightQuery.Shared.csproj | 6 ++-- .../LightQuery.Swashbuckle.csproj | 4 +-- src/LightQuery/LightQuery.csproj | 2 +- ...LightQuery.Client.Tests.Integration.csproj | 17 ++++------ .../LightQuery.Client.Tests.csproj | 12 +++---- ...tityFrameworkCore.Tests.Integration.csproj | 17 ++++------ ...ightQuery.EntityFrameworkCore.Tests.csproj | 12 +++---- .../LightQuery.IntegrationTestsServer.csproj | 18 +---------- .../Startup.cs | 4 --- .../LightQuery.Shared.Tests.csproj | 26 ++++----------- .../QueryParserTests.cs | 2 +- .../LightQuery.Tests.Integration.csproj | 32 ++++--------------- test/LightQuery.Tests/LightQuery.Tests.csproj | 12 +++---- 17 files changed, 59 insertions(+), 128 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf1aac..243d0af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ All notable changes to **LightQuery** are documented here. ## v2.4.0: - Added a dedicated target for .NET 8 - Added tests for .NET 8 -- `forceRefresh` on the Angular client no longer causes a request if now base url for the service is configured +- `forceRefresh` on the Angular client no longer causes a request if no base url for the service is configured +- Dropped tests and dedicated targets for .NET Framework 4.6.1, .NET Core 3.1 and .NET 5.0 ## v2.3.0: - Added a dedicated target for .NET 7 diff --git a/src/LightQuery.Client/LightQuery.Client.csproj b/src/LightQuery.Client/LightQuery.Client.csproj index 41c5f70..d08104a 100644 --- a/src/LightQuery.Client/LightQuery.Client.csproj +++ b/src/LightQuery.Client/LightQuery.Client.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;netstandard2.0;net461 + net8.0;net7.0;netstandard2.0 True Georg Dangl @@ -21,11 +21,7 @@ - - - - - + diff --git a/src/LightQuery.EntityFrameworkCore/LightQuery.EntityFrameworkCore.csproj b/src/LightQuery.EntityFrameworkCore/LightQuery.EntityFrameworkCore.csproj index 9a024e4..7fd2e34 100644 --- a/src/LightQuery.EntityFrameworkCore/LightQuery.EntityFrameworkCore.csproj +++ b/src/LightQuery.EntityFrameworkCore/LightQuery.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.0;net461 + net8.0;net7.0;net6.0;netstandard2.0 True Georg Dangl @@ -20,9 +20,7 @@ - - - + diff --git a/src/LightQuery.NSwag/LightQuery.NSwag.csproj b/src/LightQuery.NSwag/LightQuery.NSwag.csproj index 0f21de8..5085062 100644 --- a/src/LightQuery.NSwag/LightQuery.NSwag.csproj +++ b/src/LightQuery.NSwag/LightQuery.NSwag.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 + net8.0;net7.0;netstandard2.0 True Georg Dangl @@ -20,9 +20,7 @@ - - - + diff --git a/src/LightQuery.Shared/LightQuery.Shared.csproj b/src/LightQuery.Shared/LightQuery.Shared.csproj index 769f813..dc8bf28 100644 --- a/src/LightQuery.Shared/LightQuery.Shared.csproj +++ b/src/LightQuery.Shared/LightQuery.Shared.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 + net8.0;net7.0;netstandard2.0 True Georg Dangl @@ -19,11 +19,11 @@ false - + - + diff --git a/src/LightQuery.Swashbuckle/LightQuery.Swashbuckle.csproj b/src/LightQuery.Swashbuckle/LightQuery.Swashbuckle.csproj index a068c81..fa883d5 100644 --- a/src/LightQuery.Swashbuckle/LightQuery.Swashbuckle.csproj +++ b/src/LightQuery.Swashbuckle/LightQuery.Swashbuckle.csproj @@ -1,7 +1,7 @@ - net8.0;net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 + net8.0;net7.0;netstandard2.0 True Georg Dangl, Berkay AKÇAY @@ -23,7 +23,7 @@ - + diff --git a/src/LightQuery/LightQuery.csproj b/src/LightQuery/LightQuery.csproj index 7504ace..aa3f392 100644 --- a/src/LightQuery/LightQuery.csproj +++ b/src/LightQuery/LightQuery.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net5.0;netcoreapp3.1;netstandard2.0;net461 + net8.0;net7.0;netstandard2.0 True Georg Dangl diff --git a/test/LightQuery.Client.Tests.Integration/LightQuery.Client.Tests.Integration.csproj b/test/LightQuery.Client.Tests.Integration/LightQuery.Client.Tests.Integration.csproj index ae4817c..b1d8758 100644 --- a/test/LightQuery.Client.Tests.Integration/LightQuery.Client.Tests.Integration.csproj +++ b/test/LightQuery.Client.Tests.Integration/LightQuery.Client.Tests.Integration.csproj @@ -1,21 +1,21 @@  - net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0 false false - - - + + + all runtime; build; native; contentfiles; analyzers - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -26,11 +26,6 @@ - - true - true - - diff --git a/test/LightQuery.Client.Tests/LightQuery.Client.Tests.csproj b/test/LightQuery.Client.Tests/LightQuery.Client.Tests.csproj index d3d51bd..a4be81f 100644 --- a/test/LightQuery.Client.Tests/LightQuery.Client.Tests.csproj +++ b/test/LightQuery.Client.Tests/LightQuery.Client.Tests.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0 false false @@ -13,14 +13,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/LightQuery.EntityFrameworkCore.Tests.Integration/LightQuery.EntityFrameworkCore.Tests.Integration.csproj b/test/LightQuery.EntityFrameworkCore.Tests.Integration/LightQuery.EntityFrameworkCore.Tests.Integration.csproj index 5f13668..c3fbaca 100644 --- a/test/LightQuery.EntityFrameworkCore.Tests.Integration/LightQuery.EntityFrameworkCore.Tests.Integration.csproj +++ b/test/LightQuery.EntityFrameworkCore.Tests.Integration/LightQuery.EntityFrameworkCore.Tests.Integration.csproj @@ -1,21 +1,21 @@  - net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0 false false - - - + + + all runtime; build; native; contentfiles; analyzers - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -26,11 +26,6 @@ - - true - true - - diff --git a/test/LightQuery.EntityFrameworkCore.Tests/LightQuery.EntityFrameworkCore.Tests.csproj b/test/LightQuery.EntityFrameworkCore.Tests/LightQuery.EntityFrameworkCore.Tests.csproj index 5f7fd7a..ea60807 100644 --- a/test/LightQuery.EntityFrameworkCore.Tests/LightQuery.EntityFrameworkCore.Tests.csproj +++ b/test/LightQuery.EntityFrameworkCore.Tests/LightQuery.EntityFrameworkCore.Tests.csproj @@ -1,21 +1,21 @@  - net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0 false false - - - + + + all runtime; build; native; contentfiles; analyzers - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/LightQuery.IntegrationTestsServer/LightQuery.IntegrationTestsServer.csproj b/test/LightQuery.IntegrationTestsServer/LightQuery.IntegrationTestsServer.csproj index 75cf5a0..2a1ffe8 100644 --- a/test/LightQuery.IntegrationTestsServer/LightQuery.IntegrationTestsServer.csproj +++ b/test/LightQuery.IntegrationTestsServer/LightQuery.IntegrationTestsServer.csproj @@ -1,28 +1,12 @@  - net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 - NETCORE3 + net8.0;net7.0;net6.0 false false - - - - - - - - - - - - - - - diff --git a/test/LightQuery.IntegrationTestsServer/Startup.cs b/test/LightQuery.IntegrationTestsServer/Startup.cs index becbb74..6ce70b2 100644 --- a/test/LightQuery.IntegrationTestsServer/Startup.cs +++ b/test/LightQuery.IntegrationTestsServer/Startup.cs @@ -44,11 +44,7 @@ public void ConfigureServices(IServiceCollection services) options.OperationFilter(); }); -#if NETCORE3 services.AddMvc(mvcOptions => mvcOptions.EnableEndpointRouting = false); ; -#else - services.AddMvc(); -#endif } public void Configure(IApplicationBuilder app) diff --git a/test/LightQuery.Shared.Tests/LightQuery.Shared.Tests.csproj b/test/LightQuery.Shared.Tests/LightQuery.Shared.Tests.csproj index 1f7e017..947feff 100644 --- a/test/LightQuery.Shared.Tests/LightQuery.Shared.Tests.csproj +++ b/test/LightQuery.Shared.Tests/LightQuery.Shared.Tests.csproj @@ -1,39 +1,27 @@  - net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0 false - NETCORE3 + NET6 false - - - + + + all runtime; build; native; contentfiles; analyzers - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - diff --git a/test/LightQuery.Shared.Tests/QueryParserTests.cs b/test/LightQuery.Shared.Tests/QueryParserTests.cs index 958c268..677b20f 100644 --- a/test/LightQuery.Shared.Tests/QueryParserTests.cs +++ b/test/LightQuery.Shared.Tests/QueryParserTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Http; using Xunit; -#if !NETCORE3 +#if NET6 using Microsoft.AspNetCore.Http.Internal; #endif diff --git a/test/LightQuery.Tests.Integration/LightQuery.Tests.Integration.csproj b/test/LightQuery.Tests.Integration/LightQuery.Tests.Integration.csproj index 04f89af..03653f7 100644 --- a/test/LightQuery.Tests.Integration/LightQuery.Tests.Integration.csproj +++ b/test/LightQuery.Tests.Integration/LightQuery.Tests.Integration.csproj @@ -1,27 +1,12 @@  - net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0 false false - - - - - - - - - - - - - - - @@ -38,14 +23,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -56,11 +41,6 @@ - - true - true - - diff --git a/test/LightQuery.Tests/LightQuery.Tests.csproj b/test/LightQuery.Tests/LightQuery.Tests.csproj index 6501424..57b162b 100644 --- a/test/LightQuery.Tests/LightQuery.Tests.csproj +++ b/test/LightQuery.Tests/LightQuery.Tests.csproj @@ -1,21 +1,21 @@  - net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net8.0;net7.0;net6.0 false false - - - + + + all runtime; build; native; contentfiles; analyzers - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive From adf1ed5ebb08f238f336119535df9a6cab796449 Mon Sep 17 00:00:00 2001 From: Georg Dangl Date: Wed, 21 Feb 2024 11:56:43 +0100 Subject: [PATCH 19/19] Update System.Reactive --- src/LightQuery.Client/LightQuery.Client.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LightQuery.Client/LightQuery.Client.csproj b/src/LightQuery.Client/LightQuery.Client.csproj index d08104a..4205a47 100644 --- a/src/LightQuery.Client/LightQuery.Client.csproj +++ b/src/LightQuery.Client/LightQuery.Client.csproj @@ -20,7 +20,7 @@ - +