Merge pull request #9484 from abpframework/auto-merge/rel-4-4/460

Merge branch dev with rel-4.4
abpframework · Jul 2, 2021 · 7ef9606 · 7ef9606
2 parents 5deb7bd + d7da075
commit 7ef9606
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/...c.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorScriptContributor.cs b/...c.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorScriptContributor.cs
@@ -16,18 +16,6 @@ public class TuiEditorScriptContributor : BundleContributor
     {
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
-            context.Files.AddIfNotContains("/libs/to-mark/to-mark.min.js");
-
-            if (context.FileProvider.GetFileInfo("/libs/tui-code-snippet/tui-code-snippet.min.js").Exists)
-            {
-                context.Files.AddIfNotContains("/libs/tui-code-snippet/tui-code-snippet.min.js");
-            }
-            else
-            {
-                context.Files.AddIfNotContains("/libs/tui-code-snippet/tui-code-snippet.js");
-            }
-
-            context.Files.AddIfNotContains("/libs/squire-rte/squire.js");
             context.Files.AddIfNotContains("/libs/tui-editor/toastui-editor.js");
         }
     }

diff --git a/npm/packs/tui-editor/abp.resourcemapping.js b/npm/packs/tui-editor/abp.resourcemapping.js
@@ -1,8 +1,5 @@
 module.exports = {
     mappings: {
-        "@node_modules/to-mark/dist/to-mark.min.js": "@libs/to-mark/",
-        "@node_modules/tui-code-snippet/dist/*.*": "@libs/tui-code-snippet/",
-        "@node_modules/squire-rte/build/squire.js": "@libs/squire-rte/",
         "@node_modules/@toast-ui/editor/dist/*.*": "@libs/tui-editor/"
     }
 }
diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json
@@ -9,8 +9,7 @@
     "@abp/highlight.js": "~4.4.0-rc.1",
     "@abp/jquery": "~4.4.0-rc.1",
     "@abp/markdown-it": "~4.4.0-rc.1",
-    "@toast-ui/editor": "^2.5.1",
-    "tui-code-snippet": "^2.3.2"
+    "@toast-ui/editor": "^2.5.1"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }