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

rename storybook/ui to storybook/manager #19635

Merged
merged 5 commits into from
Oct 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion code/lib/api/src/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { State } from './index';
// setting up the store, overriding set and get to use telejson
storeSetup(store._);

export const STORAGE_KEY = '@storybook/ui/store';
export const STORAGE_KEY = '@storybook/manager/store';

function get(storage: StoreAPI) {
const data = storage.get(STORAGE_KEY);
Expand Down
2 changes: 1 addition & 1 deletion code/lib/builder-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"dependencies": {
"@fal-works/esbuild-plugin-global-externals": "^2.1.2",
"@storybook/core-common": "7.0.0-alpha.43",
"@storybook/manager": "7.0.0-alpha.43",
"@storybook/node-logger": "7.0.0-alpha.43",
"@storybook/ui": "7.0.0-alpha.43",
"@types/ejs": "^3.1.1",
"@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10",
"browser-assert": "^1.2.1",
Expand Down
4 changes: 2 additions & 2 deletions code/lib/builder-manager/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const starter: StarterFunction = async function* starterGeneratorFn({

yield;

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

router.use(`/sb-addons`, express.static(addonsDir));
router.use(`/sb-manager`, express.static(coreDirOrigin));
Expand Down Expand Up @@ -180,7 +180,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime,
yield;

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

compilation = await instance({
Expand Down
2 changes: 1 addition & 1 deletion code/lib/builder-manager/src/utils/globals.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { definitions } from '@storybook/ui/dist/globals';
export { definitions } from '@storybook/manager/dist/globals';
2 changes: 1 addition & 1 deletion code/lib/cli/src/versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default {
'@storybook/svelte-webpack5': '7.0.0-alpha.43',
'@storybook/telemetry': '7.0.0-alpha.43',
'@storybook/theming': '7.0.0-alpha.43',
'@storybook/ui': '7.0.0-alpha.43',
'@storybook/manager': '7.0.0-alpha.43',
'@storybook/vue': '7.0.0-alpha.43',
'@storybook/vue-vite': '7.0.0-alpha.43',
'@storybook/vue-webpack5': '7.0.0-alpha.43',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ import '@storybook/channel-websocket';
import '@storybook/cli';
import '@storybook/react';
import '@storybook/react-native';
import '@storybook/ui';
import '@storybook/manager';
import { storiesOf } from '@storybook/react';"
`;
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const packageNames = {
'@kadira/storybook-channels': '@storybook/channels',
'@kadira/storybook-channel-postmsg': '@storybook/channel-postmessage',
'@kadira/storybook-channel-websocket': '@storybook/channel-websocket',
'@kadira/storybook-ui': '@storybook/ui',
'@kadira/storybook-ui': '@storybook/manager',
'@kadira/react-native-storybook': '@storybook/react-native',
'@kadira/react-storybook': '@storybook/react',
'@kadira/getstorybook': '@storybook/cli',
Expand Down
2 changes: 1 addition & 1 deletion code/lib/core-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
"@storybook/client-logger": "7.0.0-alpha.43",
"@storybook/core-events": "7.0.0-alpha.43",
"@storybook/csf": "next",
"@storybook/manager": "7.0.0-alpha.43",
"@storybook/preview-web": "7.0.0-alpha.43",
"@storybook/store": "7.0.0-alpha.43",
"@storybook/types": "7.0.0-alpha.43",
"@storybook/ui": "7.0.0-alpha.43",
"global": "^4.4.0",
"regenerator-runtime": "^0.13.7",
"util-deprecate": "^1.0.2"
Expand Down
2 changes: 1 addition & 1 deletion code/lib/core-client/src/manager/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import global from 'global';
import { renderStorybookUI } from '@storybook/ui';
import { renderStorybookUI } from '@storybook/manager';

import Provider from './provider';

Expand Down
2 changes: 1 addition & 1 deletion code/lib/core-client/src/manager/provider.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import global from 'global';
import { Provider } from '@storybook/ui';
import { Provider } from '@storybook/manager';
import { Channel } from '@storybook/channels';
import type { Addon_Types, Addon_Config } from '@storybook/types';
import { addons, AddonStore } from '@storybook/addons';
Expand Down
3 changes: 1 addition & 2 deletions code/lib/core-client/src/typings.d.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
declare module 'global';
declare module 'lazy-universal-dotenv';
declare module 'pnp-webpack-plugin';
declare module '@storybook/ui/paths';
declare module '@storybook/manager/paths';
declare module 'better-opn';
declare module 'open';
declare module '@aw-web-design/x-default-browser';

5 changes: 2 additions & 3 deletions code/lib/core-server/src/typings.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ declare module 'global';
declare module 'lazy-universal-dotenv';
declare module 'pnp-webpack-plugin';
declare module '@storybook/theming/paths';
declare module '@storybook/ui/paths';
declare module '@storybook/manager/paths';
declare module 'better-opn';
declare module 'open';
declare module '@aw-web-design/x-default-browser';
declare module '@storybook/ui';
declare module '@storybook/manager';
declare module '@discoveryjs/json-ext';
declare module 'watchpack';

2 changes: 1 addition & 1 deletion code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
"@storybook/instrumenter": "workspace:*",
"@storybook/jest": "^0.0.10",
"@storybook/linter-config": "^2.5.0",
"@storybook/manager": "workspace:*",
"@storybook/nextjs": "workspace:*",
"@storybook/node-logger": "workspace:*",
"@storybook/postinstall": "workspace:*",
Expand Down Expand Up @@ -220,7 +221,6 @@
"@storybook/testing-library": "0.0.14-next.0",
"@storybook/theming": "workspace:*",
"@storybook/types": "workspace:*",
"@storybook/ui": "workspace:*",
"@storybook/vue": "workspace:*",
"@storybook/vue-webpack5": "workspace:*",
"@storybook/vue3": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion code/ui/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const isBlocksOnly = process.env.BLOCKS_ONLY === 'true';
const allStories = [
{
directory: '../manager/src',
titlePrefix: '@storybook-ui',
titlePrefix: '@storybook-manager',
},
{
directory: '../components/src',
Expand Down
4 changes: 2 additions & 2 deletions code/ui/manager/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1>Storybook UI</h1>
<h1>Storybook manager's UI</h1>

Storybook UI the core UI of [Storybook](https://storybook.js.org).
Storybook manager is the core UI of [Storybook](https://storybook.js.org).
It's a React based UI which you can initialize with a function.
You can configure it by providing a provider API.

Expand Down
2 changes: 1 addition & 1 deletion code/ui/manager/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@storybook/ui",
"name": "@storybook/manager",
"version": "7.0.0-alpha.43",
"description": "Core Storybook UI",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion code/ui/manager/paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {
'@storybook/core-events': dirname(resolve('@storybook/core-events/package.json')),
'@storybook/router': dirname(resolve('@storybook/router/package.json')),
'@storybook/theming': dirname(resolve('@storybook/theming/package.json')),
'@storybook/ui': dirname(resolve('@storybook/ui/package.json')),
'@storybook/manager': dirname(resolve('@storybook/manager/package.json')),
react: dirname(resolve('react/package.json')),
'react-dom': dirname(resolve('react-dom/package.json')),
};
2 changes: 1 addition & 1 deletion code/workspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
"root": "lib/types",
"type": "library"
},
"@storybook/ui": {
"@storybook/manager": {
"implicitDependencies": [],
"root": "ui/manager",
"type": "library"
Expand Down
92 changes: 46 additions & 46 deletions code/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6158,8 +6158,8 @@ __metadata:
dependencies:
"@fal-works/esbuild-plugin-global-externals": ^2.1.2
"@storybook/core-common": 7.0.0-alpha.43
"@storybook/manager": 7.0.0-alpha.43
"@storybook/node-logger": 7.0.0-alpha.43
"@storybook/ui": 7.0.0-alpha.43
"@types/ejs": ^3.1.1
"@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10
browser-assert: ^1.2.1
Expand Down Expand Up @@ -6465,10 +6465,10 @@ __metadata:
"@storybook/client-logger": 7.0.0-alpha.43
"@storybook/core-events": 7.0.0-alpha.43
"@storybook/csf": next
"@storybook/manager": 7.0.0-alpha.43
"@storybook/preview-web": 7.0.0-alpha.43
"@storybook/store": 7.0.0-alpha.43
"@storybook/types": 7.0.0-alpha.43
"@storybook/ui": 7.0.0-alpha.43
global: ^4.4.0
regenerator-runtime: ^0.13.7
typescript: ~4.6.3
Expand Down Expand Up @@ -6871,6 +6871,49 @@ __metadata:
languageName: node
linkType: hard

"@storybook/manager@7.0.0-alpha.43, @storybook/manager@workspace:*, @storybook/manager@workspace:ui/manager":
version: 0.0.0-use.local
resolution: "@storybook/manager@workspace:ui/manager"
dependencies:
"@fal-works/esbuild-plugin-global-externals": ^2.1.2
"@storybook/addons": 7.0.0-alpha.43
"@storybook/api": 7.0.0-alpha.43
"@storybook/channel-postmessage": 7.0.0-alpha.43
"@storybook/channel-websocket": 7.0.0-alpha.43
"@storybook/channels": 7.0.0-alpha.43
"@storybook/client-logger": 7.0.0-alpha.43
"@storybook/components": 7.0.0-alpha.43
"@storybook/core-events": 7.0.0-alpha.43
"@storybook/router": 7.0.0-alpha.43
"@storybook/theming": 7.0.0-alpha.43
"@storybook/types": 7.0.0-alpha.43
"@testing-library/react": ^11.2.2
"@types/semver": ^7.3.4
copy-to-clipboard: ^3.3.1
downshift: ^6.0.15
enzyme: ^3.11.0
fs-extra: ^9.0.1
fuse.js: ^3.6.1
global: ^4.4.0
lodash: ^4.17.21
markdown-to-jsx: ^7.1.3
memoizerific: ^1.11.3
polished: ^4.2.2
qs: ^6.10.0
react: ^16.8.0
react-dom: ^16.8.0
react-draggable: ^4.4.3
react-helmet-async: ^1.0.7
react-sizeme: ^3.0.1
resolve-from: ^5.0.0
semver: ^7.3.7
shelljs: ^0.8.5
store2: ^2.12.0
ts-dedent: ^2.0.0
typescript: ~4.6.3
languageName: unknown
linkType: soft

"@storybook/mdx2-csf@npm:0.1.0-next.0":
version: 0.1.0-next.0
resolution: "@storybook/mdx2-csf@npm:0.1.0-next.0"
Expand Down Expand Up @@ -7383,6 +7426,7 @@ __metadata:
"@storybook/instrumenter": "workspace:*"
"@storybook/jest": ^0.0.10
"@storybook/linter-config": ^2.5.0
"@storybook/manager": "workspace:*"
"@storybook/nextjs": "workspace:*"
"@storybook/node-logger": "workspace:*"
"@storybook/postinstall": "workspace:*"
Expand Down Expand Up @@ -7411,7 +7455,6 @@ __metadata:
"@storybook/testing-library": 0.0.14-next.0
"@storybook/theming": "workspace:*"
"@storybook/types": "workspace:*"
"@storybook/ui": "workspace:*"
"@storybook/vue": "workspace:*"
"@storybook/vue-webpack5": "workspace:*"
"@storybook/vue3": "workspace:*"
Expand Down Expand Up @@ -7849,49 +7892,6 @@ __metadata:
languageName: unknown
linkType: soft

"@storybook/ui@7.0.0-alpha.43, @storybook/ui@workspace:*, @storybook/ui@workspace:ui/manager":
version: 0.0.0-use.local
resolution: "@storybook/ui@workspace:ui/manager"
dependencies:
"@fal-works/esbuild-plugin-global-externals": ^2.1.2
"@storybook/addons": 7.0.0-alpha.43
"@storybook/api": 7.0.0-alpha.43
"@storybook/channel-postmessage": 7.0.0-alpha.43
"@storybook/channel-websocket": 7.0.0-alpha.43
"@storybook/channels": 7.0.0-alpha.43
"@storybook/client-logger": 7.0.0-alpha.43
"@storybook/components": 7.0.0-alpha.43
"@storybook/core-events": 7.0.0-alpha.43
"@storybook/router": 7.0.0-alpha.43
"@storybook/theming": 7.0.0-alpha.43
"@storybook/types": 7.0.0-alpha.43
"@testing-library/react": ^11.2.2
"@types/semver": ^7.3.4
copy-to-clipboard: ^3.3.1
downshift: ^6.0.15
enzyme: ^3.11.0
fs-extra: ^9.0.1
fuse.js: ^3.6.1
global: ^4.4.0
lodash: ^4.17.21
markdown-to-jsx: ^7.1.3
memoizerific: ^1.11.3
polished: ^4.2.2
qs: ^6.10.0
react: ^16.8.0
react-dom: ^16.8.0
react-draggable: ^4.4.3
react-helmet-async: ^1.0.7
react-sizeme: ^3.0.1
resolve-from: ^5.0.0
semver: ^7.3.7
shelljs: ^0.8.5
store2: ^2.12.0
ts-dedent: ^2.0.0
typescript: ~4.6.3
languageName: unknown
linkType: soft

"@storybook/vue-vite@workspace:frameworks/vue-vite":
version: 0.0.0-use.local
resolution: "@storybook/vue-vite@workspace:frameworks/vue-vite"
Expand Down
2 changes: 1 addition & 1 deletion test-storybooks/ember-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,6 @@
"@storybook/vue": "portal:../../code/renderers/vue",
"@storybook/vue3": "portal:../../code/renderers/vue3",
"@storybook/web-components": "portal:../../code/renderers/web-components",
"@storybook/ui": "portal:../../code/ui/manager"
"@storybook/manager": "portal:../../code/ui/manager"
}
}
8 changes: 4 additions & 4 deletions test-storybooks/ember-cli/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2093,7 +2093,7 @@ __metadata:
"@fal-works/esbuild-plugin-global-externals": ^2.1.2
"@storybook/core-common": 7.0.0-alpha.42
"@storybook/node-logger": 7.0.0-alpha.42
"@storybook/ui": 7.0.0-alpha.42
"@storybook/manager": 7.0.0-alpha.42
"@types/ejs": ^3.1.1
"@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10
browser-assert: ^1.2.1
Expand Down Expand Up @@ -2307,7 +2307,7 @@ __metadata:
"@storybook/csf": next
"@storybook/preview-web": 7.0.0-alpha.42
"@storybook/store": 7.0.0-alpha.42
"@storybook/ui": 7.0.0-alpha.42
"@storybook/manager": 7.0.0-alpha.42
global: ^4.4.0
regenerator-runtime: ^0.13.7
util-deprecate: ^1.0.2
Expand Down Expand Up @@ -2644,9 +2644,9 @@ __metadata:
languageName: node
linkType: soft

"@storybook/ui@portal:../../code/ui/manager::locator=ember-example%40workspace%3A.":
"@storybook/manager@portal:../../code/ui/manager::locator=ember-example%40workspace%3A.":
version: 0.0.0-use.local
resolution: "@storybook/ui@portal:../../code/ui/manager::locator=ember-example%40workspace%3A."
resolution: "@storybook/manager@portal:../../code/ui/manager::locator=ember-example%40workspace%3A."
languageName: node
linkType: soft

Expand Down
2 changes: 1 addition & 1 deletion test-storybooks/external-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,6 @@
"@storybook/vue": "portal:../../code/renderers/vue",
"@storybook/vue3": "portal:../../code/renderers/vue3",
"@storybook/web-components": "portal:../../code/renderers/web-components",
"@storybook/ui": "portal:../../code/ui/manager"
"@storybook/manager": "portal:../../code/ui/manager"
}
}
8 changes: 4 additions & 4 deletions test-storybooks/external-docs/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2328,7 +2328,7 @@ __metadata:
"@fal-works/esbuild-plugin-global-externals": ^2.1.2
"@storybook/core-common": 7.0.0-alpha.42
"@storybook/node-logger": 7.0.0-alpha.42
"@storybook/ui": 7.0.0-alpha.42
"@storybook/manager": 7.0.0-alpha.42
"@types/ejs": ^3.1.1
"@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10
browser-assert: ^1.2.1
Expand Down Expand Up @@ -2542,7 +2542,7 @@ __metadata:
"@storybook/csf": next
"@storybook/preview-web": 7.0.0-alpha.42
"@storybook/store": 7.0.0-alpha.42
"@storybook/ui": 7.0.0-alpha.42
"@storybook/manager": 7.0.0-alpha.42
global: ^4.4.0
regenerator-runtime: ^0.13.7
util-deprecate: ^1.0.2
Expand Down Expand Up @@ -2984,9 +2984,9 @@ __metadata:
languageName: node
linkType: soft

"@storybook/ui@portal:../../code/ui/manager::locator=%40storybook%2Fexternal-docs%40workspace%3A.":
"@storybook/manager@portal:../../code/ui/manager::locator=%40storybook%2Fexternal-docs%40workspace%3A.":
version: 0.0.0-use.local
resolution: "@storybook/ui@portal:../../code/ui/manager::locator=%40storybook%2Fexternal-docs%40workspace%3A."
resolution: "@storybook/manager@portal:../../code/ui/manager::locator=%40storybook%2Fexternal-docs%40workspace%3A."
languageName: node
linkType: soft

Expand Down
2 changes: 1 addition & 1 deletion test-storybooks/server-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,6 @@
"@storybook/vue": "portal:../../code/renderers/vue",
"@storybook/vue3": "portal:../../code/renderers/vue3",
"@storybook/web-components": "portal:../../code/renderers/web-components",
"@storybook/ui": "portal:../../code/ui/manager"
"@storybook/manager": "portal:../../code/ui/manager"
}
}
Loading