Skip to content

Commit b57009e

Browse files
authored
Merge pull request #11 from tinymce/feature/TINY-6890
Feature/tiny 6890
2 parents 1b8570b + ed37bc7 commit b57009e

File tree

2 files changed

+90
-59
lines changed

2 files changed

+90
-59
lines changed

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@
2424
"license": "Apache-2.0",
2525
"devDependencies": {
2626
"@ephox/agar": "^5.1.1",
27-
"@ephox/bedrock-client": "^9.6.1",
28-
"@ephox/bedrock-server": "^9.6.3",
27+
"@ephox/bedrock-client": "^11.0.0",
28+
"@ephox/bedrock-server": "^11.0.2",
2929
"@ephox/katamari": "^7.1.1",
3030
"@ephox/sugar": "^7.0.3",
3131
"@ephox/swag": "^4.3.1",
32-
"@tinymce/beehive-flow": "^0.9.0",
32+
"@tinymce/beehive-flow": "^0.12.0",
3333
"@tinymce/eslint-plugin": "^1.7.2",
3434
"@types/esm": "^3.2.0",
35-
"@types/express": "^4.17.9",
36-
"@types/node": "^14.14.20",
37-
"eslint": "^7.17.0",
35+
"@types/express": "^4.17.11",
36+
"@types/node": "^14.14.22",
37+
"eslint": "^7.18.0",
3838
"esm": "^3.2.25",
3939
"express": "^4.17.1",
40-
"rollup": "^2.28.1",
40+
"rollup": "^2.38.0",
4141
"tinymce": "^5.6.0",
42-
"ts-loader": "^8.0.13",
42+
"ts-loader": "^8.0.14",
4343
"ts-node": "^9.1.1",
4444
"typescript": "^4.0.3"
4545
},
4646
"dependencies": {},
47-
"version": "1.2.0-alpha",
47+
"version": "1.2.0-rc",
4848
"name": "@tinymce/tinymce-webcomponent"
4949
}

yarn.lock

Lines changed: 81 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -36,37 +36,52 @@
3636
"@ephox/wrap-sizzle" "^4.0.0"
3737
tslib "^2.0.0"
3838

39-
"@ephox/bedrock-client@^9.3.2", "@ephox/bedrock-client@^9.6.1":
39+
"@ephox/bedrock-client@^11.0.0":
40+
version "11.0.0"
41+
resolved "https://registry.yarnpkg.com/@ephox/bedrock-client/-/bedrock-client-11.0.0.tgz#99b61623d9b4ca78142776c90ad1e5b402a5d6ac"
42+
integrity sha512-e12u6NUk3o1pe7rmXKXhNlAtgN1763vicV6tH9QUGWa9N9pglicLhVzB+/d/GnVZ728FfptBISV9lUkcOBXhHQ==
43+
dependencies:
44+
"@ephox/bedrock-common" "^11.0.0"
45+
"@ephox/dispute" "^1.0.3"
46+
47+
"@ephox/bedrock-client@^9.3.2":
4048
version "9.6.1"
4149
resolved "https://registry.yarnpkg.com/@ephox/bedrock-client/-/bedrock-client-9.6.1.tgz#51b34012035911da11270872a5ab49e168cb7e65"
4250
integrity sha512-IQlp+NzxC+oQ017WdU5w/Gesc13qmdqJJLwA5mhpOW5j+KSyCyD1oOxaBQ8f5qUTa5jEFFHe2uw6gAOvjSOCkQ==
4351
dependencies:
4452
"@ephox/bedrock-common" "^9.3.2"
4553
"@ephox/dispute" "^1.0.3"
4654

