Skip to content

Commit c42ef24

Browse files
committed
Merge remote-tracking branch 'origin/main' into ssncferreira/fix-prebuilds-lifecycle-params
2 parents 2bc1070 + dadeab8 commit c42ef24

File tree

456 files changed

+1004
-1479
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

456 files changed

+1004
-1479
lines changed

docs/ai-coder/custom-agents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Custom Agents
22

3-
Custom agents beyond the ones listed in the [Coder registry](https://registry.coder.com/modules?tag=agent) can be used with Coder Tasks.
3+
Custom agents beyond the ones listed in the [Coder registry](https://registry.coder.com/modules?search=tag%3Aagent) can be used with Coder Tasks.
44

55
## Prerequisites
66

dogfood/coder-envbuilder/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ data "coder_workspace_owner" "me" {}
110110

111111
module "slackme" {
112112
source = "dev.registry.coder.com/coder/slackme/coder"
113-
version = "1.0.30"
113+
version = "1.0.31"
114114
agent_id = coder_agent.dev.id
115115
auth_provider_id = "slack"
116116
}
117117

118118
module "dotfiles" {
119119
source = "dev.registry.coder.com/coder/dotfiles/coder"
120-
version = "1.2.0"
120+
version = "1.2.1"
121121
agent_id = coder_agent.dev.id
122122
}
123123

dogfood/coder/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ module "dotfiles" {
279279
module "git-clone" {
280280
count = data.coder_workspace.me.start_count
281281
source = "dev.registry.coder.com/coder/git-clone/coder"
282-
version = "1.1.0"
282+
version = "1.1.1"
283283
agent_id = coder_agent.dev.id
284284
url = "https://github.com/coder/coder"
285285
base_dir = local.repo_base_dir
@@ -317,7 +317,7 @@ module "vscode-web" {
317317
module "jetbrains" {
318318
count = data.coder_workspace.me.start_count
319319
source = "dev.registry.coder.com/coder/jetbrains/coder"
320-
version = "1.0.0"
320+
version = "1.0.2"
321321
agent_id = coder_agent.dev.id
322322
agent_name = "dev"
323323
folder = local.repo_dir

site/.storybook/main.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,9 @@ module.exports = {
55

66
addons: [
77
"@chromatic-com/storybook",
8-
{
9-
name: "@storybook/addon-essentials",
10-
options: {
11-
backgrounds: false,
12-
},
13-
},
8+
"@storybook/addon-docs",
149
"@storybook/addon-links",
15-
"@storybook/addon-mdx-gfm",
1610
"@storybook/addon-themes",
17-
"@storybook/addon-actions",
18-
"@storybook/addon-interactions",
1911
"storybook-addon-remix-react-router",
2012
],
2113

site/.storybook/preview.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* @typedef {import("react").PropsWithChildren} PropsWithChildren
1010
* @typedef {import("react").FC<PropsWithChildren>} FC
1111
*
12-
* @typedef {import("@storybook/react").StoryContext} StoryContext
13-
* @typedef {import("@storybook/react").Preview} Preview
12+
* @typedef {import("@storybook/react-vite").StoryContext} StoryContext
13+
* @typedef {import("@storybook/react-vite").Preview} Preview
1414
*
1515
* @typedef {(Story: FC, Context: StoryContext) => React.JSX.Element} Decorator A
1616
* Storybook decorator function used to inject baseline data dependencies into

site/e2e/setup/addUsersAndLicense.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ test("setup deployment", async ({ page }) => {
2020
await page.getByLabel(Language.passwordLabel).fill(users.owner.password);
2121
await page.getByTestId("create").click();
2222

23-
await expectUrl(page).toHavePathName("/workspaces");
23+
await expectUrl(page).toHavePathName("/templates");
2424
await page.getByTestId("button-select-template").isVisible();
2525

2626
for (const user of Object.values(users)) {

site/package.json

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"format": "biome format --write .",
1515
"format:check": "biome format .",
1616
"lint": "pnpm run lint:check && pnpm run lint:types && pnpm run lint:circular-deps && knip",
17-
"lint:check": " biome lint --error-on-warnings .",
17+
"lint:check": "biome lint --error-on-warnings .",
1818
"lint:circular-deps": "dpdm --no-tree --no-warning -T ./src/App.tsx",
1919
"lint:knip": "knip",
2020
"lint:fix": "biome lint --error-on-warnings --write . && knip --fix",
@@ -103,7 +103,7 @@
103103
"react-markdown": "9.0.3",
104104
"react-query": "npm:@tanstack/react-query@5.77.0",
105105
"react-resizable-panels": "3.0.3",
106-
"react-router-dom": "6.26.2",
106+
"react-router": "7.8.0",
107107
"react-syntax-highlighter": "15.6.1",
108108
"react-textarea-autosize": "8.5.9",
109109
"react-virtualized-auto-sizer": "1.0.24",
@@ -125,19 +125,13 @@
125125
},
126126
"devDependencies": {
127127
"@biomejs/biome": "1.9.4",
128-
"@chromatic-com/storybook": "3.2.2",
128+
"@chromatic-com/storybook": "4.0.1",
129129
"@octokit/types": "12.3.0",
130130
"@playwright/test": "1.47.0",
131-
"@storybook/addon-actions": "8.5.2",
132-
"@storybook/addon-essentials": "8.4.6",
133-
"@storybook/addon-interactions": "8.5.3",
134-
"@storybook/addon-links": "8.5.2",
135-
"@storybook/addon-mdx-gfm": "8.5.2",
136-
"@storybook/addon-themes": "8.4.6",
137-
"@storybook/preview-api": "8.5.3",
138-
"@storybook/react": "8.4.6",
139-
"@storybook/react-vite": "8.4.6",
140-
"@storybook/test": "8.4.6",
131+
"@storybook/addon-docs": "9.0.17",
132+
"@storybook/addon-links": "9.0.17",
133+
"@storybook/addon-themes": "9.0.17",
134+
"@storybook/react-vite": "9.0.17",
141135
"@swc/core": "1.3.38",
142136
"@swc/jest": "0.2.37",
143137
"@tailwindcss/typography": "0.5.16",
@@ -182,8 +176,8 @@
182176
"rollup-plugin-visualizer": "5.14.0",
183177
"rxjs": "7.8.1",
184178
"ssh2": "1.16.0",
185-
"storybook": "8.5.3",
186-
"storybook-addon-remix-react-router": "3.1.0",
179+
"storybook": "9.0.17",
180+
"storybook-addon-remix-react-router": "5.0.0",
187181
"tailwindcss": "3.4.17",
188182
"ts-proto": "1.164.0",
189183
"typescript": "5.6.3",
@@ -197,7 +191,7 @@
197191
"semver": "7.6.2"
198192
},
199193
"engines": {
200-
"npm": ">=9.0.0 <10.0.0",
194+
"pnpm": ">=9.0.0 <10.0.0",
201195
"node": ">=18.0.0 <21.0.0"
202196
},
203197
"pnpm": {

0 commit comments

Comments
 (0)