Merge pull request #22644 from storybookjs/fix/windows-paths

CLI: Account for windows paths when copying templates
storybookjs · May 22, 2023 · edc0e78 · edc0e78
1 parent b3d6df8
commit edc0e78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/code/lib/cli/src/dirs.ts b/code/lib/cli/src/dirs.ts
@@ -38,7 +38,7 @@ export async function getRendererDir(
   const frameworkPackageName =
     externalFramework?.renderer || externalFramework?.packageName || `@storybook/${renderer}`;
 
-  const packageJsonPath = `${frameworkPackageName}/package.json`;
+  const packageJsonPath = join(frameworkPackageName, 'package.json');
 
   const errors: Error[] = [];
 

diff --git a/code/lib/cli/src/helpers.ts b/code/lib/cli/src/helpers.ts
@@ -211,7 +211,7 @@ export async function copyTemplateFiles({
   };
   const templatePath = async () => {
     const baseDir = await getRendererDir(packageManager, renderer);
-    const assetsDir = join(baseDir, 'template/cli');
+    const assetsDir = join(baseDir, 'template', 'cli');
 
     const assetsLanguage = join(assetsDir, languageFolderMapping[language]);
     const assetsJS = join(assetsDir, languageFolderMapping[SupportedLanguage.JAVASCRIPT]);
@@ -250,7 +250,7 @@ export async function copyTemplateFiles({
 
   const destinationPath = destination ?? (await targetPath());
   if (includeCommonAssets) {
-    await fse.copy(join(getCliDir(), 'rendererAssets/common'), destinationPath, {
+    await fse.copy(join(getCliDir(), 'rendererAssets', 'common'), destinationPath, {
       overwrite: true,
     });
   }