55+
"@ephox/bedrock-common@^11.0.0":
56+
version "11.0.0"
57+
resolved "https://registry.yarnpkg.com/@ephox/bedrock-common/-/bedrock-common-11.0.0.tgz#a0c39dd37979b52818bf11ceb448c3b1a628c819"
58+
integrity sha512-Fu7XTRfE0Nidw6caOC2dOThmgWp6xKDhHLIzrh//kRivB3q+2AqQC1sc/5iKyZKjXZIFeA0nM/OF8qAX8y5BVA==
59+
dependencies:
60+
diff "^4.0.1"
61+
4762
"@ephox/bedrock-common@^9.3.2":
4863
version "9.3.2"
4964
resolved "https://registry.yarnpkg.com/@ephox/bedrock-common/-/bedrock-common-9.3.2.tgz#e17352766133089c77af475d5b8add5095eccd58"
5065
integrity sha512-Ilmsn6Il5UULthq0fl39W1256a3tS+33vnO46TTqiijrkE87BswJ+Kp2ZKddNWlaY2l+wQCOgPLra9x5l/Q/Cg==
5166

52-
"@ephox/bedrock-runner@^9.7.0":
53-
version "9.7.0"
54-
resolved "https://registry.yarnpkg.com/@ephox/bedrock-runner/-/bedrock-runner-9.7.0.tgz#3aa2d341ea5cb1e6e3ec786174b42f76dd1b15d1"
55-
integrity sha512-eALt1i38NPmqqsyBltzwlrtqhut17GjMpeA++aSxvgCq0/BtleLjb5PkV5K5P5YRvxhpSiqmRYi9T6c9qlm/5Q==
67+
"@ephox/bedrock-runner@^11.0.1":
68+
version "11.0.1"
69+
resolved "https://registry.yarnpkg.com/@ephox/bedrock-runner/-/bedrock-runner-11.0.1.tgz#7ffd899546473d7b28129c39fb9ef19b23f894e6"
70+
integrity sha512-LVR4qU3XVzrJvPJJcmqLstZ1TXi0FWOqOcHqNPkbVUkHUgEQ9ndSyUyzFGRys/g1rz5YJ/LsTYVaQGs6JFcPWQ==
5671
dependencies:
57-
"@ephox/bedrock-common" "^9.3.2"
58-
diff "^4.0.1"
72+
"@ephox/bedrock-common" "^11.0.0"
73+
"@ephox/wrap-promise-polyfill" "^2.2.0"
5974
jquery "^3.4.1"
6075
querystringify "^2.1.1"
6176

62-
"@ephox/bedrock-server@^9.6.3":
63-
version "9.7.1"
64-
resolved "https://registry.yarnpkg.com/@ephox/bedrock-server/-/bedrock-server-9.7.1.tgz#d2df1b9d2ecae134f483345a57510fc32b3d612d"
65-
integrity sha512-vdaQbwVwjYGc1KRZyqOin9NAMVHgj7/6EQv/8hXqe0aozNdKsudZ1atFgLF28KRXLVv5HSFJz5QczbQ4gng0Ng==
77+
"@ephox/bedrock-server@^11.0.2":
78+
version "11.0.2"
79+
resolved "https://registry.yarnpkg.com/@ephox/bedrock-server/-/bedrock-server-11.0.2.tgz#fc8fbfbb6a011e8e779c9f8fd5080a40147aafff"
80+
integrity sha512-epwQr6RrqM9VWcmzpnnCSiLiwO3suubEN8I06U7BgQrAIaMsPquZiGWhkkiluMjKP17gVKfiYjvQ0xmRekED2g==
6681
dependencies:
67-
"@ephox/bedrock-client" "^9.6.1"
68-
"@ephox/bedrock-common" "^9.3.2"
69-
"@ephox/bedrock-runner" "^9.7.0"
82+
"@ephox/bedrock-client" "^11.0.0"
83+
"@ephox/bedrock-common" "^11.0.0"
84+
"@ephox/bedrock-runner" "^11.0.1"
7085
async "^3.0.0"
7186
command-line-args "^5.0.0"
7287
command-line-usage "^6.0.0"
@@ -183,6 +198,22 @@
183198
minimatch "^3.0.4"
184199
strip-json-comments "^3.1.1"
185200

