storybook: switch to webpack 5

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

storybook/.storybook/main.js

@@ -14,7 +14,22 @@ const BACKSTAGE_CORE_STORIES = [
   'plugins/stack-overflow',
 ];
 
-module.exports = ({ args }) => {
+// Some configuration needs to be available directly on the exported object
+const staticConfig = {
+  core: {
+    builder: 'webpack5',
+  },
+  addons: [
+    '@storybook/addon-controls',
+    '@storybook/addon-a11y',
+    '@storybook/addon-actions',
+    '@storybook/addon-links',
+    '@storybook/addon-storysource',
+    'storybook-dark-mode/register',
+  ],
+};
+
+module.exports = Object.assign(({ args }) => {
   // Calling storybook with no args causes our default list of stories to be used.
   // This set of stories are the ones that we publish to backstage.io
   //
@@ -31,15 +46,8 @@ module.exports = ({ args }) => {
   const stories = packages.map(getStoriesPath);
 
   return {
+    ...staticConfig,
     stories,
-    addons: [
-      '@storybook/addon-controls',
-      '@storybook/addon-a11y',
-      '@storybook/addon-actions',
-      '@storybook/addon-links',
-      '@storybook/addon-storysource',
-      'storybook-dark-mode/register',
-    ],
     webpackFinal: async config => {
       // Mirror config in packages/cli/src/lib/bundler
       config.resolve.mainFields = ['browser', 'module', 'main'];
@@ -86,4 +94,4 @@ module.exports = ({ args }) => {
       return config;
     },
   };
-};
+}, staticConfig);

storybook/package.json

@@ -15,14 +15,21 @@
     "sucrase": "^3.21.0"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "^6.4.21",
-    "@storybook/addon-actions": "^6.4.21",
-    "@storybook/addon-controls": "^6.4.22",
-    "@storybook/addon-links": "^6.4.21",
-    "@storybook/addon-storysource": "^6.4.21",
-    "@storybook/addons": "^6.4.21",
-    "@storybook/react": "^6.4.21",
-    "storybook-dark-mode": "^1.0.9"
+    "@storybook/addon-a11y": "^6.5.9",
+    "@storybook/addon-actions": "^6.5.9",
+    "@storybook/addon-controls": "^6.5.9",
+    "@storybook/addon-links": "^6.5.9",
+    "@storybook/addon-storysource": "^6.5.9",
+    "@storybook/addons": "^6.5.9",
+    "@storybook/builder-webpack5": "^6.5.9",
+    "@storybook/manager-webpack5": "^6.5.9",
+    "@storybook/node-logger": "^6.5.9",
+    "@storybook/react": "^6.5.9",
+    "@storybook/testing-library": "^0.0.13",
+    "storybook-dark-mode": "^1.1.0"
+  },
+  "resolutions": {
+    "webpack": "^5.73.0"
   },
   "peerDependencies": {
     "@backstage/core-app-api": "link:../packages/core-app-api",