Rename webpack-tools to core-webpack

examples/web-components-kitchen-sink/package.json

@@ -38,6 +38,7 @@
     "@storybook/core-common": "portal:../../lib/core-common",
     "@storybook/core-events": "portal:../../lib/core-events",
     "@storybook/core-server": "portal:../../lib/core-server",
+    "@storybook/core-webpack": "portal:../../lib/core-webpack",
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
     "@storybook/csf-tools": "portal:../../lib/csf-tools",
     "@storybook/docs-tools": "portal:../../lib/docs-tools",
@@ -56,7 +57,6 @@
     "@storybook/theming": "portal:../../lib/theming",
     "@storybook/ui": "portal:../../lib/ui",
     "@storybook/web-components": "portal:../../app/web-components",
-    "@storybook/webpack-tools": "portal:../../lib/webpack-tools",
     "babel-plugin-macros": "3.1.0",
     "fork-ts-checker-webpack-plugin": "6.2.13",
     "sb": "portal:../../lib/cli-sb",

examples/web-components-kitchen-sink/yarn.lock

@@ -2868,6 +2868,7 @@ __metadata:
     "@storybook/components": 6.5.0-beta.4
     "@storybook/core-common": 6.5.0-beta.4
     "@storybook/core-events": 6.5.0-beta.4
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@storybook/node-logger": 6.5.0-beta.4
     "@storybook/preview-web": 6.5.0-beta.4
     "@storybook/router": 6.5.0-beta.4
@@ -2875,7 +2876,6 @@ __metadata:
     "@storybook/store": 6.5.0-beta.4
     "@storybook/theming": 6.5.0-beta.4
     "@storybook/ui": 6.5.0-beta.4
-    "@storybook/webpack-tools": 6.5.0-beta.4
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/webpack": ^4.41.26
     autoprefixer: ^9.8.6
@@ -3234,6 +3234,18 @@ __metadata:
   languageName: node
   linkType: soft
 
+"@storybook/core-webpack@portal:../../lib/core-webpack::locator=web-components-kitchen-sink%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "@storybook/core-webpack@portal:../../lib/core-webpack::locator=web-components-kitchen-sink%40workspace%3A."
+  dependencies:
+    "@storybook/core-common": 6.5.0-beta.4
+    "@storybook/node-logger": 6.5.0-beta.4
+    "@types/node": ^14.0.10 || ^16.0.0
+    core-js: ^3.8.2
+    ts-dedent: ^2.0.0
+  languageName: node
+  linkType: soft
+
 "@storybook/csf-tools@portal:../../lib/csf-tools::locator=web-components-kitchen-sink%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@storybook/csf-tools@portal:../../lib/csf-tools::locator=web-components-kitchen-sink%40workspace%3A."
@@ -3293,10 +3305,10 @@ __metadata:
     "@storybook/addons": 6.5.0-beta.4
     "@storybook/core-client": 6.5.0-beta.4
     "@storybook/core-common": 6.5.0-beta.4
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@storybook/node-logger": 6.5.0-beta.4
     "@storybook/theming": 6.5.0-beta.4
     "@storybook/ui": 6.5.0-beta.4
-    "@storybook/webpack-tools": 6.5.0-beta.4
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/webpack": ^4.41.26
     babel-loader: ^8.0.0
@@ -3378,7 +3390,7 @@ __metadata:
     "@babel/plugin-syntax-dynamic-import": ^7.8.3
     "@babel/plugin-syntax-import-meta": ^7.10.4
     "@babel/preset-env": ^7.12.11
-    "@storybook/webpack-tools": 6.5.0-beta.4
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@types/node": ^14.14.20 || ^16.0.0
     babel-plugin-bundled-import-meta: ^0.3.1
     core-js: ^3.8.2
@@ -3582,18 +3594,6 @@ __metadata:
   languageName: node
   linkType: soft
 
-"@storybook/webpack-tools@portal:../../lib/webpack-tools::locator=web-components-kitchen-sink%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@storybook/webpack-tools@portal:../../lib/webpack-tools::locator=web-components-kitchen-sink%40workspace%3A."
-  dependencies:
-    "@storybook/core-common": 6.5.0-beta.4
-    "@storybook/node-logger": 6.5.0-beta.4
-    "@types/node": ^14.0.10 || ^16.0.0
-    core-js: ^3.8.2
-    ts-dedent: ^2.0.0
-  languageName: node
-  linkType: soft
-
 "@szmarczak/http-timer@npm:^1.1.2":
   version: 1.1.2
   resolution: "@szmarczak/http-timer@npm:1.1.2"

