Skip to content

Commit e5960ff

Browse files
authored
Merge pull request #28853 from storybookjs/norbert/fix-no-install-bug
Bug: CLI `init` failure when `--no-install` passed fixed
2 parents 81cdbba + a3ce081 commit e5960ff

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

.circleci/config.yml

+17
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,23 @@ jobs:
608608
IN_STORYBOOK_SANDBOX: true
609609
STORYBOOK_INIT_EMPTY_TYPE: << parameters.template >>
610610
STORYBOOK_DISABLE_TELEMETRY: true
611+
- when:
612+
condition:
613+
equal: ["react-vite-ts", << parameters.template >>]
614+
steps:
615+
- run:
616+
name: Storybook init from empty directory (--skip-install)
617+
command: |
618+
cd code
619+
yarn local-registry --open &
620+
cd ../../
621+
mkdir empty-<< parameters.template >>-no-install
622+
cd empty-<< parameters.template >>-no-install
623+
npx storybook init --yes --skip-install
624+
environment:
625+
IN_STORYBOOK_SANDBOX: true
626+
STORYBOOK_INIT_EMPTY_TYPE: << parameters.template >>
627+
STORYBOOK_DISABLE_TELEMETRY: true
611628
- report-workflow-on-failure
612629
test-portable-stories:
613630
parameters:

code/core/src/cli/dirs.ts

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import { dirname, join } from 'node:path';
2+
13
import type { JsPackageManager } from '@storybook/core/common';
24
import { temporaryDirectory, versions } from '@storybook/core/common';
35
import type { SupportedFrameworks } from '@storybook/core/types';
46

5-
import downloadTarball from '@ndelangen/get-tarball';
6-
import getNpmTarballUrl from 'get-npm-tarball-url';
7-
import { dirname, join } from 'path';
7+
import downloadTarballDefault from '@ndelangen/get-tarball';
8+
import getNpmTarballUrlDefault from 'get-npm-tarball-url';
89
import invariant from 'tiny-invariant';
910

1011
import { externalFrameworks } from './project_types';
@@ -17,6 +18,12 @@ const resolveUsingBranchInstall = async (packageManager: JsPackageManager, reque
1718
// FIXME: this might not be the right version for community packages
1819
const version = versions[name] || (await packageManager.latestVersion(request));
1920

21+
// an artifact of esbuild + type=commonjs + exportmap
22+
// @ts-expect-error (default export)
23+
const getNpmTarballUrl = getNpmTarballUrlDefault.default || getNpmTarballUrlDefault;
24+
// @ts-expect-error (default export)
25+
const downloadTarball = downloadTarballDefault.default || downloadTarballDefault;
26+
2027
const url = getNpmTarballUrl(request, version, {
2128
registry: await packageManager.getRegistryURL(),
2229
});

0 commit comments

Comments
 (0)