From 60504f8f8cc0f94ef23cbfab9630e82a63853f0b Mon Sep 17 00:00:00 2001
From: Michael Shilman <shilman@lab80.co>
Date: Tue, 7 Nov 2017 22:13:27 +0900
Subject: [PATCH 1/2] Fix broken CI build

- restore code from
https://github.com/storybooks/storybook/commit/cba07adda085fb3a8d7850f2b
53673be95196c3e
- update test fixture for codemod
---
 addons/knobs/src/components/types/Array.js               | 9 ++++++++-
 .../update-organisation-name.input.js                    | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/knobs/src/components/types/Array.js b/addons/knobs/src/components/types/Array.js
index 83e576a353c0..7fcc62b46022 100644
--- a/addons/knobs/src/components/types/Array.js
+++ b/addons/knobs/src/components/types/Array.js
@@ -16,12 +16,19 @@ const styles = {
   color: '#555',
 };
 
+function formatArray(value, separator) {
+  if (value === '') {
+    return [];
+  }
+  return value.split(separator);
+}
+
 const ArrayType = ({ knob, onChange }) => (
   <Textarea
     id={knob.name}
     style={styles}
     value={knob.value.join(knob.separator)}
-    onChange={e => onChange(e.target.value.split(knob.separator))}
+    onChange={e => onChange(formatArray(e.target.value, knob.separator))}
   />
 );
 
diff --git a/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js b/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js
index ec039bdd8f7a..b6631acae595 100644
--- a/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js
+++ b/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js
@@ -1,7 +1,6 @@
 /* eslint-disable */
 import '@kadira/storybook-addons';
 import '@kadira/react-storybook-decorator-centered';
-import '@kadira/storybook-addon-comments';
 import '@kadira/storybook-addon-graphql';
 import '@kadira/storybook-addon-info';
 import '@kadira/storybook-addon-knobs';

From 6df219ec8192f8ce700ad12b4d79234ff27b226b Mon Sep 17 00:00:00 2001
From: Michael Shilman <shilman@lab80.co>
Date: Tue, 7 Nov 2017 22:43:29 +0900
Subject: [PATCH 2/2] Handle deprecated @storybook/addon-comments codemod

---
 .../update-organisation-name/update-organisation-name.input.js   | 1 +
 .../update-organisation-name/update-organisation-name.output.js  | 1 +
 lib/codemod/src/transforms/update-organisation-name.js           | 1 +
 3 files changed, 3 insertions(+)

diff --git a/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js b/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js
index b6631acae595..9b16ff958663 100644
--- a/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js
+++ b/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js
@@ -1,5 +1,6 @@
 /* eslint-disable */
 import '@kadira/storybook-addons';
+import '@kadira/storybook-addon-comments';
 import '@kadira/react-storybook-decorator-centered';
 import '@kadira/storybook-addon-graphql';
 import '@kadira/storybook-addon-info';
diff --git a/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.output.js b/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.output.js
index bf101b1c5647..16520880f65c 100644
--- a/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.output.js
+++ b/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.output.js
@@ -1,5 +1,6 @@
 /* eslint-disable */
 import '@storybook/addons';
+import '@storybook/addon-comments';
 import '@storybook/addon-centered';
 import '@storybook/addon-graphql';
 import '@storybook/addon-info';
diff --git a/lib/codemod/src/transforms/update-organisation-name.js b/lib/codemod/src/transforms/update-organisation-name.js
index 1fdfd0dd9535..a07875858b2d 100644
--- a/lib/codemod/src/transforms/update-organisation-name.js
+++ b/lib/codemod/src/transforms/update-organisation-name.js
@@ -2,6 +2,7 @@ export const packageNames = {
   '@kadira/react-storybook-decorator-centered': '@storybook/addon-centered',
   '@kadira/storybook-addons': '@storybook/addons',
   '@kadira/storybook-addon-actions': '@storybook/addon-actions',
+  '@kadira/storybook-addon-comments': '@storybook/addon-comments',
   '@kadira/storybook-addon-graphql': '@storybook/addon-graphql',
   '@kadira/storybook-addon-info': '@storybook/addon-info',
   '@kadira/storybook-addon-knobs': '@storybook/addon-knobs',