fix(NA): multiple versions of the same type dependency

elastic · Sep 30, 2020 · aca6579 · aca6579
1 parent 41b2e4f
commit aca6579
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -343,7 +343,7 @@
     "@types/uuid": "^3.4.4",
     "@types/vinyl": "^2.0.4",
     "@types/vinyl-fs": "^2.4.11",
-    "@types/webpack": "^4.41.21",
+    "@types/webpack": "^4.41.3",
     "@types/webpack-env": "^1.15.2",
     "@types/zen-observable": "^0.8.0",
     "@typescript-eslint/eslint-plugin": "^3.10.0",

diff --git a/packages/kbn-storybook/package.json b/packages/kbn-storybook/package.json
@@ -13,8 +13,8 @@
     "@storybook/core": "^6.0.16",
     "@storybook/react": "^6.0.16",
     "@storybook/theming": "^6.0.16",
-    "@types/loader-utils": "^2.0.1",
-    "@types/webpack": "^4.41.5",
+    "@types/loader-utils": "^1.1.3",
+    "@types/webpack": "^4.41.3",
     "@types/webpack-env": "^1.15.2",
     "@types/webpack-merge": "^4.1.5",
     "@kbn/utils": "1.0.0",

diff --git a/packages/kbn-storybook/webpack.config.ts b/packages/kbn-storybook/webpack.config.ts
@@ -100,9 +100,5 @@ export default function ({ config: storybookConfig }: { config: Configuration })
   if (htmlWebpackPlugin) {
     htmlWebpackPlugin.options.template = require.resolve('../lib/templates/index.ejs');
   }
-
-  // @ts-expect-error There's a long error here about the types of the
-  // incompatibility of Configuration, but it looks like it just may be Webpack
-  // type definition related.
   return webpackMerge(storybookConfig, config);
 }
diff --git a/yarn.lock b/yarn.lock
@@ -4459,14 +4459,6 @@
     "@types/node" "*"
     "@types/webpack" "*"
 
-"@types/loader-utils@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/loader-utils/-/loader-utils-2.0.1.tgz#4073425aca25762099823f7b922e86599c2b85ec"
-  integrity sha512-X3jTNi/I2AEd2WrHdSqRppPkYzWkRMNGxJzeMwS0o3hVi8ZB6JCnf/XyQmqpUuCidld5lC/1VxVgTktEweRK+w==
-  dependencies:
-    "@types/node" "*"
-    "@types/webpack" "*"
-
 "@types/lodash.difference@^4.5.6":
   version "4.5.6"
   resolved "https://registry.yarnpkg.com/@types/lodash.difference/-/lodash.difference-4.5.6.tgz#41ec5c4e684eeacf543848a9a1b2a4856ccf9853"
@@ -5304,7 +5296,7 @@
     "@types/webpack-sources" "*"
     source-map "^0.6.0"
 
-"@types/webpack@^4.41.21", "@types/webpack@^4.41.5", "@types/webpack@^4.41.8":
+"@types/webpack@^4.41.8":
   version "4.41.21"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.21.tgz#cc685b332c33f153bb2f5fc1fa3ac8adeb592dee"
   integrity sha512-2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA==