Skip to content

Commit 7207834

Browse files
authored
Merge branch 'master' into component-docs
2 parents 554e07f + 94efbc8 commit 7207834

File tree

22 files changed

+15772
-15427
lines changed

22 files changed

+15772
-15427
lines changed

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "0.0.20"
5+
"version": "0.0.28"
66
}

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"demo"
1717
],
1818
"devDependencies":{
19-
"gatsby": "^2.5.2",
20-
"husky": "^2.3.0",
21-
"lerna": "^3.14.1",
22-
"lint-staged": "^8.1.7",
23-
"prettier": "^1.17.1"
19+
"gatsby": "^2.13.28",
20+
"husky": "^3.0.0",
21+
"lerna": "^3.15.0",
22+
"lint-staged": "^9.2.0",
23+
"prettier": "^1.18.2"
2424
},
2525
"husky":{
2626
"hooks":{

‎packages/editor/.babelrc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"presets": [
3+
"@babel/env",
4+
"@babel/react"
5+
],
6+
"plugins": [
7+
"@babel/proposal-class-properties"
8+
]
9+
}
10+

‎packages/editor/package.json‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
{
22
"name": "@blocks/editor",
33
"description": "WYSIWYG MDX editor",
4-
"version": "0.0.20",
4+
"version": "0.0.28",
55
"license": "MIT",
66
"author": "John Otander",
77
"repository": "johno/blocks",
8+
"main": "dist/index.js",
9+
"scripts":{
10+
"prepare": "babel src -d dist"
11+
},
812
"dependencies":{
9-
"@blocks/kit": "^0.0.20",
10-
"@blocks/serializer": "^0.0.20",
13+
"@babel/cli": "^7.5.5",
14+
"@babel/core": "^7.5.5",
15+
"@babel/plugin-proposal-class-properties": "^7.5.5",
16+
"@babel/preset-env": "^7.5.5",
17+
"@babel/preset-react": "^7.0.0",
18+
"@blocks/kit": "^0.0.28",
19+
"@blocks/serializer": "^0.0.28",
1120
"@convertkit/slate-lists": "^0.2.2",
1221
"@emotion/core": "^10.0.10",
1322
"@emotion/styled": "^10.0.11",

‎packages/editor/src/components/Editor.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import{Editor, getEventRange, getEventTransfer } from 'slate-react'
33
import{ThemeProvider}from'theme-ui'
44

55
importschemafrom'../lib/schema'
6-
importinitialValuefrom'!!raw-loader!../lib/value.mdx'
76
import{parseMDX,serializer}from'@blocks/serializer'
87
import{isUrl,isImageUrl}from'../lib/util'
98

@@ -13,6 +12,8 @@ import defaultPlugins from '../plugins'
1312
importdefaultBlocksfrom'./blocks'
1413
importToolbarfrom'./Toolbar'
1514

15+
constinitialValue='# Welcome to Blocks!'
16+
1617
constinsertImage=(change,src,target)=>{
1718
if(target){
1819
change.select(target)

‎packages/editor/src/components/ui/Label.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** @jsx jsx */
22
import{jsx}from'@emotion/core'
33
import{css}from'theme-ui'
4-
import{Box}from'theme-ui/layout'
4+
import{Box}from'theme-ui'
55

66
exportdefaultprops=>(
77
<Box

‎packages/editor/src/components/ui/ListView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
importstyledfrom'@emotion/styled'
2-
import{Flex}from'theme-ui/layout'
2+
import{Flex}from'theme-ui'
33

44
exportconstListViewItem=styled(Flex)`
55
border-bottom: thin solid;

‎packages/editor/src/components/ui/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export{Styled,css}from'theme-ui'
2-
export{Flex,Box}from'theme-ui/layout'
2+
export{Flex,Box}from'theme-ui'
33

44
export{ListView,ListViewItem}from'./ListView'
55
export{defaultasPre}from'./Pre'

‎packages/editor/src/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export{defaultasEditor}from'./components/Editor'
22
export{defaultasToolbar}from'./components/Toolbar'
3+
export{defaultastheme}from'./components/theme'
34

45
export{serializer,stringifyMDX}from'@blocks/serializer'

‎packages/editor/src/lib/value.json‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
(0)