Skip to content

Commit c6da425

Browse files
committed
fix: diff view state
1 parent 8783259 commit c6da425

File tree

16 files changed

+2714
-1546
lines changed

16 files changed

+2714
-1546
lines changed

extension/command.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { accessSync, constants, createReadStream } from 'node:fs';
99
import path from 'node:path';
1010
import ps from 'ps-tree';
1111
import kill from 'tree-kill';
12-
import { gettextareaMaxSize } from './config';
12+
import { getTextareaMaxSize } from './config';
1313

1414
const execExt = process.platform === 'win32' ? '.exe' : '';
1515

@@ -105,7 +105,7 @@ export function executeCommand(command: string, args: string[], stdin?: IOChanne
105105
if (code === null)
106106
return;
107107

108-
const max = gettextareaMaxSize();
108+
const max = getTextareaMaxSize();
109109
resolve({
110110
exitCode: code,
111111
stdout: stdout // `undefined` if redirected

extension/config.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import type { ConfigLevel } from '../shared/events';
1+
import type { ConfigLevel } from '../shared/events.js';
22
import path from 'node:path';
33
import * as vscode from 'vscode';
44
import { z } from 'zod/v4';
5-
import { contributes } from '../package.json';
6-
import { cachedFn } from './utils';
5+
import { contributes } from '../package.json' with { type: 'json' };
6+
import { cachedFn } from './utils.js';
77

88
export function isConfigured(): ConfigLevel {
99
const info = vscode.workspace.getConfiguration().inspect('oi-runner-2');
@@ -62,6 +62,6 @@ export function getAutoSave(): boolean {
6262
return vscode.workspace.getConfiguration('oi-runner-2').get<boolean>('autoSave', true) !== false;
6363
}
6464

65-
export function gettextareaMaxSize(): number {
65+
export function getTextareaMaxSize(): number {
6666
return vscode.workspace.getConfiguration('oi-runner-2').get<number>('textareaMaxSize', 1e4);
6767
}

extension/runner.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// @todo rewrite with state machine
22

3-
import type { EventMessage, IOChannel, IOFileChannel, RunStep } from '../shared/events';
4-
import type { Task } from './config';
3+
import type { EventMessage, IOChannel, IOFileChannel, RunStep } from '../shared/events.js';
4+
import type { Task } from './config.js';
55
import { createWriteStream } from 'node:fs';
66
import * as vscode from 'vscode';
7-
import { evalCommand, executeCommand } from './command';
8-
import { getConfiguredTasks, gettextareaMaxSize as getTextareaMaxSize } from './config';
9-
import { logger } from './utils';
7+
import { evalCommand, executeCommand } from './command.js';
8+
import { getConfiguredTasks, getTextareaMaxSize } from './config.js';
9+
import { logger } from './utils.js';
1010

1111
export interface RunOptions {
1212
task: string
@@ -73,7 +73,7 @@ export class Runner extends vscode.EventEmitter<EventMessage> {
7373
} else {
7474
this.fire({
7575
type: 'run:compiled',
76-
skipExcuting: step === 'compile',
76+
skipexecuting: step === 'compile',
7777
});
7878
}
7979
} else {
@@ -132,7 +132,7 @@ export class Runner extends vscode.EventEmitter<EventMessage> {
132132
}
133133

134134
public stopRun() {
135-
this._currentController!.abort();
135+
this._currentController?.abort();
136136
this._currentController = undefined;
137137
}
138138
}

package.json

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -230,50 +230,51 @@
230230
"type-check": "vue-tsc -p ./tsconfig.app.json --noEmit && vue-tsc -p ./tsconfig.node.json --noEmit"
231231
},
232232
"devDependencies": {
233-
"@antfu/eslint-config": "^5.2.1",
234-
"@commitlint/cli": "^19.8.1",
235-
"@commitlint/config-conventional": "^19.8.1",
233+
"@antfu/eslint-config": "^6.0.0",
234+
"@commitlint/cli": "^20.1.0",
235+
"@commitlint/config-conventional": "^20.0.0",
236236
"@guolao/vue-monaco-editor": "^1.5.5",
237237
"@iconify-prerendered/vue-codicon": "^0.28.1753246500",
238238
"@iconify-prerendered/vue-line-md": "^0.28.1754899771",
239-
"@tailwindcss/vite": "^4.1.12",
239+
"@tailwindcss/vite": "^4.1.14",
240240
"@tomjs/vite-plugin-vscode": "^5.0.0",
241-
"@tsconfig/node20": "^20.1.6",
241+
"@tsconfig/node22": "^22.0.2",
242242
"@typed-sigterm/eslint-config": "^1.6.0",
243243
"@types/js-md5": "^0.8.0",
244-
"@types/node": "^24.3.0",
244+
"@types/node": "^24.8.1",
245245
"@types/ps-tree": "^1.1.6",
246-
"@types/vscode": "^1.103.0",
246+
"@types/vscode": "1.100.0",
247247
"@types/vscode-webview": "^1.57.5",
248248
"@vitejs/plugin-vue": "^6.0.1",
249-
"@vscode-elements/elements": "^2.2.0",
250-
"@vscode/codicons": "^0.0.39",
251-
"@vscode/vsce": "^3.6.0",
249+
"@vscode-elements/elements": "^2.3.1",
250+
"@vscode/codicons": "^0.0.41",
251+
"@vscode/vsce": "^3.6.2",
252252
"@vue/tsconfig": "^0.8.1",
253-
"@vueuse/core": "^13.7.0",
253+
"@vueuse/core": "^13.9.0",
254254
"class-variance-authority": "^0.7.1",
255255
"clsx": "^2.1.1",
256256
"consola": "^3.4.2",
257-
"eslint": "^9.34.0",
257+
"eslint": "^9.38.0",
258258
"husky": "^9.1.7",
259259
"js-md5": "^0.8.3",
260-
"lucide-vue-next": "^0.541.0",
261-
"mixpanel-browser": "^2.69.0",
262-
"monaco-editor": "^0.52.2",
263-
"nanoid": "^5.1.5",
260+
"lucide-vue-next": "^0.546.0",
261+
"mixpanel-browser": "^2.71.0",
262+
"monaco-editor": "^0.54.0",
263+
"nanoid": "^5.1.6",
264264
"ps-tree": "^1.2.0",
265-
"reka-ui": "^2.4.1",
266-
"shadcn-vue": "^2.2.0",
265+
"reka-ui": "^2.5.1",
266+
"shadcn-vue": "^2.3.1",
267267
"tailwind-merge": "^3.3.1",
268-
"tailwindcss": "^4.1.12",
268+
"tailwindcss": "^4.1.14",
269269
"tree-kill": "^1.2.2",
270-
"tw-animate-css": "^1.3.7",
271-
"typescript": "^5.9.2",
270+
"tw-animate-css": "^1.4.0",
271+
"typescript": "^5.9.3",
272272
"un-oj": "^0.3.2",
273-
"vite": "npm:rolldown-vite@^7.1.4",
274-
"vue": "^3.5.19",
275-
"vue-tsc": "^3.0.6",
276-
"zod": "^4.0.17"
273+
"vite": "npm:rolldown-vite@^7.1.17",
274+
"vite-plugin-vue-devtools": "^8.0.3",
275+
"vue": "^3.5.22",
276+
"vue-tsc": "^3.1.1",
277+
"zod": "^4.1.12"
277278
},
278279
"pnpm": {
279280
"onlyBuiltDependencies": [
@@ -283,9 +284,6 @@
283284
"keytar",
284285
"unrs-resolver",
285286
"vue-demi"
286-
],
287-
"patchedDependencies": {
288-
"mixpanel-browser": "patches/mixpanel-browser.patch"
289-
}
287+
]
290288
}
291289
}

patches/mixpanel-browser.patch

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)