From 23a3438abbde0be05631a1cbd747fa1970a26806 Mon Sep 17 00:00:00 2001
From: Aaron Brewer <spaceribs@gmail.com>
Date: Wed, 14 Sep 2022 14:03:16 -0400
Subject: [PATCH 1/4] Alias decorateStory as applyDecorators for angular
 integration

Fixes: #17330
---
 code/frameworks/angular/src/client/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/frameworks/angular/src/client/config.ts b/code/frameworks/angular/src/client/config.ts
index 109dd3b0910..bdc5cdf797c 100644
--- a/code/frameworks/angular/src/client/config.ts
+++ b/code/frameworks/angular/src/client/config.ts
@@ -1,6 +1,6 @@
 import './globals';
 
 export { render, renderToDOM } from './render';
-export { decorateStory } from './decorateStory';
+export { decorateStory as applyDecorators } from './decorateStory';
 
 export const parameters = { framework: 'angular' as const };

From a937b03e09114af63aa387cbc1c124fca6e5a857 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@chromatic.com>
Date: Fri, 16 Sep 2022 14:24:27 +1000
Subject: [PATCH 2/4] Don't overwrite existing SB scripts in sandbox

---
 scripts/sandbox.ts | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/scripts/sandbox.ts b/scripts/sandbox.ts
index 767c38266ef..841c71f098c 100644
--- a/scripts/sandbox.ts
+++ b/scripts/sandbox.ts
@@ -180,19 +180,14 @@ async function findFirstPath(paths: string[], { cwd }: { cwd: string }) {
   return null;
 }
 
-async function addPackageScripts({
-  cwd,
-  scripts,
-}: {
-  cwd: string;
-  scripts: Record<string, string>;
-}) {
+async function updatePackageScripts({ cwd, prefix }: { cwd: string; prefix: string }) {
   logger.info(`🔢 Adding package scripts:`);
   const packageJsonPath = path.join(cwd, 'package.json');
   const packageJson = await readJSON(packageJsonPath);
   packageJson.scripts = {
     ...packageJson.scripts,
-    ...scripts,
+    storybook: packageJson.scripts.storybook.replace(/(npx )?sb/, `${prefix} $&`),
+    'build-storybook': packageJson.scripts['build-storybook'].replace(/(npx )?sb/, `${prefix} $&`),
   };
   await writeJSON(packageJsonPath, packageJson, { spaces: 2 });
 }
@@ -507,14 +502,9 @@ export async function sandbox(optionValues: OptionValues<typeof options>) {
     // Some addon stories require extra dependencies
     addExtraDependencies({ cwd, dryRun, debug });
 
-    await addPackageScripts({
+    await updatePackageScripts({
       cwd,
-      scripts: {
-        storybook:
-          'NODE_OPTIONS="--preserve-symlinks --preserve-symlinks-main" storybook dev -p 6006',
-        'build-storybook':
-          'NODE_OPTIONS="--preserve-symlinks --preserve-symlinks-main" storybook build',
-      },
+      prefix: 'NODE_OPTIONS="--preserve-symlinks --preserve-symlinks-main"',
     });
   }
 

From f868d66f038f606cb6605ee5345633cedc3f1282 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@chromatic.com>
Date: Fri, 16 Sep 2022 14:26:03 +1000
Subject: [PATCH 3/4] Fix previous

---
 scripts/sandbox.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/sandbox.ts b/scripts/sandbox.ts
index 841c71f098c..a191439a861 100644
--- a/scripts/sandbox.ts
+++ b/scripts/sandbox.ts
@@ -186,8 +186,11 @@ async function updatePackageScripts({ cwd, prefix }: { cwd: string; prefix: stri
   const packageJson = await readJSON(packageJsonPath);
   packageJson.scripts = {
     ...packageJson.scripts,
-    storybook: packageJson.scripts.storybook.replace(/(npx )?sb/, `${prefix} $&`),
-    'build-storybook': packageJson.scripts['build-storybook'].replace(/(npx )?sb/, `${prefix} $&`),
+    storybook: packageJson.scripts.storybook.replace(/(npx )?storybook/, `${prefix} $&`),
+    'build-storybook': packageJson.scripts['build-storybook'].replace(
+      /(npx )?storybook/,
+      `${prefix} $&`
+    ),
   };
   await writeJSON(packageJsonPath, packageJson, { spaces: 2 });
 }

From d9d6b4aed1d6abfed81c272e844aa8f90a180399 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@chromatic.com>
Date: Fri, 16 Sep 2022 14:29:25 +1000
Subject: [PATCH 4/4] Fix script

---
 scripts/sandbox.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/sandbox.ts b/scripts/sandbox.ts
index a191439a861..adf92015f9e 100644
--- a/scripts/sandbox.ts
+++ b/scripts/sandbox.ts
@@ -186,10 +186,10 @@ async function updatePackageScripts({ cwd, prefix }: { cwd: string; prefix: stri
   const packageJson = await readJSON(packageJsonPath);
   packageJson.scripts = {
     ...packageJson.scripts,
-    storybook: packageJson.scripts.storybook.replace(/(npx )?storybook/, `${prefix} $&`),
+    storybook: packageJson.scripts.storybook.replace(/(npx )?storybook/, `${prefix} storybook`),
     'build-storybook': packageJson.scripts['build-storybook'].replace(
       /(npx )?storybook/,
-      `${prefix} $&`
+      `${prefix} storybook`
     ),
   };
   await writeJSON(packageJsonPath, packageJson, { spaces: 2 });