From ed22dd12e018c18396e2354b8b412016db5b216d Mon Sep 17 00:00:00 2001 From: bkapustik <82807109+bkapustik@users.noreply.github.com> Date: Wed, 20 Mar 2024 18:15:23 +0100 Subject: [PATCH] fix(TagManager): fix issue with using dynamic script in nugget --- Directory.Build.props | 3 +- examples/DancingGoat/packages.lock.json | 97 +++++++++-------- .../Admin/FrontEnd/webpack.config.js | 2 +- .../Kentico.Xperience.TagManager.csproj | 2 +- .../CodeSnippetTagHelperComponent.cs | 2 +- .../Rendering/TagManagerController.cs | 6 +- .../packages.lock.json | 101 ++++++++++-------- .../wwwroot/{scripts => js}/ktc-tagmanager.js | 0 .../packages.lock.json | 101 ++++++++++-------- 9 files changed, 175 insertions(+), 139 deletions(-) rename src/Kentico.Xperience.TagManager/wwwroot/{scripts => js}/ktc-tagmanager.js (100%) diff --git a/Directory.Build.props b/Directory.Build.props index 7d1edcb..a19d330 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -22,7 +22,8 @@ - net8.0 + net6.0 + latest enable enable nullable diff --git a/examples/DancingGoat/packages.lock.json b/examples/DancingGoat/packages.lock.json index 8fea80c..4e9b41b 100644 --- a/examples/DancingGoat/packages.lock.json +++ b/examples/DancingGoat/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net8.0": { + "net6.0": { "Kentico.Xperience.Admin": { "type": "Direct", "requested": "[28.3.1, )", @@ -164,8 +164,8 @@ "resolved": "13.8.1", "contentHash": "KgsJ88vcX0UfSKAO7uzbEPOGu8wwJU3Vkgz7AgeTrnfdgIVjZFkesvMxDqjzY6F3fmMbJmfAOLjufYLFs1Fq1g==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", + "Microsoft.Extensions.ObjectPool": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0", "System.Threading.Tasks.Extensions": "4.5.0" } }, @@ -190,7 +190,8 @@ "contentHash": "+llX8ziARzp+aKsOaXQfZAtqE+lF8gSmTiMiRCdpf03M+IWl/uCD9965nhqkM4mauWufwBXlwA7TE4uIUu+UjQ==", "dependencies": { "HotChocolate.Language": "13.8.1", - "System.Collections.Immutable": "8.0.0" + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Collections.Immutable": "6.0.0" } }, "HotChocolate.AspNetCore": { @@ -234,8 +235,8 @@ "HotChocolate.Types": "13.8.1", "HotChocolate.Utilities.DependencyInjection": "13.8.1", "HotChocolate.Validation": "13.8.1", - "Microsoft.Extensions.DependencyInjection": "8.0.0", - "System.Threading.Channels": "8.0.0" + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "System.Threading.Channels": "6.0.0" } }, "HotChocolate.Execution.Abstractions": { @@ -244,7 +245,7 @@ "contentHash": "sAL6A/Qa23inTgu8sWiNoaKpaJ3MosXLsiP908+XUogMOjudpWnaSWPYu5THgl1deaQ6q55gbyiFvwJx5lRR8A==", "dependencies": { "HotChocolate.Abstractions": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" } }, "HotChocolate.Fetching": { @@ -272,7 +273,7 @@ "resolved": "13.8.1", "contentHash": "0RYVxhsxR1vf0ue/V8GZnN8UVxh1bI74KPe0vFLLlNXRSq55LXTuGt3gYc6+LxSCc4KaItzRl6DwdgRuDRINjw==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "8.0.0" + "Microsoft.Extensions.ObjectPool": "6.0.0" } }, "HotChocolate.Language.Utf8": { @@ -315,7 +316,7 @@ "dependencies": { "HotChocolate.Execution.Abstractions": "13.8.1", "HotChocolate.Subscriptions": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" } }, "HotChocolate.Transport.Sockets": { @@ -323,7 +324,7 @@ "resolved": "13.8.1", "contentHash": "YVfn1O+B0UlGKtieqRoGEeZjnFpSNjK1ZQVLvfKZ/DfCh+7FR9CwZ6II7YXWCE+M9sCQTvEo9Cz5XCpsnJDhIw==", "dependencies": { - "System.IO.Pipelines": "8.0.0" + "System.IO.Pipelines": "6.0.0" } }, "HotChocolate.Types": { @@ -334,10 +335,10 @@ "HotChocolate.Abstractions": "13.8.1", "HotChocolate.Types.Shared": "13.8.1", "HotChocolate.Utilities": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.ObjectPool": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.ObjectPool": "6.0.0", "System.ComponentModel.Annotations": "5.0.0", - "System.Text.Json": "8.0.0" + "System.Text.Json": "6.0.7" } }, "HotChocolate.Types.CursorPagination": { @@ -393,7 +394,7 @@ "resolved": "13.8.1", "contentHash": "4tEg4xfDfiahuLrC59gH+BYfAFqDPEvoyBK7PU3ep7O2cmQgnqeE3tKMqJ1UovGMsVQ5nYwcQ98LhqrPOxECUw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "8.0.0" + "Microsoft.Extensions.DependencyInjection": "6.0.0" } }, "HotChocolate.Validation": { @@ -402,8 +403,8 @@ "contentHash": "kmPmYrtCt1NtmyZiSvfjDU+Abc/4hI2wDLe1uDEZW8JC8O2uwH0becZm1K6j9ZUfVMLp/5ZNsQONOXzL1VwxLA==", "dependencies": { "HotChocolate.Types": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0" } }, "HtmlSanitizer": { @@ -675,16 +676,16 @@ }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "4pm+XgxSukskwjzDDfSjG4KNUIOdFF2VaqZZDtTzoyQMOVSnlV6ZM8a9aVu5dg9LVZTB//utzSc8fOi0b0Mb2Q==" + "resolved": "6.0.0", + "contentHash": "7hR9FU0JJHOCLmn/Ary31pLLAhlzoMptBKs5CJmNUzD87dXjl+/NqVkyCTl6cT2JAfTK0G39HpvCOv1fhsX3BQ==" }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -701,8 +702,11 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "Microsoft.Identity.Client": { "type": "Transitive", @@ -840,7 +844,10 @@ "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.ComponentModel.Annotations": { "type": "Transitive", @@ -852,19 +859,16 @@ "resolved": "8.0.0", "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", "dependencies": { - "System.Diagnostics.EventLog": "8.0.0", "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" - }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Formats.Asn1": { "type": "Transitive", @@ -896,8 +900,8 @@ }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA==" + "resolved": "6.0.0", + "contentHash": "mXX66shZ4xLlI3vNLaJ0lt8OIZdmXTvIqXRdQX5HLVGSkLhINLsVhyZuX2UdRFnOGkqnwmMUs40pIIQ7mna4+A==" }, "System.Memory": { "type": "Transitive", @@ -969,25 +973,32 @@ "System.Text.Encoding.CodePages": { "type": "Transitive", "resolved": "7.0.0", - "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==" + "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", "dependencies": { - "System.Text.Encodings.Web": "8.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" } }, "System.Threading.Channels": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==" + "resolved": "6.0.0", + "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", diff --git a/src/Kentico.Xperience.TagManager/Admin/FrontEnd/webpack.config.js b/src/Kentico.Xperience.TagManager/Admin/FrontEnd/webpack.config.js index 4598156..49c9893 100644 --- a/src/Kentico.Xperience.TagManager/Admin/FrontEnd/webpack.config.js +++ b/src/Kentico.Xperience.TagManager/Admin/FrontEnd/webpack.config.js @@ -6,7 +6,7 @@ const isProduction = process.env.NODE_ENV == "production"; const config = { entry: "./src/index.js", output: { - path: path.resolve(__dirname, "../.././wwwroot/scripts"), + path: path.resolve(__dirname, "../.././wwwroot/js"), filename: "ktc-tagmanager.js", module: true, }, diff --git a/src/Kentico.Xperience.TagManager/Kentico.Xperience.TagManager.csproj b/src/Kentico.Xperience.TagManager/Kentico.Xperience.TagManager.csproj index aa8142f..fa3a9d8 100644 --- a/src/Kentico.Xperience.TagManager/Kentico.Xperience.TagManager.csproj +++ b/src/Kentico.Xperience.TagManager/Kentico.Xperience.TagManager.csproj @@ -61,7 +61,7 @@ - + \ No newline at end of file diff --git a/src/Kentico.Xperience.TagManager/Rendering/CodeSnippetTagHelperComponent.cs b/src/Kentico.Xperience.TagManager/Rendering/CodeSnippetTagHelperComponent.cs index 0a1a6c5..68e2795 100644 --- a/src/Kentico.Xperience.TagManager/Rendering/CodeSnippetTagHelperComponent.cs +++ b/src/Kentico.Xperience.TagManager/Rendering/CodeSnippetTagHelperComponent.cs @@ -92,7 +92,7 @@ private IHtmlContent GetScriptSrcTag() ["type"] = "module", ["src"] = fileVersionProvider.AddFileVersionToPath( ViewContext.HttpContext.Request.PathBase, - urlHelper.Content("~/_content/Kentico.Xperience.TagManager/Scripts/ktc-tagmanager.js")) + urlHelper.Content("./_content/Kentico.Xperience.TagManager/js/ktc-tagmanager.js")) } }; diff --git a/src/Kentico.Xperience.TagManager/Rendering/TagManagerController.cs b/src/Kentico.Xperience.TagManager/Rendering/TagManagerController.cs index 836b7a5..d68b1bf 100644 --- a/src/Kentico.Xperience.TagManager/Rendering/TagManagerController.cs +++ b/src/Kentico.Xperience.TagManager/Rendering/TagManagerController.cs @@ -7,9 +7,11 @@ namespace Kentico.Xperience.TagManager.Rendering; [ApiController] [Route("/kentico.tagmanager/[action]")] -public sealed class TagManagerController(IChannelCodeSnippetsService channelCodeSnippetsContext) : Controller +public sealed class TagManagerController : Controller { - private readonly IChannelCodeSnippetsService channelCodeSnippetsContext = channelCodeSnippetsContext; + private readonly IChannelCodeSnippetsService channelCodeSnippetsContext; + + public TagManagerController(IChannelCodeSnippetsService channelCodeSnippetsContext) => this.channelCodeSnippetsContext = channelCodeSnippetsContext; private static readonly JsonSerializerOptions jsonSerializerOptions = new() { diff --git a/src/Kentico.Xperience.TagManager/packages.lock.json b/src/Kentico.Xperience.TagManager/packages.lock.json index 1184c29..5e6c5ac 100644 --- a/src/Kentico.Xperience.TagManager/packages.lock.json +++ b/src/Kentico.Xperience.TagManager/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net8.0": { + "net6.0": { "Kentico.Xperience.Admin": { "type": "Direct", "requested": "[28.3.1, )", @@ -125,8 +125,8 @@ "resolved": "13.8.1", "contentHash": "KgsJ88vcX0UfSKAO7uzbEPOGu8wwJU3Vkgz7AgeTrnfdgIVjZFkesvMxDqjzY6F3fmMbJmfAOLjufYLFs1Fq1g==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", + "Microsoft.Extensions.ObjectPool": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0", "System.Threading.Tasks.Extensions": "4.5.0" } }, @@ -151,7 +151,8 @@ "contentHash": "+llX8ziARzp+aKsOaXQfZAtqE+lF8gSmTiMiRCdpf03M+IWl/uCD9965nhqkM4mauWufwBXlwA7TE4uIUu+UjQ==", "dependencies": { "HotChocolate.Language": "13.8.1", - "System.Collections.Immutable": "8.0.0" + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Collections.Immutable": "6.0.0" } }, "HotChocolate.AspNetCore": { @@ -195,8 +196,8 @@ "HotChocolate.Types": "13.8.1", "HotChocolate.Utilities.DependencyInjection": "13.8.1", "HotChocolate.Validation": "13.8.1", - "Microsoft.Extensions.DependencyInjection": "8.0.0", - "System.Threading.Channels": "8.0.0" + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "System.Threading.Channels": "6.0.0" } }, "HotChocolate.Execution.Abstractions": { @@ -205,7 +206,7 @@ "contentHash": "sAL6A/Qa23inTgu8sWiNoaKpaJ3MosXLsiP908+XUogMOjudpWnaSWPYu5THgl1deaQ6q55gbyiFvwJx5lRR8A==", "dependencies": { "HotChocolate.Abstractions": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" } }, "HotChocolate.Fetching": { @@ -233,7 +234,7 @@ "resolved": "13.8.1", "contentHash": "0RYVxhsxR1vf0ue/V8GZnN8UVxh1bI74KPe0vFLLlNXRSq55LXTuGt3gYc6+LxSCc4KaItzRl6DwdgRuDRINjw==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "8.0.0" + "Microsoft.Extensions.ObjectPool": "6.0.0" } }, "HotChocolate.Language.Utf8": { @@ -276,7 +277,7 @@ "dependencies": { "HotChocolate.Execution.Abstractions": "13.8.1", "HotChocolate.Subscriptions": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" } }, "HotChocolate.Transport.Sockets": { @@ -284,7 +285,7 @@ "resolved": "13.8.1", "contentHash": "YVfn1O+B0UlGKtieqRoGEeZjnFpSNjK1ZQVLvfKZ/DfCh+7FR9CwZ6II7YXWCE+M9sCQTvEo9Cz5XCpsnJDhIw==", "dependencies": { - "System.IO.Pipelines": "8.0.0" + "System.IO.Pipelines": "6.0.0" } }, "HotChocolate.Types": { @@ -295,10 +296,10 @@ "HotChocolate.Abstractions": "13.8.1", "HotChocolate.Types.Shared": "13.8.1", "HotChocolate.Utilities": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.ObjectPool": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.ObjectPool": "6.0.0", "System.ComponentModel.Annotations": "5.0.0", - "System.Text.Json": "8.0.0" + "System.Text.Json": "6.0.7" } }, "HotChocolate.Types.CursorPagination": { @@ -354,7 +355,7 @@ "resolved": "13.8.1", "contentHash": "4tEg4xfDfiahuLrC59gH+BYfAFqDPEvoyBK7PU3ep7O2cmQgnqeE3tKMqJ1UovGMsVQ5nYwcQ98LhqrPOxECUw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "8.0.0" + "Microsoft.Extensions.DependencyInjection": "6.0.0" } }, "HotChocolate.Validation": { @@ -363,8 +364,8 @@ "contentHash": "kmPmYrtCt1NtmyZiSvfjDU+Abc/4hI2wDLe1uDEZW8JC8O2uwH0becZm1K6j9ZUfVMLp/5ZNsQONOXzL1VwxLA==", "dependencies": { "HotChocolate.Types": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0" } }, "HtmlSanitizer": { @@ -447,8 +448,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, "Microsoft.Data.SqlClient": { "type": "Transitive", @@ -636,16 +637,16 @@ }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "4pm+XgxSukskwjzDDfSjG4KNUIOdFF2VaqZZDtTzoyQMOVSnlV6ZM8a9aVu5dg9LVZTB//utzSc8fOi0b0Mb2Q==" + "resolved": "6.0.0", + "contentHash": "7hR9FU0JJHOCLmn/Ary31pLLAhlzoMptBKs5CJmNUzD87dXjl+/NqVkyCTl6cT2JAfTK0G39HpvCOv1fhsX3BQ==" }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -662,8 +663,11 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "Microsoft.Identity.Client": { "type": "Transitive", @@ -774,7 +778,10 @@ "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.ComponentModel.Annotations": { "type": "Transitive", @@ -786,19 +793,16 @@ "resolved": "8.0.0", "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", "dependencies": { - "System.Diagnostics.EventLog": "8.0.0", "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" - }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Formats.Asn1": { "type": "Transitive", @@ -830,8 +834,8 @@ }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA==" + "resolved": "6.0.0", + "contentHash": "mXX66shZ4xLlI3vNLaJ0lt8OIZdmXTvIqXRdQX5HLVGSkLhINLsVhyZuX2UdRFnOGkqnwmMUs40pIIQ7mna4+A==" }, "System.Memory": { "type": "Transitive", @@ -903,25 +907,32 @@ "System.Text.Encoding.CodePages": { "type": "Transitive", "resolved": "7.0.0", - "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==" + "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", "dependencies": { - "System.Text.Encodings.Web": "8.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" } }, "System.Threading.Channels": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==" + "resolved": "6.0.0", + "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", diff --git a/src/Kentico.Xperience.TagManager/wwwroot/scripts/ktc-tagmanager.js b/src/Kentico.Xperience.TagManager/wwwroot/js/ktc-tagmanager.js similarity index 100% rename from src/Kentico.Xperience.TagManager/wwwroot/scripts/ktc-tagmanager.js rename to src/Kentico.Xperience.TagManager/wwwroot/js/ktc-tagmanager.js diff --git a/tests/Kentico.Xperience.TagManager.Tests/packages.lock.json b/tests/Kentico.Xperience.TagManager.Tests/packages.lock.json index 566c9b4..d336162 100644 --- a/tests/Kentico.Xperience.TagManager.Tests/packages.lock.json +++ b/tests/Kentico.Xperience.TagManager.Tests/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net8.0": { + "net6.0": { "coverlet.collector": { "type": "Direct", "requested": "[6.0.1, )", @@ -110,8 +110,8 @@ "resolved": "13.8.1", "contentHash": "KgsJ88vcX0UfSKAO7uzbEPOGu8wwJU3Vkgz7AgeTrnfdgIVjZFkesvMxDqjzY6F3fmMbJmfAOLjufYLFs1Fq1g==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", + "Microsoft.Extensions.ObjectPool": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0", "System.Threading.Tasks.Extensions": "4.5.0" } }, @@ -136,7 +136,8 @@ "contentHash": "+llX8ziARzp+aKsOaXQfZAtqE+lF8gSmTiMiRCdpf03M+IWl/uCD9965nhqkM4mauWufwBXlwA7TE4uIUu+UjQ==", "dependencies": { "HotChocolate.Language": "13.8.1", - "System.Collections.Immutable": "8.0.0" + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Collections.Immutable": "6.0.0" } }, "HotChocolate.AspNetCore": { @@ -180,8 +181,8 @@ "HotChocolate.Types": "13.8.1", "HotChocolate.Utilities.DependencyInjection": "13.8.1", "HotChocolate.Validation": "13.8.1", - "Microsoft.Extensions.DependencyInjection": "8.0.0", - "System.Threading.Channels": "8.0.0" + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "System.Threading.Channels": "6.0.0" } }, "HotChocolate.Execution.Abstractions": { @@ -190,7 +191,7 @@ "contentHash": "sAL6A/Qa23inTgu8sWiNoaKpaJ3MosXLsiP908+XUogMOjudpWnaSWPYu5THgl1deaQ6q55gbyiFvwJx5lRR8A==", "dependencies": { "HotChocolate.Abstractions": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" } }, "HotChocolate.Fetching": { @@ -218,7 +219,7 @@ "resolved": "13.8.1", "contentHash": "0RYVxhsxR1vf0ue/V8GZnN8UVxh1bI74KPe0vFLLlNXRSq55LXTuGt3gYc6+LxSCc4KaItzRl6DwdgRuDRINjw==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "8.0.0" + "Microsoft.Extensions.ObjectPool": "6.0.0" } }, "HotChocolate.Language.Utf8": { @@ -261,7 +262,7 @@ "dependencies": { "HotChocolate.Execution.Abstractions": "13.8.1", "HotChocolate.Subscriptions": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" } }, "HotChocolate.Transport.Sockets": { @@ -269,7 +270,7 @@ "resolved": "13.8.1", "contentHash": "YVfn1O+B0UlGKtieqRoGEeZjnFpSNjK1ZQVLvfKZ/DfCh+7FR9CwZ6II7YXWCE+M9sCQTvEo9Cz5XCpsnJDhIw==", "dependencies": { - "System.IO.Pipelines": "8.0.0" + "System.IO.Pipelines": "6.0.0" } }, "HotChocolate.Types": { @@ -280,10 +281,10 @@ "HotChocolate.Abstractions": "13.8.1", "HotChocolate.Types.Shared": "13.8.1", "HotChocolate.Utilities": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.ObjectPool": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.ObjectPool": "6.0.0", "System.ComponentModel.Annotations": "5.0.0", - "System.Text.Json": "8.0.0" + "System.Text.Json": "6.0.7" } }, "HotChocolate.Types.CursorPagination": { @@ -339,7 +340,7 @@ "resolved": "13.8.1", "contentHash": "4tEg4xfDfiahuLrC59gH+BYfAFqDPEvoyBK7PU3ep7O2cmQgnqeE3tKMqJ1UovGMsVQ5nYwcQ98LhqrPOxECUw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "8.0.0" + "Microsoft.Extensions.DependencyInjection": "6.0.0" } }, "HotChocolate.Validation": { @@ -348,8 +349,8 @@ "contentHash": "kmPmYrtCt1NtmyZiSvfjDU+Abc/4hI2wDLe1uDEZW8JC8O2uwH0becZm1K6j9ZUfVMLp/5ZNsQONOXzL1VwxLA==", "dependencies": { "HotChocolate.Types": "13.8.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0" } }, "HtmlSanitizer": { @@ -432,8 +433,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, "Microsoft.CodeCoverage": { "type": "Transitive", @@ -626,16 +627,16 @@ }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "4pm+XgxSukskwjzDDfSjG4KNUIOdFF2VaqZZDtTzoyQMOVSnlV6ZM8a9aVu5dg9LVZTB//utzSc8fOi0b0Mb2Q==" + "resolved": "6.0.0", + "contentHash": "7hR9FU0JJHOCLmn/Ary31pLLAhlzoMptBKs5CJmNUzD87dXjl+/NqVkyCTl6cT2JAfTK0G39HpvCOv1fhsX3BQ==" }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -652,8 +653,11 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "Microsoft.Identity.Client": { "type": "Transitive", @@ -787,7 +791,10 @@ "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.ComponentModel.Annotations": { "type": "Transitive", @@ -799,19 +806,16 @@ "resolved": "8.0.0", "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", "dependencies": { - "System.Diagnostics.EventLog": "8.0.0", "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" - }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Formats.Asn1": { "type": "Transitive", @@ -843,8 +847,8 @@ }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA==" + "resolved": "6.0.0", + "contentHash": "mXX66shZ4xLlI3vNLaJ0lt8OIZdmXTvIqXRdQX5HLVGSkLhINLsVhyZuX2UdRFnOGkqnwmMUs40pIIQ7mna4+A==" }, "System.Memory": { "type": "Transitive", @@ -921,25 +925,32 @@ "System.Text.Encoding.CodePages": { "type": "Transitive", "resolved": "7.0.0", - "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==" + "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", "dependencies": { - "System.Text.Encodings.Web": "8.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" } }, "System.Threading.Channels": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==" + "resolved": "6.0.0", + "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive",