Fix(variables-scss): Export in JS barrel file #DS-1503

lmc-eu · Oct 4, 2024 · 3d9eb6e · 3d9eb6e
1 parent 7aac16d
commit 3d9eb6e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/exporters/variables-scss/generated/exporter.cjs b/exporters/variables-scss/generated/exporter.cjs
diff --git a/exporters/variables-scss/src/generators/__tests__/fileGenerator.test.ts b/exporters/variables-scss/src/generators/__tests__/fileGenerator.test.ts
@@ -98,7 +98,7 @@ describe('fileGenerator', () => {
         { path: './js/global/', fileName: 'index.ts', content: barrelJsFile },
         // Root barrel files
         { path: './scss/', fileName: '@global.scss', content: "@forward 'global';\n" },
-        { path: './js/', fileName: '@global.ts', content: "export * from './global';\n" },
+        { path: './js/', fileName: 'index.ts', content: "export * from './global';\nexport * from './themes';\n" },
         // Themes files
         { path: './scss/themes/theme-light/', fileName: '_colors.scss', content: emptyFile },
         { path: './js/themes/theme-light/', fileName: 'colors.ts', content: emptyFile },
@@ -110,7 +110,7 @@ describe('fileGenerator', () => {
         { path: './js/themes/theme-light-inverted/', fileName: 'index.ts', content: barrelJsColorFile },
         // Themes root barrel files
         { path: './scss/', fileName: '@themes.scss', content: mockedRootThemeFile },
-        { path: './js/', fileName: '@themes.ts', content: mockedRootThemeJsFile },
+        { path: './js/', fileName: 'themes.ts', content: mockedRootThemeJsFile },
       ]);
     });
   });

diff --git a/exporters/variables-scss/src/generators/fileGenerator.ts b/exporters/variables-scss/src/generators/fileGenerator.ts
@@ -114,8 +114,8 @@ export const generateOutputFilesByThemes = async (
   });
   outputFiles.push({
     path: `./${JS_DIRECTORY}/`,
-    fileName: '@global.ts',
-    content: `export * from './${GLOBAL_DIRECTORY}';\n`,
+    fileName: 'index.ts',
+    content: `export * from './${GLOBAL_DIRECTORY}';\nexport * from './${THEMES_DIRECTORY}';\n`,
   });
 
   // Compute themed tokens for all themes in parallel
@@ -161,7 +161,7 @@ export const generateOutputFilesByThemes = async (
   const rootThemesFileContent = generateThemesRootFile(themes);
   const rootTsThemesFileContent = generateThemesRootFile(themes, true);
   outputFiles.push({ path: `./${SCSS_DIRECTORY}/`, fileName: '@themes.scss', content: rootThemesFileContent });
-  outputFiles.push({ path: `./${JS_DIRECTORY}/`, fileName: '@themes.ts', content: rootTsThemesFileContent });
+  outputFiles.push({ path: `./${JS_DIRECTORY}/`, fileName: 'themes.ts', content: rootTsThemesFileContent });
 
   return outputFiles;
 };