lib/builder-webpack4/package.json

@@ -49,6 +49,7 @@
     "@storybook/components": "6.5.0-beta.4",
     "@storybook/core-common": "6.5.0-beta.4",
     "@storybook/core-events": "6.5.0-beta.4",
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@storybook/node-logger": "6.5.0-beta.4",
     "@storybook/preview-web": "6.5.0-beta.4",
     "@storybook/router": "6.5.0-beta.4",
@@ -56,7 +57,6 @@
     "@storybook/store": "6.5.0-beta.4",
     "@storybook/theming": "6.5.0-beta.4",
     "@storybook/ui": "6.5.0-beta.4",
-    "@storybook/webpack-tools": "6.5.0-beta.4",
     "@types/node": "^14.0.10 || ^16.0.0",
     "@types/webpack": "^4.41.26",
     "autoprefixer": "^9.8.6",

lib/builder-webpack4/src/index.ts

@@ -6,7 +6,7 @@ import webpackHotMiddleware from 'webpack-hot-middleware';
 import { logger } from '@storybook/node-logger';
 import type { Builder, Options } from '@storybook/core-common';
 import { useProgressReporting } from '@storybook/core-common';
-import { checkWebpackVersion } from '@storybook/webpack-tools';
+import { checkWebpackVersion } from '@storybook/core-webpack';
 
 export * from './types';
 

lib/builder-webpack4/src/presets/custom-webpack-preset.ts

@@ -2,7 +2,7 @@ import * as webpackReal from 'webpack';
 import { logger } from '@storybook/node-logger';
 import type { Configuration } from 'webpack';
 import type { CoreConfig, Options } from '@storybook/core-common';