201+
"@eslint/eslintrc@^0.3.0":
202+
version "0.3.0"
203+
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318"
204+
integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==
205+
dependencies:
206+
ajv "^6.12.4"
207+
debug "^4.1.1"
208+
espree "^7.3.0"
209+
globals "^12.1.0"
210+
ignore "^4.0.6"
211+
import-fresh "^3.2.1"
212+
js-yaml "^3.13.1"
213+
lodash "^4.17.20"
214+
minimatch "^3.0.4"
215+
strip-json-comments "^3.1.1"
216+
186217
"@kwsites/file-exists@^1.1.1":
187218
version "1.1.1"
188219
resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99"
@@ -228,10 +259,10 @@
228259
dependencies:
229260
defer-to-connect "^2.0.0"
230261

231-
"@tinymce/beehive-flow@^0.9.0":
232-
version "0.9.0"
233-
resolved "https://registry.yarnpkg.com/@tinymce/beehive-flow/-/beehive-flow-0.9.0.tgz#5dc5ea1fff1f78d9a9e81d460f252d5d6274c002"
234-
integrity sha512-U9LTKkna5tp4P7VlVlujSjmn43v9B40WRnI+Tcp9vj8/7uxpAk6MWyVzi07aZVYMZYCBmPpEEKFlLTeW2ynsPA==
262+
"@tinymce/beehive-flow@^0.12.0":
263+
version "0.12.0"
264+
resolved "https://registry.yarnpkg.com/@tinymce/beehive-flow/-/beehive-flow-0.12.0.tgz#f50927771b18a7c02e08de9a2545c4cfa3817f2d"
265+
integrity sha512-zxdAlsevxiXTbJixiUTNi/zw3Of3zqLHHx80oA7STosNu4o1DtyUrQ9J8hKIgZaw58IlKSkDjkhglUG7aZaHWw==
235266
dependencies:
236267
cross-spawn-promise "^0.10.2"
237268
fp-ts "^2.9.3"
@@ -310,22 +341,22 @@
310341
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884"
311342
integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==
312343

313-
"@types/express-serve-static-core@*":
314-
version "4.17.17"
315-
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.17.tgz#6ba02465165b6c9c3d8db3a28def6b16fc9b70f5"
316-
integrity sha512-YYlVaCni5dnHc+bLZfY908IG1+x5xuibKZMGv8srKkvtul3wUuanYvpIj9GXXoWkQbaAdR+kgX46IETKUALWNQ==
344+
"@types/express-serve-static-core@^4.17.18":
345+
version "4.17.18"
346+
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz#8371e260f40e0e1ca0c116a9afcd9426fa094c40"
347+
integrity sha512-m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==
317348
dependencies:
318349
"@types/node" "*"
319350
"@types/qs" "*"
320351
"@types/range-parser" "*"
321352

322-
"@types/express@^4.17.9":
323-
version "4.17.9"
324-
resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.9.tgz#f5f2df6add703ff28428add52bdec8a1091b0a78"
325-
integrity sha512-SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw==
353+
"@types/express@^4.17.11":
354+
version "4.17.11"
355+
resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
356+
integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
326357
dependencies:
327358
"@types/body-parser" "*"
328-
"@types/express-serve-static-core" "*"
359+
"@types/express-serve-static-core" "^4.17.18"
329360
"@types/qs" "*"
330361
"@types/serve-static" "*"
331362

@@ -416,10 +447,10 @@
416447
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
417448
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
418449

419-
"@types/node@*", "@types/node@^14.14.20":
420-
version "14.14.20"
421-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340"
422-
integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==
450+
"@types/node@*", "@types/node@^14.14.22":
451+
version "14.14.22"
452+
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
453+
integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
423454

424455
"@types/normalize-package-data@^2.4.0":
425456
version "2.4.0"
@@ -1508,7 +1539,7 @@ chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
15081539
escape-string-regexp "^1.0.5"
15091540
supports-color "^5.3.0"
15101541

1511-
chalk@^4.0.0, chalk@~4.1.0:
1542+
chalk@^4.0.0, chalk@^4.1.0, chalk@~4.1.0:
15121543
version "4.1.0"
15131544
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
15141545
integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -2423,13 +2454,13 @@ eslint-visitor-keys@^2.0.0:
24232454
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
24242455
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
24252456

