diff --git a/CHANGELOG.md b/CHANGELOG.md index fec8251..dc230f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Added +- `VersionLoader.pLoadVersion` function. #TINY-10394 + ### Removed - Removed support for TinyMCE 4.x. #TINY-10142 +### Changed +- Made the `VersionLoader.setup` functions logs argument optional. #TINY-10394 + ## 5.0.1 - 2022-06-29 ### Changed diff --git a/package.json b/package.json index bb40eff..a3bda8f 100644 --- a/package.json +++ b/package.json @@ -21,14 +21,14 @@ "author": "Tiny Technologies", "license": "Apache-2.0", "dependencies": { - "@ephox/agar": "^7.1.1", - "@ephox/katamari": "^9.0.3", - "@ephox/mcagar": "^8.0.3", - "@ephox/sugar": "^9.0.3" + "@ephox/agar": "^8.0.0", + "@ephox/katamari": "^9.1.5", + "@ephox/mcagar": "^9.0.0", + "@ephox/sugar": "^9.3.0" }, "devDependencies": { "@ephox/bedrock-client": "^13.0.0", - "@ephox/bedrock-server": "^13.3.0", + "@ephox/bedrock-server": "^13.6.0", "@tinymce/beehive-flow": "^0.19.0", "@tinymce/eslint-plugin": "^2.2.1", "fork-ts-checker-webpack-plugin": "^6.5.0", diff --git a/src/main/ts/api/VersionLoader.ts b/src/main/ts/api/VersionLoader.ts index 8cb6a04..6133727 100644 --- a/src/main/ts/api/VersionLoader.ts +++ b/src/main/ts/api/VersionLoader.ts @@ -1,6 +1,7 @@ import { Pipeline, Step, TestLogs } from '@ephox/agar'; import { TinyLoader } from '@ephox/mcagar'; +import * as Loader from '../loader/Loader'; import { readPlugins, registerPlugins, sRegisterPlugins } from '../loader/Plugins'; import * as TinyVersions from '../loader/Versions'; @@ -18,7 +19,7 @@ export const setupVersion = ( settings: Record, success: SuccessCallback, failure: FailureCallback, - logs: TestLogs + logs: TestLogs = TestLogs.init() ): void => { const plugins = readPlugins(testPlugins); @@ -42,4 +43,10 @@ export const sSetupVersion = (version: string, testPlugins: string[], call }, settings, next, die, initLogs) ); -export const sWithVersion = TinyVersions.sWithVersion; \ No newline at end of file +export const sWithVersion = TinyVersions.sWithVersion; + +export const pLoadVersion = (version: string): Promise => { + return new Promise((resolve, reject) => { + Loader.load(version, resolve, reject); + }); +}; diff --git a/src/main/ts/loader/Versions.ts b/src/main/ts/loader/Versions.ts index c449e2c..282a894 100644 --- a/src/main/ts/loader/Versions.ts +++ b/src/main/ts/loader/Versions.ts @@ -35,4 +35,4 @@ const sWithVersion = (version: string, step: Step): Step