Skip to content
This repository was archived by the owner on May 31, 2020. It is now read-only.

Commit 6da917c

Browse files
juliankrispeljuliankrispel
authored
Merge branch 'master' into docs/clean-up-block-switcher
2 parents 493b04f + f03a387 commit 6da917c

File tree

32 files changed

+706
-247
lines changed

32 files changed

+706
-247
lines changed

‎.bookignore‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
**/node_modules
2+
**/*.js
3+
**/*.jsx
4+
**/*.png
5+
**/*.jpg
6+
**/package.json
7+
**/package-lock.json
8+
**/*.log
9+
**/.flowconfig
10+
dist
11+
examples
12+
**/src
13+
.vscode
14+
flow-lib
15+
.storybook
16+
.git
17+
.DS_Store

‎SUMMARY.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,4 @@
33
* [Introduction](README.md)
44

55
## Packages
6-
* [The Editor](packages/editor/README.md)
7-
* [Autocomplete](packages/autocomplete/README.md)
8-
* [Atomic Block](packages/atomic-block/README.md)
9-
* [Inline Style Toggle](packages/inline-style-toggle/README.md)
10-
* [Block Type Toggle](packages/block-type-toggle/README.md)
11-
* [Utils](packages/utils/README.md)
12-
6+
* [Core](packages/core/README.md)

‎examples/add-video-block/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@djsp/block-insert",
33
"homepage": "https://juliankrispel.github.io/@djsp/core",
4-
"version": "0.1.0",
4+
"version": "0.1.4",
55
"private": true,
66
"license": "MIT",
77
"dependencies": {
8-
"@djsp/atomic-block": "^0.1.0",
9-
"@djsp/core": "^0.1.0",
10-
"@djsp/utils": "^0.1.0",
8+
"@djsp/atomic-block": "^0.1.4",
9+
"@djsp/core": "^0.1.4",
10+
"@djsp/utils": "^0.1.4",
1111
"prop-types": "^15.6.1",
1212
"react": "^16.5.0",
1313
"react-dom": "^16.2.0",

‎examples/atomic-block/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@djsp/atomic-block-example",
33
"homepage": "https://juliankrispel.github.io/djs-autocomplete",
4-
"version": "0.1.0",
4+
"version": "0.1.4",
55
"private": true,
66
"license": "MIT",
77
"dependencies": {
8-
"@djsp/atomic-block": "^0.1.0",
9-
"@djsp/core": "^0.1.0",
8+
"@djsp/atomic-block": "^0.1.4",
9+
"@djsp/core": "^0.1.4",
1010
"emoji.json": "^11.0.0",
1111
"prop-types": "^15.6.1",
1212
"react": "^16.2.0",

‎examples/block-switcher/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
2-
"name": "@djsp/block-insert",
2+
"name": "@djsp/block-switcher",
33
"homepage": "https://juliankrispel.github.io/@djsp/core",
4-
"version": "0.1.0",
4+
"version": "0.1.4",
55
"private": true,
66
"license": "MIT",
77
"dependencies": {
8-
"@djsp/atomic-block": "^0.1.0",
9-
"@djsp/core": "^0.1.0",
8+
"@djsp/atomic-block": "^0.1.4",
9+
"@djsp/core": "^0.1.4",
10+
"@djsp/utils": "^0.1.4",
1011
"prop-types": "^15.6.1",
1112
"react": "^16.5.0",
1213
"react-dom": "^16.2.0",

‎examples/editor/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@djsp/core-example",
33
"homepage": "https://juliankrispel.github.io/@djsp/core",
4-
"version": "0.1.0",
4+
"version": "0.1.4",
55
"private": true,
66
"license": "MIT",
77
"dependencies": {
8-
"@djsp/core": "^0.1.0",
8+
"@djsp/core": "^0.1.4",
99
"draft-js": "^0.10.5",
1010
"prop-types": "^15.6.1",
1111
"react": "^16.5.0",

‎examples/emoji-example/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@djsp/emoji-example",
33
"homepage": "https://juliankrispel.github.io/djs-autocomplete",
4-
"version": "0.1.0",
4+
"version": "0.1.4",
55
"private": true,
66
"license": "MIT",
77
"dependencies": {
8-
"@djsp/autocomplete": "^0.1.0",
9-
"@djsp/core": "^0.1.0",
8+
"@djsp/autocomplete": "^0.1.4",
9+
"@djsp/core": "^0.1.4",
1010
"draft-js": "^0.10.5",
1111
"emoji.json": "^11.0.0",
1212
"prop-types": "^15.6.1",

‎examples/inline-toolbar/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@djsp/inline-toolbar-example",
3-
"version": "0.1.0",
3+
"version": "0.1.4",
44
"private": true,
55
"license": "MIT",
66
"dependencies": {
7-
"@djsp/block-type-toggle": "^0.1.0",
8-
"@djsp/core": "^0.1.0",
9-
"@djsp/inline-style-toggle": "^0.1.0",
7+
"@djsp/block-type-toggle": "^0.1.4",
8+
"@djsp/core": "^0.1.4",
9+
"@djsp/inline-style-toggle": "^0.1.4",
1010
"draft-js": "^0.10.5",
1111
"prop-types": "^15.6.1",
1212
"react": "^16.5.0",

‎examples/mentions-example/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@djsp/autocomplete-example",
33
"homepage": "https://juliankrispel.github.io/djs-autocomplete",
4-
"version": "0.1.0",
4+
"version": "0.1.4",
55
"private": true,
66
"license": "MIT",
77
"dependencies": {
8-
"@djsp/autocomplete": "^0.1.0",
9-
"@djsp/core": "^0.1.0",
10-
"@djsp/utils": "^0.1.0",
8+
"@djsp/autocomplete": "^0.1.4",
9+
"@djsp/core": "^0.1.4",
10+
"@djsp/utils": "^0.1.4",
1111
"prop-types": "^15.6.1",
1212
"react": "^16.2.0",
1313
"react-dom": "^16.2.0",

‎examples/static-toolbar-example/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@djsp/static-toolbar-example",
3-
"version": "0.1.0",
3+
"version": "0.1.4",
44
"private": true,
55
"license": "MIT",
66
"dependencies": {
7-
"@djsp/block-type-toggle": "^0.1.0",
8-
"@djsp/core": "^0.1.0",
9-
"@djsp/inline-style-toggle": "^0.1.0",
7+
"@djsp/block-type-toggle": "^0.1.4",
8+
"@djsp/core": "^0.1.4",
9+
"@djsp/inline-style-toggle": "^0.1.4",
1010
"draft-js": "^0.10.5",
1111
"prop-types": "^15.6.1",
1212
"react": "^16.5.0",

0 commit comments

Comments
 (0)