-import { loadCustomWebpackConfig } from '@storybook/webpack-tools';
+import { loadCustomWebpackConfig } from '@storybook/core-webpack';
 import { createDefaultWebpackConfig } from '../preview/base-webpack.config';
 
 export async function webpack(config: Configuration, options: Options) {

lib/builder-webpack5/package.json

@@ -49,13 +49,13 @@
     "@storybook/components": "6.5.0-beta.4",
     "@storybook/core-common": "6.5.0-beta.4",
     "@storybook/core-events": "6.5.0-beta.4",
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@storybook/node-logger": "6.5.0-beta.4",
     "@storybook/preview-web": "6.5.0-beta.4",
     "@storybook/router": "6.5.0-beta.4",
     "@storybook/semver": "^7.3.2",
     "@storybook/store": "6.5.0-beta.4",
     "@storybook/theming": "6.5.0-beta.4",
-    "@storybook/webpack-tools": "6.5.0-beta.4",
     "@types/node": "^14.0.10 || ^16.0.0",
     "babel-loader": "^8.0.0",
     "babel-plugin-named-exports-order": "^0.0.2",

lib/builder-webpack5/src/index.ts

@@ -4,7 +4,7 @@ import webpackHotMiddleware from 'webpack-hot-middleware';
 import { logger } from '@storybook/node-logger';
 import { useProgressReporting } from '@storybook/core-common';
 import type { Builder, Options } from '@storybook/core-common';
-import { checkWebpackVersion } from '@storybook/webpack-tools';
+import { checkWebpackVersion } from '@storybook/core-webpack';
 
 export * from './types';
 

lib/builder-webpack5/src/presets/custom-webpack-preset.ts

@@ -4,7 +4,7 @@ import type { Options, CoreConfig } from '@storybook/core-common';
 import type { Configuration } from 'webpack';
 import deprecate from 'util-deprecate';
 import dedent from 'ts-dedent';
-import { loadCustomWebpackConfig } from '@storybook/webpack-tools';
+import { loadCustomWebpackConfig } from '@storybook/core-webpack';
 import { createDefaultWebpackConfig } from '../preview/base-webpack.config';
 
 export async function webpack(config: Configuration, options: Options) {

lib/core-webpack/package.json

@@ -1,18 +1,18 @@
 {
-  "name": "@storybook/webpack-tools",
+  "name": "@storybook/core-webpack",
   "version": "6.5.0-beta.4",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/main/lib/webpack-tools",
+  "homepage": "https://github.com/storybookjs/storybook/tree/main/lib/core-webpack",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/storybookjs/storybook.git",
-    "directory": "lib/webpack-tools"
+    "directory": "lib/core-webpack"
   },
   "funding": {
     "type": "opencollective",

lib/manager-webpack4/package.json

@@ -48,10 +48,10 @@
     "@storybook/addons": "6.5.0-beta.4",
     "@storybook/core-client": "6.5.0-beta.4",
     "@storybook/core-common": "6.5.0-beta.4",
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@storybook/node-logger": "6.5.0-beta.4",
     "@storybook/theming": "6.5.0-beta.4",
     "@storybook/ui": "6.5.0-beta.4",
-    "@storybook/webpack-tools": "6.5.0-beta.4",
     "@types/node": "^14.0.10 || ^16.0.0",
     "@types/webpack": "^4.41.26",
     "babel-loader": "^8.0.0",

lib/manager-webpack4/src/index.ts

@@ -4,7 +4,7 @@ import webpackDevMiddleware from 'webpack-dev-middleware';
 import { logger } from '@storybook/node-logger';
 import { useProgressReporting } from '@storybook/core-common';
 import type { Builder, Options } from '@storybook/core-common';
-import { checkWebpackVersion } from '@storybook/webpack-tools';
+import { checkWebpackVersion } from '@storybook/core-webpack';
 
 import findUp from 'find-up';
 import fs from 'fs-extra';

lib/manager-webpack5/package.json

@@ -48,10 +48,10 @@
     "@storybook/addons": "6.5.0-beta.4",
     "@storybook/core-client": "6.5.0-beta.4",
     "@storybook/core-common": "6.5.0-beta.4",
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@storybook/node-logger": "6.5.0-beta.4",
     "@storybook/theming": "6.5.0-beta.4",
     "@storybook/ui": "6.5.0-beta.4",
-    "@storybook/webpack-tools": "6.5.0-beta.4",
     "@types/node": "^14.0.10 || ^16.0.0",
     "babel-loader": "^8.0.0",
     "case-sensitive-paths-webpack-plugin": "^2.3.0",

lib/manager-webpack5/src/index.ts

@@ -4,7 +4,7 @@ import webpackDevMiddleware from 'webpack-dev-middleware';
 import { logger } from '@storybook/node-logger';
 import { useProgressReporting } from '@storybook/core-common';
 import type { Builder, Options } from '@storybook/core-common';
-import { checkWebpackVersion } from '@storybook/webpack-tools';
+import { checkWebpackVersion } from '@storybook/core-webpack';
 
 import findUp from 'find-up';
 import fs from 'fs-extra';

nx.json

@@ -154,7 +154,7 @@
     "@storybook/web-components": {
       "implicitDependencies": []
     },
-    "@storybook/webpack-tools": {
+    "@storybook/core-webpack": {
       "implicitDependencies": []
     },
     "angular-cli": {

package.json

@@ -165,6 +165,7 @@
     "@storybook/codemod": "workspace:*",
     "@storybook/components": "workspace:*",
     "@storybook/core-events": "workspace:*",
+    "@storybook/core-webpack": "workspace:*",
     "@storybook/csf-tools": "workspace:*",
     "@storybook/docs-tools": "workspace:*",
     "@storybook/ember": "workspace:*",
@@ -206,7 +207,6 @@
     "@storybook/ui": "workspace:*",
     "@storybook/vue": "workspace:*",
     "@storybook/web-components": "workspace:*",
-    "@storybook/webpack-tools": "workspace:*",
     "@testing-library/dom": "^7.29.4",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^11.2.2",

presets/html-webpack/package.json

@@ -39,7 +39,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/webpack-tools": "6.5.0-beta.4",
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@types/node": "^14.14.20 || ^16.0.0",
     "core-js": "^3.8.2",
     "html-loader": "^1.3.2",

presets/html-webpack/src/preset.ts

@@ -1,4 +1,4 @@
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 
 export const webpack: StorybookConfig['webpack'] = (config) => {
   config.module.rules.push({

presets/preact-webpack/package.json

@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "^7.12.12",
-    "@storybook/webpack-tools": "6.5.0-beta.4",
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@types/node": "^14.14.20 || ^16.0.0",
     "core-js": "^3.8.2",
     "react": "16.14.0",

presets/preact-webpack/src/framework-preset-preact.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 
 export const babelDefault: StorybookConfig['babelDefault'] = (config) => {
   return {

presets/react-webpack/package.json

@@ -43,12 +43,12 @@
     "@babel/preset-flow": "^7.12.1",
     "@babel/preset-react": "^7.12.10",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@storybook/docs-tools": "6.5.0-beta.4",
     "@storybook/node-logger": "6.5.0-beta.4",
     "@storybook/react-docgen-typescript-plugin": "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0",
     "@storybook/renderer-react": "6.5.0-beta.4",
     "@storybook/semver": "^7.3.2",
-    "@storybook/webpack-tools": "6.5.0-beta.4",
     "@types/node": "^14.14.20 || ^16.0.0",
     "babel-plugin-add-react-displayname": "^0.0.5",
     "babel-plugin-react-docgen": "^4.2.1",

presets/react-webpack/src/framework-preset-cra.ts

@@ -1,5 +1,5 @@
 import { logger } from '@storybook/node-logger';
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 import { isReactScriptsInstalled } from './cra-config';
 
 type Preset = string | { name: string };

presets/react-webpack/src/framework-preset-react-docs.test.ts

@@ -1,5 +1,5 @@
 import ReactDocgenTypescriptPlugin from '@storybook/react-docgen-typescript-plugin';
-import type { TypescriptConfig } from '@storybook/webpack-tools';
+import type { TypescriptConfig } from '@storybook/core-webpack';
 import * as preset from './framework-preset-react-docs';
 
 describe('framework-preset-react-docgen', () => {

presets/react-webpack/src/framework-preset-react-dom-hack.ts

@@ -1,6 +1,6 @@
 import { readJSON } from 'fs-extra';
 import { IgnorePlugin } from 'webpack';
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 
 // this is a hack to allow importing react-dom/client even when it's not available
 // this should be removed once we drop support for react-dom < 18

presets/react-webpack/src/framework-preset-react.test.ts

@@ -1,6 +1,6 @@
 import type { Configuration } from 'webpack';
 import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
-import type { Options } from '@storybook/webpack-tools';
+import type { Options } from '@storybook/core-webpack';
 import * as preset from './framework-preset-react';
 
 const mockApply = jest.fn();

presets/react-webpack/src/framework-preset-react.ts

@@ -3,7 +3,7 @@ import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
 
 import { logger } from '@storybook/node-logger';
 
-import type { StorybookConfig, Options, Preset } from '@storybook/webpack-tools';
+import type { StorybookConfig, Options, Preset } from '@storybook/core-webpack';
 import type { ReactOptions } from './types';
 
 const useFastRefresh = async (options: Options) => {

presets/react-webpack/src/types.ts

@@ -2,10 +2,10 @@ import type {
   CommonWebpackConfiguration,
   StorybookConfig as BaseStorybookConfig,
   TypescriptOptions as BaseTypescriptOptions,
-} from '@storybook/webpack-tools';
+} from '@storybook/core-webpack';
 import type { PluginOptions as ReactDocgenTypescriptOptions } from '@storybook/react-docgen-typescript-plugin';
 
-export type { BuilderResult } from '@storybook/webpack-tools';
+export type { BuilderResult } from '@storybook/core-webpack';
 
 export interface ReactOptions {
   fastRefresh?: boolean;

presets/server-webpack/package.json

@@ -40,8 +40,8 @@
   },
   "dependencies": {
     "@storybook/core-server": "6.5.0-beta.4",
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@storybook/renderer-server": "6.5.0-beta.4",
-    "@storybook/webpack-tools": "6.5.0-beta.4",
     "@types/node": "^14.14.20 || ^16.0.0",
     "core-js": "^3.8.2",
     "global": "^4.4.0",

presets/server-webpack/src/framework-preset-server.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 
 export const webpack: StorybookConfig['webpack'] = (config) => {
   config.module.rules.push({

presets/svelte-webpack/package.json

@@ -40,8 +40,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@storybook/node-logger": "6.5.0-beta.4",
-    "@storybook/webpack-tools": "6.5.0-beta.4",
     "core-js": "^3.8.2",
     "loader-utils": "^2.0.0",
     "react": "16.14.0",

presets/svelte-webpack/src/framework-preset-svelte-docs.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { StorybookConfig } from '@storybook/webpack-tools';
+import { StorybookConfig } from '@storybook/core-webpack';
 
 export const webpackFinal: StorybookConfig['webpackFinal'] = async (config, options) => {
   const svelteOptions = await options.presets.apply('svelteOptions', {} as any, options);

presets/svelte-webpack/src/framework-preset-svelte.ts

@@ -1,4 +1,4 @@
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 
 export const webpack: StorybookConfig['webpack'] = async (config, options) => {
   const { preprocess = undefined, loader = {} } = await options.presets.apply(

presets/svelte-webpack/src/preset.ts

@@ -1,4 +1,4 @@
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 
 export const addons: StorybookConfig['addons'] = [
   require.resolve('./framework-preset-svelte'),

presets/vue-webpack/package.json

@@ -39,8 +39,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@storybook/docs-tools": "6.5.0-beta.4",
-    "@storybook/webpack-tools": "6.5.0-beta.4",
     "@types/node": "^14.14.20 || ^16.0.0",
     "core-js": "^3.8.2",
     "react": "16.14.0",

presets/vue-webpack/src/framework-preset-vue-docs.ts

@@ -1,4 +1,4 @@
-import { StorybookConfig } from '@storybook/webpack-tools';
+import { StorybookConfig } from '@storybook/core-webpack';
 import { hasDocsOrControls } from '@storybook/docs-tools';
 
 export const webpackFinal: StorybookConfig['webpackFinal'] = (config, options) => {

presets/vue-webpack/src/framework-preset-vue.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-param-reassign */
 import { VueLoaderPlugin } from 'vue-loader';
 
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 
 export const webpack: StorybookConfig['webpack'] = async (config, { presets }) => {
   const typescriptOptions = await presets.apply<StorybookConfig['typescript']>(

presets/vue-webpack/src/preset.ts

@@ -1,4 +1,4 @@
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 
 export const addons: StorybookConfig['addons'] = [
   require.resolve('./framework-preset-vue'),

presets/vue3-webpack/package.json

@@ -40,8 +40,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@storybook/docs-tools": "6.5.0-beta.4",
-    "@storybook/webpack-tools": "6.5.0-beta.4",
     "@types/node": "^14.14.20 || ^16.0.0",
     "core-js": "^3.8.2",
     "react": "16.14.0",

presets/vue3-webpack/src/framework-preset-vue3-docs.ts

@@ -1,4 +1,4 @@
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 import { hasDocsOrControls } from '@storybook/docs-tools';
 
 export const webpackFinal: StorybookConfig['webpackFinal'] = (config, options) => {

presets/vue3-webpack/src/framework-preset-vue3.ts

@@ -1,6 +1,6 @@
 import { VueLoaderPlugin } from 'vue-loader';
 import { DefinePlugin } from 'webpack';
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 
 export const webpack: StorybookConfig['webpack'] = (config) => {
   return {

presets/vue3-webpack/src/preset.ts

@@ -1,4 +1,4 @@
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 
 export const addons: StorybookConfig['addons'] = [
   require.resolve('./framework-preset-vue3'),

presets/web-components-webpack/package.json

@@ -44,7 +44,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-import-meta": "^7.10.4",
     "@babel/preset-env": "^7.12.11",
-    "@storybook/webpack-tools": "6.5.0-beta.4",
+    "@storybook/core-webpack": "6.5.0-beta.4",
     "@types/node": "^14.14.20 || ^16.0.0",
     "babel-plugin-bundled-import-meta": "^0.3.1",
     "core-js": "^3.8.2",

presets/web-components-webpack/src/preset.ts

@@ -1,4 +1,4 @@
-import type { StorybookConfig } from '@storybook/webpack-tools';
+import type { StorybookConfig } from '@storybook/core-webpack';
 
 export const webpack: StorybookConfig['webpack'] = (config, options) => {
   const babelrcOptions = options.features?.babelModeV7 ? null : { babelrc: false };

workspace.json

@@ -117,8 +117,8 @@
       "root": "app/web-components",
       "type": "library"
     },
-    "@storybook/webpack-tools": {
+    "@storybook/core-webpack": {
-      "root": "lib/webpack-tools",
+      "root": "lib/core-webpack",
       "type": "library"
     },
     "angular-cli": {

yarn.lock

@@ -7326,6 +7326,7 @@ __metadata:
     "@storybook/components": 6.5.0-beta.4
     "@storybook/core-common": 6.5.0-beta.4
     "@storybook/core-events": 6.5.0-beta.4
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@storybook/node-logger": 6.5.0-beta.4
     "@storybook/preview-web": 6.5.0-beta.4
     "@storybook/router": 6.5.0-beta.4
@@ -7333,7 +7334,6 @@ __metadata:
     "@storybook/store": 6.5.0-beta.4
     "@storybook/theming": 6.5.0-beta.4
     "@storybook/ui": 6.5.0-beta.4
-    "@storybook/webpack-tools": 6.5.0-beta.4
     "@types/case-sensitive-paths-webpack-plugin": ^2.1.4
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/terser-webpack-plugin": ^4.2.0
@@ -7392,13 +7392,13 @@ __metadata:
     "@storybook/components": 6.5.0-beta.4
     "@storybook/core-common": 6.5.0-beta.4
     "@storybook/core-events": 6.5.0-beta.4
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@storybook/node-logger": 6.5.0-beta.4
     "@storybook/preview-web": 6.5.0-beta.4
     "@storybook/router": 6.5.0-beta.4
     "@storybook/semver": ^7.3.2
     "@storybook/store": 6.5.0-beta.4
     "@storybook/theming": 6.5.0-beta.4
-    "@storybook/webpack-tools": 6.5.0-beta.4
     "@types/case-sensitive-paths-webpack-plugin": ^2.1.4
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/terser-webpack-plugin": ^5.0.2
@@ -7826,6 +7826,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@storybook/core-webpack@6.5.0-beta.4, @storybook/core-webpack@workspace:*, @storybook/core-webpack@workspace:lib/core-webpack":
+  version: 0.0.0-use.local
+  resolution: "@storybook/core-webpack@workspace:lib/core-webpack"
+  dependencies:
+    "@storybook/core-common": 6.5.0-beta.4
+    "@storybook/node-logger": 6.5.0-beta.4
+    "@types/node": ^14.0.10 || ^16.0.0
+    core-js: ^3.8.2
+    ts-dedent: ^2.0.0
+  languageName: unknown
+  linkType: soft
+
 "@storybook/csf-tools@6.5.0-beta.4, @storybook/csf-tools@workspace:*, @storybook/csf-tools@workspace:lib/csf-tools":
   version: 0.0.0-use.local
   resolution: "@storybook/csf-tools@workspace:lib/csf-tools"
@@ -8131,10 +8143,10 @@ __metadata:
     "@storybook/addons": 6.5.0-beta.4
     "@storybook/core-client": 6.5.0-beta.4
     "@storybook/core-common": 6.5.0-beta.4
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@storybook/node-logger": 6.5.0-beta.4
     "@storybook/theming": 6.5.0-beta.4
     "@storybook/ui": 6.5.0-beta.4
-    "@storybook/webpack-tools": 6.5.0-beta.4
     "@types/case-sensitive-paths-webpack-plugin": ^2.1.4
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/terser-webpack-plugin": ^4.2.0
@@ -8184,10 +8196,10 @@ __metadata:
     "@storybook/addons": 6.5.0-beta.4
     "@storybook/core-client": 6.5.0-beta.4
     "@storybook/core-common": 6.5.0-beta.4
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@storybook/node-logger": 6.5.0-beta.4
     "@storybook/theming": 6.5.0-beta.4
     "@storybook/ui": 6.5.0-beta.4
-    "@storybook/webpack-tools": 6.5.0-beta.4
     "@types/case-sensitive-paths-webpack-plugin": ^2.1.4
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/terser-webpack-plugin": ^5.0.2
@@ -8340,7 +8352,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@storybook/preset-html-webpack@workspace:presets/html-webpack"
   dependencies:
-    "@storybook/webpack-tools": 6.5.0-beta.4
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@types/node": ^14.14.20 || ^16.0.0
     core-js: ^3.8.2
     html-loader: ^1.3.2
@@ -8357,7 +8369,7 @@ __metadata:
   resolution: "@storybook/preset-preact-webpack@workspace:presets/preact-webpack"
   dependencies:
     "@babel/plugin-transform-react-jsx": ^7.12.12
-    "@storybook/webpack-tools": 6.5.0-beta.4
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@types/node": ^14.14.20 || ^16.0.0
     core-js: ^3.8.2
     preact: ^10.5.13
@@ -8377,12 +8389,12 @@ __metadata:
     "@babel/preset-flow": ^7.12.1
     "@babel/preset-react": ^7.12.10
     "@pmmmwh/react-refresh-webpack-plugin": ^0.5.3
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@storybook/docs-tools": 6.5.0-beta.4
     "@storybook/node-logger": 6.5.0-beta.4
     "@storybook/react-docgen-typescript-plugin": 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0
     "@storybook/renderer-react": 6.5.0-beta.4
     "@storybook/semver": ^7.3.2
-    "@storybook/webpack-tools": 6.5.0-beta.4
     "@types/node": ^14.14.20 || ^16.0.0
     "@types/util-deprecate": ^1.0.0
     babel-plugin-add-react-displayname: ^0.0.5
@@ -8430,8 +8442,8 @@ __metadata:
   resolution: "@storybook/preset-server-webpack@workspace:presets/server-webpack"
   dependencies:
     "@storybook/core-server": 6.5.0-beta.4
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@storybook/renderer-server": 6.5.0-beta.4
-    "@storybook/webpack-tools": 6.5.0-beta.4
     "@types/node": ^14.14.20 || ^16.0.0
     core-js: ^3.8.2
     fs-extra: ^9.0.1
@@ -8450,8 +8462,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@storybook/preset-svelte-webpack@workspace:presets/svelte-webpack"
   dependencies:
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@storybook/node-logger": 6.5.0-beta.4
-    "@storybook/webpack-tools": 6.5.0-beta.4
     "@types/loader-utils": ^2.0.0
     core-js: ^3.8.2
     loader-utils: ^2.0.0
@@ -8473,8 +8485,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@storybook/preset-vue-webpack@workspace:presets/vue-webpack"
   dependencies:
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@storybook/docs-tools": 6.5.0-beta.4
-    "@storybook/webpack-tools": 6.5.0-beta.4
     "@types/node": ^14.14.20 || ^16.0.0
     core-js: ^3.8.2
     react: 16.14.0
@@ -8501,8 +8513,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@storybook/preset-vue3-webpack@workspace:presets/vue3-webpack"
   dependencies:
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@storybook/docs-tools": 6.5.0-beta.4
-    "@storybook/webpack-tools": 6.5.0-beta.4
     "@types/node": ^14.14.20 || ^16.0.0
     "@vue/compiler-sfc": 3.0.0
     core-js: ^3.8.2
@@ -8530,7 +8542,7 @@ __metadata:
     "@babel/plugin-syntax-dynamic-import": ^7.8.3
     "@babel/plugin-syntax-import-meta": ^7.10.4
     "@babel/preset-env": ^7.12.11
-    "@storybook/webpack-tools": 6.5.0-beta.4
+    "@storybook/core-webpack": 6.5.0-beta.4
     "@types/node": ^14.14.20 || ^16.0.0
     babel-plugin-bundled-import-meta: ^0.3.1
     core-js: ^3.8.2
@@ -8868,6 +8880,7 @@ __metadata:
     "@storybook/codemod": "workspace:*"
     "@storybook/components": "workspace:*"
     "@storybook/core-events": "workspace:*"
+    "@storybook/core-webpack": "workspace:*"
     "@storybook/csf-tools": "workspace:*"
     "@storybook/docs-tools": "workspace:*"
     "@storybook/ember": "workspace:*"
@@ -8909,7 +8922,6 @@ __metadata:
     "@storybook/ui": "workspace:*"
     "@storybook/vue": "workspace:*"
     "@storybook/web-components": "workspace:*"
-    "@storybook/webpack-tools": "workspace:*"
     "@testing-library/dom": ^7.29.4
     "@testing-library/jest-dom": ^5.11.9
     "@testing-library/react": ^11.2.2
@@ -9408,18 +9420,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@storybook/webpack-tools@6.5.0-beta.4, @storybook/webpack-tools@workspace:*, @storybook/webpack-tools@workspace:lib/webpack-tools":
-  version: 0.0.0-use.local
-  resolution: "@storybook/webpack-tools@workspace:lib/webpack-tools"
-  dependencies:
-    "@storybook/core-common": 6.5.0-beta.4
-    "@storybook/node-logger": 6.5.0-beta.4
-    "@types/node": ^14.0.10 || ^16.0.0
-    core-js: ^3.8.2
-    ts-dedent: ^2.0.0
-  languageName: unknown
-  linkType: soft
-
 "@stroncium/procfs@npm:^1.2.1":
   version: 1.2.1
   resolution: "@stroncium/procfs@npm:1.2.1"