Merge branch 'master' into u/bvalverde/mergeLinkFormat

microsoft · Jun 5, 2024 · 83f4442 · 83f4442
2 parents 23b674a + f722a40
commit 83f4442
Show file tree

Hide file tree

Showing 1,000 changed files with 45,677 additions and 94,824 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -154,13 +154,7 @@ module.exports = {
     },
     overrides: [
         {
-            files: [
-                'roosterjs-editor-*/**/*.ts',
-                'roosterjs-react/**/*.ts',
-                'roosterjs-react/**/*.tsx',
-                'roosterjs-color-utils/**/*.ts',
-                'roosterjs/**/*.ts',
-            ],
+            files: ['roosterjs-color-utils/**/*.ts'],
             rules: {
                 'import/no-default-export': 'off',
             },

diff --git a/.gitignore b/.gitignore
@@ -14,5 +14,3 @@ dist/
 # Mac files
 .DS_Store
 
-# Temp files
-packages/roosterjs-editor-types/lib/compatibleEnum/
diff --git a/README.md b/README.md
@@ -51,22 +51,22 @@ There are also some extension packages to provide additional functionalities.
 1. [roosterjs-color-utils](https://microsoft.github.io/roosterjs/docs/modules/roosterjs_color_utils.html):
    Provide color transformation utility to make editor work under dark mode.
 
-2. [roosterjs-react](https://microsoft.github.io/roosterjs/docs/modules/roosterjs_react.html):
-   Provide a React wrapper of roosterjs so it can be easily used with React.
-
 To be compatible with old (8.\*) versions, you can use `EditorAdapter` class from the following package which can act as a 8.\* Editor:
 
 1. [roosterjs-editor-adapter](https://microsoft.github.io/roosterjs/docs/modules/roosterjs_editor_adapter.html):
    Provide a adapter class `EditorAdapter` to work with Editor (9.\*) and legacy plugins (via [EditorAdapterOptions.legacyPlugins](https://microsoft.github.io/roosterjs/docs/interfaces/roosterjs_editor_adapter.editoradapteroptions.html#legacyplugins))
 
-And the following packages are for old (8.\*) compatibility:
+All old packages (8.\*) are moved to branch [roosterjsv8](https://github.com/microsoft/roosterjs/tree/roosterjsv8), including
+
+1. roosterjs-editor-core
+2. roosterjs-editor-api
+3. roosterjs-editor-dom
+4. roosterjs-editor-plugins
+5. roosterjs-editor-types
+6. roosterjs-editor-types-compatible
+7. roosterjs-react
 
-1. [roosterjs-editor-core](https://microsoft.github.io/roosterjs/docs/modules/roosterjs_editor_core.html):
-2. [roosterjs-editor-api](https://microsoft.github.io/roosterjs/docs/modules/roosterjs_editor_api.html):
-3. [roosterjs-editor-dom](https://microsoft.github.io/roosterjs/docs/modules/roosterjs_editor_dom.html):
-4. [roosterjs-editor-plugins](https://microsoft.github.io/roosterjs/docs/modules/roosterjs_editor_plugins.html):
-5. [roosterjs-editor-types](https://microsoft.github.io/roosterjs/docs/modules/roosterjs_editor_types.html):
-6. [roosterjs-editor-types-compatible](https://microsoft.github.io/roosterjs/docs/modules/roosterjs_editor_types_compatible.html):
+We will not update these branches any more unless there are new security bugs.
 
 ### APIs
 

diff --git a/assets/legacy-demo/demo.js b/assets/legacy-demo/demo.js
diff --git a/assets/legacy-demo/demo.js.LICENSE.txt b/assets/legacy-demo/demo.js.LICENSE.txt
@@ -0,0 +1 @@
+/*! @license DOMPurify 2.3.0 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.3.0/LICENSE */
diff --git a/assets/legacy-demo/demo.js.map b/assets/legacy-demo/demo.js.map
diff --git a/assets/legacy-demo/index.html b/assets/legacy-demo/index.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>RoosterJs Demo Site</title>
+        <style>
+            #mainPane {
+                position: absolute;
+                left: 10px;
+                right: 10px;
+                top: 10px;
+                bottom: 10px;
+            }
+        </style>
+        <meta
+            http-equiv="Content-Security-Policy"
+            content="require-trusted-types-for 'script'; trusted-types dompurify;"
+        />
+    </head>
+    <body>
+        <div id="mainPane"></div>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/react/16.14.0/umd/react.production.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.14.0/umd/react-dom.production.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/fluentui-react/8.60.1/fluentui-react.min.js"></script>
+        <script src="rooster-legacy-min.js"></script>
+        <script src="rooster-min.js"></script>
+        <script src="rooster-adapter-min.js"></script>
+        <script src="rooster-react-min.js"></script>
+        <script src="demo.js"></script>
+    </body>
+</html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/! @license DOMPurify 2.3.0 \| (c) Cure53 and other contributors \| Released under the Apache license 2.0 and Mozilla Public License 2.0 \| github.com/cure53/DOMPurify/blob/2.3.0/LICENSE /