Merge branch 'main' into better-diff

kettanaito · kettanaito · commit 5771e1409f01 · 2025-08-26T11:13:32.000+02:00
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ speed on some of the tools and concepts we'll be covering:
 ## System Requirements
 
 - [git][git] v2.18 or greater
-- **[NodeJS][node] v23.11.0 or greater**
+- **[NodeJS][node] v24 or greater**
 - [npm][npm] v8 or greater
 
 All of these must be available in your `PATH`. To verify things are set up
diff --git a/exercises/01.setup/01.solution.vscode-extension/src/sort-by.test.ts b/exercises/01.setup/01.solution.vscode-extension/src/sort-by.test.ts
@@ -20,8 +20,8 @@ test('sorts a list of players by their score', () => {
 			'score',
 		),
 	).toEqual([
-		{ name: 'Sarah', score: 21 },
-		{ name: 'John', score: 10 },
 		{ name: 'Allen', score: 5 },
+		{ name: 'John', score: 10 },
+		{ name: 'Sarah', score: 21 },
 	])
 })
diff --git a/exercises/01.setup/02.problem.multiple-workspaces/package.json b/exercises/01.setup/02.problem.multiple-workspaces/package.json
@@ -5,6 +5,7 @@
     "test": "vitest"
   },
   "devDependencies": {
+    "@edge-runtime/types": "^4.0.0",
     "vitest": "^3.1.1"
   }
 }
diff --git a/exercises/01.setup/02.problem.multiple-workspaces/tsconfig.json b/exercises/01.setup/02.problem.multiple-workspaces/tsconfig.json
@@ -1,10 +1,10 @@
 {
 	"files": [],
 	"references": [
-		{ "path": "tsconfig.edge.json" },
-		{ "path": "tsconfig.app.json" },
-		{ "path": "tsconfig.node.json" },
-		{ "path": "tsconfig.test.edge.json" },
-		{ "path": "tsconfig.test.json" }
+		{ "path": "./tsconfig.edge.json" },
+		{ "path": "./tsconfig.app.json" },
+		{ "path": "./tsconfig.node.json" },
+		{ "path": "./tsconfig.test.edge.json" },
+		{ "path": "./tsconfig.test.json" }
 	]
 }
diff --git a/exercises/01.setup/02.problem.multiple-workspaces/tsconfig.test.json b/exercises/01.setup/02.problem.multiple-workspaces/tsconfig.test.json
@@ -1,8 +1,8 @@
 {
 	"extends": "./tsconfig.app.json",
-	"include": ["global.d.ts", "src/**/*", "src/**/*.test.ts"],
-	"exclude": [],
+	"include": ["global.d.ts", "src/**/*.test.ts"],
+	"exclude": ["src/**/*.edge.test.ts"],
 	"compilerOptions": {
-		"types": ["vitest/globals"]
+		"types": ["@types/node", "vitest/globals"]
 	}
 }
