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.

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 20 commits into
base: next
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
add bin to core
  • Loading branch information
ndelangen committed Jan 2, 2025
commit ac6e73b9d8ce31dd9acc80999c8d7c22a111f3cc
5 changes: 2 additions & 3 deletions code/addons/test/src/node/boot-test-runner.test.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { Channel, type ChannelTransport } from '@storybook/core/channels';

import { Channel, type ChannelTransport } from 'storybook/internal/channels';
import {
TESTING_MODULE_CANCEL_TEST_RUN_REQUEST,
TESTING_MODULE_PROGRESS_REPORT,
TESTING_MODULE_RUN_REQUEST,
TESTING_MODULE_WATCH_MODE_REQUEST,
} from '@storybook/core/core-events';
} from 'storybook/internal/core-events';

// eslint-disable-next-line depend/ban-dependencies
import { execaNode } from 'execa';
4 changes: 2 additions & 2 deletions code/addons/test/src/node/test-manager.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { describe, expect, it, vi } from 'vitest';
import { createVitest as actualCreateVitest } from 'vitest/node';

import { Channel, type ChannelTransport } from '@storybook/core/channels';
import type { StoryIndex } from '@storybook/types';
import { Channel, type ChannelTransport } from 'storybook/internal/channels';
import type { StoryIndex } from 'storybook/internal/types';

import path from 'pathe';

5 changes: 2 additions & 3 deletions code/addons/test/src/postinstall.ts
Original file line number Diff line number Diff line change
@@ -289,8 +289,7 @@ export default async function postInstall(options: PostinstallOptions) {
args: ['playwright', 'install', 'chromium', '--with-deps'],
});

const fileExtension =
allDeps['typescript'] || (await findFile('tsconfig', ['.json'])) ? 'ts' : 'js';
const fileExtension = allDeps.typescript || (await findFile('tsconfig', ['.json'])) ? 'ts' : 'js';

