Skip to content

Commit

Permalink
Merge pull request #24569 from storybookjs/revert-24566-kasper/test-b…
Browse files Browse the repository at this point in the history
…uild-bench

Revert: "Build: Implement test build bench"
  • Loading branch information
kasperpeulen authored Oct 24, 2023
2 parents 5a68ab9 + d8d16f4 commit b2d66c6
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 130 deletions.
39 changes: 0 additions & 39 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -341,30 +341,6 @@ jobs:
paths:
- sandbox/*/bench/*.json
- sandbox/*/storybook-static
build-test-sandboxes:
parameters:
parallelism:
type: integer
executor:
class: large
name: sb_node_16_browsers
parallelism: << parameters.parallelism >>
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
- attach_workspace:
at: .
- run:
name: Building Sandboxes
command: yarn task --task test-build --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task build) --no-link --start-from=never --junit
- report-workflow-on-failure:
template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task build)
- store_test_results:
path: test-results
- persist_to_workspace:
root: .
paths:
- sandbox/*/bench/test-build.json
test-runner-production:
parameters:
parallelism:
Expand Down Expand Up @@ -526,10 +502,6 @@ workflows:
parallelism: 12
requires:
- build
- build-test-sandboxes:
parallelism: 12
requires:
- create-sandboxes
- build-sandboxes:
parallelism: 12
requires:
Expand All @@ -554,7 +526,6 @@ workflows:
parallelism: 3
requires:
- build-sandboxes
- build-test-sandboxes
# TODO: reenable once we find out the source of flakyness
# - test-runner-dev:
# requires:
Expand Down Expand Up @@ -587,10 +558,6 @@ workflows:
parallelism: 21
requires:
- build
- build-test-sandboxes:
parallelism: 12
requires:
- create-sandboxes
- build-sandboxes:
parallelism: 21
requires:
Expand All @@ -615,7 +582,6 @@ workflows:
parallelism: 3
requires:
- build-sandboxes
- build-test-sandboxes
# TODO: reenable once we find out the source of flakyness
# - test-runner-dev:
# parallelism: 4
Expand Down Expand Up @@ -649,10 +615,6 @@ workflows:
# - smoke-test-sandboxes: # disabled for now
# requires:
# - create-sandboxes
- build-test-sandboxes:
parallelism: 12
requires:
- create-sandboxes
- build-sandboxes:
parallelism: 36
requires:
Expand All @@ -678,4 +640,3 @@ workflows:
# parallelism: 4
# requires:
# - create-sandboxes

Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ addToGlobalContext('cliVersion', versions.storybook);
export type StorybookBuilderOptions = JsonObject & {
browserTarget?: string | null;
tsConfig?: string;
test: boolean;
docs: boolean;
compodoc: boolean;
compodocArgs: string[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@
"description": "Starts Storybook in documentation mode. Learn more about it : https://storybook.js.org/docs/react/writing-docs/build-documentation#preview-storybooks-documentation.",
"default": false
},
"test": {
"type": "boolean",
"description": "Build the static version of the sandbox optimized for testing purposes",
"default": false
},
"compodoc": {
"type": "boolean",
"description": "Execute compodoc before.",
Expand Down
1 change: 0 additions & 1 deletion code/lib/cli/src/generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,6 @@ command('build')
)
.option('--force-build-preview', 'Build the preview iframe even if you are using --preview-url')
.option('--docs', 'Build a documentation-only site using addon-docs')
.option('--test', 'Build stories optimized for testing purposes.')
.action(async (options) => {
process.env.NODE_ENV = process.env.NODE_ENV || 'production';
logger.setLevel(program.loglevel);
Expand Down
9 changes: 0 additions & 9 deletions scripts/bench/bench.schema
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@ buildSbPreviewSize: INTEGER,
buildStaticSize: INTEGER,
buildPrebuildSize: INTEGER,
buildPreviewSize: INTEGER,
testBuildTime: INTEGER,
testBuildSize: INTEGER,
testBuildSbAddonsSize: INTEGER,
testBuildSbCommonSize: INTEGER,
testBuildSbManagerSize: INTEGER,
testBuildSbPreviewSize: INTEGER,
testBuildStaticSize: INTEGER,
testBuildPrebuildSize: INTEGER,
testBuildPreviewSize: INTEGER,
devPreviewResponsive: INTEGER,
devManagerResponsive: INTEGER,
devManagerHeaderVisible: INTEGER,
Expand Down
18 changes: 0 additions & 18 deletions scripts/bench/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,6 @@ export interface BenchResults {
buildPrebuildSize: number;
/** Total size of everything else (user's stories & components & CSS & assets etc.) */
buildPreviewSize: number;
/** Full `sb build` time */
testBuildTime: number;
/** Size of the storybook-static directory in total */
testBuildSize: number;
/** Size of the storybook-static/sb-addons in total */
testBuildSbAddonsSize: number;
/** Size of the storybook-static/sb-common-assets */
testBuildSbCommonSize: number;
/** Size of the storybook-static/sb-manager */
testBuildSbManagerSize: number;
/** Size of storybook-static/sb-preview */
testBuildSbPreviewSize: number;
/** Size of the `static` directory if it exists */
testBuildStaticSize: number;
/** Total size of `sb-x` above */
testBuildPrebuildSize: number;
/** Total size of everything else (user's stories & components & CSS & assets etc.) */
testBuildPreviewSize: number;
/** Time to wait-on iframe.html */
devPreviewResponsive: number;
/** Time to wait-on index.html */
Expand Down
3 changes: 1 addition & 2 deletions scripts/task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { sandbox } from './tasks/sandbox';
import { syncDocs } from './tasks/sync-docs';
import { dev } from './tasks/dev';
import { smokeTest } from './tasks/smoke-test';
import { build, testBuild } from './tasks/build';
import { build } from './tasks/build';
import { serve } from './tasks/serve';
import { testRunnerBuild } from './tasks/test-runner-build';
import { testRunnerDev } from './tasks/test-runner-dev';
Expand Down Expand Up @@ -103,7 +103,6 @@ export const tasks = {
dev,
'smoke-test': smokeTest,
build,
'test-build': testBuild,
serve,
'test-runner': testRunnerBuild,
'test-runner-dev': testRunnerDev,
Expand Down
46 changes: 0 additions & 46 deletions scripts/tasks/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,49 +48,3 @@ export const build: Task = {
);
},
};

