Merge branch 'develop'

GeorgDangl · GeorgDangl · commit 88da89df54b6 · 2024-04-26T12:22:55.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to **angular-material-shared** are documented here.
 
+## v2.6.1:
+
+- The `@tinymce/tinymce-angular` dependency was added to the package
+
 ## v2.6.0:
 
 - tinymce was updated to v7
diff --git a/build/Build.cs b/build/Build.cs
@@ -77,7 +77,7 @@ private async Task CopyTinyMceAssetsToDist()
             }
         }
 
-        var tinyMceAssetFolders = new[] { "icons", "plugins", "skins", "themes" };
+        var tinyMceAssetFolders = new[] { "icons", "plugins", "skins", "themes", "models" };
         foreach (var tinyMceAssetFolder in tinyMceAssetFolders)
         {
             CopyDirectoryRecursively(NgAppDir / "node_modules" / "tinymce" / tinyMceAssetFolder, TinyMceAssetsDirectory / tinyMceAssetFolder);
diff --git a/src/angular-material-shared-demo/projects/angular-material-shared/package.json b/src/angular-material-shared-demo/projects/angular-material-shared/package.json
@@ -9,7 +9,8 @@
     "@angular/core": ">=17.0.8",
     "@angular/forms": ">=17.0.8",
     "@angular/material": ">=17.0.4",
-    "@angular/cdk": ">=17.0.4"
+    "@angular/cdk": ">=17.0.4",
+    "@tinymce/tinymce-angular": "^7.0.0"
   },
   "dependencies": {
     "tslib": ">=2.3.1"

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private async Task CopyTinyMceAssetsToDist()`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`- var tinyMceAssetFolders = new[] { "icons", "plugins", "skins", "themes" };`
	`80`	`+ var tinyMceAssetFolders = new[] { "icons", "plugins", "skins", "themes", "models" };`
`81`	`81`	`foreach (var tinyMceAssetFolder in tinyMceAssetFolders)`
`82`	`82`	`{`
`83`	`83`	`CopyDirectoryRecursively(NgAppDir / "node_modules" / "tinymce" / tinyMceAssetFolder, TinyMceAssetsDirectory / tinyMceAssetFolder);`