From a4d2f184b5b596419098d3daf189f0057188e72c Mon Sep 17 00:00:00 2001
From: Yann Braga <yannbf@gmail.com>
Date: Thu, 17 Nov 2022 16:38:42 +0100
Subject: [PATCH 1/2] add angular 14 template and skip test runner on angular
 15

---
 .circleci/config.yml                | 16 ++++++++--------
 code/lib/cli/src/repro-templates.ts | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5392b5d7910..f6674fc9c46 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -689,11 +689,11 @@ workflows:
           requires:
             - build
       - create-sandboxes:
-          parallelism: 14
+          parallelism: 15
           requires:
             - build
       - build-sandboxes:
-          parallelism: 14
+          parallelism: 15
           requires:
             - create-sandboxes
       - test-runner-sandboxes:
@@ -701,11 +701,11 @@ workflows:
           requires:
             - build-sandboxes
       - chromatic-sandboxes:
-          parallelism: 14
+          parallelism: 15
           requires:
             - build-sandboxes
       - e2e-sandboxes:
-          parallelism: 14
+          parallelism: 15
           requires:
             - build-sandboxes
   daily:
@@ -714,14 +714,14 @@ workflows:
     jobs:
       - build
       - create-sandboxes:
-          parallelism: 24
+          parallelism: 25
           requires:
             - build
       # - smoke-test-sandboxes: # disabled for now
       #     requires:
       #       - create-sandboxes
       - build-sandboxes:
-          parallelism: 24
+          parallelism: 25
           requires:
             - create-sandboxes
       - test-runner-sandboxes:
@@ -729,10 +729,10 @@ workflows:
           requires:
             - build-sandboxes
       - chromatic-sandboxes:
-          parallelism: 24
+          parallelism: 25
           requires:
             - build-sandboxes
       - e2e-sandboxes:
-          parallelism: 24
+          parallelism: 25
           requires:
             - build-sandboxes
diff --git a/code/lib/cli/src/repro-templates.ts b/code/lib/cli/src/repro-templates.ts
index 1cfad299109..aad239b4d0f 100644
--- a/code/lib/cli/src/repro-templates.ts
+++ b/code/lib/cli/src/repro-templates.ts
@@ -141,6 +141,17 @@ export const allTemplates = {
     name: 'Angular CLI (latest)',
     script:
       'npx -p @angular/cli ng new angular-latest --directory . --routing=true --minimal=true --style=scss --strict --skip-git --skip-install --package-manager=yarn',
+    skipTasks: ['test-runner'],
+    expected: {
+      framework: '@storybook/angular',
+      renderer: '@storybook/angular',
+      builder: '@storybook/builder-webpack5',
+    },
+  },
+  'angular-cli/14-ts': {
+    name: 'Angular CLI (Version 14)',
+    script:
+      'npx -p @angular/cli@14 ng new angular-v14 --directory . --routing=true --minimal=true --style=scss --strict --skip-git --skip-install --package-manager=yarn',
     expected: {
       framework: '@storybook/angular',
       renderer: '@storybook/angular',
@@ -251,7 +262,8 @@ type TemplateKey = keyof typeof allTemplates;
 export const ci: TemplateKey[] = ['cra/default-ts', 'react-vite/default-ts'];
 export const pr: TemplateKey[] = [
   ...ci,
-  'angular-cli/default-ts',
+  // TODO: swap with 'angular-cli/default-ts' once angular 15 fully works with Storybook
+  'angular-cli/14-ts',
   'vue3-vite/default-ts',
   'vue-cli/vue2-default-js',
   'lit-vite/default-ts',
@@ -263,6 +275,7 @@ export const merged: TemplateKey[] = [
   ...pr,
   'react-webpack/18-ts',
   'react-webpack/17-ts',
+  'angular-cli/default-ts',
   'angular-cli/13-ts',
   'preact-webpack5/default-ts',
   'html-webpack/default',

From 6d7fa1d6a954425f85b50e954ba4552ac883b9bc Mon Sep 17 00:00:00 2001
From: Yann Braga <yannbf@gmail.com>
Date: Fri, 18 Nov 2022 12:24:32 +0100
Subject: [PATCH 2/2] fix deletion of after_storybook node_modules

---
 scripts/next-repro-generators/generate-repros.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/next-repro-generators/generate-repros.ts b/scripts/next-repro-generators/generate-repros.ts
index 029affbc0c2..21913d0ac41 100755
--- a/scripts/next-repro-generators/generate-repros.ts
+++ b/scripts/next-repro-generators/generate-repros.ts
@@ -164,8 +164,10 @@ const runGenerators = async (
         // Remove node_modules to save space and avoid GH actions failing
         // They're not uploaded to the git repros repo anyway
         if (process.env.CLEANUP_REPRO_NODE_MODULES) {
+          console.log(`🗑️ Removing ${join(beforeDir, 'node_modules')}`);
           await remove(join(beforeDir, 'node_modules'));
-          await remove(join(baseDir, 'node_modules'));
+          console.log(`🗑️ Removing ${join(baseDir, AFTER_DIR_NAME, 'node_modules')}`);
+          await remove(join(baseDir, AFTER_DIR_NAME, 'node_modules'));
         }
 
         console.log(