From 5416773951fbb32bc129faffd3b7d10d7f3087d5 Mon Sep 17 00:00:00 2001 From: uluckydev Date: Mon, 21 Oct 2024 21:58:31 +0530 Subject: [PATCH] Fix Storybook Configuration for Windows Development Environment (#7904) #### Description This PR resolves issue #7903 regarding the Storybook configuration for Windows development environments. Previously, the configuration script generated forward slashes instead of backslashes, leading to errors when running the command `npx nx run twenty-front:storybook:serve:dev --configuration=modules` on Windows systems. #### Changes Made - Updated the Storybook configuration to ensure that backslashes are used in file paths for Windows environments, preventing command execution errors. #### How to Test 1. **Run Storybook Command**: - On a Windows machine, execute the command: ``` npx nx run twenty-front:storybook:serve:dev --configuration=modules ``` - Ensure that the command runs successfully without any path-related errors. 2. **Verify Configuration**: - Check the Storybook configuration files to confirm that paths are using backslashes where applicable. - Test the same command on non-Windows environments to verify that there are no regressions. #### Related Issue - Fixes #7903 --- package.json | 1 + packages/twenty-ui/scripts/generateBarrels.js | 7 ++++--- yarn.lock | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index a83f2180f..816fe84a5 100644 --- a/package.json +++ b/package.json @@ -176,6 +176,7 @@ "scroll-into-view": "^1.16.2", "semver": "^7.5.4", "sharp": "^0.32.1", + "slash": "^5.1.0", "stripe": "^14.17.0", "ts-key-enum": "^2.0.12", "tslib": "^2.3.0", diff --git a/packages/twenty-ui/scripts/generateBarrels.js b/packages/twenty-ui/scripts/generateBarrels.js index 8988c1e8e..6d91aa19d 100644 --- a/packages/twenty-ui/scripts/generateBarrels.js +++ b/packages/twenty-ui/scripts/generateBarrels.js @@ -1,5 +1,6 @@ import * as fs from 'fs'; import path from 'path'; +import slash from 'slash'; const extensions = ['.ts', '.tsx']; const excludedExtensions = [ @@ -73,10 +74,10 @@ moduleDirectories.forEach((moduleDirectoryPath) => { return directFilesPaths.map((filePath) => { const fileName = filePath.split('.').slice(0, -1).join('.'); - return `export * from './${path.relative( + return `export * from './${slash(path.relative( moduleDirectoryPath, path.join(directoryPath, fileName), - )}';`; + ))}';`; }); }) .sort((a, b) => a.localeCompare(b)) @@ -92,7 +93,7 @@ moduleDirectories.forEach((moduleDirectoryPath) => { const mainBarrelExports = moduleDirectories .map( (moduleDirectoryPath) => - `export * from './${path.relative(srcPath, moduleDirectoryPath)}';`, + `export * from './${slash(path.relative(srcPath, moduleDirectoryPath))}';`, ) .sort((a, b) => a.localeCompare(b)) .join('\n'); diff --git a/yarn.lock b/yarn.lock index 475ba43b0..b6ed9d913 100644 --- a/yarn.lock +++ b/yarn.lock @@ -41555,7 +41555,7 @@ __metadata: languageName: node linkType: hard -"slash@npm:^5.0.0": +"slash@npm:^5.0.0, slash@npm:^5.1.0": version: 5.1.0 resolution: "slash@npm:5.1.0" checksum: 10c0/eb48b815caf0bdc390d0519d41b9e0556a14380f6799c72ba35caf03544d501d18befdeeef074bc9c052acf69654bc9e0d79d7f1de0866284137a40805299eb3 @@ -44314,6 +44314,7 @@ __metadata: scroll-into-view: "npm:^1.16.2" semver: "npm:^7.5.4" sharp: "npm:^0.32.1" + slash: "npm:^5.1.0" source-map-support: "npm:^0.5.20" storybook: "npm:^7.6.3" storybook-addon-cookie: "npm:^3.2.0"