From 9294a70c73bc01d3b821abcd9b93bf7d667ec52f Mon Sep 17 00:00:00 2001 From: Salih Date: Mon, 13 Nov 2023 12:19:41 +0300 Subject: [PATCH 1/2] Fix replaceOne error --- .../PrismjsStyleBundleContributorDocsExtension.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/docs/src/Volo.Docs.Web/Bundling/PrismjsStyleBundleContributorDocsExtension.cs b/modules/docs/src/Volo.Docs.Web/Bundling/PrismjsStyleBundleContributorDocsExtension.cs index eb0436c5ff..8ea15229f7 100644 --- a/modules/docs/src/Volo.Docs.Web/Bundling/PrismjsStyleBundleContributorDocsExtension.cs +++ b/modules/docs/src/Volo.Docs.Web/Bundling/PrismjsStyleBundleContributorDocsExtension.cs @@ -7,10 +7,19 @@ namespace Volo.Docs.Bundling { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.ReplaceOne("/libs/prismjs/themes/prism.css","/libs/prismjs/themes/prism-okaidia.css"); + ReplaceOne(context.Files, "/libs/prismjs/themes/prism.css","/libs/prismjs/themes/prism-okaidia.css"); context.Files.AddIfNotContains("/libs/prismjs/plugins/line-highlight/prism-line-highlight.css"); context.Files.AddIfNotContains("/libs/prismjs/plugins/toolbar/prism-toolbar.css"); context.Files.AddIfNotContains("/libs/prismjs/plugins/diff-highlight/prism-diff-highlight.css"); } + + private static void ReplaceOne(List files, string oldFile, string newFile) + { + var index = files.FindIndex(x => x.FileName == oldFile); + if (index >= 0) + { + files[index] = new BundleFile(newFile); + } + } } } From 4081351b230c1c03e1e45b791827b5cf5a52b128 Mon Sep 17 00:00:00 2001 From: Salih Date: Mon, 13 Nov 2023 12:28:27 +0300 Subject: [PATCH 2/2] Update PrismjsStyleBundleContributorDocsExtension.cs --- ...PrismjsStyleBundleContributorDocsExtension.cs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/docs/src/Volo.Docs.Web/Bundling/PrismjsStyleBundleContributorDocsExtension.cs b/modules/docs/src/Volo.Docs.Web/Bundling/PrismjsStyleBundleContributorDocsExtension.cs index 8ea15229f7..f23f4bb803 100644 --- a/modules/docs/src/Volo.Docs.Web/Bundling/PrismjsStyleBundleContributorDocsExtension.cs +++ b/modules/docs/src/Volo.Docs.Web/Bundling/PrismjsStyleBundleContributorDocsExtension.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using Volo.Abp.AspNetCore.Mvc.UI.Bundling; namespace Volo.Docs.Bundling @@ -7,19 +8,14 @@ namespace Volo.Docs.Bundling { public override void ConfigureBundle(BundleConfigurationContext context) { - ReplaceOne(context.Files, "/libs/prismjs/themes/prism.css","/libs/prismjs/themes/prism-okaidia.css"); + var prismCss = context.Files.FirstOrDefault(x => x.FileName == "/libs/prismjs/themes/prism.css"); + if (prismCss != null) + { + prismCss.FileName = "/libs/prismjs/themes/prism-okaidia.css"; + } context.Files.AddIfNotContains("/libs/prismjs/plugins/line-highlight/prism-line-highlight.css"); context.Files.AddIfNotContains("/libs/prismjs/plugins/toolbar/prism-toolbar.css"); context.Files.AddIfNotContains("/libs/prismjs/plugins/diff-highlight/prism-diff-highlight.css"); } - - private static void ReplaceOne(List files, string oldFile, string newFile) - { - var index = files.FindIndex(x => x.FileName == oldFile); - if (index >= 0) - { - files[index] = new BundleFile(newFile); - } - } } }