Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: Remove JS templates in sandboxes generation/testing #29833

Open
wants to merge 1 commit into
base: next
Choose a base branch
from
+14 −172
Open

Build: Remove JS templates in sandboxes generation/testing #29833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,27 +912,27 @@ workflows:
requires:
- unit-tests
- create-sandboxes:
parallelism: 20
parallelism: 19
requires:
- build
- build-sandboxes:
parallelism: 20
parallelism: 19
requires:
- create-sandboxes
- chromatic-sandboxes:
parallelism: 17
parallelism: 16
requires:
- build-sandboxes
- e2e-production:
parallelism: 15
parallelism: 14
requires:
- build-sandboxes
- e2e-dev:
parallelism: 2
requires:
- create-sandboxes
- test-runner-production:
parallelism: 15
parallelism: 14
requires:
- build-sandboxes
- vitest-integration:
Expand Down Expand Up @@ -986,34 +986,34 @@ workflows:
requires:
- build
- create-sandboxes:
parallelism: 38
parallelism: 29
requires:
- build
# - smoke-test-sandboxes: # disabled for now
# requires:
# - create-sandboxes
- build-sandboxes:
parallelism: 38
parallelism: 29
requires:
- create-sandboxes
- chromatic-sandboxes:
parallelism: 35
parallelism: 26
requires:
- build-sandboxes
- e2e-production:
parallelism: 33
parallelism: 24
requires:
- build-sandboxes
- e2e-dev:
parallelism: 2
requires:
- create-sandboxes
- test-runner-production:
parallelism: 33
parallelism: 24
requires:
- build-sandboxes
- vitest-integration:
parallelism: 11
parallelism: 7
requires:
- create-sandboxes
- test-portable-stories:
Expand Down
164 changes: 3 additions & 161 deletions code/lib/cli-storybook/src/sandbox-templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { ConfigFile } from 'storybook/internal/csf-tools';
import type { StoriesEntry, StorybookConfigRaw } from 'storybook/internal/types';
import type { StorybookConfigRaw } from 'storybook/internal/types';

export type SkippableTask =
| 'smoke-test'
Expand Down Expand Up @@ -91,54 +91,6 @@ type BaseTemplates = Template & {
};

