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

Maintenance: Merge @storybook/core with storybook #30168

Open
wants to merge 10 commits into
base: next
Choose a base branch
from
Open

Maintenance: Merge @storybook/core with storybook #30168

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
447caec
add bin to core
ndelangen Jan 2, 2025
ac6e73b
add bin to core
ndelangen Jan 2, 2025
bf23898
delete cli package
ndelangen Jan 2, 2025
858f098
remove CLI package
ndelangen Jan 2, 2025
2d955cd
fixes
ndelangen Jan 2, 2025
c42b53e
fix usage of cli path
ndelangen Jan 2, 2025
5f51f17
fix
ndelangen Jan 2, 2025
e256f9b
fix
ndelangen Jan 2, 2025
f081014
Merge branch 'next' into norbert/merge-core-cli
ndelangen Jan 3, 2025
2e9cfd8
fixes
ndelangen Jan 3, 2025
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
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@ndelangen
ndelangen committed Jan 2, 2025
commit 5f51f1750436d95f623ad9a1518ab82e81167aa3
12 changes: 2 additions & 10 deletions code/core/src/builder-manager/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,7 @@ const starter: StarterFunction = async function* starterGeneratorFn({

yield;

const coreDirOrigin = join(
dirname(require.resolve('storybook/internal/kage.json')),
'dist',
'manager'
);
const coreDirOrigin = join(dirname(require.resolve('storybook/package.json')), 'dist', 'manager');

router.use(
'/sb-addons',
Expand Down Expand Up @@ -258,11 +254,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime,
yield;

const addonsDir = config.outdir;
const coreDirOrigin = join(
dirname(require.resolve('storybook/internal/kage.json')),
'dist',
'manager'
);
const coreDirOrigin = join(dirname(require.resolve('storybook/package.json')), 'dist', 'manager');
const coreDirTarget = join(options.outputDir, `sb-manager`);

// TODO: this doesn't watch, we should change this to use the esbuild watch API: https://esbuild.github.io/api/#watch
Expand Down
Loading