From bbd7262611ec64c0dd00bb9556097fa16b86afb7 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 24 Nov 2021 10:49:09 +0100 Subject: [PATCH] cleanup typescript webpack types --- app/angular/src/server/utils/filter-out-styling-rules.ts | 2 +- app/react/src/typings.d.ts | 2 -- app/vue/src/typings.d.ts | 2 -- app/vue3/src/typings.d.ts | 2 -- lib/builder-webpack4/src/preview/iframe-webpack.config.ts | 2 +- lib/core-common/src/utils/es6Transpiler.ts | 2 +- lib/manager-webpack4/src/presets/babel-loader-manager.ts | 2 +- lib/manager-webpack5/src/presets/babel-loader-manager.ts | 2 +- 8 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/angular/src/server/utils/filter-out-styling-rules.ts b/app/angular/src/server/utils/filter-out-styling-rules.ts index 46591becee5d..26489cee2ffc 100644 --- a/app/angular/src/server/utils/filter-out-styling-rules.ts +++ b/app/angular/src/server/utils/filter-out-styling-rules.ts @@ -1,4 +1,4 @@ -import { Configuration, RuleSetRule } from 'webpack'; +import type { Configuration, RuleSetRule } from 'webpack'; const isStylingRule = (rule: RuleSetRule) => { const { test } = rule; diff --git a/app/react/src/typings.d.ts b/app/react/src/typings.d.ts index 26c2a8b586bf..4ff88fa9018c 100644 --- a/app/react/src/typings.d.ts +++ b/app/react/src/typings.d.ts @@ -1,4 +1,2 @@ declare module '@storybook/semver'; declare module 'global'; -// todo check for correct types -declare module 'webpack/lib/RuleSet'; diff --git a/app/vue/src/typings.d.ts b/app/vue/src/typings.d.ts index 87f498f04800..4f4eff6c31cd 100644 --- a/app/vue/src/typings.d.ts +++ b/app/vue/src/typings.d.ts @@ -1,5 +1,3 @@ declare module 'global'; -// todo check for correct types -declare module 'webpack/lib/RuleSet'; declare module 'vue-loader/lib/plugin'; \ No newline at end of file diff --git a/app/vue3/src/typings.d.ts b/app/vue3/src/typings.d.ts index 64a098b25475..35a53756975e 100644 --- a/app/vue3/src/typings.d.ts +++ b/app/vue3/src/typings.d.ts @@ -1,6 +1,4 @@ declare module 'global'; -// todo check for correct types -declare module 'webpack/lib/RuleSet'; declare module 'vue-loader' { export const VueLoaderPlugin diff --git a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts index d20ddd08ad82..524a733bd1e9 100644 --- a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts +++ b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts @@ -1,7 +1,7 @@ import path from 'path'; import { DefinePlugin, HotModuleReplacementPlugin, ProgressPlugin } from 'webpack'; // @ts-ignore -import { Configuration, RuleSetRule } from '@types/webpack'; +import type { Configuration, RuleSetRule } from '@types/webpack'; import HtmlWebpackPlugin from 'html-webpack-plugin'; import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin'; import WatchMissingNodeModulesPlugin from 'react-dev-utils/WatchMissingNodeModulesPlugin'; diff --git a/lib/core-common/src/utils/es6Transpiler.ts b/lib/core-common/src/utils/es6Transpiler.ts index 5404e76bdc31..5b6c45900656 100644 --- a/lib/core-common/src/utils/es6Transpiler.ts +++ b/lib/core-common/src/utils/es6Transpiler.ts @@ -1,4 +1,4 @@ -import { RuleSetRule } from 'webpack'; +import type { RuleSetRule } from 'webpack'; import { getStorybookBabelConfig } from './babel'; const { plugins } = getStorybookBabelConfig(); diff --git a/lib/manager-webpack4/src/presets/babel-loader-manager.ts b/lib/manager-webpack4/src/presets/babel-loader-manager.ts index 07f9f43118ec..04ca8447de9d 100644 --- a/lib/manager-webpack4/src/presets/babel-loader-manager.ts +++ b/lib/manager-webpack4/src/presets/babel-loader-manager.ts @@ -1,4 +1,4 @@ -import { RuleSetRule } from 'webpack'; +import type { RuleSetRule } from 'webpack'; import { getProjectRoot, getStorybookBabelConfig } from '@storybook/core-common'; export const babelLoader = () => { diff --git a/lib/manager-webpack5/src/presets/babel-loader-manager.ts b/lib/manager-webpack5/src/presets/babel-loader-manager.ts index 07f9f43118ec..04ca8447de9d 100644 --- a/lib/manager-webpack5/src/presets/babel-loader-manager.ts +++ b/lib/manager-webpack5/src/presets/babel-loader-manager.ts @@ -1,4 +1,4 @@ -import { RuleSetRule } from 'webpack'; +import type { RuleSetRule } from 'webpack'; import { getProjectRoot, getStorybookBabelConfig } from '@storybook/core-common'; export const babelLoader = () => {