Revert path.posix changes

storybookjs · Nov 14, 2022 · 78c3ddb · 78c3ddb
1 parent 7539f51
commit 78c3ddb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/code/jest.config.js b/code/jest.config.js
@@ -1,6 +1,11 @@
 const os = require('os');
 
-// TODO Revisit this test later, when we have a windows machine @valentinpalkovic
+/**
+ * TODO: Some windows related tasks are still commented out, because they are behaving differently on
+ * a local Windows machine compared to the Windows Server 2022 machine running in GitHub Actions.
+ * The main issue is that path.sep is behaving differently on the two machines. Some more investagations
+ * are necessary!
+ * */
 const skipOnWindows = [
   'lib/core-server/src/utils/__tests__/server-statics.test.ts',
   'lib/core-common/src/utils/__tests__/template.test.ts',

diff --git a/code/lib/cli/src/helpers.ts b/code/lib/cli/src/helpers.ts
@@ -197,15 +197,15 @@ export async function copyComponents(
   };
   const componentsPath = async () => {
     const baseDir = getRendererDir(renderer);
-    const assetsDir = posix.join(baseDir, 'template/cli');
+    const assetsDir = path.join(baseDir, 'template/cli');
 
-    const assetsLanguage = posix.join(assetsDir, languageFolderMapping[language]);
-    const assetsJS = posix.join(assetsDir, languageFolderMapping[SupportedLanguage.JAVASCRIPT]);
-    const assetsTSLegacy = posix.join(
+    const assetsLanguage = path.join(assetsDir, languageFolderMapping[language]);
+    const assetsJS = path.join(assetsDir, languageFolderMapping[SupportedLanguage.JAVASCRIPT]);
+    const assetsTSLegacy = path.join(
       assetsDir,
       languageFolderMapping[SupportedLanguage.TYPESCRIPT_LEGACY]
     );
-    const assetsTS = posix.join(assetsDir, languageFolderMapping[SupportedLanguage.TYPESCRIPT]);
+    const assetsTS = path.join(assetsDir, languageFolderMapping[SupportedLanguage.TYPESCRIPT]);
 
     if (await fse.pathExists(assetsLanguage)) {
       return assetsLanguage;
@@ -233,7 +233,7 @@ export async function copyComponents(
   };
 
   const destinationPath = await targetPath();
-  await fse.copy(posix.join(getCliDir(), 'rendererAssets/common'), destinationPath, {
+  await fse.copy(path.join(getCliDir(), 'rendererAssets/common'), destinationPath, {
     overwrite: true,
   });
   await fse.copy(await componentsPath(), destinationPath, { overwrite: true });