diff --git a/README.md b/README.md index 12c40708..1c7510ad 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Just install the extension, look at the releases section. No need for Jupyter or > ⚠️ **Important:** > Remember deno.enable:true in the workspace that contains the notebooks. The best way is to use the command _Deno: Initialize -Workspace Configuration_ (adds some more configuration besides deno.enable). +Workspace Configuration_. Rename any .ts file to .nb.ts to get started. You can also start with an empty file: diff --git a/client/src/commands.ts b/client/src/commands.ts index f9358046..ba3d0663 100644 --- a/client/src/commands.ts +++ b/client/src/commands.ts @@ -672,7 +672,6 @@ export function enable( return async () => { const config = vscode.workspace.getConfiguration(EXTENSION_NS); await config.update("enable", true); - await vscode.workspace.getConfiguration('typescript.validate').update('enable', false); vscode.window.showInformationMessage("Deno workspace initialized."); const tsserverConfig = vscode.workspace.getConfiguration( "typescript.tsserver", @@ -703,7 +702,6 @@ export function disable( return async () => { const config = vscode.workspace.getConfiguration(EXTENSION_NS); await config.update("enable", undefined); - await vscode.workspace.getConfiguration('typescript.validate').update('enable', undefined); }; } diff --git a/devcontainer-root/.vscode/settings.json b/devcontainer-root/.vscode/settings.json index 2d7d98c4..3c2e53b3 100644 --- a/devcontainer-root/.vscode/settings.json +++ b/devcontainer-root/.vscode/settings.json @@ -1,4 +1,3 @@ { - "deno.enable": true, - "typescript.validate.enable": false + "deno.enable": true } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 54b0b480..4770704f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,20 @@ { "name": "vscode-nbts", - "version": "1.0.18", + "version": "1.0.19", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vscode-nbts", - "version": "1.0.18", + "version": "1.0.19", "hasInstallScript": true, "license": "MIT", "dependencies": { - "typescript-deno-plugin": "./typescript-deno-plugin", "zeromq": "6.0.8" }, "devDependencies": { "@types/node": "^14.14.25", + "copy-folder-util": "^1.1.4", "esbuild": "^0.14.23", "typescript": "^5.0.2" }, @@ -163,6 +163,19 @@ "node": "^16.14.0 || >=18.0.0" } }, + "node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, "node_modules/chownr": { "version": "2.0.0", "license": "ISC", @@ -177,6 +190,16 @@ "node": ">=6" } }, + "node_modules/cli-argv-util": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/cli-argv-util/-/cli-argv-util-1.2.6.tgz", + "integrity": "sha512-TxdSefm6I7eTj7JXOcj34ucba/JcD17Xc8zBBe4bLd0ibL1GBjANhDAB1QjtOrU53d9cdPDzeDcr33okJJ6Q3A==", + "dev": true, + "license": "MIT", + "dependencies": { + "slash": "~5.1" + } + }, "node_modules/color-convert": { "version": "2.0.1", "license": "MIT", @@ -191,10 +214,37 @@ "version": "1.1.4", "license": "MIT" }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "dev": true, + "license": "ISC", + "bin": { + "color-support": "bin.js" + } + }, "node_modules/concat-map": { "version": "0.0.1", "license": "MIT" }, + "node_modules/copy-folder-util": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/copy-folder-util/-/copy-folder-util-1.1.4.tgz", + "integrity": "sha512-X4FgLcBc3OGoJKybTWoZr6x/VS/98IwmjQ4LgoDEJhra4WIwClehkFestxakPhdamlNWyyqM9GHpaDhm0UZ0rQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "~5.3", + "cli-argv-util": "~1.2", + "fancy-log": "~2.0", + "slash": "~5.1" + }, + "bin": { + "copy-folder": "bin/cli.js", + "copy-folder-util": "bin/cli.js" + } + }, "node_modules/cross-env": { "version": "7.0.3", "license": "MIT", @@ -319,6 +369,19 @@ "version": "3.1.1", "license": "Apache-2.0" }, + "node_modules/fancy-log": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz", + "integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-support": "^1.1.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/foreground-child": { "version": "3.3.0", "license": "ISC", @@ -944,6 +1007,19 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/slash": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", + "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/smart-buffer": { "version": "4.2.0", "license": "MIT", @@ -1134,10 +1210,6 @@ "node": ">=14.17" } }, - "node_modules/typescript-deno-plugin": { - "resolved": "typescript-deno-plugin", - "link": true - }, "node_modules/unique-filename": { "version": "3.0.0", "license": "ISC", @@ -1274,6 +1346,7 @@ }, "typescript-deno-plugin": { "version": "3.43.1", + "extraneous": true, "license": "MIT", "devDependencies": { "typescript": "^5.0.2" diff --git a/package.json b/package.json index 31a7d8cc..302e5d59 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Visual Studio Code plugin for Deno lsp support on notebooks (+ NBTS serializer + DenoNBTS kernel)", "author": "redking00 & Deno Land Inc.", "license": "MIT", - "version": "1.0.18", + "version": "1.0.19", "icon": "deno.png", "galleryBanner": { "color": "#3B3738", @@ -871,7 +871,7 @@ ] }, "scripts": { - "vscode:prepublish": "npm i && npm run esbuild-plugin && npm i && npm run esbuild-base", + "vscode:prepublish": "npm i && npm run esbuild-plugin && npm i && npm run esbuild-base && copy-folder typescript-deno-plugin node_modules/typescript-deno-plugin", "esbuild-base": "esbuild ./client/src/extension.ts --bundle --outfile=client/dist/main.js --external:vscode --external:zeromq --format=cjs --platform=node", "esbuild-plugin": "esbuild ./typescript-deno-plugin/src/index.ts --bundle --outfile=typescript-deno-plugin/dist/index.js --external:vscode --format=cjs --platform=node", "esbuild": "npm run esbuild-plugin -- --sourcemap && npm run esbuild-base -- --sourcemap", @@ -881,11 +881,11 @@ "postinstall": "cd typescript-deno-plugin && npm i && cd ../client && npm i && cd .." }, "dependencies": { - "zeromq": "6.0.8", - "typescript-deno-plugin": "./typescript-deno-plugin" + "zeromq": "6.0.8" }, "devDependencies": { "@types/node": "^14.14.25", + "copy-folder-util": "^1.1.4", "esbuild": "^0.14.23", "typescript": "^5.0.2" }