Improved compat

smapiot · May 22, 2022 · 0b8df16 · 0b8df16
1 parent 3806c96
commit 0b8df16
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/extension/webView.ts b/src/extension/webView.ts
@@ -103,7 +103,10 @@ export async function createRepository(context: vscode.ExtensionContext) {
             return;
           }
 
-          const target = `${options.targetFolder}/${options.name}`;
+          const isWindows = process.platform === 'win32' && !vscode.env.remoteName;
+          const pathSep = isWindows ? '\\' : '/';
+          const cmdSep = isWindows ? ' ; ' : ' && ';
+          const target = `${options.targetFolder}${pathSep}${options.name}`;
           const installDependencies = options.nodeModules ? '--install' : '--no-install';
           const templateOptions = Object.keys(options.templateOptionsValues).map(
             (key) => `--vars.${key}="${options.templateOptionsValues[key]}"`,
@@ -153,7 +156,7 @@ export async function createRepository(context: vscode.ExtensionContext) {
               `cd ${target}`,
               `npm version ${options.version} --no-git-tag --allow-same-version`,
               'code .',
-            ].join(' && '),
+            ].join(cmdSep),
           );
           break;
         }
@@ -166,7 +169,8 @@ export async function createRepository(context: vscode.ExtensionContext) {
           });
 
           if (localPath) {
-            wv.webview.postMessage({ command: 'sendLocalPath', data: localPath });
+            const path = localPath[0].fsPath;
+            wv.webview.postMessage({ command: 'sendLocalPath', path });
           }
 
           break;

diff --git a/src/scaffold/store.ts b/src/scaffold/store.ts
@@ -21,7 +21,7 @@ export const useStore = create<Store>((set) => {
       case 'sendLocalPath':
         dispatch(set, (state) => ({
           ...state,
-          localPath: message.data[0].path,
+          localPath: message.path,
         }));
         break;