diff --git a/package.json b/package.json index d88a351f7..1cc56e3bc 100644 --- a/package.json +++ b/package.json @@ -38,9 +38,9 @@ "npm-run-all": "^4.1.1", "parse5": "^3.0.2", "prismjs": "^1.5.1", - "react": "^15.4.2", - "react-addons-perf": "^15.4.2", - "react-dom": "^15.4.2", + "react": "^16.0.0", + "react-addons-perf": "^16.0.0-alpha", + "react-dom": "^16.0.0", "react-frame-aware-selection-plugin": "^1.0.0", "react-frame-component": "^1.1.1", "react-portal": "^3.1.0", diff --git a/packages/slate-html-serializer/package.json b/packages/slate-html-serializer/package.json index 310de4fbd..85ba8ba8d 100644 --- a/packages/slate-html-serializer/package.json +++ b/packages/slate-html-serializer/package.json @@ -11,8 +11,8 @@ }, "peerDependencies": { "immutable": "^3.8.1", - "react": "^0.14.0 || ^15.0.0", - "react-dom": "^0.14.0 || ^15.0.0", + "react": "^0.14.0 || ^15.0.0 || ^16.0.0", + "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0", "slate": "^0.26.0" }, "devDependencies": { diff --git a/packages/slate-react/package.json b/packages/slate-react/package.json index 494809789..fac9798c4 100644 --- a/packages/slate-react/package.json +++ b/packages/slate-react/package.json @@ -21,8 +21,8 @@ "slate-prop-types": "^0.1.12" }, "peerDependencies": { - "react": "^0.14.0 || ^15.0.0", - "react-dom": "^0.14.0 || ^15.0.0", + "react": "^0.14.0 || ^15.0.0 || ^16.0.0", + "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0", "slate": "^0.26.0" }, "devDependencies": { diff --git a/packages/slate-react/test/rendering/fixtures/custom-block-void.js b/packages/slate-react/test/rendering/fixtures/custom-block-void.js index d4949307a..b292468d7 100644 --- a/packages/slate-react/test/rendering/fixtures/custom-block-void.js +++ b/packages/slate-react/test/rendering/fixtures/custom-block-void.js @@ -24,7 +24,7 @@ export const state = ( export const output = `
- +   diff --git a/packages/slate-react/test/rendering/fixtures/custom-decorator.js b/packages/slate-react/test/rendering/fixtures/custom-decorator.js index 73f1b0540..bdf306d1b 100644 --- a/packages/slate-react/test/rendering/fixtures/custom-decorator.js +++ b/packages/slate-react/test/rendering/fixtures/custom-decorator.js @@ -36,10 +36,10 @@ export const state = ( export const output = `
-
+
o - n + n e
diff --git a/packages/slate-react/test/rendering/fixtures/custom-inline-multiple.js b/packages/slate-react/test/rendering/fixtures/custom-inline-multiple.js index 63b1e3477..4ccab05c2 100644 --- a/packages/slate-react/test/rendering/fixtures/custom-inline-multiple.js +++ b/packages/slate-react/test/rendering/fixtures/custom-inline-multiple.js @@ -33,7 +33,7 @@ export const state = ( export const output = `
-
+
  diff --git a/packages/slate-react/test/rendering/fixtures/custom-inline-void.js b/packages/slate-react/test/rendering/fixtures/custom-inline-void.js index 3968efbaf..1a1139d35 100644 --- a/packages/slate-react/test/rendering/fixtures/custom-inline-void.js +++ b/packages/slate-react/test/rendering/fixtures/custom-inline-void.js @@ -25,14 +25,14 @@ export const state = ( export const output = `
-
+
  - +   diff --git a/packages/slate-react/test/rendering/fixtures/custom-inline.js b/packages/slate-react/test/rendering/fixtures/custom-inline.js index a950987b1..c50cad041 100644 --- a/packages/slate-react/test/rendering/fixtures/custom-inline.js +++ b/packages/slate-react/test/rendering/fixtures/custom-inline.js @@ -27,7 +27,7 @@ export const state = ( export const output = `
-
+
  diff --git a/packages/slate-react/test/rendering/fixtures/custom-mark-as-component.js b/packages/slate-react/test/rendering/fixtures/custom-mark-as-component.js index 191001998..ba21aced8 100644 --- a/packages/slate-react/test/rendering/fixtures/custom-mark-as-component.js +++ b/packages/slate-react/test/rendering/fixtures/custom-mark-as-component.js @@ -31,7 +31,7 @@ export const state = ( export const output = `
-
+
one two diff --git a/packages/slate-react/test/rendering/fixtures/custom-mark-as-function.js b/packages/slate-react/test/rendering/fixtures/custom-mark-as-function.js index f3dce300d..87d30db98 100644 --- a/packages/slate-react/test/rendering/fixtures/custom-mark-as-function.js +++ b/packages/slate-react/test/rendering/fixtures/custom-mark-as-function.js @@ -25,7 +25,7 @@ export const state = ( export const output = `
-
+
one two diff --git a/packages/slate-react/test/rendering/fixtures/custom-mark-as-object.js b/packages/slate-react/test/rendering/fixtures/custom-mark-as-object.js index bc95931a2..bace25646 100644 --- a/packages/slate-react/test/rendering/fixtures/custom-mark-as-object.js +++ b/packages/slate-react/test/rendering/fixtures/custom-mark-as-object.js @@ -22,10 +22,10 @@ export const state = ( export const output = `
-
+
one - two + two three
diff --git a/packages/slate-react/test/rendering/fixtures/custom-mark-as-string.js b/packages/slate-react/test/rendering/fixtures/custom-mark-as-string.js index fb915ad12..e835f31cd 100644 --- a/packages/slate-react/test/rendering/fixtures/custom-mark-as-string.js +++ b/packages/slate-react/test/rendering/fixtures/custom-mark-as-string.js @@ -20,7 +20,7 @@ export const state = ( export const output = `
-
+
one two diff --git a/packages/slate-react/test/rendering/fixtures/default-block-with-inline.js b/packages/slate-react/test/rendering/fixtures/default-block-with-inline.js index 244d3dd78..833f628b7 100644 --- a/packages/slate-react/test/rendering/fixtures/default-block-with-inline.js +++ b/packages/slate-react/test/rendering/fixtures/default-block-with-inline.js @@ -18,13 +18,13 @@ export const state = ( export const output = `
-
+
  - + word diff --git a/packages/slate-react/test/rendering/fixtures/default-block.js b/packages/slate-react/test/rendering/fixtures/default-block.js index bdaa6364f..cf5b8b693 100644 --- a/packages/slate-react/test/rendering/fixtures/default-block.js +++ b/packages/slate-react/test/rendering/fixtures/default-block.js @@ -16,7 +16,7 @@ export const state = ( export const output = `
-
+
word diff --git a/packages/slate-react/test/rendering/fixtures/empty-block-with-inline.js b/packages/slate-react/test/rendering/fixtures/empty-block-with-inline.js index 56b1ff3b5..be70099c3 100644 --- a/packages/slate-react/test/rendering/fixtures/empty-block-with-inline.js +++ b/packages/slate-react/test/rendering/fixtures/empty-block-with-inline.js @@ -16,7 +16,7 @@ export const state = ( export const output = `
-
+

diff --git a/packages/slate-react/test/rendering/fixtures/empty-block.js b/packages/slate-react/test/rendering/fixtures/empty-block.js index b1f8102dd..29972734b 100644 --- a/packages/slate-react/test/rendering/fixtures/empty-block.js +++ b/packages/slate-react/test/rendering/fixtures/empty-block.js @@ -14,7 +14,7 @@ export const state = ( export const output = `
-
+

diff --git a/packages/slate-react/test/rendering/fixtures/nested-text-direction.js b/packages/slate-react/test/rendering/fixtures/nested-text-direction.js index fdd0acff3..f73943cd3 100644 --- a/packages/slate-react/test/rendering/fixtures/nested-text-direction.js +++ b/packages/slate-react/test/rendering/fixtures/nested-text-direction.js @@ -21,13 +21,13 @@ export const state = ( export const output = `
-
-
+
+
مرحبا بالعالم
-
+
שלום עולם diff --git a/packages/slate-react/test/rendering/fixtures/text-direction.js b/packages/slate-react/test/rendering/fixtures/text-direction.js index 69fe6042a..6a9643667 100644 --- a/packages/slate-react/test/rendering/fixtures/text-direction.js +++ b/packages/slate-react/test/rendering/fixtures/text-direction.js @@ -22,17 +22,17 @@ export const state = ( export const output = `
-
+
Hello, world!
-
+
مرحبا بالعالم
-
+
שלום עולם diff --git a/packages/slate/package.json b/packages/slate/package.json index bfb84bc21..9621ce3b1 100644 --- a/packages/slate/package.json +++ b/packages/slate/package.json @@ -18,7 +18,7 @@ }, "peerDependencies": { "immutable": "^3.8.1", - "react": "^0.14.0 || ^15.0.0" + "react": "^0.14.0 || ^15.0.0 || ^16.0.0" }, "devDependencies": { "babel-cli": "^6.10.1", diff --git a/yarn.lock b/yarn.lock index a7711bfe1..6dd0330ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1928,8 +1928,8 @@ debug@^2.1.1, debug@^2.2.0: ms "0.7.3" debug@^2.3.2: - version "2.6.8" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: ms "2.0.0" @@ -2553,7 +2553,19 @@ fb-watchman@^1.8.0, fb-watchman@^1.9.0: dependencies: bser "1.0.2" -fbjs@^0.8.3, fbjs@^0.8.4, fbjs@^0.8.9: +fbjs@^0.8.16: + version "0.8.16" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" + dependencies: + core-js "^1.0.0" + isomorphic-fetch "^2.1.1" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.9" + +fbjs@^0.8.3, fbjs@^0.8.9: version "0.8.12" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04" dependencies: @@ -4554,7 +4566,7 @@ object-assign@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa" -object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0: +object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -4886,7 +4898,7 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@^15.5.4, prop-types@^15.5.7, prop-types@~15.5.7: +prop-types@^15.5.4: version "15.5.8" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394" dependencies: @@ -4899,6 +4911,14 @@ prop-types@^15.5.8: fbjs "^0.8.9" loose-envify "^1.3.1" +prop-types@^15.6.0: + version "15.6.0" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.3.1" + object-assign "^4.1.1" + prr@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" @@ -4992,21 +5012,21 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-addons-perf@^15.4.2: - version "15.4.2" - resolved "https://registry.yarnpkg.com/react-addons-perf/-/react-addons-perf-15.4.2.tgz#110bdcf5c459c4f77cb85ed634bcd3397536383b" - dependencies: - fbjs "^0.8.4" - object-assign "^4.1.0" - -react-dom@^15.4.2: - version "15.5.4" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.5.4.tgz#ba0c28786fd52ed7e4f2135fe0288d462aef93da" +react-addons-perf@^16.0.0-alpha: + version "16.0.0-alpha.3" + resolved "https://registry.yarnpkg.com/react-addons-perf/-/react-addons-perf-16.0.0-alpha.3.tgz#10a980395e78ad851404368c40670c97d82dafd4" dependencies: fbjs "^0.8.9" - loose-envify "^1.1.0" object-assign "^4.1.0" - prop-types "~15.5.7" + +react-dom@^16.0.0: + version "16.0.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.0" react-frame-aware-selection-plugin@^1.0.0: version "1.0.0" @@ -5057,14 +5077,14 @@ react-router@^4.1.1: prop-types "^15.5.4" warning "^3.0.0" -react@^15.4.2: - version "15.5.4" - resolved "https://registry.yarnpkg.com/react/-/react-15.5.4.tgz#fa83eb01506ab237cdc1c8c3b1cea8de012bf047" +react@^16.0.0: + version "16.0.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d" dependencies: - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.7" + object-assign "^4.1.1" + prop-types "^15.6.0" read-cmd-shim@^1.0.1: version "1.0.1"