From e6d641253198d2c57ab16aa692039652d92f8f65 Mon Sep 17 00:00:00 2001
From: Paul Grau <paul@graycoding.com>
Date: Mon, 19 Jul 2021 16:01:25 +0900
Subject: [PATCH 1/2] Fix react-ts example to be runable standalone

---
 examples/react-ts/.babelrc     |  7 +++++++
 examples/react-ts/main.ts      | 10 ----------
 examples/react-ts/package.json | 25 +++++++++++++++----------
 3 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 examples/react-ts/.babelrc

diff --git a/examples/react-ts/.babelrc b/examples/react-ts/.babelrc
new file mode 100644
index 000000000000..202d425a099e
--- /dev/null
+++ b/examples/react-ts/.babelrc
@@ -0,0 +1,7 @@
+{
+  "presets": [
+    "@babel/preset-env",
+    "@babel/preset-react",
+    "@babel/preset-typescript"
+  ]
+}
diff --git a/examples/react-ts/main.ts b/examples/react-ts/main.ts
index e3077e25ebb7..20b85cb03b2a 100644
--- a/examples/react-ts/main.ts
+++ b/examples/react-ts/main.ts
@@ -5,17 +5,7 @@ const config: StorybookConfig = {
   logLevel: 'debug',
   addons: [
     '@storybook/addon-essentials',
-    '@storybook/addon-controls',
     '@storybook/addon-storysource',
-    {
-      name: '@storybook/addon-docs',
-      options: {
-        sourceLoaderOptions: {
-          parser: 'typescript',
-          injectStoryParameters: false,
-        },
-      },
-    },
     '@storybook/addon-storyshots',
   ],
   typescript: {
diff --git a/examples/react-ts/package.json b/examples/react-ts/package.json
index 1c8ef1c7074b..fff4db991532 100644
--- a/examples/react-ts/package.json
+++ b/examples/react-ts/package.json
@@ -8,23 +8,28 @@
     "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./ --no-manager-cache"
   },
   "dependencies": {
-    "@storybook/addon-controls": "6.4.0-alpha.18",
+    "formik": "^2.2.9",
+    "prop-types": "15.7.2",
+    "react": "16.14.0",
+    "react-dom": "16.14.0"
+  },
+  "devDependencies": {
+    "@babel/preset-env": "^7.14.7",
+    "@babel/preset-react": "^7.14.5",
+    "@babel/preset-typescript": "^7.14.5",
     "@storybook/addon-essentials": "6.4.0-alpha.18",
+    "@storybook/addon-storyshots": "6.4.0-alpha.18",
+    "@storybook/addon-storysource": "6.4.0-alpha.18",
     "@storybook/components": "6.4.0-alpha.18",
     "@storybook/react": "6.4.0-alpha.18",
     "@storybook/theming": "6.4.0-alpha.18",
+    "@testing-library/dom": "^7.31.2",
+    "@testing-library/user-event": "^13.1.9",
+    "@types/babel__preset-env": "^7",
     "@types/react": "^16.14.2",
     "@types/react-dom": "^16.9.10",
-    "formik": "^2.2.9",
-    "prop-types": "15.7.2",
-    "react": "16.14.0",
-    "react-dom": "16.14.0",
+    "cross-env": "^7.0.3",
     "typescript": "^3.9.7",
     "webpack": "4"
-  },
-  "devDependencies": {
-    "@testing-library/dom": "^7.31.2",
-    "@testing-library/user-event": "^13.1.9",
-    "cross-env": "^7.0.3"
   }
 }

From 0b74220846afd165898a89c3a3d5d4f9687ccbf0 Mon Sep 17 00:00:00 2001
From: Paul Grau <paul@graycoding.com>
Date: Mon, 19 Jul 2021 17:12:20 +0900
Subject: [PATCH 2/2] Fix dependency versions

---
 examples/react-ts/package.json |  6 +++---
 yarn.lock                      | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/examples/react-ts/package.json b/examples/react-ts/package.json
index fff4db991532..66514ae99a14 100644
--- a/examples/react-ts/package.json
+++ b/examples/react-ts/package.json
@@ -14,9 +14,9 @@
     "react-dom": "16.14.0"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.14.7",
-    "@babel/preset-react": "^7.14.5",
-    "@babel/preset-typescript": "^7.14.5",
+    "@babel/preset-env": "^7.12.11",
+    "@babel/preset-react": "^7.12.10",
+    "@babel/preset-typescript": "^7.12.7",
     "@storybook/addon-essentials": "6.4.0-alpha.18",
     "@storybook/addon-storyshots": "6.4.0-alpha.18",
     "@storybook/addon-storysource": "6.4.0-alpha.18",
diff --git a/yarn.lock b/yarn.lock
index 37ad6d75798e..5777d402b2a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6897,13 +6897,18 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@storybook/example-react-ts@workspace:examples/react-ts"
   dependencies:
-    "@storybook/addon-controls": 6.4.0-alpha.18
+    "@babel/preset-env": ^7.12.11
+    "@babel/preset-react": ^7.12.10
+    "@babel/preset-typescript": ^7.12.7
     "@storybook/addon-essentials": 6.4.0-alpha.18
+    "@storybook/addon-storyshots": 6.4.0-alpha.18
+    "@storybook/addon-storysource": 6.4.0-alpha.18
     "@storybook/components": 6.4.0-alpha.18
     "@storybook/react": 6.4.0-alpha.18
     "@storybook/theming": 6.4.0-alpha.18
     "@testing-library/dom": ^7.31.2
     "@testing-library/user-event": ^13.1.9
+    "@types/babel__preset-env": ^7
     "@types/react": ^16.14.2
     "@types/react-dom": ^16.9.10
     cross-env: ^7.0.3
@@ -8167,6 +8172,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/babel__preset-env@npm:^7":
+  version: 7.9.2
+  resolution: "@types/babel__preset-env@npm:7.9.2"
+  checksum: 89d389de7fb2b4be8f43b021899b1fd8bdc85e912cc01b1b5a2504b033ada58b034d44131561c56ab6781c31913a21b769d33a05b549549bbc49bb92537e2dfb
+  languageName: node
+  linkType: hard
+
 "@types/babel__template@npm:*":
   version: 7.4.0
   resolution: "@types/babel__template@npm:7.4.0"