Core: Simplify @emotion/react module augmentation

code/core/src/theming/index.ts

@@ -1,5 +1,4 @@
 /// <reference path="../typings.d.ts" />
-/// <reference path="./emotionAugmentation.d.ts" />
 import type { FunctionInterpolation, Interpolation } from '@emotion/react';
 
 import type { StorybookTheme } from './types';
@@ -30,7 +29,6 @@ export type {
 
 export * from './base';
 export * from './types';
-// export * from './emotionAugmentation.d.ts';
 
 export { default as createCache } from '@emotion/cache';
 export { default as isPropValid } from '@emotion/is-prop-valid';
@@ -44,3 +42,9 @@ export { lightenColor as lighten, darkenColor as darken, getPreferredColorScheme
 
 export const ignoreSsrWarning =
   '/* emotion-disable-server-rendering-unsafe-selector-warning-please-do-not-use-this-the-warning-exists-for-a-reason */';
+
+// Re-export Theme from @emotion/react and self-augment with StorybookTheme
+declare module '.' {
+  interface Theme extends StorybookTheme {}
+}
+export type { Theme } from '@emotion/react';

scripts/build/build-package.ts

@@ -25,7 +25,6 @@ import { generateBundle } from './utils/generate-bundle';
 import { generatePackageJsonFile } from './utils/generate-package-json';
 import { generateTypesMapperFiles } from './utils/generate-type-mappers';
 import { generateTypesFiles } from './utils/generate-types';
-import { modifyCoreThemeTypes } from './utils/modify-core-theme-types';
 
 const {
   values: { prod, production, optimized, watch, cwd },
@@ -87,7 +86,6 @@ async function run() {
     measure(async () => generateBundle({ cwd: DIR_CWD, entry, name, isWatch })),
     measure(async () => {
       await generateTypesMapperFiles(DIR_CWD, entry);
-      await modifyCoreThemeTypes(DIR_CWD);
       if (isProduction) {
         await generateTypesFiles(DIR_CWD, entry);
       }

scripts/build/utils/generate-types.ts

@@ -5,7 +5,6 @@ import picocolors from 'picocolors';
 
 import { ROOT_DIRECTORY } from '../../utils/constants';
 import type { BuildEntries } from './entry-utils';
-import { modifyCoreThemeTypes } from './modify-core-theme-types';
 
 const DIR_CODE = join(import.meta.dirname, '..', '..', '..', 'code');
 
@@ -86,10 +85,6 @@ export async function generateTypesFiles(cwd: string, data: BuildEntries) {
           process.exit(dtsProcess.exitCode || 1);
         } else {
           console.log('✅ Generated types for', picocolors.cyan(join(DIR_REL, entryPoint)));
-
-          if (entryPoint.includes('src/theming/index')) {
-            await modifyCoreThemeTypes(cwd);
-          }
         }
       });
     })