From d2d27c40c502219cf4bcdc30cb41ca5912b29ad1 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 12 Dec 2023 15:43:10 +0100 Subject: [PATCH 1/5] add sandbox for react16 --- code/lib/cli/src/sandbox-templates.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts index f2d4950bf2d1..7e3867d107e7 100644 --- a/code/lib/cli/src/sandbox-templates.ts +++ b/code/lib/cli/src/sandbox-templates.ts @@ -519,6 +519,19 @@ const internalTemplates = { }, skipTasks: ['bench'], }, + 'internal/react16-webpack': { + name: 'React 16 (Webpack | TypeScript)', + script: + 'yarn create webpack5-react {{beforeDir}} --version-react=16 --version-react-dom=16 --version-@types/react=16 --version-@types/react-dom=16', + expected: { + framework: '@storybook/react-webpack5', + renderer: '@storybook/react', + builder: '@storybook/builder-webpack5', + }, + skipTasks: ['e2e-tests-dev', 'bench'], + isInternal: true, + inDevelopment: true, + }, 'internal/server-webpack5': { name: 'Server Webpack5', script: 'yarn init -y && echo "module.exports = {}" > webpack.config.js', From aeec36d99442bd9614021e211202d15ac7c36a74 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 14 Dec 2023 13:32:29 +0100 Subject: [PATCH 2/5] add to daily --- code/lib/cli/src/sandbox-templates.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts index 7e3867d107e7..715073b01c98 100644 --- a/code/lib/cli/src/sandbox-templates.ts +++ b/code/lib/cli/src/sandbox-templates.ts @@ -654,6 +654,7 @@ export const daily: TemplateKey[] = [ 'preact-webpack5/default-js', 'preact-vite/default-js', 'html-vite/default-js', + 'internal/react16-webpack', ]; export const templatesByCadence = { normal, merged, daily }; From 4ef8ba726c39f3efa2acc958cdf8f841f9e43c68 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Mon, 18 Dec 2023 15:41:18 +0100 Subject: [PATCH 3/5] remove inDevelopment for react16-webpack --- code/lib/cli/src/sandbox-templates.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts index b3344136507d..f31375126b9e 100644 --- a/code/lib/cli/src/sandbox-templates.ts +++ b/code/lib/cli/src/sandbox-templates.ts @@ -508,7 +508,6 @@ const internalTemplates = { }, skipTasks: ['e2e-tests-dev', 'bench'], isInternal: true, - inDevelopment: true, }, 'internal/server-webpack5': { name: 'Server Webpack5', From e6ecbe0b0bb20dc7f31a888a09a4be4c08e49fba Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 18 Dec 2023 13:56:40 -0300 Subject: [PATCH 4/5] fix parallelism count --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae9183fdf07f..b2338349a82e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -706,22 +706,22 @@ workflows: requires: - build - create-sandboxes: - parallelism: 31 + parallelism: 32 requires: - build # - smoke-test-sandboxes: # disabled for now # requires: # - create-sandboxes - build-sandboxes: - parallelism: 31 + parallelism: 32 requires: - create-sandboxes - chromatic-sandboxes: - parallelism: 28 + parallelism: 29 requires: - build-sandboxes - e2e-production: - parallelism: 26 + parallelism: 27 requires: - build-sandboxes - e2e-dev: @@ -729,7 +729,7 @@ workflows: requires: - create-sandboxes - test-runner-production: - parallelism: 26 + parallelism: 27 requires: - build-sandboxes From d9dca670e00b4b235b94ed30e3e225abd0c80957 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 18 Dec 2023 14:06:31 -0300 Subject: [PATCH 5/5] improve cadence check message --- scripts/get-template.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/get-template.ts b/scripts/get-template.ts index ee3b81b13025..ecb62a942f80 100644 --- a/scripts/get-template.ts +++ b/scripts/get-template.ts @@ -101,7 +101,7 @@ async function checkParallelism(cadence?: Cadence, scriptName?: TaskKey) { let isIncorrect = false; cadences.forEach((cad) => { - summary.push(`\n${cad}`); + summary.push(`\n${chalk.bold(cad)}`); const cadenceTemplates = Object.entries(allTemplates).filter(([key]) => templatesByCadence[cad].includes(key as TemplateKey) ); @@ -110,6 +110,7 @@ async function checkParallelism(cadence?: Cadence, scriptName?: TaskKey) { scripts.forEach((script) => { const templateKeysPerScript = potentialTemplateKeys.filter((t) => { const currentTemplate = allTemplates[t] as Template; + return ( currentTemplate.inDevelopment !== true && !currentTemplate.skipTasks?.includes(script as SkippableTask) @@ -153,6 +154,18 @@ async function checkParallelism(cadence?: Cadence, scriptName?: TaskKey) { summary.unshift('✅ The parallelism count is correct for all jobs in .circleci/config.yml:'); console.log(summary.concat('\n').join('\n')); } + + const inDevelopmentTemplates = Object.entries(allTemplates) + .filter(([_, t]) => t.inDevelopment) + .map(([k]) => k); + + if (inDevelopmentTemplates.length > 0) { + console.log( + `👇 Some templates were skipped as they are flagged to be in development. Please review if they should still contain this flag:\n${inDevelopmentTemplates + .map((k) => `- ${k}`) + .join('\n')}` + ); + } } type RunOptions = { cadence?: Cadence; task?: TaskKey; check: boolean };