From bb1eec167e7e21919543882de786bf45ac1abcca Mon Sep 17 00:00:00 2001 From: gavinleroy Date: Fri, 23 Feb 2024 23:13:10 +0100 Subject: [PATCH] Update IDE for vsce publishing. --- ide/packages/common/package.json | 2 +- ide/packages/extension/LICENSE | 1 + ide/packages/extension/README.md | 1 + ide/packages/extension/extension | 1 + ide/packages/extension/package.json | 41 +++++++++++++------------ ide/packages/extension/src/setup.ts | 2 +- ide/packages/extension/vite.config.ts | 4 ++- ide/packages/panoptes/src/Workspace.tsx | 4 +-- ide/pnpm-lock.yaml | 9 ------ 9 files changed, 32 insertions(+), 33 deletions(-) create mode 120000 ide/packages/extension/LICENSE create mode 120000 ide/packages/extension/README.md create mode 120000 ide/packages/extension/extension diff --git a/ide/packages/common/package.json b/ide/packages/common/package.json index 70d8f6a..049f30c 100644 --- a/ide/packages/common/package.json +++ b/ide/packages/common/package.json @@ -23,4 +23,4 @@ "devDependencies": { "jsdom": "^22.1.0" } -} \ No newline at end of file +} diff --git a/ide/packages/extension/LICENSE b/ide/packages/extension/LICENSE new file mode 120000 index 0000000..ed64294 --- /dev/null +++ b/ide/packages/extension/LICENSE @@ -0,0 +1 @@ +/Users/gavingray/dev/prj/argus/LICENSE \ No newline at end of file diff --git a/ide/packages/extension/README.md b/ide/packages/extension/README.md new file mode 120000 index 0000000..4f005e2 --- /dev/null +++ b/ide/packages/extension/README.md @@ -0,0 +1 @@ +/Users/gavingray/dev/prj/argus/README.md \ No newline at end of file diff --git a/ide/packages/extension/extension b/ide/packages/extension/extension new file mode 120000 index 0000000..9ac4bfe --- /dev/null +++ b/ide/packages/extension/extension @@ -0,0 +1 @@ +/Users/gavingray/dev/prj/argus/ide/packages/extension \ No newline at end of file diff --git a/ide/packages/extension/package.json b/ide/packages/extension/package.json index 1b505bf..babc565 100644 --- a/ide/packages/extension/package.json +++ b/ide/packages/extension/package.json @@ -1,21 +1,22 @@ { - "name": "@argus/extension", - "displayName": "Argus Extension", + "name": "argus", + "publisher": "gavinleroy", + "displayName": "Argus", "description": "A trait debugger for Rust", - "version": "0.0.1", + "version": "0.1.0", "engines": { - "vscode": "^1.22.0" + "vscode": "^1.79.0" }, "bugs": { - "url": "https://github.com/gavinleroy/argus/issues", + "url": "https://github.com/cognitive-engineering-lab/argus/issues", "email": "gavinleroy6@gmail.com" }, - "categories": [ - "Programming Languages" - ], - "activationEvents": [ - "onLanguage:rust" - ], + "repository": { + "url": "https://github.com/cognitive-engineering-lab/argus", + "type": "git" + }, + "categories": ["Programming Languages"], + "activationEvents": ["onLanguage:rust"], "contributes": { "commands": [ { @@ -24,13 +25,11 @@ } ] }, - "files": [ - "dist" - ], - "main": "./dist/extension.js", + "files": ["dist"], + "main": "./dist/argus.js", "exports": { ".": { - "default": "./dist/extension.js" + "default": "./dist/argus.js" }, "./*": { "default": "./dist/*.js" @@ -43,9 +42,13 @@ "typedoc": { "entryPoint": "./src/main.ts" }, - "dependencies": { - "vscode": "*" + "vsce": { + "dependencies": false + }, + "scripts": { + "build": "depot build" }, + "dependencies": {}, "devDependencies": { "@argus/common": "workspace:*", "@argus/panoptes": "workspace:*", @@ -67,4 +70,4 @@ "typescript": "^5.1.3", "vite": "^4.4.9" } -} \ No newline at end of file +} diff --git a/ide/packages/extension/src/setup.ts b/ide/packages/extension/src/setup.ts index c4cfde4..37f6ce1 100644 --- a/ide/packages/extension/src/setup.ts +++ b/ide/packages/extension/src/setup.ts @@ -231,7 +231,7 @@ const checkVersionAndInstall = async ( await execNotify( cargo, - [...cargoArgs, "install", "argus_cli", "--version", VERSION, "--force"], + [...cargoArgs, "install", "argus-cli", "--version", VERSION, "--force"], "Installing Argus from source... (this may take a minute)" ); diff --git a/ide/packages/extension/vite.config.ts b/ide/packages/extension/vite.config.ts index 4121318..5e01af8 100644 --- a/ide/packages/extension/vite.config.ts +++ b/ide/packages/extension/vite.config.ts @@ -17,7 +17,9 @@ export default defineConfig(({ mode }) => ({ formats: ["cjs"], }, rollupOptions: { - external: Object.keys(manifest.dependencies || {}).concat(builtinModules), + external: Object.keys(manifest.dependencies || {}) + .concat(builtinModules) + .concat(["vscode"]), }, }, define: { diff --git a/ide/packages/panoptes/src/Workspace.tsx b/ide/packages/panoptes/src/Workspace.tsx index 3ea622f..4e3cd54 100644 --- a/ide/packages/panoptes/src/Workspace.tsx +++ b/ide/packages/panoptes/src/Workspace.tsx @@ -47,7 +47,7 @@ const Workspace = ({ const [showHidden, setShowHidden] = useState(false); const toggleHidden = () => setShowHidden(!showHidden); - const checkbox = ( + const _checkbox = (
Show hidden information @@ -79,7 +79,7 @@ const Workspace = ({ return ( <> - {checkbox} + {/*checkbox*/} {tabs} {fileComponents} diff --git a/ide/pnpm-lock.yaml b/ide/pnpm-lock.yaml index 9c5ce8b..251162e 100644 --- a/ide/pnpm-lock.yaml +++ b/ide/pnpm-lock.yaml @@ -46,10 +46,6 @@ importers: version: 22.1.0 packages/extension: - dependencies: - vscode: - specifier: '*' - version: 0.8.0 devDependencies: '@argus/common': specifier: workspace:* @@ -3765,11 +3761,6 @@ packages: resolution: {integrity: sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==} dev: true - /vscode@0.8.0: - resolution: {integrity: sha512-S2EMtHW71xRD9jwAah/XbOVuz/zHe3JFRGOF0/C7QvkX7GB+ld0Z96Q//2ihTM3XuFgX8y4OS0yU3Uf+DbWuQQ==} - deprecated: 'This package is deprecated in favor of @types/vscode and vscode-test. For more information please read: https://code.visualstudio.com/updates/v1_36#_splitting-vscode-package-into-typesvscode-and-vscodetest' - dev: false - /w3c-xmlserializer@4.0.0: resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==} engines: {node: '>=14'}