Fixed a module resolution issue and a syntax error from a bad merge
Brian Vaughn committed
Jul 23, 2019 at 07:46 UTC
1178d5725731e228e948e6bec69f758d9e378b81
25 files changed
+17
-29
.gitignore
+3
-1
@@ -6,7 +6,9 @@
6
/packages/react-devtools-core/dist
7
/shells/dev/dist
8
build
9
-node_modules
9
+/node_modules
10
+/packages/react-devtools-core/node_modules/
11
+/packages/react-devtools/node_modules/
12
npm-debug.log
13
yarn-error.log
14
.DS_Store
package.json
-1
@@ -146,7 +146,6 @@
146
"react-is": "0.0.0-424099da6",
147
"react-test-renderer": "^0.0.0-424099da6",
148
"react-virtualized-auto-sizer": "^1.0.2",
149
- "react-window": "./vendor/react-window",
149
"request-promise": "^4.2.4",
150
"rimraf": "^2.6.3",
151
"scheduler": "^0.0.0-424099da6",
src/node_modules/react-window/CHANGELOG.md
renamed
src/node_modules/react-window/LICENSE.md
renamed
src/node_modules/react-window/README.md
renamed
src/node_modules/react-window/dist/index-dev.umd.js
renamed
src/node_modules/react-window/dist/index-prod.umd.js
renamed
src/node_modules/react-window/dist/index.cjs.js
renamed
src/node_modules/react-window/dist/index.cjs.js.flow
renamed
src/node_modules/react-window/dist/index.esm.js
renamed
+6
-4
@@ -6,6 +6,8 @@ import { createElement, PureComponent } from 'react';
6
import { flushSync } from 'react-dom';
7
import _objectWithoutPropertiesLoose from '@babel/runtime/helpers/esm/objectWithoutPropertiesLoose';
8
9
+console.warn('react-window index.esm.js');
10
+
11
// Animation frame based implementation of setTimeout.
12
// Inspired by Joe Lambert, https://gist.github.com/joelambert/1002116#file-requesttimeout-js
13
var hasNativePerformanceNow = typeof performance === 'object' && typeof performance.now === 'function';
@@ -1167,8 +1169,8 @@ function createListComponent(_ref) {
1169
scrollUpdateWasRequested: false
1170
};
1171
}, _this._resetIsScrollingDebounced);
1170
- };
1171
- });
1172
+ });
1173
+ };
1174
1175
_this._onScrollVertical = function (event) {
1176
var _event$currentTarget2 = event.currentTarget,
@@ -1195,8 +1197,8 @@ function createListComponent(_ref) {
1197
scrollUpdateWasRequested: false
1198
};
1199
}, _this._resetIsScrollingDebounced);
1198
- };
1199
- });
1200
+ });
1201
+ };
1202
1203
_this._outerRefSetter = function (ref) {
1204
var outerRef = _this.props.outerRef;
src/node_modules/react-window/dist/index.esm.js.flow
renamed
src/node_modules/react-window/package.json
renamed
src/node_modules/react-window/src/FixedSizeGrid.js
renamed
src/node_modules/react-window/src/FixedSizeList.js
renamed
src/node_modules/react-window/src/VariableSizeGrid.js
renamed
src/node_modules/react-window/src/VariableSizeList.js
renamed
src/node_modules/react-window/src/areEqual.js
renamed
src/node_modules/react-window/src/createGridComponent.js
renamed
src/node_modules/react-window/src/createListComponent.js
renamed
src/node_modules/react-window/src/domHelpers.js
renamed
src/node_modules/react-window/src/index.js
renamed
src/node_modules/react-window/src/shallowDiffers.js
renamed
src/node_modules/react-window/src/shouldComponentUpdate.js
renamed
src/node_modules/react-window/src/timer.js
renamed
yarn.lock
+8
-23
@@ -765,13 +765,6 @@
765
dependencies:
766
regenerator-runtime "^0.12.0"
767
768
-"@babel/runtime@^7.0.0":
769
- version "7.5.5"
770
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"
771
- integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==
772
- dependencies:
773
- regenerator-runtime "^0.13.2"
774
-
768
"@babel/template@^7.0.0", "@babel/template@^7.4.0":
769
version "7.4.0"
770
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.0.tgz#12474e9c077bae585c5d835a95c0b0b790c25c8b"
@@ -8249,11 +8242,6 @@ mem@^4.0.0:
8242
mimic-fn "^1.0.0"
8243
p-is-promise "^2.0.0"
8244
8252
-"memoize-one@>=3.1.1 <6":
8253
- version "5.0.5"
8254
- resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.0.5.tgz#8cd3809555723a07684afafcd6f756072ac75d7e"
8255
- integrity sha512-ey6EpYv0tEaIbM/nTDOpHciXUvd+ackQrJgEzBwemhZZIWZjcyodqEcrmqDy2BKRTM3a65kKBV4WtLXJDt26SQ==
8256
-
8245
memoize-one@^3.1.1:
8246
version "3.1.1"
8247
resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-3.1.1.tgz#ef609811e3bc28970eac2884eece64d167830d17"
@@ -9934,6 +9922,14 @@ react-color@^2.11.7:
9922
reactcss "^1.2.0"
9923
tinycolor2 "^1.4.1"
9924
9925
+react-devtools-core@4.0.0-alpha.0:
9926
+ version "4.0.0-alpha.0"
9927
+ resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.0.0-alpha.0.tgz#79d3cd89b456ca264d5f4da392a70c85ad870402"
9928
+ integrity sha512-l9JgiXz7nj/u+oLmiri/4yRnddRY4F6bHtsUKQNrddYHilGAiA+3WXzeEhX2QAlXMEcmpXdcT5celmAFzLnycQ==
9929
+ dependencies:
9930
+ shell-quote "^1.6.1"
9931
+ ws "^7"
9932
+
9933
"react-dom-15@npm:react-dom@^15":
9934
version "15.6.2"
9935
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
@@ -9984,12 +9980,6 @@ react-virtualized-auto-sizer@^1.0.2:
9980
resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.2.tgz#a61dd4f756458bbf63bd895a92379f9b70f803bd"
9981
integrity sha512-MYXhTY1BZpdJFjUovvYHVBmkq79szK/k7V3MO+36gJkWGkrXKtyr4vCPtpphaTLRAdDNoYEYFZWE8LjN+PIHNg==
9982
9987
-react-window@./vendor/react-window:
9988
- version "1.8.0"
9989
- dependencies:
9990
- "@babel/runtime" "^7.0.0"
9991
- memoize-one ">=3.1.1 <6"
9992
-
9983
react@^0.0.0-424099da6:
9984
version "0.0.0-424099da6"
9985
resolved "https://registry.yarnpkg.com/react/-/react-0.0.0-424099da6.tgz#bf9155a10bb09783cfdc9e79438062af4b249861"
@@ -10182,11 +10172,6 @@ regenerator-runtime@^0.12.0:
10172
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
10173
integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
10174
10185
-regenerator-runtime@^0.13.2:
10186
- version "0.13.3"
10187
- resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
10188
- integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
10189
-
10175
regenerator-runtime@^0.9.5:
10176
version "0.9.6"
10177
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"