const vitestSetupFile = resolve(options.configDir, `vitest.setup.${fileExtension}`);
if (existsSync(vitestSetupFile)) {
@@ -542,7 +541,7 @@ async function getStorybookInfo({ configDir, packageManager: pkgMgr }: Postinsta
const presets = await loadAllPresets({
corePresets: [join(frameworkName, 'preset')],
overridePresets: [
require.resolve('@storybook/core/core-server/presets/common-override-preset'),
require.resolve('storybook/internal/core-server/presets/common-override-preset'),
],
configDir,
packageJson,
54 changes: 27 additions & 27 deletions code/core/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@storybook/core",
"name": "storybook",
"version": "8.5.0-beta.7",
"description": "Storybook framework-agnostic API",
"keywords": [
@@ -187,82 +187,82 @@
"*": [
"./dist/index.d.ts"
],
"node-logger": [
"internal/node-logger": [
"./dist/node-logger/index.d.ts"
],
"client-logger": [
"internal/client-logger": [
"./dist/client-logger/index.d.ts"
],
"theming": [
"internal/theming": [
"./dist/theming/index.d.ts"
],
"theming/create": [
"internal/theming/create": [
"./dist/theming/create.d.ts"
],
"core-server": [
"internal/core-server": [
"./dist/core-server/index.d.ts"
],
"core-events": [
"internal/core-events": [
"./dist/core-events/index.d.ts"
],
"manager-errors": [
"internal/manager-errors": [
"./dist/manager-errors.d.ts"
],
"preview-errors": [
"internal/preview-errors": [
"./dist/preview-errors.d.ts"
],
"server-errors": [
"internal/server-errors": [
"./dist/server-errors.d.ts"
],
"channels": [
"internal/channels": [
"./dist/channels/index.d.ts"
],
"types": [
"internal/types": [
"./dist/types/index.d.ts"
],
"csf-tools": [
"internal/csf-tools": [
"./dist/csf-tools/index.d.ts"
],
"common": [
"internal/common": [
"./dist/common/index.d.ts"
],
"builder-manager": [
"internal/builder-manager": [
"./dist/builder-manager/index.d.ts"
],
"telemetry": [
"internal/telemetry": [
"./dist/telemetry/index.d.ts"
],
"preview-api": [
"internal/preview-api": [
"./dist/preview-api/index.d.ts"
],
"manager-api": [
"internal/manager-api": [
"./dist/manager-api/index.d.ts"
],
"router": [
"internal/router": [
"./dist/router/index.d.ts"
],
"components": [
"internal/components": [
"./dist/components/index.d.ts"
],
"docs-tools": [
"internal/docs-tools": [
"./dist/docs-tools/index.d.ts"
],
"manager/globals-module-info": [
"internal/manager/globals-module-info": [
"./dist/manager/globals-module-info.d.ts"
],
"manager/globals": [
"internal/manager/globals": [
"./dist/manager/globals.d.ts"
],
"preview/globals": [
"internal/preview/globals": [
"./dist/preview/globals.d.ts"
],
"cli": [
"internal/cli": [
"./dist/cli/index.d.ts"
],
"babel": [
"internal/babel": [
"./dist/babel/index.d.ts"
],
"cli/bin": [
"internal/cli/bin": [
"./dist/cli/bin/index.d.ts"
]
}
36 changes: 18 additions & 18 deletions code/core/scripts/dts.ts
Original file line number Diff line number Diff line change
@@ -17,24 +17,24 @@ async function run() {
...Object.keys((pkg as any).peerDependencies || {}),
...nodeInternals,
'typescript',
'@storybook/core',

'@storybook/core/builder-manager',
'@storybook/core/channels',
'@storybook/core/client-logger',
'@storybook/core/common',
'@storybook/core/components',
'@storybook/core/core-events',
'@storybook/core/core-server',
'@storybook/core/csf-tools',
'@storybook/core/docs-tools',
'@storybook/core/manager-api',
'@storybook/core/node-logger',
'@storybook/core/preview-api',
'@storybook/core/router',
'@storybook/core/telemetry',
'@storybook/core/theming',
'@storybook/core/types',
'storybook',

'storybook/internal/builder-manager',
'storybook/internal/channels',
'storybook/internal/client-logger',
'storybook/internal/common',
'storybook/internal/components',
'storybook/internal/core-events',
'storybook/internal/core-server',
'storybook/internal/csf-tools',
'storybook/internal/docs-tools',
'storybook/internal/manager-api',
'storybook/internal/node-logger',
'storybook/internal/preview-api',
'storybook/internal/router',
'storybook/internal/telemetry',
'storybook/internal/theming',
'storybook/internal/types',
];

const all = entries.filter((e) => e.dts);
2 changes: 1 addition & 1 deletion code/core/scripts/helpers/generatePackageJsonFile.ts
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ export async function generatePackageJsonFile(entries: ReturnType<typeof getEntr
}

const content = ['./' + main.replace(/\.tsx?/, '.d.ts')];
acc[key.replace('dist/', '')] = content;
acc[key.replace('dist/', 'internal/')] = content;
return acc;
}, {}),
},
1 change: 1 addition & 0 deletions code/core/scripts/helpers/sourcefiles.ts
Original file line number Diff line number Diff line change
@@ -82,6 +82,7 @@ async function generateFrameworksFile(prettierConfig: prettier.Options | null):

const localAlias = {
'@storybook/core': join(__dirname, '..', '..', 'src'),
'storybook/internal': join(__dirname, '..', '..', 'src'),
storybook: join(__dirname, '..', '..', 'src'),
};
async function generateExportsFile(prettierConfig: prettier.Options | null): Promise<void> {
6 changes: 3 additions & 3 deletions code/core/scripts/prep.ts
Original file line number Diff line number Diff line change
@@ -94,7 +94,7 @@ async function run() {
assetNames: 'assets/[name]-[hash]',
bundle: true,
chunkNames: 'chunks/[name]-[hash]',
external: ['@storybook/core', ...external],
external: ['storybook', ...external],
keepNames: true,
legalComments: 'none',
lineLimit: 140,
@@ -192,7 +192,7 @@ async function run() {
outExtension: { '.js': '.js' },
alias: {
...browserAliases,
'@storybook/core': join(cwd, 'src'),
'storybook/internal': join(cwd, 'src'),
react: dirname(require.resolve('react/package.json')),
'react-dom': dirname(require.resolve('react-dom/package.json')),
'react-dom/client': join(
@@ -217,7 +217,7 @@ async function run() {
esbuild.context(
merge<EsbuildContextOptions>(browserEsbuildOptions, {
alias: {
'@storybook/core': join(cwd, 'src'),
'storybook/internal': join(cwd, 'src'),
react: dirname(require.resolve('react/package.json')),
'react-dom': dirname(require.resolve('react-dom/package.json')),
'react-dom/client': join(
4 changes: 2 additions & 2 deletions code/core/src/bin/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { versions } from '@storybook/core/common';
import { versions } from 'storybook/internal/common';

import { spawn } from 'child_process';

const args = process.argv.slice(2);

if (['dev', 'build'].includes(args[0])) {
require('@storybook/core/cli/bin');
require('storybook/internal/cli/bin');
} else {
const proxiedArgs =
args[0] === 'init'
11 changes: 5 additions & 6 deletions code/core/src/builder-manager/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { cp, rm, writeFile } from 'node:fs/promises';
import { dirname, join, parse } from 'node:path';

import { stringifyProcessEnvs } from '@storybook/core/common';

import { globalsModuleInfoMap } from '@storybook/core/manager/globals-module-info';
import { logger } from '@storybook/core/node-logger';
import { stringifyProcessEnvs } from 'storybook/internal/common';
import { globalsModuleInfoMap } from 'storybook/internal/manager/globals-module-info';
import { logger } from 'storybook/internal/node-logger';

import { globalExternals } from '@fal-works/esbuild-plugin-global-externals';
import { pnpPlugin } from '@yarnpkg/esbuild-plugin-pnp';
@@ -161,7 +160,7 @@ const starter: StarterFunction = async function* starterGeneratorFn({
yield;

const coreDirOrigin = join(
dirname(require.resolve('@storybook/core/package.json')),
dirname(require.resolve('storybook/internal/kage.json')),
'dist',
'manager'
);
@@ -260,7 +259,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime,

const addonsDir = config.outdir;
const coreDirOrigin = join(
dirname(require.resolve('@storybook/core/package.json')),
dirname(require.resolve('storybook/internal/kage.json')),
'dist',
'manager'
);
2 changes: 1 addition & 1 deletion code/core/src/builder-manager/types.ts
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import type {
BuilderStats,
Builder_Unpromise,
Builder_WithRequiredProperty,
} from '@storybook/core/types';
} from 'storybook/internal/types';

import type { BuildOptions, BuildResult } from 'esbuild';

4 changes: 2 additions & 2 deletions code/core/src/builder-manager/utils/data.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { basename } from 'node:path';

import { getRefs } from '@storybook/core/common';
import type { Options } from '@storybook/core/types';
import { getRefs } from 'storybook/internal/common';
import type { Options } from 'storybook/internal/types';

import { executor, getConfig } from '../index';
import { readTemplate } from './template';
7 changes: 5 additions & 2 deletions code/core/src/builder-manager/utils/framework.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { sep } from 'node:path';

import { extractProperRendererNameFromFramework, getFrameworkName } from '@storybook/core/common';
import type { Options } from '@storybook/core/types';
import {
extractProperRendererNameFromFramework,
getFrameworkName,
} from 'storybook/internal/common';
import type { Options } from 'storybook/internal/types';

interface PropertyObject {
name: string;
2 changes: 1 addition & 1 deletion code/core/src/builder-manager/utils/managerEntries.ts
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs';
import { mkdir, writeFile } from 'node:fs/promises';
import { dirname, join, parse, relative, sep } from 'node:path';

import { resolvePathInStorybookCache } from '@storybook/core/common';
import { resolvePathInStorybookCache } from 'storybook/internal/common';

import slash from 'slash';

4 changes: 2 additions & 2 deletions code/core/src/builder-manager/utils/template.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { readFile } from 'node:fs/promises';
import { dirname, join } from 'node:path';

import type { DocsOptions, Options, Ref, TagsOptions } from '@storybook/core/types';
import type { DocsOptions, Options, Ref, TagsOptions } from 'storybook/internal/types';

import { render } from 'ejs';

export const getTemplatePath = async (template: string) => {
return join(dirname(require.resolve('@storybook/core/package.json')), 'assets/server', template);
return join(dirname(require.resolve('storybook/package.json')), 'assets/server', template);
};

export const readTemplate = async (template: string) => {
2 changes: 1 addition & 1 deletion code/core/src/channels/postmessage/getEventSourceUrl.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { logger } from '@storybook/core/client-logger';
import { logger } from 'storybook/internal/client-logger';

export const getEventSourceUrl = (event: MessageEvent) => {
const frames: HTMLIFrameElement[] = Array.from(
6 changes: 3 additions & 3 deletions code/core/src/channels/postmessage/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/// <reference path="../../typings.d.ts" />
import { global } from '@storybook/global';
import { logger, pretty } from 'storybook/internal/client-logger';
import * as EVENTS from 'storybook/internal/core-events';

import { logger, pretty } from '@storybook/core/client-logger';
import * as EVENTS from '@storybook/core/core-events';
import { global } from '@storybook/global';

import { isJSON, parse, stringify } from 'telejson';
import invariant from 'tiny-invariant';
4 changes: 2 additions & 2 deletions code/core/src/channels/websocket/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// <reference path="../../typings.d.ts" />
import { global } from '@storybook/global';
import * as EVENTS from 'storybook/internal/core-events';

import * as EVENTS from '@storybook/core/core-events';
import { global } from '@storybook/global';

import { isJSON, parse, stringify } from 'telejson';
import invariant from 'tiny-invariant';
4 changes: 2 additions & 2 deletions code/core/src/cli/angular/helpers.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { existsSync, readFileSync, writeFileSync } from 'node:fs';
import { join } from 'node:path';

import { logger } from '@storybook/core/node-logger';
import { MissingAngularJsonError } from '@storybook/core/server-errors';
import { logger } from 'storybook/internal/node-logger';
import { MissingAngularJsonError } from 'storybook/internal/server-errors';

import boxen from 'boxen';
import prompts from 'prompts';
Loading
Loading