export const testBuild: Task = {
description: 'Build the static version of the sandbox optimized for testing purposes',
dependsOn: ['sandbox'],
async ready({ builtSandboxDir }) {
return pathExists(builtSandboxDir);
},
async run({ sandboxDir }, { dryRun, debug }) {
const start = now();

await exec(`yarn build-storybook --test --quiet`, { cwd: sandboxDir }, { dryRun, debug });

const testBuildTime = now() - start;
const dir = join(sandboxDir, 'storybook-static');
const getSize = promisify(dirSize);
const testBuildSize = await getSize(dir);
const testBuildSbAddonsSize = await getSize(join(dir, 'sb-addons'));
const testBuildSbCommonSize = await getSize(join(dir, 'sb-common-assets'));
const testBuildSbManagerSize = await getSize(join(dir, 'sb-manager'));
const testBuildSbPreviewSize = await getSize(join(dir, 'sb-preview'));
const testBuildPrebuildSize =
testBuildSbAddonsSize +
testBuildSbCommonSize +
testBuildSbManagerSize +
testBuildSbPreviewSize;

const testBuildStaticSize = await getSize(join(dir, 'static')).catch(() => 0);
const testBuildPreviewSize = testBuildSize - testBuildPrebuildSize - testBuildStaticSize;

await saveBench(
'test-build',
{
testBuildTime,
testBuildSize,
testBuildSbAddonsSize,
testBuildSbCommonSize,
testBuildSbManagerSize,
testBuildSbPreviewSize,
testBuildStaticSize,
testBuildPrebuildSize,
testBuildPreviewSize,
},
{ rootDir: sandboxDir }
);
},
};
9 changes: 0 additions & 9 deletions scripts/upload-bench.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ const defaults: Record<keyof BenchResults, null> = {
buildStaticSize: null,
buildPrebuildSize: null,
buildPreviewSize: null,
testBuildTime: null,
testBuildSize: null,
testBuildSbAddonsSize: null,
testBuildSbCommonSize: null,
testBuildSbManagerSize: null,
testBuildSbPreviewSize: null,
testBuildStaticSize: null,
testBuildPrebuildSize: null,
testBuildPreviewSize: null,
devPreviewResponsive: null,
devManagerResponsive: null,
devManagerHeaderVisible: null,
Expand Down

0 comments on commit b2d66c6

Please sign in to comment.