Update Storybook updates to v6.4.15 (#44586)

* Update Storybook updates to v6.4.15

* revert(storybook): remove webpack process resolution as 6.4.14 patched it

* chore(yarn): update packageExtensions for storybook bump

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>

.yarnrc.yml

@@ -9,28 +9,28 @@ packageExtensions:
   "@mdx-js/loader@1.6.22":
     peerDependencies:
       react: 17.0.1
-  "@storybook/addon-docs@6.4.13":
+  "@storybook/addon-docs@6.4.15":
     peerDependencies:
-      "@storybook/manager-webpack5": 6.4.13
-  "@storybook/addon-essentials@6.4.13":
+      "@storybook/manager-webpack5": 6.4.15
+  "@storybook/addon-essentials@6.4.15":
     peerDependencies:
-      "@storybook/components": 6.4.13
-      "@storybook/core-events": 6.4.13
-      "@storybook/manager-webpack5": 6.4.13
-      "@storybook/theming": 6.4.13
-  "@storybook/core-server@6.4.13":
+      "@storybook/components": 6.4.15
+      "@storybook/core-events": 6.4.15
+      "@storybook/manager-webpack5": 6.4.15
+      "@storybook/theming": 6.4.15
+  "@storybook/core-server@6.4.15":
     peerDependencies:
       "@babel/core": ^7.0.0
-  "@storybook/core@6.4.13":
+  "@storybook/core@6.4.15":
     peerDependencies:
       "@babel/core": ^7.0.0
-      "@storybook/manager-webpack5": 6.4.13
-  "@storybook/csf-tools@6.4.13":
+      "@storybook/manager-webpack5": 6.4.15
+  "@storybook/csf-tools@6.4.15":
     peerDependencies:
       "@babel/core": ^7.0.0
-  "@storybook/react@6.4.13":
+  "@storybook/react@6.4.15":
     peerDependencies:
-      "@storybook/manager-webpack5": 6.4.13
+      "@storybook/manager-webpack5": 6.4.15
   doctrine@3.0.0:
     dependencies:
       assert: 2.0.0

packages/grafana-ui/.storybook/main.ts

@@ -166,34 +166,6 @@ module.exports = {
       })
     );
 
-    config.plugins = fixProcessResolution(config.plugins);
-
-    return config;
-  },
-  // This webpack config only affects the manager (storybook UI) and generally shouldn't need to be changed.
-  // If stories are failing to build check `webpackFinal` property above.
-  managerWebpack: async (config: any) => {
-    config.plugins = fixProcessResolution(config.plugins);
-
     return config;
   },
 };
-
-// Storybook 6.4.13 introduced https://github.com/storybookjs/storybook/pull/17213
-// which appears to prevent resolving correctly with yarn pnp.
-// We can probably remove this in the next patch release.
-function fixProcessResolution(plugins: any[]) {
-  plugins.forEach((p: any, i: number) => {
-    if (p.constructor.name === 'ProvidePlugin') {
-      plugins.splice(
-        i,
-        1,
-        new ProvidePlugin({
-          process: require.resolve('process/browser.js'),
-        })
-      );
-    }
-  });
-
-  return plugins;
-}

packages/grafana-ui/package.json

@@ -99,20 +99,20 @@
     "@rollup/plugin-commonjs": "21.0.1",
     "@rollup/plugin-image": "2.1.1",
     "@rollup/plugin-node-resolve": "13.1.3",
-    "@storybook/addon-a11y": "6.4.13",
-    "@storybook/addon-actions": "6.4.13",
-    "@storybook/addon-docs": "6.4.13",
-    "@storybook/addon-essentials": "6.4.13",
+    "@storybook/addon-a11y": "6.4.15",
+    "@storybook/addon-actions": "6.4.15",
+    "@storybook/addon-docs": "6.4.15",
+    "@storybook/addon-essentials": "6.4.15",
     "@storybook/addon-knobs": "6.4.0",
-    "@storybook/addon-storysource": "6.4.13",
-    "@storybook/addons": "6.4.13",
-    "@storybook/api": "6.4.13",
-    "@storybook/builder-webpack5": "6.4.13",
-    "@storybook/components": "6.4.13",
-    "@storybook/core-events": "6.4.13",
-    "@storybook/manager-webpack5": "6.4.13",
-    "@storybook/react": "6.4.13",
-    "@storybook/theming": "6.4.13",
+    "@storybook/addon-storysource": "6.4.15",
+    "@storybook/addons": "6.4.15",
+    "@storybook/api": "6.4.15",
+    "@storybook/builder-webpack5": "6.4.15",
+    "@storybook/components": "6.4.15",
+    "@storybook/core-events": "6.4.15",
+    "@storybook/manager-webpack5": "6.4.15",
+    "@storybook/react": "6.4.15",
+    "@storybook/theming": "6.4.15",
     "@swc/helpers": "0.3.2",
     "@testing-library/dom": "8.11.1",
     "@testing-library/jest-dom": "5.16.1",