GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-05 08:01:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10985 from storybookjs/fix-10915-cli-init-in-yarn-workspace

Browse Source 
CLI: Fix `sb init` in Yarn workspace environment
This commit is contained in:
Michael Shilman 2020-06-01 23:28:15 +08:00 committed by GitHub
commit c9fb748033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cli/src/helpers.ts
View File

@ -255,6 +255,10 @@ export function installDependencies(
installArgs.push('-D');
}
if (options.useYarn) {
installArgs.push('--ignore-workspace-root-check');
}
const dependencyResult = spawnSync(spawnCommand, installArgs, {
stdio: 'inherit',
});

10
scripts/run-e2e-config.ts
View File

@ -152,3 +152,13 @@ export const yarn2Cra: Parameters = {
`yarn dlx create-react-app@{{version}} {{name}}-v{{version}}`,
].join(' && '),
};
export const reactInYarnWorkspace: Parameters = {
name: 'reactInYarnWorkspace',
version: 'latest',
generator: [
'cd {{name}}-v{{version}}',
'echo "{ \\"name\\": \\"workspace-root\\", \\"private\\": true, \\"workspaces\\": [] }" > package.json',
`yarn add react react-dom --silent -W`,
].join(' && '),
};

21
scripts/run-e2e.ts
View File

@ -85,7 +85,7 @@ const initStorybook = async ({ cwd, autoDetect = true, name }: Options) => {
logger.info(`🎨 Initializing Storybook with @storybook/cli`);
try {
const type = autoDetect ? '' : `--type ${name}`;
await exec(`npx -p @storybook/cli sb init --skip-install --yes ${type}`, { cwd });
await exec(`npx -p @storybook/cli sb init --yes ${type}`, { cwd });
} catch (e) {
logger.error(`🚨 Storybook initialization failed`);
throw e;
@ -187,10 +187,10 @@ const runTests = async ({ name, version, ...rest }: Parameters) => {
await generate({ ...options, cwd: siblingDir });
logger.log();
await initStorybook(options);
await setResolutions(options);
logger.log();
await setResolutions(options);
await initStorybook(options);
logger.log();
await addRequiredDeps(options);
@ -274,13 +274,18 @@ if (frameworkArgs.length > 0) {
const perform = () => {
const limit = pLimit(1);
const narrowedConfigs = Object.values(e2eConfigs);
const [a, b] = [+process.env.CIRCLE_NODE_INDEX || 0, +process.env.CIRCLE_NODE_TOTAL || 1];
const step = Math.ceil(narrowedConfigs.length / b);
const offset = step * a;
const nodeIndex = +process.env.CIRCLE_NODE_INDEX || 0;
const numberOfNodes = +process.env.CIRCLE_NODE_TOTAL || 1;
const list = narrowedConfigs.slice().splice(offset, step);
const list = narrowedConfigs.filter((_, index) => {
return index % numberOfNodes === nodeIndex;
});
logger.info(`📑 Assigning jobs ${list.map((c) => c.name).join(', ')} to node ${a} (on ${b})`);
logger.info(
`📑 Assigning jobs ${list
.map((c) => c.name)
.join(', ')} to node ${nodeIndex} (on ${numberOfNodes})`
);
return Promise.all(list.map((config) => limit(() => runE2E(config))));
};