Skip to content

Commit 0998916

Browse files
metonymmetonym
authored
test: upgrade vitest, use beforeEach instead of afterEach callback (#228)
* chore(deps-dev): bump deps * test: replace afterEach with beforeEach and reset document.head * chore: use export default syntax * chore(examples): bump deps [ci skip]
1 parent dc451ff commit 0998916

File tree

11 files changed

+68
-76
lines changed

11 files changed

+68
-76
lines changed

‎examples/rollup-typescript/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"devDependencies": {
99
"@rollup/plugin-commonjs": "^22.0.1",
1010
"@rollup/plugin-node-resolve": "^13.3.0",
11-
"@rollup/plugin-typescript": "^8.3.3",
11+
"@rollup/plugin-typescript": "^8.3.4",
1212
"@tsconfig/svelte": "^3.0.0",
13-
"rollup": "^2.77.0",
13+
"rollup": "^2.77.2",
1414
"rollup-plugin-svelte": "^7.0.0",
1515
"rollup-plugin-terser": "^7.0.2",
1616
"svelte": "^3.49.0",

‎examples/rollup-typescript/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@
109109
is-module "^1.0.0"
110110
resolve "^1.19.0"
111111

112-
"@rollup/plugin-typescript@^8.3.3":
113-
version "8.3.3"
114-
resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.3.3.tgz#eee7edab9cfc064f1cfd16570492693cf1432215"
115-
integrity sha512-55L9SyiYu3r/JtqdjhwcwaECXP7JeJ9h1Sg1VWRJKIutla2MdZQodTgcCNybXLMCnqpNLEhS2vGENww98L1npg==
112+
"@rollup/plugin-typescript@^8.3.4":
113+
version "8.3.4"
114+
resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.3.4.tgz#45cdc0787b658b37d0362c705d8de86bc8bc040e"
115+
integrity sha512-wt7JnYE9antX6BOXtsxGoeVSu4dZfw0dU3xykfOQ4hC3EddxRbVG/K0xiY1Wup7QOHJcjLYXWAn0Kx9Z1SBHHg==
116116
dependencies:
117117
"@rollup/pluginutils" "^3.1.0"
118118
resolve "^1.17.0"
@@ -655,10 +655,10 @@ rollup-pluginutils@^2.8.2:
655655
dependencies:
656656
estree-walker "^0.6.1"
657657

658-
rollup@^2.77.0:
659-
version "2.77.0"
660-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.0.tgz#749eaa5ac09b6baa52acc076bc46613eddfd53f4"
661-
integrity sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==
658+
rollup@^2.77.2:
659+
version "2.77.2"
660+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.2.tgz#6b6075c55f9cc2040a5912e6e062151e42e2c4e3"
661+
integrity sha512-m/4YzYgLcpMQbxX3NmAqDvwLATZzxt8bIegO78FZLl+lAgKJBd1DRAOeEiZcKOIOPjxE6ewHWHNgGEalFXuz1g==
662662
optionalDependencies:
663663
fsevents "~2.3.2"
664664

‎examples/rollup/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"devDependencies": {
88
"@rollup/plugin-commonjs": "^22.0.1",
99
"@rollup/plugin-node-resolve": "^13.3.0",
10-
"rollup": "^2.77.0",
10+
"rollup": "^2.77.2",
1111
"rollup-plugin-svelte": "^7.1.0",
1212
"rollup-plugin-terser": "^7.0.2",
1313
"svelte": "^3.49.0",

‎examples/rollup/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,10 +403,10 @@ rollup-pluginutils@^2.8.2:
403403
dependencies:
404404
estree-walker "^0.6.1"
405405

406-
rollup@^2.77.0:
407-
version "2.77.0"
408-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.0.tgz#749eaa5ac09b6baa52acc076bc46613eddfd53f4"
409-
integrity sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==
406+
rollup@^2.77.2:
407+
version "2.77.2"
408+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.2.tgz#6b6075c55f9cc2040a5912e6e062151e42e2c4e3"
409+
integrity sha512-m/4YzYgLcpMQbxX3NmAqDvwLATZzxt8bIegO78FZLl+lAgKJBd1DRAOeEiZcKOIOPjxE6ewHWHNgGEalFXuz1g==
410410
optionalDependencies:
411411
fsevents "~2.3.2"
412412

‎examples/sveltekit/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"preview": "vite preview"
88
},
99
"devDependencies": {
10-
"@sveltejs/adapter-node": "1.0.0-next.84",
11-
"@sveltejs/kit": "1.0.0-next.394",
10+
"@sveltejs/adapter-node": "1.0.0-next.85",
11+
"@sveltejs/kit": "1.0.0-next.396",
1212
"svelte": "^3.49.0",
1313
"svelte-highlight": "^6.2.0",
1414
"vite": "^3.0.3"

‎examples/sveltekit/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
estree-walker "^2.0.1"
1111
picomatch "^2.2.2"
1212

13-
"@sveltejs/[email protected].84":
14-
version "1.0.0-next.84"
15-
resolved "https://registry.yarnpkg.com/@sveltejs/adapter-node/-/adapter-node-1.0.0-next.84.tgz#3367aa9ea57d30d09a1b7099aaf82e993d157307"
16-
integrity sha512-MEt1Ej2yfmKJhyW1rfBeQbmCzeFvMSqUnH78pyHDvmaOH7/jfjBTu9UpBlkfObRMclo9ZW6P+1tiHE6gwXkesQ==
13+
"@sveltejs/[email protected].85":
14+
version "1.0.0-next.85"
15+
resolved "https://registry.yarnpkg.com/@sveltejs/adapter-node/-/adapter-node-1.0.0-next.85.tgz#a28071947bccc14f60227754da5bdc2e059c9cc7"
16+
integrity sha512-rSiUAbFZbxP0QdcBmtIudR1F1jHUfjUNk7cguUfOnJ9HyuKmXxFctY6lz68pO1bX2kTHf9ixu9DKC7VfDmt2mg==
1717
dependencies:
1818
tiny-glob "^0.2.9"
1919

20-
"@sveltejs/[email protected].394":
21-
version "1.0.0-next.394"
22-
resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.394.tgz#0f06064c166f31f0de322d0a47456e78f049a4c7"
23-
integrity sha512-YfRNSKdbvihHFvmQodaMlChcyf9dfU36FwK8WYQF5jqEmiRajLBb/ooU6RqPA0Z6j5okJHDSYBwxW8TP+nc+gg==
20+
"@sveltejs/[email protected].396":
21+
version "1.0.0-next.396"
22+
resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.396.tgz#f87f27bfbff9add1dc869885f4e9b6497058280b"
23+
integrity sha512-bKFpuzp9QxPkOIOEIeNeedvxEMORNqBPxUmoJXDP/Se7MrSfcxYiamjBcKrG+bgGNWmV39nD3EvUox+CXno/Ig==
2424
dependencies:
2525
"@sveltejs/vite-plugin-svelte" "^1.0.1"
2626
chokidar "^3.5.3"

‎package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
},
2323
"devDependencies": {
2424
"@sveltejs/adapter-static": "1.0.0-next.38",
25-
"@sveltejs/kit": "1.0.0-next.385",
25+
"@sveltejs/kit": "1.0.0-next.396",
2626
"@testing-library/svelte": "^3.1.3",
2727
"@testing-library/user-event": "^14.3.0",
28-
"@types/prettier": "^2.6.3",
29-
"carbon-components-svelte": "^0.67.1",
30-
"carbon-icons-svelte": "^11.1.0",
28+
"@types/prettier": "^2.6.4",
29+
"carbon-components-svelte": "^0.67.4",
30+
"carbon-icons-svelte": "^11.2.0",
3131
"carbon-preprocess-svelte": "^0.9.1",
3232
"jsdom": "^20.0.0",
3333
"prettier": "^2.7.1",
@@ -36,11 +36,11 @@
3636
"svelte-check": "^2.8.0",
3737
"svelte-focus-key": "^0.3.2",
3838
"svelte-preprocess": "^4.10.7",
39-
"svelte2tsx": "^0.5.12",
39+
"svelte2tsx": "^0.5.13",
4040
"totalist": "^3.0.0",
4141
"typescript": "^4.7.4",
42-
"vite": "^3.0.2",
43-
"vitest": "^0.18.1"
42+
"vite": "^3.0.3",
43+
"vitest": "^0.19.1"
4444
},
4545
"repository": {
4646
"type": "git",

‎svelte.config.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const CONTENT = {
1515
};
1616

1717
/** @type {import('@sveltejs/kit').Config} */
18-
const config = {
18+
export default {
1919
preprocess: [
2020
preprocess(),
2121
optimizeImports(),
@@ -53,5 +53,3 @@ const config = {
5353
},
5454
},
5555
};
56-
57-
export default config;

‎tests/SvelteHighlight.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
import { test, expect, describe, afterEach } from "vitest";
1+
import { test, expect, describe, beforeEach } from "vitest";
22
import userEvent from "@testing-library/user-event";
33
import SvelteHighlight from "./SvelteHighlight.test.svelte";
44

55
describe("SvelteHighlight", () => {
66
let instance: null | SvelteHighlight = null;
77

8-
afterEach(() => {
8+
beforeEach(() => {
99
instance?.$destroy();
1010
instance = null;
11+
document.head.innerHTML = "";
1112
document.body.innerHTML = "";
1213
});
1314

‎vite.config.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
import { sveltekit } from "@sveltejs/kit/vite";
22
import { svelte } from "@sveltejs/vite-plugin-svelte";
33

4+
const TEST = process.env.VITEST;
5+
46
/** @type {import('vite').UserConfig} */
5-
const config = {
6-
plugins: [
7-
process.env.VITEST
8-
? svelte({
9-
hot: false,
10-
})
11-
: sveltekit(),
12-
],
7+
export default {
8+
plugins: [TEST ? svelte({ hot: false }) : sveltekit()],
139
optimizeDeps: {
1410
include: ["highlight.js", "highlight.js/lib/core"],
1511
},
@@ -19,9 +15,6 @@ const config = {
1915
},
2016
},
2117
test: {
22-
globals: true,
2318
environment: "jsdom",
2419
},
2520
};
26-
27-
export default config;

0 commit comments

Comments
 (0)