Merge branch 'main' into renovate/cypress-9.x

packages/testing/config/storybook/main.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 
-const { merge, mergeWithCustomize } = require('webpack-merge')
+const { mergeWithCustomize } = require('webpack-merge')
 
 const { getSharedPlugins } = require('@redwoodjs/core/config/webpack.common.js')
 const {
@@ -16,29 +16,6 @@ const rwjsPaths = getPaths()
 
 const staticAssetsFolder = path.join(getPaths().web.base, 'public')
 
-function isPackageInstalled(alias) {
-  try {
-    return Boolean(require(alias))
-  } catch (e) {
-    return false
-  }
-}
-
-function withEmotionVersionFallback(config) {
-  const alias = Object.entries({
-    '@emotion/core': '@emotion/core',
-    '@emotion/styled': '@emotion/styled',
-    'emotion-theming': '@emotion/react',
-  }).reduce((acc, [packageName, alias]) => {
-    if (isPackageInstalled(alias)) {
-      acc[packageName] = require.resolve(alias)
-    }
-    return acc
-  }, {})
-
-  return merge(config, { resolve: { alias } })
-}
-
 const baseConfig = {
   core: {
     builder: 'webpack5',
@@ -135,8 +112,6 @@ const baseConfig = {
     // https://webpack.js.org/guides/build-performance/#output-without-path-info
     sbConfig.output.pathinfo = false
 
-    sbConfig = withEmotionVersionFallback(sbConfig)
-
     return sbConfig
   },
   // only set staticDirs when running Storybook process; will fail if set for SB --build