Merge pull request #161 from oddbird/dependabot/npm_and_yarn/dev-7bd7…

…055def

Bump the dev group with 5 updates

.eslintignore

@@ -2,7 +2,7 @@
 .git/
 .vscode/
 .yarn/
-.yarnrc
+.yarnrc.yml
 /.svelte-kit
 /build
 /package

.prettierignore

@@ -2,7 +2,7 @@
 .git/
 .vscode/
 .yarn/
-.yarnrc
+.yarnrc.yml
 /.svelte-kit
 /build
 /package

.stylelintignore

@@ -2,7 +2,7 @@
 .git/
 .vscode/
 .yarn/
-.yarnrc
+.yarnrc.yml
 /.svelte-kit
 /build
 /package

.svelte-kit/tsconfig.json

@@ -40,7 +40,6 @@
 		"ambient.d.ts",
 		"non-ambient.d.ts",
 		"./types/**/$types.d.ts",
-		"../svelte.config.js",
 		"../vite.config.js",
 		"../vite.config.ts",
 		"../src/**/*.js",
@@ -51,6 +50,9 @@
 		"../tests/**/*.svelte"
 	],
 	"exclude": [
-		"../node_modules/**"
+		"../node_modules/**",
+		"../src/service-worker.js",
+		"../src/service-worker.ts",
+		"../src/service-worker.d.ts"
 	]
 }

.yarnrc.yml

@@ -7,5 +7,5 @@ nodeLinker: node-modules
 packageExtensions:
   markdown-it-anchor@*:
     peerDependenciesMeta:
-      '@types/markdown-it':
+      "@types/markdown-it":
         optional: true

package.json

@@ -41,15 +41,15 @@
   },
   "devDependencies": {
     "@sveltejs/adapter-auto": "^3.1.1",
-    "@sveltejs/kit": "^2.5.2",
+    "@sveltejs/kit": "^2.5.3",
     "@sveltejs/vite-plugin-svelte": "^3.0.2",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/svelte": "^4.2.1",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.14.202",
     "@types/node": "*",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
     "@vitest/coverage-v8": "^1.3.1",
     "chokidar-cli": "^3.0.0",
     "eslint": "^8.57.0",
@@ -76,9 +76,9 @@
     "svelte": "^4.2.12",
     "svelte-check": "^3.6.6",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3",
-    "vite": "^5.1.4",
+    "typescript": "^5.4.2",
+    "vite": "^5.1.6",
     "vitest": "^1.3.1"
   },
-  "packageManager": "[email protected].0"
+  "packageManager": "[email protected].1"
 }

test/tsconfig.json

@@ -9,6 +9,7 @@
     "../.eslintrc.cjs",
     "../svelte.config.js",
     "../vite.config.ts",
+    "../vitest.config.ts",
     "../src/**/*.d.ts"
   ]
 }

vite.config.ts

@@ -1,5 +1,3 @@
-/// <reference types="vitest" />
-
 import { sveltekit } from '@sveltejs/kit/vite';
 import path from 'path';
 import { NodePackageImporter } from 'sass';
@@ -15,29 +13,4 @@ export default defineConfig({
       },
     },
   },
-  /**
-   * @see https://vitest.dev/config/#configuration
-   */
-  test: {
-    include: ['./test/js/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    globals: true,
-    environment: 'jsdom',
-    watch: false,
-    setupFiles: './test/js/setup.js',
-    clearMocks: true,
-    reporters: 'dot',
-    coverage: {
-      enabled: true,
-      reporter: ['text-summary', 'html'],
-      include: ['src/**/*.{js,ts,svelte}'],
-      exclude: [
-        'src/**/*.d.ts',
-        'src/routes/styleguide/**/*',
-        'src/routes/+layout.*',
-      ],
-      all: true,
-      skipFull: true,
-      reportOnFailure: true,
-    },
-  },
 });

vitest.config.ts

@@ -0,0 +1,34 @@
+import { defineConfig, mergeConfig } from 'vitest/config';
+
+import viteConfig from './vite.config.js';
+
+/**
+ * @see https://vitest.dev/config/#configuration
+ */
+export default mergeConfig(
+  viteConfig,
+  defineConfig({
+    test: {
+      include: ['./test/js/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+      globals: true,
+      environment: 'jsdom',
+      watch: false,
+      setupFiles: './test/js/setup.js',
+      clearMocks: true,
+      reporters: 'dot',
+      coverage: {
+        enabled: true,
+        reporter: ['text-summary', 'html'],
+        include: ['src/**/*.{js,ts,svelte}'],
+        exclude: [
+          'src/**/*.d.ts',
+          'src/routes/styleguide/**/*',
+          'src/routes/+layout.*',
+        ],
+        all: true,
+        skipFull: true,
+        reportOnFailure: true,
+      },
+    },
+  }),
+);