diff --git a/package.json b/package.json index c400d322..b424fe58 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coderoad", - "version": "0.19.0", + "version": "0.19.1", "description": "Play interactive coding tutorials in your editor", "keywords": [ "tutorial", diff --git a/src/actions/onRunReset.ts b/src/actions/onRunReset.ts index b82996d8..bf03a7f6 100644 --- a/src/actions/onRunReset.ts +++ b/src/actions/onRunReset.ts @@ -28,12 +28,12 @@ const onRunReset = async (action: ResetAction, context: Context): Promise } // load timeline until last pass commit - reset({ branch, hash }) + await reset({ branch, hash }) // if tutorial.config.reset.command, run it const resetActions = tutorial?.config?.reset if (resetActions) { - hooks.onReset( + await hooks.onReset( { commands: resetActions?.commands, vscodeCommands: resetActions?.vscodeCommands }, tutorial?.id as string, ) diff --git a/src/actions/onTutorialConfigContinue.ts b/src/actions/onTutorialConfigContinue.ts index 5d1f2d12..61d85955 100644 --- a/src/actions/onTutorialConfigContinue.ts +++ b/src/actions/onTutorialConfigContinue.ts @@ -30,7 +30,7 @@ const onTutorialConfigContinue = async (action: T.Action, context: Context): Pro // if tutorial.config.reset.command, run it const continueActions = tutorialToContinue?.config?.continue if (continueActions) { - hooks.onContinue( + await hooks.onContinue( { commands: continueActions?.commands, vscodeCommands: continueActions?.vscodeCommands }, tutorialToContinue?.id as string, ) diff --git a/src/channel.ts b/src/channel.ts index df896cdf..e7f1aa80 100644 --- a/src/channel.ts +++ b/src/channel.ts @@ -59,12 +59,12 @@ class Channel implements Channel { case 'EDITOR_LEVEL_ENTER': case 'EDITOR_STEP_ENTER': await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_POSITION, action.payload.position) - hooks.onSetupEnter(action.payload.actions) + await hooks.onSetupEnter(action.payload.actions) return // load solution step actions (git commits, commands, open files) case 'EDITOR_SOLUTION_ENTER': await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_POSITION, action.payload.position) - hooks.onSolutionEnter(action.payload.actions) + await hooks.onSolutionEnter(action.payload.actions) return case 'EDITOR_SYNC_POSITION': // update progress when a level is deemed complete in the client @@ -83,13 +83,13 @@ class Channel implements Channel { actions.onRunReset({ type: 'POSITION', position: action.payload.position }, this.context) return case 'EDITOR_STEP_COMPLETE': - hooks.onStepComplete(action.payload) + await hooks.onStepComplete(action.payload) return case 'EDITOR_LEVEL_COMPLETE': - hooks.onLevelComplete(action.payload) + await hooks.onLevelComplete(action.payload) return case 'EDITOR_TUTORIAL_COMPLETE': - hooks.onTutorialComplete(action.payload) + await hooks.onTutorialComplete(action.payload) return default: logger(`No match for action type: ${actionType}`) diff --git a/src/commands.ts b/src/commands.ts index 6c805cf5..20e9eaf7 100644 --- a/src/commands.ts +++ b/src/commands.ts @@ -70,7 +70,7 @@ export const createCommands = (commandProps: CreateCommandProps): { [key: string if (!alreadyConfigured) { const setupActions = data.config.setup if (setupActions) { - hooks.onInit(setupActions, data.id) + await hooks.onInit(setupActions, data.id) } } testRunner = createTestRunner(data, { diff --git a/src/services/reset/index.ts b/src/services/reset/index.ts index e512a049..b13cdae6 100644 --- a/src/services/reset/index.ts +++ b/src/services/reset/index.ts @@ -36,7 +36,7 @@ const reset = async ({ branch, hash }: Input): Promise => { }) // stash any current work await exec({ - command: 'git stash', + command: 'git stash --include-untracked', }).catch(ignoreError) // remove any other files diff --git a/web-app/package.json b/web-app/package.json index 1f396b0e..f1637786 100644 --- a/web-app/package.json +++ b/web-app/package.json @@ -1,6 +1,6 @@ { "name": "coderoad-app", - "version": "0.19.0", + "version": "0.19.1", "private": true, "scripts": { "analyze": "source-map-explorer 'build/static/js/*.js'",