From fa87bb091d252883582d9ee8b0d29af93618fdee Mon Sep 17 00:00:00 2001
From: Michael Shilman <michael@lab80.co>
Date: Thu, 18 Jul 2019 12:26:15 +0800
Subject: [PATCH 1/2] Fix sb migrate on npm: use npx to run jscodeshift

---
 lib/codemod/src/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemod/src/index.js b/lib/codemod/src/index.js
index 0b2726471a8..8977ff40530 100644
--- a/lib/codemod/src/index.js
+++ b/lib/codemod/src/index.js
@@ -42,8 +42,8 @@ export async function runCodemod(codemod, { glob, logger, dryRun, rename, hasYar
   const files = await globby([glob, '!node_modules', '!dist']);
   logger.log(`=> Applying ${codemod}: ${files.length} files`);
   if (!dryRun) {
-    const runner = hasYarn ? 'yarn' : 'npm';
-    spawnSync(runner, ['run', 'jscodeshift', '-t', `${TRANSFORM_DIR}/${codemod}.js`, ...files], {
+    const runner = hasYarn ? 'yarn' : 'npx';
+    spawnSync(runner, ['jscodeshift', '-t', `${TRANSFORM_DIR}/${codemod}.js`, ...files], {
       stdio: 'inherit',
     });
   }

From 7be57273768c58aa37714d18acd55fa1ce6fe92c Mon Sep 17 00:00:00 2001
From: Michael Shilman <michael@lab80.co>
Date: Thu, 18 Jul 2019 12:37:59 +0800
Subject: [PATCH 2/2] CLI: sb migrate typescript support

---
 lib/cli/bin/generate.js  |  7 ++++---
 lib/codemod/src/index.js | 13 +++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/cli/bin/generate.js b/lib/cli/bin/generate.js
index c9fddf3d1fc..2752b350ae0 100644
--- a/lib/cli/bin/generate.js
+++ b/lib/cli/bin/generate.js
@@ -22,7 +22,7 @@ if (process.argv[1].includes('getstorybook')) {
     .option('-f --force', 'Forcely add storybook')
     .option('-s --skip-install', 'Skip installing deps')
     .option('-N --use-npm', 'Use npm to install deps')
-    .option('-p --parser <babel | babylon | flow>', 'jscodeshift parser')
+    .option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser')
     .option('-t --type <type>', 'Add Storybook for a specific project type')
     .option('-y --yes', 'Answer yes to all prompts')
     .action(options => initiate(options, pkg));
@@ -53,6 +53,7 @@ if (process.argv[1].includes('getstorybook')) {
     .description('Run a storybook codemod migration on your source files')
     .option('-l --list', 'List available migrations')
     .option('-g --glob <glob>', 'Glob for files upon which to apply the migration', '**/*.js')
+    .option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser')
     .option(
       '-n --dry-run',
       'Dry run: verify the migration exists and show the files to which it will be applied'
@@ -61,8 +62,8 @@ if (process.argv[1].includes('getstorybook')) {
       '-r --rename <from-to>',
       'Rename suffix of matching files after codemod has been applied, e.g. ".js:.ts"'
     )
-    .action((migration, { configDir, glob, dryRun, list, rename }) => {
-      migrate(migration, { configDir, glob, dryRun, list, rename, logger }).catch(err => {
+    .action((migration, { configDir, glob, dryRun, list, rename, parser }) => {
+      migrate(migration, { configDir, glob, dryRun, list, rename, parser, logger }).catch(err => {
         logger.error(err);
         process.exit(1);
       });
diff --git a/lib/codemod/src/index.js b/lib/codemod/src/index.js
index 8977ff40530..a78536fb76b 100644
--- a/lib/codemod/src/index.js
+++ b/lib/codemod/src/index.js
@@ -25,7 +25,7 @@ async function renameFile(file, from, to, { logger }) {
   return fs.rename(file, newFile);
 }
 
-export async function runCodemod(codemod, { glob, logger, dryRun, rename, hasYarn }) {
+export async function runCodemod(codemod, { glob, logger, dryRun, rename, hasYarn, parser }) {
   const codemods = listCodemods();
   if (!codemods.includes(codemod)) {
     throw new Error(`Unknown codemod ${codemod}. Run --list for options.`);
@@ -43,9 +43,14 @@ export async function runCodemod(codemod, { glob, logger, dryRun, rename, hasYar
   logger.log(`=> Applying ${codemod}: ${files.length} files`);
   if (!dryRun) {
     const runner = hasYarn ? 'yarn' : 'npx';
-    spawnSync(runner, ['jscodeshift', '-t', `${TRANSFORM_DIR}/${codemod}.js`, ...files], {
-      stdio: 'inherit',
-    });
+    const parserArgs = parser ? ['--parser', parser] : [];
+    spawnSync(
+      runner,
+      ['jscodeshift', '-t', `${TRANSFORM_DIR}/${codemod}.js`, ...parserArgs, ...files],
+      {
+        stdio: 'inherit',
+      }
+    );
   }
 
   if (renameParts) {