diff --git a/exercises/01.setup/02.solution.multiple-workspaces/tsconfig.app.json b/exercises/01.setup/02.solution.multiple-workspaces/tsconfig.app.json
@@ -1,6 +1,6 @@
 {
 	"extends": "./tsconfig.base.json",
-	"include": ["src/**/*"],
+	"include": ["src"],
 	"exclude": ["src/api", "src/**/*.test.ts"],
 	"compilerOptions": {
 		"lib": ["esnext"]
diff --git a/exercises/01.setup/02.solution.multiple-workspaces/tsconfig.json b/exercises/01.setup/02.solution.multiple-workspaces/tsconfig.json
@@ -1,10 +1,10 @@
 {
 	"files": [],
 	"references": [
-		{ "path": "tsconfig.edge.json" },
-		{ "path": "tsconfig.app.json" },
-		{ "path": "tsconfig.node.json" },
-		{ "path": "tsconfig.test.edge.json" },
-		{ "path": "tsconfig.test.json" }
+		{ "path": "./tsconfig.edge.json" },
+		{ "path": "./tsconfig.app.json" },
+		{ "path": "./tsconfig.node.json" },
+		{ "path": "./tsconfig.test.edge.json" },
+		{ "path": "./tsconfig.test.json" }
 	]
 }
diff --git a/exercises/01.setup/02.solution.multiple-workspaces/tsconfig.test.json b/exercises/01.setup/02.solution.multiple-workspaces/tsconfig.test.json
@@ -1,8 +1,8 @@
 {
 	"extends": "./tsconfig.app.json",
-	"include": ["global.d.ts", "src/**/*", "src/**/*.test.ts"],
-	"exclude": [],
+	"include": ["global.d.ts", "src/**/*.test.ts"],
+	"exclude": ["src/**/*.edge.test.ts"],
 	"compilerOptions": {
-		"types": ["vitest/globals"]
+		"types": ["@types/node", "vitest/globals"]
 	}
 }
diff --git a/exercises/03.assertions/01.problem.custom-matchers/package.json b/exercises/03.assertions/01.problem.custom-matchers/package.json
@@ -5,7 +5,7 @@
     "test": "vitest"
   },
   "devDependencies": {
-    "@types/node": "^22.14.1",
+    "@types/node": "^24.3.0",
     "vitest": "^3.2.0"
   },
   "dependencies": {
diff --git a/exercises/03.assertions/01.solution.custom-matchers/package.json b/exercises/03.assertions/01.solution.custom-matchers/package.json
@@ -5,7 +5,7 @@
     "test": "vitest"
   },
   "devDependencies": {
-    "@types/node": "^22.14.1",
+    "@types/node": "^24.3.0",
     "vitest": "^3.2.0"
   },
   "dependencies": {
diff --git a/exercises/03.assertions/02.problem.asymmetric-matchers/package.json b/exercises/03.assertions/02.problem.asymmetric-matchers/package.json
@@ -5,7 +5,7 @@
     "test": "vitest"
   },
   "devDependencies": {
-    "@types/node": "^22.14.1",
+    "@types/node": "^24.3.0",
     "vitest": "^3.1.1"
   },
   "dependencies": {
diff --git a/exercises/03.assertions/02.solution.asymmetric-matchers/package.json b/exercises/03.assertions/02.solution.asymmetric-matchers/package.json
@@ -5,7 +5,7 @@
     "test": "vitest"
   },
   "devDependencies": {
-    "@types/node": "^22.14.1",
+    "@types/node": "^24.3.0",
     "vitest": "^3.1.1"
   },
   "dependencies": {
diff --git a/exercises/04.performance/01.problem.profiling-slow-tests/src/rows.test.ts b/exercises/04.performance/01.problem.profiling-slow-tests/src/rows.test.ts
@@ -3,5 +3,5 @@ import { expensiveCompute } from './utils'
 test('retrieves all the rows', function myTest() {
 	const rows = expensiveCompute()
 	expect(rows).toBeInstanceOf(Array)
-	expect(rows).toHaveLength(100_000_000)
+	expect(rows).toHaveLength(10_000_000)
 })
diff --git a/exercises/04.performance/01.problem.profiling-slow-tests/src/utils.ts b/exercises/04.performance/01.problem.profiling-slow-tests/src/utils.ts
@@ -1,7 +1,7 @@
 export function expensiveCompute() {
 	const rows = []
 
-	for (let i = 0; i < 100_000_000; i++) {
+	for (let i = 0; i < 10_000_000; i++) {
 		rows.push(i)
 	}
 
diff --git a/exercises/04.performance/01.solution.profiling-slow-tests/src/rows.test.ts b/exercises/04.performance/01.solution.profiling-slow-tests/src/rows.test.ts
@@ -3,5 +3,5 @@ import { expensiveCompute } from './utils'
 test('retrieves all the rows', function myTest() {
 	const rows = expensiveCompute()
 	expect(rows).toBeInstanceOf(Array)
-	expect(rows).toHaveLength(100_000_000)
+	expect(rows).toHaveLength(10_000_000)
 })
diff --git a/exercises/04.performance/01.solution.profiling-slow-tests/src/utils.ts b/exercises/04.performance/01.solution.profiling-slow-tests/src/utils.ts
@@ -1,7 +1,7 @@
 export function expensiveCompute() {
 	const rows = []
 
-	for (let i = 0; i < 100_000_000; i++) {
+	for (let i = 0; i < 10_000_000; i++) {
 		rows.push(i)
 	}
 
diff --git a/exercises/04.performance/02.problem.concurrency/package.json b/exercises/04.performance/02.problem.concurrency/package.json
@@ -5,6 +5,7 @@
     "test": "vitest"
   },
   "devDependencies": {
+    "@types/node": "^24.3.0",
     "vitest": "^3.1.1"
   }
 }
diff --git a/exercises/04.performance/02.solution.concurrency/package.json b/exercises/04.performance/02.solution.concurrency/package.json
@@ -5,6 +5,7 @@
     "test": "vitest"
   },
   "devDependencies": {
+    "@types/node": "^24.3.0",
     "vitest": "^3.1.1"
   }
 }
diff --git a/exercises/04.performance/03.problem.test-isolation/tsconfig.test.json b/exercises/04.performance/03.problem.test-isolation/tsconfig.test.json
@@ -1,6 +1,6 @@
 {
 	"extends": "./tsconfig.base.json",
-	"include": ["src/**/*", "src/**/*.test.ts*"],
+	"include": ["tests"],
 	"exclude": [],
 	"compilerOptions": {
 		"types": ["vitest/globals"]
diff --git a/exercises/04.performance/03.solution.test-isolation/tsconfig.test.json b/exercises/04.performance/03.solution.test-isolation/tsconfig.test.json
@@ -1,6 +1,6 @@
 {
 	"extends": "./tsconfig.base.json",
-	"include": ["src/**/*", "src/**/*.test.ts*"],
+	"include": ["tests"],
 	"exclude": [],
 	"compilerOptions": {
 		"types": ["vitest/globals"]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`"test": "vitest"`
`6`	`6`	`},`
`7`	`7`	`"devDependencies": {`
	`8`	`+ "@edge-runtime/types": "^4.0.0",`
`8`	`9`	`"vitest": "^3.1.1"`
`9`	`10`	`}`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"files": [],`
`3`	`3`	`"references": [`
`4`		`- { "path": "tsconfig.edge.json" },`
`5`		`- { "path": "tsconfig.app.json" },`
`6`		`- { "path": "tsconfig.node.json" },`
`7`		`- { "path": "tsconfig.test.edge.json" },`
`8`		`- { "path": "tsconfig.test.json" }`
	`4`	`+ { "path": "./tsconfig.edge.json" },`
	`5`	`+ { "path": "./tsconfig.app.json" },`
	`6`	`+ { "path": "./tsconfig.node.json" },`
	`7`	`+ { "path": "./tsconfig.test.edge.json" },`
	`8`	`+ { "path": "./tsconfig.test.json" }`
`9`	`9`	`]`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "./tsconfig.app.json",`
`3`		`- "include": ["global.d.ts", "src/*/", "src/*/.test.ts"],`
`4`		`- "exclude": [],`
	`3`	`+ "include": ["global.d.ts", "src/*/.test.ts"],`
	`4`	`+ "exclude": ["src/*/.edge.test.ts"],`
`5`	`5`	`"compilerOptions": {`
`6`		`- "types": ["vitest/globals"]`
	`6`	`+ "types": ["@types/node", "vitest/globals"]`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "./tsconfig.base.json",`
`3`		`- "include": ["src/*/"],`
	`3`	`+ "include": ["src"],`
`4`	`4`	`"exclude": ["src/api", "src/*/.test.ts"],`
`5`	`5`	`"compilerOptions": {`
`6`	`6`	`"lib": ["esnext"]`