Skip to content

Commit

Permalink
Merge branch 'release/v2023.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
gavincyi committed Sep 10, 2023
2 parents c37496b + 5f3ae84 commit 0101d01
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gavincyi/jupyterlab-executor",
"version": "2023.1.0",
"version": "2023.1.1",
"description": "JupyterLab extension of executing the scripts",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -63,7 +63,8 @@
"@jupyterlab/apputils": "^4.0.0",
"@jupyterlab/filebrowser": "^4.0.0",
"@jupyterlab/terminal": "^4.0.0",
"@phosphor/algorithm": "^1.2.0"
"@phosphor/algorithm": "^1.2.0",
"path": "^0.12.7"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.0",
Expand Down
7 changes: 5 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import { IExecutor } from './command';

import { showExecutionDialog } from './executor';

import path from "path";

const PLUGIN_ID = '@gavincyi/jupyterlab-executor:executor';

const COMMAND_ID = 'gavincyi/jupyterlab-executor:execute';
Expand Down Expand Up @@ -51,8 +53,9 @@ function activate(
}

// Show the execution dialog
const path = widget.selectedItems().next()!.value.path;
showExecutionDialog(app, path, executors);
const serverRoot = (app as any)?.paths?.directories?.serverRoot;
const localPath = widget.selectedItems().next()!.value.path;
showExecutionDialog(app, path.join(serverRoot, localPath), executors);
},
});
}
Expand Down
3 changes: 2 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1721,6 +1721,7 @@ __metadata:
eslint-plugin-prettier: ^5.0.0
jest: ^29.2.0
npm-run-all: ^4.1.5
path: ^0.12.7
prettier: ^3.0.0
rimraf: ^5.0.1
source-map-loader: ^1.0.2
Expand Down Expand Up @@ -9075,7 +9076,7 @@ __metadata:
languageName: node
linkType: hard

"path@npm:~0.12.7":
"path@npm:^0.12.7, path@npm:~0.12.7":
version: 0.12.7
resolution: "path@npm:0.12.7"
dependencies:
Expand Down

0 comments on commit 0101d01

Please sign in to comment.