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

Commit a70335a

Browse files
freedomlangfreedomlang
authored
Merge branch 'master' into example/checkable-list
2 parents 1872741 + 6e41163 commit a70335a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+27537
-474
lines changed

‎.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"plugins": ["prettier", "flowtype", "react", "standard"],
2424
"env": {
2525
"es6": true,
26-
"browser": true
26+
"browser": true,
27+
"mocha": true
2728
},
2829
"rules": {
2930
"prettier/prettier": "error"

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

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "@djsp/block-insert",
3-
"homepage": "https://juliankrispel.github.io/@djsp/core",
2+
"name": "@djsp/add-video-block-example",
3+
"homepage": "https://github.com/draft-js-plugins/next#readme",
44
"version": "0.1.5",
55
"private": true,
66
"license": "MIT",
@@ -9,8 +9,8 @@
99
"@djsp/core": "^0.1.5",
1010
"@djsp/utils": "^0.1.5",
1111
"prop-types": "^15.6.1",
12-
"react": "^16.5.0",
13-
"react-dom": "^16.2.0",
12+
"react": "16.5.0",
13+
"react-dom": "16.5.0",
1414
"react-scripts": "^1.1.1",
1515
"react-text-selection-popover": "^1.0.3",
1616
"styled-components": "^3.4.5"

‎examples/add-video-block/public/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
88
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
99

10-
<title>@djsp/core</title>
10+
<title>@djsp/add-video-block-example</title>
1111
</head>
1212

1313
<body>

‎examples/atomic-block/package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/atomic-block/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"@djsp/core": "^0.1.5",
1010
"emoji.json": "^11.0.0",
1111
"prop-types": "^15.6.1",
12-
"react": "^16.2.0",
13-
"react-dom": "^16.2.0",
12+
"react": "16.5.0",
13+
"react-dom": "16.5.0",
1414
"react-scripts": "^1.1.1"
1515
},
1616
"scripts": {

‎examples/block-switcher/package-lock.json

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/block-switcher/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "@djsp/block-switcher",
3-
"homepage": "https://juliankrispel.github.io/@djsp/core",
2+
"name": "@djsp/block-switcher-example",
3+
"homepage": "https://github.com/draft-js-plugins/next#readme",
44
"version": "0.1.5",
55
"private": true,
66
"license": "MIT",
@@ -9,8 +9,8 @@
99
"@djsp/core": "^0.1.5",
1010
"@djsp/utils": "^0.1.5",
1111
"prop-types": "^15.6.1",
12-
"react": "^16.5.0",
13-
"react-dom": "^16.2.0",
12+
"react": "16.5.0",
13+
"react-dom": "16.5.0",
1414
"react-scripts": "^1.1.1"
1515
},
1616
"scripts": {

‎examples/block-switcher/public/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
66
<meta name="theme-color" content="#000000">
7-
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
87
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
98

10-
<title>@djsp/core</title>
9+
<title>@djsp/block-switcher-example</title>
1110
</head>
1211

1312
<body>

0 commit comments

Comments
 (0)