From f9fa522842e92ef5ee749787ed2ab6600ffa54b2 Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Tue, 7 Nov 2017 16:28:55 +0000 Subject: [PATCH 01/46] Update danger from 2.0.0 to 2.0.1 in / --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 58cc3573d0a..4f83709a4c1 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "codecov": "^3.0.0", "commander": "^2.11.0", "cross-env": "^5.1.1", - "danger": "^2.0.0", + "danger": "^2.0.1", "enzyme": "^3.1.1", "enzyme-adapter-react-16": "^1.0.4", "eslint": "^4.10.0", diff --git a/yarn.lock b/yarn.lock index 8d4c9152054..f784fb439ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3290,9 +3290,9 @@ damerau-levenshtein@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514" -danger@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/danger/-/danger-2.0.0.tgz#95a18f03a84f9584a49dc866c69e85b501454596" +danger@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/danger/-/danger-2.0.1.tgz#d3b303162c1132cb0a5471eb79f041f1941f9de2" dependencies: babel-polyfill "7.0.0-alpha.19" chalk "^2.0.0" @@ -11880,7 +11880,7 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" -vm2@patriksimek/vm2#custom_files: +"vm2@github:patriksimek/vm2#custom_files": version "3.5.0" resolved "https://codeload.github.com/patriksimek/vm2/tar.gz/7e82f90ac705fc44fad044147cb0df09b4c79a57" From 5fd0bca51eafe5d49dc7236eb4be3cbdeccd1fa1 Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Tue, 7 Nov 2017 16:32:16 +0000 Subject: [PATCH 02/46] Update prettier from 1.7.4 to 1.8.1 in / --- package.json | 2 +- yarn.lock | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 4f83709a4c1..4f94c325ea1 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "lodash": "^4.17.4", "nodemon": "^1.12.1", "npmlog": "^4.1.2", - "prettier": "^1.7.4", + "prettier": "^1.8.1", "puppeteer": "^0.12.0", "raf": "^3.4.0", "react": "^16.0.0", diff --git a/yarn.lock b/yarn.lock index f784fb439ff..ce6f42cd2d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8940,10 +8940,14 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^1.7.0, prettier@^1.7.4: +prettier@^1.7.0: version "1.7.4" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.4.tgz#5e8624ae9363c80f95ec644584ecdf55d74f93fa" +prettier@^1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.1.tgz#91064d778c08c85ac1cbe6b23195c34310d039f9" + pretty-bytes@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9" @@ -11880,7 +11884,7 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" -"vm2@github:patriksimek/vm2#custom_files": +vm2@patriksimek/vm2#custom_files: version "3.5.0" resolved "https://codeload.github.com/patriksimek/vm2/tar.gz/7e82f90ac705fc44fad044147cb0df09b4c79a57" From 56b908ca40fe65138915239a844f0be90201d29a Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Tue, 7 Nov 2017 16:34:06 +0000 Subject: [PATCH 03/46] Update react-modal from 3.1.0 to 3.1.2 in lib/ui --- lib/ui/package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ui/package.json b/lib/ui/package.json index 37a8c805ec5..a014acd5b9f 100644 --- a/lib/ui/package.json +++ b/lib/ui/package.json @@ -33,7 +33,7 @@ "react-icons": "^2.2.7", "react-inspector": "^2.2.1", "react-komposer": "^2.0.0", - "react-modal": "^3.1.0", + "react-modal": "^3.1.2", "react-split-pane": "^0.1.68", "react-treebeard": "^2.0.3", "redux": "^3.7.2" diff --git a/yarn.lock b/yarn.lock index ce6f42cd2d3..22a486442b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9368,9 +9368,9 @@ react-komposer@^2.0.0: react-stubber "^1.0.0" shallowequal "^0.2.2" -react-modal@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.0.tgz#ce594f88f9ab7338ee265cfec4be3cc5253f5baa" +react-modal@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.2.tgz#6e1fd656315d6fc62a1edda2b5aecc9752ac6bca" dependencies: exenv "^1.2.0" prop-types "^15.5.10" From 9af3afc42e4f24ed6bd19ce2d5ad11e26ebad2a2 Mon Sep 17 00:00:00 2001 From: hypnos Date: Wed, 8 Nov 2017 02:56:13 +0300 Subject: [PATCH 04/46] Remove unused prop --- lib/ui/src/modules/ui/components/search_box.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/ui/src/modules/ui/components/search_box.js b/lib/ui/src/modules/ui/components/search_box.js index d56e2a1f371..8ccbce2df89 100644 --- a/lib/ui/src/modules/ui/components/search_box.js +++ b/lib/ui/src/modules/ui/components/search_box.js @@ -109,8 +109,6 @@ export default class SearchBox extends React.Component { style={modalStyle} contentLabel="Search" shouldReturnFocusAfterClose={false} - // see https://github.com/reactjs/react-modal/pull/540/files#r148984350 - shouldFocusAfterRender={false} > Date: Wed, 8 Nov 2017 03:23:25 +0300 Subject: [PATCH 05/46] Use replaceState instead of pushState when the story stays the same --- .../src/modules/ui/configs/handle_routing.js | 20 ++++++++++++++++--- .../modules/ui/configs/handle_routing.test.js | 14 ++++++------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/lib/ui/src/modules/ui/configs/handle_routing.js b/lib/ui/src/modules/ui/configs/handle_routing.js index 1ca89a8a021..7f72c7c086d 100755 --- a/lib/ui/src/modules/ui/configs/handle_routing.js +++ b/lib/ui/src/modules/ui/configs/handle_routing.js @@ -40,7 +40,7 @@ export function getUrlState(data) { }; } -export function changeUrl(clientStore) { +export function changeUrl(clientStore, usePush) { // Do not change the URL if we are inside a popState event. if (config.insidePopState) return; @@ -48,7 +48,7 @@ export function changeUrl(clientStore) { if (!data.selectedKind) return; const state = getUrlState(data); - window.history.pushState(state, '', state.url); + window.history[usePush ? 'pushState' : 'replaceState'](state, '', state.url); } export function updateStore(queryParams, actions) { @@ -92,8 +92,22 @@ export default function({ clientStore }, actions) { // handle initial URL handleInitialUrl(actions, window.location); + const data = clientStore.getAll(); + let prevKind = data.selectedKind; + let prevStory = data.selectedStory; + // subscribe to clientStore and change the URL - clientStore.subscribe(() => changeUrl(clientStore)); + clientStore.subscribe(() => { + const { selectedKind, selectedStory } = clientStore.getAll(); + // use pushState only when a new story is selected + const usePush = + prevKind != null && + prevStory != null && + (selectedKind !== prevKind || selectedStory !== prevStory); + changeUrl(clientStore, usePush); + prevKind = selectedKind; + prevStory = selectedStory; + }); changeUrl(clientStore); // handle back button diff --git a/lib/ui/src/modules/ui/configs/handle_routing.test.js b/lib/ui/src/modules/ui/configs/handle_routing.test.js index aea5bbdd270..82a734a8634 100755 --- a/lib/ui/src/modules/ui/configs/handle_routing.test.js +++ b/lib/ui/src/modules/ui/configs/handle_routing.test.js @@ -10,7 +10,7 @@ describe('manager.ui.config.handle_routing', () => { config.insidePopState = false; }); - test('should put the correct URL and state to pushState', done => { + test('should put the correct URL and state to replaceState', done => { const state = { selectedKind: 'kk', selectedStory: 'ss', @@ -31,7 +31,7 @@ describe('manager.ui.config.handle_routing', () => { const url = '?customText=test&selectedKind=kk&selectedStory=ss&full=0&down=1&left=1&panelRight=1&downPanel=pp'; - const pushState = { + const replaceState = { url, selectedKind: 'kk', selectedStory: 'ss', @@ -42,16 +42,16 @@ describe('manager.ui.config.handle_routing', () => { downPanel: 'pp', customText: 'test', }; - const originalPushState = window.history.pushState; - window.history.pushState = (s, t, u) => { - expect(s).toEqual(pushState); - expect(u).toBe(pushState.url); + const originalReplaceState = window.history.replaceState; + window.history.replaceState = (s, t, u) => { + expect(s).toEqual(replaceState); + expect(u).toBe(replaceState.url); done(); }; changeUrl(clientStore); - window.history.pushState = originalPushState; + window.history.replaceState = originalReplaceState; }); }); From eb0415dee8d0ed26766acc596ee1ef8b6ad68061 Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 10:36:41 +0000 Subject: [PATCH 06/46] Update jest-image-snapshot from 2.1.0 to 2.2.0 in / --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4f94c325ea1..bbf77398b16 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "jest": "^21.2.0", "jest-cli": "^21.2.1", "jest-enzyme": "^4.0.1", - "jest-image-snapshot": "^2.1.0", + "jest-image-snapshot": "^2.2.0", "lerna": "^2.5.1", "lint-staged": "^4.3.0", "lodash": "^4.17.4", diff --git a/yarn.lock b/yarn.lock index 22a486442b8..8fc61760238 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6418,9 +6418,9 @@ jest-haste-map@^21, jest-haste-map@^21.2.0: sane "^2.0.0" worker-farm "^1.3.1" -jest-image-snapshot@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/jest-image-snapshot/-/jest-image-snapshot-2.1.0.tgz#a8863f38de868e0175335dd9a1b170650e0bcdc9" +jest-image-snapshot@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/jest-image-snapshot/-/jest-image-snapshot-2.2.0.tgz#48b9aa6d9545e55b1eae4086454694ce80f8f434" dependencies: chalk "^1.1.3" lodash "^4.17.4" From f64ea20161936e68a6cde5e54c98d22cd4fdf7aa Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 10:38:18 +0000 Subject: [PATCH 07/46] Update @types/node from 8.0.49 to 8.0.50 in addons/knobs --- addons/knobs/package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/knobs/package.json b/addons/knobs/package.json index d0e22f5e931..312d2c7d5ac 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -28,7 +28,7 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@types/node": "^8.0.49", + "@types/node": "^8.0.50", "@types/react": "^16.0.20", "raw-loader": "^0.5.1", "react": "^16.0.0", diff --git a/yarn.lock b/yarn.lock index 8fc61760238..ed7b6d02507 100644 --- a/yarn.lock +++ b/yarn.lock @@ -101,9 +101,9 @@ version "6.0.88" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.88.tgz#f618f11a944f6a18d92b5c472028728a3e3d4b66" -"@types/node@^8.0.49": - version "8.0.49" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.49.tgz#417f86ab4829c629fe561779ee48751e0fe2a11b" +"@types/node@^8.0.50": + version "8.0.50" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.50.tgz#dc545448e128c88c4eec7cd64025fcc3b7604541" "@types/react@^16.0.18": version "16.0.19" From 1cd5c323591e6348d86a3e0fa3b525b822c71204 Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 10:39:42 +0000 Subject: [PATCH 08/46] Update @types/react from 16.0.20 to 16.0.21 in addons/knobs --- addons/knobs/package.json | 2 +- yarn.lock | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/knobs/package.json b/addons/knobs/package.json index 312d2c7d5ac..6fa52287e87 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -29,7 +29,7 @@ }, "devDependencies": { "@types/node": "^8.0.50", - "@types/react": "^16.0.20", + "@types/react": "^16.0.21", "raw-loader": "^0.5.1", "react": "^16.0.0", "react-dom": "^16.0.0", diff --git a/yarn.lock b/yarn.lock index ed7b6d02507..f1923381eb2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -113,6 +113,10 @@ version "16.0.20" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.20.tgz#dc16feb9c0bdf50e439482c6fd3c43d5a1d9f3b1" +"@types/react@^16.0.21": + version "16.0.21" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.21.tgz#1f4313594f784a477521a0795c46e7b832051ef3" + JSONStream@^1.0.4: version "1.3.1" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a" From 74e3cfc16882147c9bfaff1a1f9c19f1c463c841 Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 10:42:14 +0000 Subject: [PATCH 09/46] Update react-native from 0.50.1 to 0.50.2 in app/react-native --- app/react-native/package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/react-native/package.json b/app/react-native/package.json index 9520bbcaf0b..3916c7d79a4 100644 --- a/app/react-native/package.json +++ b/app/react-native/package.json @@ -73,7 +73,7 @@ "babel-cli": "^6.26.0", "react": "^16.0.0", "react-dom": "^16.0.0", - "react-native": "^0.50.1" + "react-native": "^0.50.2" }, "peerDependencies": { "react": "*", diff --git a/yarn.lock b/yarn.lock index f1923381eb2..810dcbb9b21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9385,9 +9385,9 @@ react-native-compat@^1.0.0: dependencies: prop-types "^15.5.10" -react-native@^0.50.1: - version "0.50.1" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.50.1.tgz#3d8bb7c96dd3151788e795a22155d305f15abfd1" +react-native@^0.50.2: + version "0.50.2" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.50.2.tgz#cad6152c716a4fda950f226c71affc2d494fa730" dependencies: absolute-path "^0.0.0" art "^0.10.0" From 095fbb92bcc017c6f8117a022fd398701a628dbc Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 10:43:36 +0000 Subject: [PATCH 10/46] Update vue-hot-reload-api from 2.2.0 to 2.2.3 in app/vue --- app/vue/package.json | 2 +- yarn.lock | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/vue/package.json b/app/vue/package.json index b91af7afb28..33641c2e2c6 100644 --- a/app/vue/package.json +++ b/app/vue/package.json @@ -69,7 +69,7 @@ "url-loader": "^0.6.2", "util-deprecate": "^1.0.2", "uuid": "^3.1.0", - "vue-hot-reload-api": "^2.1.1", + "vue-hot-reload-api": "^2.2.3", "vue-style-loader": "^3.0.1", "webpack": "^3.6.0", "webpack-dev-middleware": "^1.12.0", diff --git a/yarn.lock b/yarn.lock index 810dcbb9b21..d17b26b1bc6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11896,10 +11896,14 @@ voca@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/voca/-/voca-1.3.0.tgz#02751ac839bf0c92e2cfe88e49c393c94dd50ac3" -vue-hot-reload-api@^2.1.1, vue-hot-reload-api@^2.2.0: +vue-hot-reload-api@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.0.tgz#9a21b35ced3634434a43ee80efb7350ea8fb206d" +vue-hot-reload-api@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.3.tgz#43c8e5506d65a271d2571936d77253019fd3eb17" + vue-loader@^13.4.0: version "13.4.0" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.4.0.tgz#44aa7eef4fb1be89fbc37193ad33b8253417c4b9" From 897d05b2abaec1bc76f78c220ff2989a39895b33 Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 10:45:03 +0000 Subject: [PATCH 11/46] Update vue-loader from 13.4.0 to 13.5.0 in app/vue --- app/vue/package.json | 2 +- yarn.lock | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/vue/package.json b/app/vue/package.json index 33641c2e2c6..7da4d3b2a83 100644 --- a/app/vue/package.json +++ b/app/vue/package.json @@ -79,7 +79,7 @@ "babel-cli": "^6.26.0", "nodemon": "^1.12.1", "vue": "^2.5.3", - "vue-loader": "^13.4.0", + "vue-loader": "^13.5.0", "vue-template-compiler": "^2.5.3" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index d17b26b1bc6..5150a98ca72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11922,6 +11922,24 @@ vue-loader@^13.4.0: vue-style-loader "^3.0.0" vue-template-es2015-compiler "^1.6.0" +vue-loader@^13.5.0: + version "13.5.0" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.5.0.tgz#52f7b3790a267eff80012b77ea187a54586dd5d4" + dependencies: + consolidate "^0.14.0" + hash-sum "^1.0.2" + loader-utils "^1.1.0" + lru-cache "^4.1.1" + postcss "^6.0.8" + postcss-load-config "^1.1.0" + postcss-selector-parser "^2.0.0" + prettier "^1.7.0" + resolve "^1.4.0" + source-map "^0.6.1" + vue-hot-reload-api "^2.2.0" + vue-style-loader "^3.0.0" + vue-template-es2015-compiler "^1.6.0" + vue-style-loader@^3.0.0, vue-style-loader@^3.0.1: version "3.0.3" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.3.tgz#623658f81506aef9d121cdc113a4f5c9cac32df7" From c2717f9417f8261d53a8eca34e5a203a2e528b0c Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 10:46:25 +0000 Subject: [PATCH 12/46] Update vue-hot-reload-api from 2.2.0 to 2.2.3 in examples/vue-kitchen-sink --- examples/vue-kitchen-sink/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json index 6909799bd01..08549238643 100644 --- a/examples/vue-kitchen-sink/package.json +++ b/examples/vue-kitchen-sink/package.json @@ -17,7 +17,7 @@ "cross-env": "^5.1.1", "css-loader": "^0.28.7", "file-loader": "^1.1.5", - "vue-hot-reload-api": "^2.2.0", + "vue-hot-reload-api": "^2.2.3", "vue-loader": "^13.4.0", "vue-style-loader": "^3.0.1", "vue-template-compiler": "^2.5.3", From 5ee8b57eba30a576fb421025d507bc454a0ad0f8 Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 10:47:43 +0000 Subject: [PATCH 13/46] Update vue-loader from 13.4.0 to 13.5.0 in examples/vue-kitchen-sink --- examples/vue-kitchen-sink/package.json | 2 +- yarn.lock | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json index 08549238643..59636a9e69a 100644 --- a/examples/vue-kitchen-sink/package.json +++ b/examples/vue-kitchen-sink/package.json @@ -18,7 +18,7 @@ "css-loader": "^0.28.7", "file-loader": "^1.1.5", "vue-hot-reload-api": "^2.2.3", - "vue-loader": "^13.4.0", + "vue-loader": "^13.5.0", "vue-style-loader": "^3.0.1", "vue-template-compiler": "^2.5.3", "webpack": "^3.6.0", diff --git a/yarn.lock b/yarn.lock index 5150a98ca72..8a976bb70e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11904,24 +11904,6 @@ vue-hot-reload-api@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.3.tgz#43c8e5506d65a271d2571936d77253019fd3eb17" -vue-loader@^13.4.0: - version "13.4.0" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.4.0.tgz#44aa7eef4fb1be89fbc37193ad33b8253417c4b9" - dependencies: - consolidate "^0.14.0" - hash-sum "^1.0.2" - loader-utils "^1.1.0" - lru-cache "^4.1.1" - postcss "^6.0.8" - postcss-load-config "^1.1.0" - postcss-selector-parser "^2.0.0" - prettier "^1.7.0" - resolve "^1.4.0" - source-map "^0.6.1" - vue-hot-reload-api "^2.2.0" - vue-style-loader "^3.0.0" - vue-template-es2015-compiler "^1.6.0" - vue-loader@^13.5.0: version "13.5.0" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.5.0.tgz#52f7b3790a267eff80012b77ea187a54586dd5d4" From da319570bfbf3f16ab523eca2bb18a0b6fd07348 Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 16:26:55 +0000 Subject: [PATCH 14/46] Update react-textarea-autosize from 5.1.0 to 5.2.0 in addons/events --- addons/events/package.json | 2 +- yarn.lock | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/events/package.json b/addons/events/package.json index f5e3b774ef2..8ed3276a0f8 100644 --- a/addons/events/package.json +++ b/addons/events/package.json @@ -24,7 +24,7 @@ "babel-runtime": "^6.26.0", "format-json": "^1.0.3", "prop-types": "^15.6.0", - "react-textarea-autosize": "^5.1.0", + "react-textarea-autosize": "^5.2.0", "uuid": "^3.1.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 8a976bb70e2..7f8e62a5dd5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9545,6 +9545,12 @@ react-textarea-autosize@^5.1.0: dependencies: prop-types "^15.5.10" +react-textarea-autosize@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-5.2.0.tgz#a5dba76149b658c2c5dcd3a25e5a0a96b9fe668e" + dependencies: + prop-types "^15.6.0" + react-timer-mixin@^0.13.2: version "0.13.3" resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.3.tgz#0da8b9f807ec07dc3e854d082c737c65605b3d22" From 696bdb905dd2541cf10a79c0afdfce8d80012a14 Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 16:29:01 +0000 Subject: [PATCH 15/46] Update react-textarea-autosize from 5.1.0 to 5.2.0 in addons/knobs --- addons/knobs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/knobs/package.json b/addons/knobs/package.json index 6fa52287e87..ce0166ef1ae 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -24,7 +24,7 @@ "prop-types": "^15.6.0", "react-color": "^2.11.4", "react-datetime": "^2.10.3", - "react-textarea-autosize": "^5.1.0", + "react-textarea-autosize": "^5.2.0", "util-deprecate": "^1.0.2" }, "devDependencies": { From 97f3119de237f1e807e888bb0dc01975b14a71ef Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 16:32:20 +0000 Subject: [PATCH 16/46] Update react-native from 0.50.2 to 0.50.3 in app/react-native --- app/react-native/package.json | 2 +- yarn.lock | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/react-native/package.json b/app/react-native/package.json index 3916c7d79a4..50c9b7a6ac4 100644 --- a/app/react-native/package.json +++ b/app/react-native/package.json @@ -73,7 +73,7 @@ "babel-cli": "^6.26.0", "react": "^16.0.0", "react-dom": "^16.0.0", - "react-native": "^0.50.2" + "react-native": "^0.50.3" }, "peerDependencies": { "react": "*", diff --git a/yarn.lock b/yarn.lock index 7f8e62a5dd5..23d5c6c6b9b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7607,9 +7607,9 @@ methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" -metro-bundler@^0.20.0: - version "0.20.0" - resolved "https://registry.yarnpkg.com/metro-bundler/-/metro-bundler-0.20.0.tgz#a2faef20ba7f566484a6c5bd585f590f8640c183" +metro-bundler@^0.20.1: + version "0.20.2" + resolved "https://registry.yarnpkg.com/metro-bundler/-/metro-bundler-0.20.2.tgz#6c4dc9ea24314d876c466103eff5d78d15646bb5" dependencies: absolute-path "^0.0.0" async "^2.4.0" @@ -7643,7 +7643,8 @@ metro-bundler@^0.20.0: source-map "^0.5.6" temp "0.8.3" throat "^4.1.0" - uglify-es "^3.1.0" + uglify-es "^3.1.8" + wordwrap "^1.0.0" write-file-atomic "^1.2.0" xpipe "^1.0.5" @@ -9385,9 +9386,9 @@ react-native-compat@^1.0.0: dependencies: prop-types "^15.5.10" -react-native@^0.50.2: - version "0.50.2" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.50.2.tgz#cad6152c716a4fda950f226c71affc2d494fa730" +react-native@^0.50.3: + version "0.50.3" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.50.3.tgz#91282bd5356cc7d794969cdc443cc764389b9af4" dependencies: absolute-path "^0.0.0" art "^0.10.0" @@ -9415,7 +9416,7 @@ react-native@^0.50.2: graceful-fs "^4.1.3" inquirer "^3.0.6" lodash "^4.16.6" - metro-bundler "^0.20.0" + metro-bundler "^0.20.1" mime "^1.3.4" minimist "^1.2.0" mkdirp "^0.5.1" @@ -11468,9 +11469,9 @@ ua-parser-js@^0.7.9: version "0.7.14" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.14.tgz#110d53fa4c3f326c121292bbeac904d2e03387ca" -uglify-es@^3.1.0: - version "3.1.6" - resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.1.6.tgz#b0f818c055a7e9538abc2286e70c743f2938311f" +uglify-es@^3.1.8: + version "3.1.8" + resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.1.8.tgz#2f21a56871d6354dcc21469cc034c3967f14c5b1" dependencies: commander "~2.11.0" source-map "~0.6.1" @@ -12208,14 +12209,14 @@ wordwrap@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" +wordwrap@^1.0.0, wordwrap@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" -wordwrap@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - worker-farm@^1.3.1: version "1.5.0" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.0.tgz#adfdf0cd40581465ed0a1f648f9735722afd5c8d" From faa40831eb975ee8539c77bed1a9ae3b94892c1e Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Wed, 8 Nov 2017 16:34:40 +0000 Subject: [PATCH 17/46] Update react-textarea-autosize from 5.1.0 to 5.2.0 in addons/comments --- addons/comments/package.json | 2 +- yarn.lock | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/addons/comments/package.json b/addons/comments/package.json index 534fc265e85..b82c81d47f0 100644 --- a/addons/comments/package.json +++ b/addons/comments/package.json @@ -33,7 +33,7 @@ "moment": "^2.19.0", "prop-types": "^15.6.0", "react-render-html": "^0.5.2", - "react-textarea-autosize": "^5.1.0" + "react-textarea-autosize": "^5.2.0" }, "devDependencies": { "@kadira/storybook-database-cloud": "*", diff --git a/yarn.lock b/yarn.lock index 23d5c6c6b9b..33d8a40ee83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9540,12 +9540,6 @@ react-test-renderer@^16.0.0, react-test-renderer@^16.0.0-0: fbjs "^0.8.16" object-assign "^4.1.1" -react-textarea-autosize@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-5.1.0.tgz#ffbf8164fce217c79443c1c17dedf730592df224" - dependencies: - prop-types "^15.5.10" - react-textarea-autosize@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-5.2.0.tgz#a5dba76149b658c2c5dcd3a25e5a0a96b9fe668e" From 67a5fd584125dc6c23bb3e6069e8667b1dd0a38c Mon Sep 17 00:00:00 2001 From: hypnos Date: Thu, 9 Nov 2017 02:22:26 +0300 Subject: [PATCH 18/46] Addon-info: allow duplicate displayNames --- addons/info/src/components/Story.js | 13 +- .../src/__snapshots__/storyshots.test.js.snap | 341 ++++++++++++++++++ .../src/stories/issues.stories.js | 19 + 3 files changed, 367 insertions(+), 6 deletions(-) create mode 100644 examples/cra-kitchen-sink/src/stories/issues.stories.js diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js index b0a2863075b..a02ce066f58 100644 --- a/addons/info/src/components/Story.js +++ b/addons/info/src/components/Story.js @@ -14,6 +14,8 @@ import { Pre } from './markdown'; global.STORYBOOK_REACT_CLASSES = global.STORYBOOK_REACT_CLASSES || []; const { STORYBOOK_REACT_CLASSES } = global; +const getName = type => type.displayName || type.name; + const stylesheet = { link: { base: { @@ -324,14 +326,13 @@ export default class Story extends React.Component { extract(this.props.children); const array = Array.from(types.keys()); - array.sort((a, b) => (a.displayName || a.name) > (b.displayName || b.name)); + array.sort((a, b) => getName(a) > getName(b)); const { maxPropObjectKeys, maxPropArrayLength, maxPropStringLength } = this.props; - const propTables = array.map(type => ( -
-

- "{type.displayName || type.name}" Component -

+ const propTables = array.map((type, i) => ( + // eslint-disable-next-line react/no-array-index-key +
+

"{getName(type)}" Component

`; +exports[`Storyshots GitHub issues #1814 1`] = ` +
+
+
+ + ); + +storiesOf('GitHub issues', module).add( + '#1814', + withInfo('HOC')(() => ( +
+ + ); + +storiesOf('Addon Info.GitHub issues', module).add( + '#1814', + withInfo('Allow Duplicate DisplayNames for HOC #1814')(() => ( +
+ + ); - -storiesOf('GitHub issues', module).add( - '#1814', - withInfo('HOC')(() => ( -
- -