mirror of
https://github.com/storybookjs/storybook.git
synced 2025-04-03 05:04:51 +08:00
Merge branch 'next-6.0.0' into chore-supplement-rax
This commit is contained in:
Norbert de Langen
GitHub
commit
0715355fef
@ -32,7 +32,7 @@
|
||||
"@storybook/source-loader": "5.3.0-rc.1",
|
||||
"babel-loader": "^8.0.4",
|
||||
"cross-env": "^6.0.3",
|
||||
"file-loader": "^4.2.0",
|
||||
"file-loader": "^5.0.2",
|
||||
"preact-render-to-json": "^3.6.6",
|
||||
"raw-loader": "^3.1.0",
|
||||
"svg-url-loader": "^3.0.2",
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
"@storybook/source-loader": "5.3.0-rc.1",
|
||||
"babel-loader": "^8.0.4",
|
||||
"cross-env": "^6.0.3",
|
||||
"file-loader": "^4.2.0",
|
||||
"file-loader": "^5.0.2",
|
||||
"raw-loader": "^3.1.0",
|
||||
"riot-tag-loader": "^2.1.0",
|
||||
"svg-url-loader": "^3.0.2",
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
"babel-core": "^7.0.0-bridge.0",
|
||||
"babel-loader": "^8.0.5",
|
||||
"cross-env": "^6.0.3",
|
||||
"file-loader": "^4.2.0",
|
||||
"file-loader": "^5.0.2",
|
||||
"prop-types": "^15.7.2",
|
||||
"svg-url-loader": "^3.0.2",
|
||||
"vue-loader": "^15.7.0",
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
/* eslint no-underscore-dangle: 0 */
|
||||
import deprecate from 'util-deprecate';
|
||||
import isPlainObject from 'is-plain-object';
|
||||
import { logger } from '@storybook/client-logger';
|
||||
import addons, { StoryContext, StoryFn, Parameters } from '@storybook/addons';
|
||||
import Events from '@storybook/core-events';
|
||||
import { StoryContext, StoryFn, Parameters } from '@storybook/addons';
|
||||
import { toId } from '@storybook/csf';
|
||||
|
||||
import mergeWith from 'lodash/mergeWith';
|
||||
import isEqual from 'lodash/isEqual';
|
||||
import get from 'lodash/get';
|
||||
import { ClientApiParams, DecoratorFunction, ClientApiAddons, StoryApi } from './types';
|
||||
import subscriptionsStore from './subscriptions_store';
|
||||
import { applyHooks } from './hooks';
|
||||
import StoryStore from './story_store';
|
||||
|
||||
@ -60,28 +57,6 @@ export const defaultDecorateStory = (storyFn: StoryFn, decorators: DecoratorFunc
|
||||
storyFn
|
||||
);
|
||||
|
||||
const metaSubscriptionHandler = deprecate(
|
||||
subscriptionsStore.register,
|
||||
'Events.REGISTER_SUBSCRIPTION is deprecated and will be removed in 6.0. Please use useEffect from @storybook/client-api instead.'
|
||||
);
|
||||
|
||||
const metaSubscription = () => {
|
||||
addons.getChannel().on(Events.REGISTER_SUBSCRIPTION, metaSubscriptionHandler);
|
||||
return () =>
|
||||
addons.getChannel().removeListener(Events.REGISTER_SUBSCRIPTION, metaSubscriptionHandler);
|
||||
};
|
||||
|
||||
const withSubscriptionTracking = (storyFn: StoryFn) => {
|
||||
if (!addons.hasChannel()) {
|
||||
return storyFn();
|
||||
}
|
||||
subscriptionsStore.markAllAsUnused();
|
||||
subscriptionsStore.register(metaSubscription);
|
||||
const result = storyFn();
|
||||
subscriptionsStore.clearUnused();
|
||||
return result;
|
||||
};
|
||||
|
||||
let _globalDecorators: DecoratorFunction[] = [];
|
||||
|
||||
let _globalParameters: Parameters = {};
|
||||
@ -274,7 +249,6 @@ export default class ClientApi {
|
||||
...(allParam.decorators || []),
|
||||
...localDecorators,
|
||||
..._globalDecorators,
|
||||
withSubscriptionTracking,
|
||||
],
|
||||
}
|
||||
);
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
import ClientApi, { defaultDecorateStory, addDecorator, addParameters } from './client_api';
|
||||
import StoryStore from './story_store';
|
||||
import ConfigApi from './config_api';
|
||||
import subscriptionsStore from './subscriptions_store';
|
||||
import pathToId from './pathToId';
|
||||
|
||||
import { getQueryParams, getQueryParam } from './queryparams';
|
||||
@ -12,7 +11,6 @@ export {
|
||||
ClientApi,
|
||||
StoryStore,
|
||||
ConfigApi,
|
||||
subscriptionsStore,
|
||||
defaultDecorateStory,
|
||||
pathToId,
|
||||
getQueryParams,
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
import { createSubscriptionsStore } from './subscriptions_store';
|
||||
|
||||
const mockSubscription = () => {
|
||||
let listening = false;
|
||||
const listener = jest.fn();
|
||||
|
||||
return {
|
||||
listener,
|
||||
subscribe() {
|
||||
listening = true;
|
||||
return () => {
|
||||
listening = false;
|
||||
};
|
||||
},
|
||||
trigger(value?) {
|
||||
if (listening) {
|
||||
listener(value);
|
||||
}
|
||||
},
|
||||
};
|
||||
};
|
||||
|
||||
describe('preview.subscriptions_store', () => {
|
||||
describe('register', () => {
|
||||
it('should register a subscription', () => {
|
||||
const { listener, subscribe, trigger } = mockSubscription();
|
||||
const store = createSubscriptionsStore();
|
||||
|
||||
trigger('foo');
|
||||
store.register(subscribe);
|
||||
trigger('bar');
|
||||
|
||||
expect(listener).toHaveBeenCalledTimes(1);
|
||||
expect(listener).toHaveBeenCalledWith('bar');
|
||||
});
|
||||
|
||||
it("shouldn't subscribe when subscription is already registered", () => {
|
||||
const subscribe = jest.fn();
|
||||
const store = createSubscriptionsStore();
|
||||
|
||||
store.register(subscribe);
|
||||
store.register(subscribe);
|
||||
|
||||
expect(subscribe).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
|
||||
describe('clearUnused', () => {
|
||||
it('should stop unused subscriptions', () => {
|
||||
const { listener, subscribe, trigger } = mockSubscription();
|
||||
const store = createSubscriptionsStore();
|
||||
|
||||
store.register(subscribe);
|
||||
store.markAllAsUnused();
|
||||
store.clearUnused();
|
||||
|
||||
trigger();
|
||||
|
||||
expect(listener).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("shouldn't stop used subscriptions", () => {
|
||||
const { listener, subscribe, trigger } = mockSubscription();
|
||||
const store = createSubscriptionsStore();
|
||||
|
||||
store.register(subscribe);
|
||||
store.markAllAsUnused();
|
||||
store.register(subscribe);
|
||||
store.clearUnused();
|
||||
|
||||
trigger();
|
||||
|
||||
expect(listener).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should subscribe again after unsubscribing', () => {
|
||||
const { listener, subscribe, trigger } = mockSubscription();
|
||||
const store = createSubscriptionsStore();
|
||||
|
||||
store.register(subscribe);
|
||||
store.markAllAsUnused();
|
||||
store.clearUnused();
|
||||
|
||||
trigger('foo');
|
||||
store.register(subscribe);
|
||||
trigger('bar');
|
||||
|
||||
expect(listener).toHaveBeenCalledTimes(1);
|
||||
expect(listener).toHaveBeenCalledWith('bar');
|
||||
});
|
||||
});
|
||||
});
|
||||
@ -1,34 +0,0 @@
|
||||
export const createSubscriptionsStore = () => {
|
||||
const subscriptions = new Map();
|
||||
|
||||
return {
|
||||
register(subscribe: () => void): void {
|
||||
let subscription = subscriptions.get(subscribe);
|
||||
if (!subscription) {
|
||||
subscription = {
|
||||
unsubscribe: subscribe(),
|
||||
};
|
||||
subscriptions.set(subscribe, subscription);
|
||||
}
|
||||
subscription.used = true;
|
||||
},
|
||||
|
||||
markAllAsUnused(): void {
|
||||
subscriptions.forEach(subscription => {
|
||||
// eslint-disable-next-line no-param-reassign
|
||||
subscription.used = false;
|
||||
});
|
||||
},
|
||||
|
||||
clearUnused(): void {
|
||||
subscriptions.forEach((subscription, key) => {
|
||||
if (subscription.used) return;
|
||||
|
||||
subscription.unsubscribe();
|
||||
subscriptions.delete(key);
|
||||
});
|
||||
},
|
||||
};
|
||||
};
|
||||
|
||||
export default createSubscriptionsStore();
|
||||
@ -61,7 +61,7 @@
|
||||
"dotenv-webpack": "^1.7.0",
|
||||
"ejs": "^2.7.4",
|
||||
"express": "^4.17.0",
|
||||
"file-loader": "^4.2.0",
|
||||
"file-loader": "^5.0.2",
|
||||
"file-system-cache": "^1.0.5",
|
||||
"find-cache-dir": "^3.0.0",
|
||||
"find-up": "^4.1.0",
|
||||
|
||||
@ -64,8 +64,9 @@ export async function createDefaultWebpackConfig(storybookBaseConfig, options) {
|
||||
{
|
||||
test: /\.(svg|ico|jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|cur|ani|pdf)(\?.*)?$/,
|
||||
loader: require.resolve('file-loader'),
|
||||
query: {
|
||||
options: {
|
||||
name: 'static/media/[name].[hash:8].[ext]',
|
||||
esModule: false,
|
||||
},
|
||||
},
|
||||
{
|
||||
|
||||
10
yarn.lock
10
yarn.lock
@ -14129,7 +14129,15 @@ file-loader@4.2.0:
|
||||
loader-utils "^1.2.3"
|
||||
schema-utils "^2.0.0"
|
||||
|
||||
file-loader@^4.2.0, file-loader@~4.3.0:
|
||||
file-loader@^5.0.2:
|
||||
version "5.0.2"
|
||||
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.0.2.tgz#7f3d8b4ac85a5e8df61338cfec95d7405f971caa"
|
||||
integrity sha512-QMiQ+WBkGLejKe81HU8SZ9PovsU/5uaLo0JdTCEXOYv7i7jfAjHZi1tcwp9tSASJPOmmHZtbdCervFmXMH/Dcg==
|
||||
dependencies:
|
||||
loader-utils "^1.2.3"
|
||||
schema-utils "^2.5.0"
|
||||
|
||||
file-loader@~4.3.0:
|
||||
version "4.3.0"
|
||||
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af"
|
||||
integrity sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user