From 16d92ab8d4a3e5ff7c5cbb34089cc4c47ab4dd6d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 09:34:06 +0000 Subject: [PATCH 1/5] Bump file-loader from 4.3.0 to 5.0.2 Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 4.3.0 to 5.0.2. - [Release notes](https://github.com/webpack-contrib/file-loader/releases) - [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/file-loader/compare/v4.3.0...v5.0.2) Signed-off-by: dependabot-preview[bot] --- examples/preact-kitchen-sink/package.json | 2 +- examples/riot-kitchen-sink/package.json | 2 +- examples/vue-kitchen-sink/package.json | 2 +- lib/core/package.json | 2 +- yarn.lock | 10 +++++++++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/examples/preact-kitchen-sink/package.json b/examples/preact-kitchen-sink/package.json index 7a5ae68a577..3e540261fdc 100644 --- a/examples/preact-kitchen-sink/package.json +++ b/examples/preact-kitchen-sink/package.json @@ -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", diff --git a/examples/riot-kitchen-sink/package.json b/examples/riot-kitchen-sink/package.json index 68b47ac3994..b0b32dab530 100644 --- a/examples/riot-kitchen-sink/package.json +++ b/examples/riot-kitchen-sink/package.json @@ -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", diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json index b3f35a473c4..c9fba55cee8 100644 --- a/examples/vue-kitchen-sink/package.json +++ b/examples/vue-kitchen-sink/package.json @@ -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", diff --git a/lib/core/package.json b/lib/core/package.json index ed07b590e48..7d6da9e1f21 100644 --- a/lib/core/package.json +++ b/lib/core/package.json @@ -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", diff --git a/yarn.lock b/yarn.lock index 5a6de0d29ac..d3e8244a77e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13928,7 +13928,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== From 0de291b8d24d9785d4baed0c99df88756c36c0d7 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 23 Dec 2019 15:30:48 +0100 Subject: [PATCH 2/5] FIX --- lib/core/src/server/preview/base-webpack.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/core/src/server/preview/base-webpack.config.js b/lib/core/src/server/preview/base-webpack.config.js index 87a87972683..409af775a73 100644 --- a/lib/core/src/server/preview/base-webpack.config.js +++ b/lib/core/src/server/preview/base-webpack.config.js @@ -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, }, }, { From dcbbdbb7782755774294f46b8118246c8cf99183 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 23 Dec 2019 17:08:53 +0100 Subject: [PATCH 3/5] I think this is all deprecated & should be removed --- lib/client-api/src/client_api.ts | 28 +----- .../src/subscriptions_store.test.ts | 92 ------------------- lib/client-api/src/subscriptions_store.ts | 34 ------- lib/core/src/client/preview/start.js | 2 +- 4 files changed, 2 insertions(+), 154 deletions(-) delete mode 100644 lib/client-api/src/subscriptions_store.test.ts delete mode 100644 lib/client-api/src/subscriptions_store.ts diff --git a/lib/client-api/src/client_api.ts b/lib/client-api/src/client_api.ts index af2c9db0844..c1a315cb0c8 100644 --- a/lib/client-api/src/client_api.ts +++ b/lib/client-api/src/client_api.ts @@ -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, ], } ); diff --git a/lib/client-api/src/subscriptions_store.test.ts b/lib/client-api/src/subscriptions_store.test.ts deleted file mode 100644 index f19ca3729eb..00000000000 --- a/lib/client-api/src/subscriptions_store.test.ts +++ /dev/null @@ -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'); - }); - }); -}); diff --git a/lib/client-api/src/subscriptions_store.ts b/lib/client-api/src/subscriptions_store.ts deleted file mode 100644 index 7cf418f1799..00000000000 --- a/lib/client-api/src/subscriptions_store.ts +++ /dev/null @@ -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(); diff --git a/lib/core/src/client/preview/start.js b/lib/core/src/client/preview/start.js index cee43477545..3375bc36f00 100644 --- a/lib/core/src/client/preview/start.js +++ b/lib/core/src/client/preview/start.js @@ -6,7 +6,7 @@ import AnsiToHtml from 'ansi-to-html'; import addons from '@storybook/addons'; import createChannel from '@storybook/channel-postmessage'; -import { ClientApi, StoryStore, ConfigApi } from '@storybook/client-api'; +import { ClientApi, StoryStore, ConfigApi, useEffect } from '@storybook/client-api'; import { toId, storyNameFromExport, isExportStory } from '@storybook/csf'; import { logger } from '@storybook/client-logger'; import Events from '@storybook/core-events'; From bd2afc82365d8515c8fea5eede04f95dec4a3507 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 23 Dec 2019 17:12:20 +0100 Subject: [PATCH 4/5] REMOVE unused import --- lib/core/src/client/preview/start.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/src/client/preview/start.js b/lib/core/src/client/preview/start.js index 3375bc36f00..cee43477545 100644 --- a/lib/core/src/client/preview/start.js +++ b/lib/core/src/client/preview/start.js @@ -6,7 +6,7 @@ import AnsiToHtml from 'ansi-to-html'; import addons from '@storybook/addons'; import createChannel from '@storybook/channel-postmessage'; -import { ClientApi, StoryStore, ConfigApi, useEffect } from '@storybook/client-api'; +import { ClientApi, StoryStore, ConfigApi } from '@storybook/client-api'; import { toId, storyNameFromExport, isExportStory } from '@storybook/csf'; import { logger } from '@storybook/client-logger'; import Events from '@storybook/core-events'; From 7ce5eb59732cba17a37da3f7b51d724a6d19d3fb Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 23 Dec 2019 18:06:38 +0100 Subject: [PATCH 5/5] REMOVE remainders --- lib/client-api/src/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/client-api/src/index.ts b/lib/client-api/src/index.ts index 1ee7795e0aa..763bd90b07b 100644 --- a/lib/client-api/src/index.ts +++ b/lib/client-api/src/index.ts @@ -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,