From e42768c297e89cd84ea68d2d70d1ceb0212a65d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ochman?= Date: Sat, 10 Nov 2018 16:06:23 +0100 Subject: [PATCH] Fix compatibility with React 16.6.0 (#83) --- CHANGELOG.md | 3 ++ config/rollup.config.js | 2 +- package-lock.json | 67 ++++++++++++++++++++++++++--------------- package.json | 2 +- yarn.lock | 17 ++++++++--- 5 files changed, 61 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a34e5f9..efc1e80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Changed +- Fixed React 16.6.0 compatibility ([#71]) + ## [0.5.1] - 2018-11-02 diff --git a/config/rollup.config.js b/config/rollup.config.js index 69566a5..76a88d9 100644 --- a/config/rollup.config.js +++ b/config/rollup.config.js @@ -43,7 +43,7 @@ const getPlugins = () => [ "node_modules/react/**", "node_modules/react-dom/**", "node_modules/react-reconciler/**", - "node_modules/schedule/**", + "node_modules/scheduler/**", ], }), globals(), diff --git a/package-lock.json b/package-lock.json index baf2ecb..8cba6c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "react-pixi-fiber", - "version": "0.5.0", + "version": "0.5.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -328,6 +328,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "3.2.2", "longest": "1.0.1", @@ -339,6 +340,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "1.1.6" } @@ -2980,12 +2982,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -3000,17 +3004,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3127,7 +3134,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3139,6 +3147,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "1.0.1" } @@ -3153,6 +3162,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "1.1.11" } @@ -3160,12 +3170,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "5.1.1", "yallist": "3.0.2" @@ -3184,6 +3196,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3264,7 +3277,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3276,6 +3290,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1.0.2" } @@ -3397,6 +3412,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", @@ -5845,7 +5861,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.3.1", @@ -6649,6 +6666,7 @@ "version": "15.6.0", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "dev": true, "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", @@ -6737,14 +6755,14 @@ } }, "react-reconciler": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.13.0.tgz", - "integrity": "sha512-7e/EEUgYTYy29p2fgcEhNm1I159IKs5Kk+4QW4Y5AwyD8Y4GZ8M03ZhMhRz8gifG8XFks2vbdpRIT5QGfRPYHw==", - "requires": { - "loose-envify": "1.3.1", - "object-assign": "4.1.1", - "prop-types": "15.6.2", - "schedule": "0.3.0" + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.17.0.tgz", + "integrity": "sha512-gDcWwagjyNldniQ4TrekdBUAYB6GtZ/PhMCN92G521HcbmKPq/sGd8HI41gEK9/lqeTSR/YFUFEndSIlmS5wLA==", + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.11.0" }, "dependencies": { "prop-types": { @@ -6752,8 +6770,8 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", "requires": { - "loose-envify": "1.3.1", - "object-assign": "4.1.1" + "loose-envify": "^1.3.1", + "object-assign": "^4.1.1" } } } @@ -7700,12 +7718,13 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true }, - "schedule": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/schedule/-/schedule-0.3.0.tgz", - "integrity": "sha512-20+1KVo517sR7Nt+bYBN8a+bEJDKLPEx7Ohtts1kX05E4/HY53YUNuhfkVNItmWAnBYHcpG9vsd2/CJxG+aPCQ==", + "scheduler": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.0.tgz", + "integrity": "sha512-MAYbBfmiEHxF0W+c4CxMpEqMYK+rYF584VP/qMKSiHM6lTkBKKYOJaDiSILpJHla6hBOsVd6GucPL46o2Uq3sg==", "requires": { - "object-assign": "4.1.1" + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" } }, "semver": { diff --git a/package.json b/package.json index 4347b4b..800162c 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dependencies": { "fbjs": "^0.8.0", "performance-now": "^2.1.0", - "react-reconciler": "^0.13.0" + "react-reconciler": "^0.17.0" }, "peerDependencies": { "pixi.js": "^4.4.0", diff --git a/yarn.lock b/yarn.lock index 393e694..a6a4a2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3304,14 +3304,15 @@ react-dom@^16.0.0: prop-types "^15.6.2" schedule "^0.3.0" -react-reconciler@^0.13.0: - version "0.13.0" - resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.13.0.tgz#89a5ff1403d03fee2b8760d515b133ff3d87a044" +react-reconciler@^0.17.0: + version "0.17.0" + resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.17.0.tgz#7ea99b61290956efb895bdb8a3a288dafeb585b5" + integrity sha512-gDcWwagjyNldniQ4TrekdBUAYB6GtZ/PhMCN92G521HcbmKPq/sGd8HI41gEK9/lqeTSR/YFUFEndSIlmS5wLA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - schedule "^0.3.0" + scheduler "^0.11.0" react-test-renderer@^16.0.0: version "16.2.0" @@ -3764,6 +3765,14 @@ schedule@^0.3.0: dependencies: object-assign "^4.1.1" +scheduler@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.11.0.tgz#def1f1bfa6550cc57981a87106e65e8aea41a6b5" + integrity sha512-MAYbBfmiEHxF0W+c4CxMpEqMYK+rYF584VP/qMKSiHM6lTkBKKYOJaDiSILpJHla6hBOsVd6GucPL46o2Uq3sg== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + "semver@2 || 3 || 4 || 5": version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"