Skip to content

Commit

Permalink
Merge pull request tinymce#10 in TINYMCE/tinymce-vue from upgrade-dep…
Browse files Browse the repository at this point in the history
…s to master

* commit '65235f8ba074d1c57187248756fd18d49f1c9cd8':
  Upgraded dependencies and upgraded to bedrock 9
  • Loading branch information
lnewson committed Dec 16, 2019
2 parents 55f87cd + 65235f8 commit 5ed590f
Show file tree
Hide file tree
Showing 3 changed files with 2,860 additions and 1,446 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"devDependencies": {
"@babel/core": "^7.2.2",
"@ephox/agar": "^4.13.10",
"@ephox/bedrock": "^4.3.0",
"@ephox/bedrock-client": "^9.3.2",
"@ephox/bedrock-server": "^9.3.2",
"@ephox/sugar": "^4.6.21",
"@ephox/tslint-rules": "^1.0.11",
"@storybook/addon-notes": "^5.1.11",
Expand Down
2 changes: 1 addition & 1 deletion src/test/ts/browser/InitTest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Assertions, GeneralSteps, Logger, Pipeline } from '@ephox/agar';
import { UnitTest } from '@ephox/bedrock';
import { UnitTest } from '@ephox/bedrock-client';
import { setup } from '../alien/Setup';

UnitTest.asynctest('InitTest', (success, failure) => {
Expand Down
Loading

0 comments on commit 5ed590f

Please sign in to comment.