const baseTemplates = {
'cra/default-js': {
name: 'Create React App Latest (Webpack | JavaScript)',
script: `
npx create-react-app {{beforeDir}} && cd {{beforeDir}} && \
jq '.browserslist.production[0] = ">0.9%"' package.json > tmp.json && mv tmp.json package.json
`,
expected: {
// TODO: change this to @storybook/cra once that package is created
framework: '@storybook/react-webpack5',
renderer: '@storybook/react',
builder: '@storybook/builder-webpack5',
},

skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
modifications: {
extraDependencies: ['prop-types'],
mainConfig: (config) => {
const stories = config.getFieldValue<Array<StoriesEntry>>(['stories']);
return {
stories: stories?.map((s) => {
if (typeof s === 'string') {
return s.replace(/\|(tsx?|ts)\b|\b(tsx?|ts)\|/g, '');
} else {
return s;
}
}),
};
},
},
},
'cra/default-ts': {
name: 'Create React App Latest (Webpack | TypeScript)',
script: `
npx create-react-app {{beforeDir}} --template typescript && cd {{beforeDir}} && \
jq '.browserslist.production[0] = ">0.9%"' package.json > tmp.json && mv tmp.json package.json
`,
// Re-enable once https://github.com/storybookjs/storybook/issues/19351 is fixed.
skipTasks: ['smoke-test', 'bench', 'vitest-integration'],
expected: {
// TODO: change this to @storybook/cra once that package is created
framework: '@storybook/react-webpack5',
renderer: '@storybook/react',
builder: '@storybook/builder-webpack5',
},
modifications: {
extraDependencies: ['prop-types'],
},
},
'nextjs/13-ts': {
name: 'Next.js v13.5 (Webpack | TypeScript)',
script:
Expand Down Expand Up @@ -172,7 +124,6 @@ const baseTemplates = {
extraDependencies: ['server-only', 'prop-types'],
},
skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
inDevelopment: true,
},
'nextjs/default-ts': {
name: 'Next.js Latest (Webpack | TypeScript)',
Expand Down Expand Up @@ -229,7 +180,6 @@ const baseTemplates = {
'prop-types',
],
},
inDevelopment: true,
skipTasks: ['e2e-tests-dev', 'bench'],
},
'experimental-nextjs-vite/default-ts': {
Expand All @@ -255,19 +205,6 @@ const baseTemplates = {
},
skipTasks: ['e2e-tests-dev', 'bench'],
},
'react-vite/default-js': {
name: 'React Latest (Vite | JavaScript)',
script: 'npm create vite --yes {{beforeDir}} -- --template react',
expected: {
framework: '@storybook/react-vite',
renderer: '@storybook/react',
builder: '@storybook/builder-vite',
},
modifications: {
extraDependencies: ['prop-types'],
},
skipTasks: ['e2e-tests-dev', 'bench'],
},
'react-vite/default-ts': {
name: 'React Latest (Vite | TypeScript)',
script: 'npm create vite --yes {{beforeDir}} -- --template react-ts',
Expand Down Expand Up @@ -318,7 +255,7 @@ const baseTemplates = {
modifications: {
extraDependencies: ['prop-types'],
},
skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
skipTasks: ['bench', 'vitest-integration'],
},
'react-webpack/17-ts': {
name: 'React v17 (Webpack | TypeScript)',
Expand Down Expand Up @@ -358,18 +295,6 @@ const baseTemplates = {
},
skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
},
'solid-vite/default-js': {
name: 'SolidJS Latest (Vite | JavaScript)',
script: 'npx degit solidjs/templates/js {{beforeDir}}',
expected: {
framework: 'storybook-solidjs-vite',
renderer: 'storybook-solidjs',
builder: '@storybook/builder-vite',
},
// TODO: remove this once solid-vite framework is released
inDevelopment: true,
skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
},
'solid-vite/default-ts': {
name: 'SolidJS Latest (Vite | TypeScript)',
script: 'npx degit solidjs/templates/ts {{beforeDir}}',
Expand All @@ -382,16 +307,6 @@ const baseTemplates = {
inDevelopment: true,
skipTasks: ['e2e-tests-dev', 'bench'],
},
'vue3-vite/default-js': {
name: 'Vue v3 (Vite | JavaScript)',
script: 'npm create vite --yes {{beforeDir}} -- --template vue',
expected: {
framework: '@storybook/vue3-vite',
renderer: '@storybook/vue3',
builder: '@storybook/builder-vite',
},
skipTasks: ['e2e-tests-dev', 'bench'],
},
'vue3-vite/default-ts': {
name: 'Vue v3 (Vite | TypeScript)',
script: 'npm create vite --yes {{beforeDir}} -- --template vue-ts',
Expand All @@ -412,17 +327,6 @@ const baseTemplates = {
},
skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
},
'html-vite/default-js': {
name: 'HTML Latest (Vite | JavaScript)',
script:
'npm create vite --yes {{beforeDir}} -- --template vanilla && cd {{beforeDir}} && echo "export default {}" > vite.config.js',
expected: {
framework: '@storybook/html-vite',
renderer: '@storybook/html',
builder: '@storybook/builder-vite',
},
skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
},
'html-vite/default-ts': {
name: 'HTML Latest (Vite | TypeScript)',
script:
Expand All @@ -434,16 +338,6 @@ const baseTemplates = {
},
skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
},
'svelte-vite/default-js': {
name: 'Svelte Latest (Vite | JavaScript)',
script: 'npm create vite --yes {{beforeDir}} -- --template svelte',
expected: {
framework: '@storybook/svelte-vite',
renderer: '@storybook/svelte',
builder: '@storybook/builder-vite',
},
skipTasks: ['e2e-tests-dev', 'bench'],
},
'svelte-vite/default-ts': {
name: 'Svelte Latest (Vite | TypeScript)',
script: 'npm create vite --yes {{beforeDir}} -- --template svelte-ts',
Expand Down Expand Up @@ -488,17 +382,6 @@ const baseTemplates = {
},
skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
},
'svelte-kit/skeleton-js': {
name: 'SvelteKit Latest (Vite | JavaScript)',
script:
'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory={{beforeDir}} --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest --no-svelte5',
expected: {
framework: '@storybook/sveltekit',
renderer: '@storybook/svelte',
builder: '@storybook/builder-vite',
},
skipTasks: ['e2e-tests-dev', 'bench'],
},
'svelte-kit/skeleton-ts': {
name: 'SvelteKit Latest (Vite | TypeScript)',
script:
Expand All @@ -521,18 +404,6 @@ const baseTemplates = {
},
skipTasks: ['e2e-tests-dev', 'bench'],
},
'lit-vite/default-js': {
name: 'Lit Latest (Vite | JavaScript)',
script:
'npm create vite --yes {{beforeDir}} -- --template lit && cd {{beforeDir}} && echo "export default {}" > vite.config.js',
expected: {
framework: '@storybook/web-components-vite',
renderer: '@storybook/web-components',
builder: '@storybook/builder-vite',
},
// Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed.
skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench', 'vitest-integration'],
},
'lit-vite/default-ts': {
name: 'Lit Latest (Vite | TypeScript)',
script:
Expand All @@ -557,19 +428,6 @@ const baseTemplates = {
// Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed.
skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench', 'vitest-integration'],
},
'preact-vite/default-js': {
name: 'Preact Latest (Vite | JavaScript)',
script: 'npm create vite --yes {{beforeDir}} -- --template preact',
expected: {
framework: '@storybook/preact-vite',
renderer: '@storybook/preact',
builder: '@storybook/builder-vite',
},
modifications: {
extraDependencies: ['preact-render-to-string'],
},
skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
},
'preact-vite/default-ts': {
name: 'Preact Latest (Vite | TypeScript)',
script: 'npm create vite --yes {{beforeDir}} -- --template preact-ts',
Expand Down Expand Up @@ -706,13 +564,6 @@ const internalTemplates = {
isInternal: true,
skipTasks: ['bench', 'vitest-integration'],
},
// 'internal/pnp': {
// ...baseTemplates['cra/default-ts'],
// name: 'PNP (cra/default-ts)',
// script: 'yarn create react-app . --use-pnp',
// isInternal: true,
// inDevelopment: true,
// },
} satisfies Record<`internal/${string}`, Template & { isInternal: true }>;

const benchTemplates = {
Expand Down Expand Up @@ -806,7 +657,7 @@ export const allTemplates: Record<TemplateKey, Template> = {
};

export const normal: TemplateKey[] = [
'cra/default-ts',
'react-webpack/18-ts',
'react-vite/default-ts',
'angular-cli/default-ts',
'vue3-vite/default-ts',
Expand All @@ -825,7 +676,6 @@ export const normal: TemplateKey[] = [

export const merged: TemplateKey[] = [
...normal,
'react-webpack/18-ts',
'react-webpack/17-ts',
'angular-cli/15-ts',
'preact-vite/default-ts',
Expand All @@ -836,21 +686,13 @@ export const merged: TemplateKey[] = [
export const daily: TemplateKey[] = [
...merged,
'angular-cli/prerelease',
'cra/default-js',
'react-vite/default-js',
'react-vite/prerelease-ts',
'react-webpack/prerelease-ts',
'vue3-vite/default-js',
'vue-cli/default-js',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: vue-cli/default-js is kept while other JS templates are removed - consider migrating this to TypeScript for consistency

'lit-vite/default-js',
'svelte-kit/skeleton-js',
'svelte-kit/prerelease-ts',
'svelte-vite/default-js',
'nextjs/13-ts',
'nextjs/prerelease',
'qwik-vite/default-ts',
'preact-vite/default-js',
'html-vite/default-js',
'internal/react16-webpack',
'internal/react18-webpack-babel',
'react-native-web-vite/expo-ts',
Expand Down
Loading