Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ updates:
ignore:
# Pinned to engines.vscode minimum; bump manually with engine updates.
- dependency-name: "@types/vscode"
- dependency-name: "electron"
# These versions must match the versions specified in coder/coder exactly.
- dependency-name: "@types/ua-parser-js"
- dependency-name: "ua-parser-js"
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,8 @@
"word-wrap": "1.2.5"
},
"dependencies": {
"@peculiar/x509": "^1.14.3",
"@abraham/reflection": "^0.13.0",
"@peculiar/x509": "^2.0.0",
"@repo/shared": "workspace:*",
"axios": "1.13.6",
"date-fns": "catalog:",
Expand Down
1 change: 1 addition & 0 deletions packages/tasks/src/css.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module "*.css";
48 changes: 25 additions & 23 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src/error/serverCertificateError.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import "@abraham/reflection";
import {
X509Certificate,
KeyUsagesExtension,
KeyUsageFlags,
KeyUsagesExtension,
X509Certificate,
} from "@peculiar/x509";
import { isAxiosError } from "axios";
import * as tls from "node:tls";
Expand Down
4 changes: 2 additions & 2 deletions test/integration/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"module": "CommonJS",
"moduleResolution": "Node10"
"module": "Node16",
"moduleResolution": "Node16"
}
}
15 changes: 8 additions & 7 deletions test/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"baseUrl": "..",
"rootDir": "..",
"types": ["node", "mocha"],
"jsx": "react-jsx",
// Both mappings needed: exact match for root, wildcard for subpaths
"paths": {
"@/*": ["src/*"],
"@repo/shared": ["packages/shared/src/index.ts"],
"@repo/shared/*": ["packages/shared/src/*"],
"@repo/webview-shared": ["packages/webview-shared/src/index.ts"],
"@repo/webview-shared/*": ["packages/webview-shared/src/*"],
"@repo/tasks/*": ["packages/tasks/src/*"]
"@/*": ["../src/*"],
"@repo/shared": ["../packages/shared/src/index.ts"],
"@repo/shared/*": ["../packages/shared/src/*"],
"@repo/webview-shared": ["../packages/webview-shared/src/index.ts"],
"@repo/webview-shared/*": ["../packages/webview-shared/src/*"],
"@repo/tasks/*": ["../packages/tasks/src/*"]
}
},
"include": [".", "../src"]
Expand Down
10 changes: 9 additions & 1 deletion test/unit/api/coderApi.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@ import axios, {
import { type ProvisionerJobLog } from "coder/site/src/api/typesGenerated";
import { EventSource } from "eventsource";
import { ProxyAgent } from "proxy-agent";
import { describe, it, expect, vi, beforeEach, type Mock } from "vitest";
import {
afterEach,
beforeEach,
describe,
expect,
it,
type Mock,
vi,
} from "vitest";
import Ws from "ws";

import {
Expand Down
1 change: 1 addition & 0 deletions test/unit/error/serverCertificateError.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import "@abraham/reflection";
import {
KeyUsagesExtension,
X509Certificate as X509CertificatePeculiar,
Expand Down