Merge branch 'main' into feature/INT-2305

Author: tiny-james

contributing.md

@@ -1,6 +1,6 @@
 # Contributing
 
-This project follows the [beehive-flow](https://github.com/tinymce/beehive-flow/) branching process. 
+This project follows the [beehive-flow](https://github.com/tinymce/beehive-flow/) branching process ("Basic process - release from main branch"). 
 Please read the [beehive-flow readme](https://github.com/tinymce/beehive-flow/blob/main/README.md) for more information.
 This mainly affects branching and merging for Tiny staff. 
 

package.json

@@ -29,21 +29,21 @@
     "@ephox/katamari": "^7.1.1",
     "@ephox/sugar": "^7.0.3",
     "@ephox/swag": "^4.3.1",
-    "@tinymce/beehive-flow": "^0.9.0",
+    "@tinymce/beehive-flow": "^0.12.0",
     "@tinymce/eslint-plugin": "^1.7.2",
     "@types/esm": "^3.2.0",
-    "@types/express": "^4.17.9",
-    "@types/node": "^14.14.20",
-    "eslint": "^7.17.0",
+    "@types/express": "^4.17.11",
+    "@types/node": "^14.14.22",
+    "eslint": "^7.18.0",
     "esm": "^3.2.25",
     "express": "^4.17.1",
-    "rollup": "^2.28.1",
+    "rollup": "^2.38.0",
     "tinymce": "^5.6.0",
-    "ts-loader": "^8.0.13",
+    "ts-loader": "^8.0.14",
     "ts-node": "^9.1.1",
     "typescript": "^4.0.3"
   },
   "dependencies": {},
-  "version": "1.2.0-alpha",
+  "version": "1.2.0-rc",
   "name": "@tinymce/tinymce-webcomponent"
 }

yarn.lock

@@ -245,10 +245,10 @@
   dependencies:
     defer-to-connect "^2.0.0"
 
-"@tinymce/beehive-flow@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@tinymce/beehive-flow/-/beehive-flow-0.9.0.tgz#5dc5ea1fff1f78d9a9e81d460f252d5d6274c002"
-  integrity sha512-U9LTKkna5tp4P7VlVlujSjmn43v9B40WRnI+Tcp9vj8/7uxpAk6MWyVzi07aZVYMZYCBmPpEEKFlLTeW2ynsPA==
+"@tinymce/beehive-flow@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@tinymce/beehive-flow/-/beehive-flow-0.12.0.tgz#f50927771b18a7c02e08de9a2545c4cfa3817f2d"
+  integrity sha512-zxdAlsevxiXTbJixiUTNi/zw3Of3zqLHHx80oA7STosNu4o1DtyUrQ9J8hKIgZaw58IlKSkDjkhglUG7aZaHWw==
   dependencies:
     cross-spawn-promise "^0.10.2"
     fp-ts "^2.9.3"
@@ -329,7 +329,7 @@
     "@types/qs" "*"
     "@types/range-parser" "*"
 
-"@types/express@^4.17.9":
+"@types/express@^4.17.11":
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
   integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
@@ -379,7 +379,7 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
-"@types/node@*", "@types/node@^14.14.20":
+"@types/node@*", "@types/node@^14.14.22":
   version "14.14.22"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
   integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
@@ -2367,7 +2367,7 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@^7.0.0, eslint@^7.17.0:
+eslint@^7.0.0, eslint@^7.18.0:
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz#6719621b196b5fad72e43387981314e5d0dc3f41"
   integrity sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg==
@@ -5540,7 +5540,7 @@ rollup@^1.23.1:
     "@types/node" "*"
     acorn "^7.1.0"
 
-rollup@^2.0.0, rollup@^2.28.1:
+rollup@^2.0.0, rollup@^2.38.0:
   version "2.38.3"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.3.tgz#2a0b6cc6eab1da4431aab875a31a401fa2988c10"
   integrity sha512-FVx/XzR2DtCozKNDBjHJCHIgkC12rNg/ruAeoYWjLeeKfSKgwhh+lDLDhuCkuRG/fsup8py8dKBTlHdvUFX32A==
@@ -6291,7 +6291,7 @@ ts-loader@^5.3.3:
     micromatch "^3.1.4"
     semver "^5.0.1"
 
-ts-loader@^8.0.13:
+ts-loader@^8.0.14:
   version "8.0.14"
   resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.14.tgz#e46ac1f8dcb88808d0b1335d2eae65b74bd78fe8"
   integrity sha512-Jt/hHlUnApOZjnSjTmZ+AbD5BGlQFx3f1D0nYuNKwz0JJnuDGHJas6az+FlWKwwRTu+26GXpv249A8UAnYUpqA==