2426-
eslint@^7.0.0, eslint@^7.17.0:
2427-
version "7.17.0"
2428-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0"
2429-
integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==
2457+
eslint@^7.0.0, eslint@^7.18.0:
2458+
version "7.18.0"
2459+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz#7fdcd2f3715a41fe6295a16234bd69aed2c75e67"
2460+
integrity sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==
24302461
dependencies:
24312462
"@babel/code-frame" "^7.0.0"
2432-
"@eslint/eslintrc" "^0.2.2"
2463+
"@eslint/eslintrc" "^0.3.0"
24332464
ajv "^6.10.0"
24342465
chalk "^4.0.0"
24352466
cross-spawn "^7.0.2"
@@ -2453,7 +2484,7 @@ eslint@^7.0.0, eslint@^7.17.0:
24532484
js-yaml "^3.13.1"
24542485
json-stable-stringify-without-jsonify "^1.0.1"
24552486
levn "^0.4.1"
2456-
lodash "^4.17.19"
2487+
lodash "^4.17.20"
24572488
minimatch "^3.0.4"
24582489
natural-compare "^1.4.0"
24592490
optionator "^0.9.1"
@@ -5608,10 +5639,10 @@ rollup@^1.23.1:
56085639
"@types/node" "*"
56095640
acorn "^7.1.0"
56105641

5611-
rollup@^2.0.0, rollup@^2.28.1:
5612-
version "2.35.1"
5613-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.35.1.tgz#e6bc8d10893556a638066f89e8c97f422d03968c"
5614-
integrity sha512-q5KxEyWpprAIcainhVy6HfRttD9kutQpHbeqDTWnqAFNJotiojetK6uqmcydNMymBEtC4I8bCYR+J3mTMqeaUA==
5642+
rollup@^2.0.0, rollup@^2.38.0:
5643+
version "2.38.0"
5644+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.0.tgz#57942d5a10826cb12ed1f19c261f774efa502d2d"
5645+
integrity sha512-ay9zDiNitZK/LNE/EM2+v5CZ7drkB2xyDljvb1fQJCGnq43ZWRkhxN145oV8GmoW1YNi4sA/1Jdkr2LfawJoXw==
56155646
optionalDependencies:
56165647
fsevents "~2.1.2"
56175648

@@ -5696,7 +5727,7 @@ semver@^6.0.0, semver@^6.3.0:
56965727
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
56975728
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
56985729

5699-
semver@^7.2.1, semver@^7.3.2:
5730+
semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
57005731
version "7.3.4"
57015732
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
57025733
integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
@@ -6359,16 +6390,16 @@ ts-loader@^5.3.3:
63596390
micromatch "^3.1.4"
63606391
semver "^5.0.1"
63616392

6362-
ts-loader@^8.0.13:
6363-
version "8.0.13"
6364-
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.13.tgz#2bebeb833570ca46bb9338322a9a29900e988535"
6365-
integrity sha512-1o1nO6aqouA23d2nlcMSEyPMAWRhnYUU0EQUJSc60E0TUyBNX792RHFYUN1ZM29vhMUNayrsbj2UVdZwKhXCDA==
6393+
ts-loader@^8.0.14:
6394+
version "8.0.14"
6395+
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.14.tgz#e46ac1f8dcb88808d0b1335d2eae65b74bd78fe8"
6396+
integrity sha512-Jt/hHlUnApOZjnSjTmZ+AbD5BGlQFx3f1D0nYuNKwz0JJnuDGHJas6az+FlWKwwRTu+26GXpv249A8UAnYUpqA==
63666397
dependencies:
6367-
chalk "^2.3.0"
6398+
chalk "^4.1.0"
63686399
enhanced-resolve "^4.0.0"
6369-
loader-utils "^1.0.2"
6400+
loader-utils "^2.0.0"
63706401
micromatch "^4.0.0"
6371-
semver "^6.0.0"
6402+
semver "^7.3.4"
63726403

63736404
ts-node@^9.1.1:
63746405
version "9.1.1"

0 commit comments

Comments
 (0)