From d2baf1ddaeb50e219844b9c10086015e5a9de8ed Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Tue, 9 Apr 2024 19:57:10 +0700 Subject: [PATCH 1/2] Modified for Window compatibility --- .../@coorpacademy-components/scripts/observables/components.js | 2 +- .../scripts/observables/generate-stories.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@coorpacademy-components/scripts/observables/components.js b/packages/@coorpacademy-components/scripts/observables/components.js index 6d096b47e1..35784e71b5 100644 --- a/packages/@coorpacademy-components/scripts/observables/components.js +++ b/packages/@coorpacademy-components/scripts/observables/components.js @@ -11,7 +11,7 @@ const {readComponentFiles$} = require('./component-files'); const parse = cwd => pipe( file => relative(cwd, file), - split('/'), + split('\\'), slice(0, -1), folders => { const levels = slice(0, -1)(folders); diff --git a/packages/@coorpacademy-components/scripts/observables/generate-stories.js b/packages/@coorpacademy-components/scripts/observables/generate-stories.js index b7a027182b..2209924102 100644 --- a/packages/@coorpacademy-components/scripts/observables/generate-stories.js +++ b/packages/@coorpacademy-components/scripts/observables/generate-stories.js @@ -17,7 +17,7 @@ const generateStories$ = cwd => readComponentFixtures$({title, path, type}).pipe( map( ({fixture, fixturePath}) => - `import fixture${fixture} from './${relative(testPath, fixturePath)}';` + `import fixture${fixture} from './${relative(testPath, fixturePath)}';`.replace('\\', '/') ) ), of( From 169a61d2732465ce82625639eb31818e59a1448c Mon Sep 17 00:00:00 2001 From: esa-coorp Date: Tue, 9 Apr 2024 15:32:07 +0200 Subject: [PATCH 2/2] [Windows support] Use file separator and replace all '\' by '/' import fixtures --- .../scripts/observables/components.js | 3 ++- .../scripts/observables/generate-stories.js | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/@coorpacademy-components/scripts/observables/components.js b/packages/@coorpacademy-components/scripts/observables/components.js index 35784e71b5..d1dd9949e6 100644 --- a/packages/@coorpacademy-components/scripts/observables/components.js +++ b/packages/@coorpacademy-components/scripts/observables/components.js @@ -1,4 +1,5 @@ const {relative, join} = require('path'); +const {sep: folderSeparator} = require('path'); const pipe = require('lodash/fp/pipe'); const last = require('lodash/fp/last'); const _join = require('lodash/fp/join'); @@ -11,7 +12,7 @@ const {readComponentFiles$} = require('./component-files'); const parse = cwd => pipe( file => relative(cwd, file), - split('\\'), + split(folderSeparator), slice(0, -1), folders => { const levels = slice(0, -1)(folders); diff --git a/packages/@coorpacademy-components/scripts/observables/generate-stories.js b/packages/@coorpacademy-components/scripts/observables/generate-stories.js index 2209924102..f023cfcacd 100644 --- a/packages/@coorpacademy-components/scripts/observables/generate-stories.js +++ b/packages/@coorpacademy-components/scripts/observables/generate-stories.js @@ -15,9 +15,11 @@ const generateStories$ = cwd => concat( of(`import React from 'react';`, `import ${title} from '..';`), readComponentFixtures$({title, path, type}).pipe( - map( - ({fixture, fixturePath}) => - `import fixture${fixture} from './${relative(testPath, fixturePath)}';`.replace('\\', '/') + map(({fixture, fixturePath}) => + `import fixture${fixture} from './${relative(testPath, fixturePath)}';`.replace( + /\\/g, + '/' + ) ) ), of(