Merge pull request #209 from getodk/chore/post-030-deps

Post-release (`@getodk/web-forms` 0.3.0) dependency updates & related
getodk · Sep 6, 2024 · 6f1ffe3 · 6f1ffe3
2 parents a1bd2f4 + 2fd5b84
commit 6f1ffe3
Show file tree

Hide file tree

Showing 43 changed files with 1,251 additions and 1,375 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['18.20.4', '20.15.1', '22.4.1']
+        node-version: ['18.20.4', '20.17.0', '22.8.0']
 
     steps:
       - uses: 'actions/checkout@v4'
@@ -82,7 +82,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['22.4.1']
+        node-version: ['22.8.0']
 
     steps:
       - uses: 'actions/checkout@v4'
@@ -128,16 +128,16 @@ jobs:
     strategy:
       matrix:
         target: ['Node']
-        node-version: ['18.20.4', '20.15.1', '22.4.1']
+        node-version: ['18.20.4', '20.17.0', '22.8.0']
         include:
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: chromium
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: firefox
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: webkit
 
     steps:
@@ -192,16 +192,16 @@ jobs:
     strategy:
       matrix:
         target: ['Node']
-        node-version: ['18.20.4', '20.15.1', '22.4.1']
+        node-version: ['18.20.4', '20.17.0', '22.8.0']
         include:
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: chromium
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: firefox
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: webkit
 
     steps:
@@ -256,16 +256,16 @@ jobs:
     strategy:
       matrix:
         target: ['Node']
-        node-version: ['18.20.4', '20.15.1', '22.4.1']
+        node-version: ['18.20.4', '20.17.0', '22.8.0']
         include:
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: chromium
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: firefox
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: webkit
 
     steps:
@@ -320,16 +320,16 @@ jobs:
     strategy:
       matrix:
         target: ['Node']
-        node-version: ['18.20.4', '20.15.1', '22.4.1']
+        node-version: ['18.20.4', '20.17.0', '22.8.0']
         include:
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: chromium
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: firefox
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: webkit
 
     steps:
@@ -389,7 +389,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['18.20.4', '20.15.1', '22.4.1']
+        node-version: ['18.20.4', '20.17.0', '22.8.0']
 
     steps:
       - uses: 'actions/checkout@v4'
@@ -433,16 +433,16 @@ jobs:
     strategy:
       matrix:
         target: ['Node']
-        node-version: ['18.20.4', '20.15.1', '22.4.1']
+        node-version: ['18.20.4', '20.17.0', '22.8.0']
         include:
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: chromium
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: firefox
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: webkit
 
     steps:
@@ -497,16 +497,16 @@ jobs:
     strategy:
       matrix:
         target: ['Node']
-        node-version: ['18.20.4', '20.15.1', '22.4.1']
+        node-version: ['18.20.4', '20.17.0', '22.8.0']
         include:
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: chromium
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: firefox
           - target: 'Web'
-            node-version: '22.4.1'
+            node-version: '22.8.0'
             browser: webkit
 
     steps:

diff --git a/.gitignore b/.gitignore
@@ -63,6 +63,7 @@ packages/tree-sitter-xpath/*.tgz
 packages/tree-sitter-xpath/.build/
 
 # Go artifacts
+packages/tree-sitter-xpath/go.mod
 packages/tree-sitter-xpath/go.sum
 packages/tree-sitter-xpath/_obj/
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,7 +3,7 @@
 
   // Formatting
   "eslint.enable": true,
-  "eslint.experimental.useFlatConfig": true,
+  "eslint.useFlatConfig": true,
   "eslint.format.enable": true,
   "eslint.nodePath": "../node_modules/.bin",
   "prettier.configPath": "prettier.config.js",
@@ -28,11 +28,11 @@
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",
     "editor.formatOnSave": true
   },
+  "[xml]": {
+    "editor.defaultFormatter": "redhat.vscode-xml"
+  },
   // This corresponds to the `lib` we're using everywhere. Setting it here
   // helps to address editor-only type errors in tooling files, where VSCode
   // doesn't pick up the top-level `tsconfig.tools.json`.
-  "js/ts.implicitProjectConfig.target": "ES2022",
-  "[xml]": {
-    "editor.defaultFormatter": "redhat.vscode-xml"
-  }
+  "js/ts.implicitProjectConfig.target": "ES2022"
 }
diff --git a/eslint.config.js b/eslint.config.js
@@ -8,7 +8,6 @@
 // annotating with a date, but it'd be nice if we could just derive that from
 // git history or whatever.
 
-/// <reference path="./vendor-types/@eslint/eslintrc.d.ts" />
 /// <reference path="./vendor-types/@vue/eslint-config-typescript/index.d.ts" />
 /// <reference path="./vendor-types/eslint-plugin-no-only-tests.d.ts" />
 /// <reference path="./vendor-types/eslint-plugin-vue/lib/configs/base.d.ts" />
@@ -18,7 +17,6 @@
 /// <reference path="./vendor-types/eslint-plugin-vue/lib/index.d.ts" />
 /// <reference path="./vendor-types/eslint-plugin-vue/lib/processor.d.ts" />
 
-import { FlatCompat } from '@eslint/eslintrc';
 import eslint from '@eslint/js';
 import eslintConfigPrettier from 'eslint-config-prettier';
 import jsdoc from 'eslint-plugin-jsdoc';
@@ -30,19 +28,8 @@ import vue3Recommended from 'eslint-plugin-vue/lib/configs/vue3-recommended.js';
 import vue3StronglyRecommended from 'eslint-plugin-vue/lib/configs/vue3-strongly-recommended.js';
 import vueProcessor from 'eslint-plugin-vue/lib/processor.js';
 import { builtinModules } from 'node:module';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
 import tseslint from 'typescript-eslint';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-const compat = new FlatCompat({
-	baseDirectory: __dirname,
-	resolvePluginsRelativeTo: __dirname,
-	recommendedConfig: eslint.configs.recommended,
-	allConfig: eslint.configs.all,
-});
+import vueESLintParser from 'vue-eslint-parser';
 
 /**
  * @param {string} pathSansExtension
@@ -147,14 +134,11 @@ export default tseslint.config(
 			 * Note: Contrary to the defaults provided in a Vue template project, it
 			 * was found that linting applies most consistently by applying
 			 * Vue-specific parsing **after** TypeScript.
-			 *
-			 * TODO: after breaking up the parser and rule aspects, it seemed likely
-			 * that we could stop using `FlatCompat` for this. For reasons that are
-			 * unclear, I wasn't able to find a way to get that working.
 			 */
-			...compat
-				.config({
-					parser: 'vue-eslint-parser',
+			{
+				files: [vuePackageGlob],
+				languageOptions: {
+					parser: vueESLintParser,
 					parserOptions: {
 						/**
 						 * @see {@link https://github.com/vuejs/vue-eslint-parser/issues/173#issuecomment-1367298274}
@@ -172,17 +156,13 @@ export default tseslint.config(
 							'<template>': 'espree',
 						},
 					},
-				})
-				.map((vueConfig) => ({
-					files: [vuePackageGlob],
-					plugins: {
-						vue: vuePlugin,
-						'@typescript-eslint': tseslint.plugin,
-					},
-					processor: vueProcessor,
-
-					...vueConfig,
-				})),
+				},
+				plugins: {
+					vue: vuePlugin,
+					'@typescript-eslint': tseslint.plugin,
+				},
+				processor: vueProcessor,
+			},
 
 			eslintConfigPrettier,
 		],
@@ -325,6 +305,7 @@ export default tseslint.config(
 			'@typescript-eslint/no-unsafe-call': 'error',
 			'@typescript-eslint/no-unsafe-member-access': 'error',
 			'@typescript-eslint/no-unsafe-return': 'error',
+			'@typescript-eslint/only-throw-error': 'warn',
 			'@typescript-eslint/prefer-nullish-coalescing': 'error',
 			'@typescript-eslint/prefer-optional-chain': 'error',
 			'@typescript-eslint/prefer-string-starts-ends-with': 'error',
@@ -341,6 +322,12 @@ export default tseslint.config(
 					allowSingleExtends: true,
 				},
 			],
+			'@typescript-eslint/no-empty-object-type': [
+				'error',
+				{
+					allowInterfaces: 'with-single-extends',
+				},
+			],
 			'prefer-const': 'error',
 
 			// Ensure Node built-ins aren't used by default
@@ -399,15 +386,6 @@ export default tseslint.config(
 			'packages/xforms-engine/vite.*.config.ts',
 			'packages/*/tools/**/*',
 			'packages/tree-sitter-xpath/scripts/build/*.mjs',
-
-			// TODO: in theory, all e2e tests (if they continue to be run with
-			// Playwright) are technically run in a "Node" environment, although
-			// they will likely exercise non-Node code when calling into the
-			// Playwright-managed browser process. I'm adding this special case
-			// mainly to make note of this because it's unclear what the best
-			// solution will be for mixed Node-/browser-API code in terms of type
-			// safety and linting.
-			'packages/tree-sitter-xpath/e2e/sub-expression-queries.test.ts',
 		],
 		rules: {
 			'no-restricted-imports': 'off',

diff --git a/package.json b/package.json
@@ -8,11 +8,11 @@
   "type": "module",
   "version": "0.1.0",
   "engines": {
-    "node": "^18.20.4 || ^20.15.1 || ^22.4.1",
+    "node": "^18.20.4 || ^20.17.0 || ^22.8.0",
     "yarn": "1.22.22"
   },
   "volta": {
-    "node": "22.4.1",
+    "node": "22.8.0",
     "yarn": "1.22.22"
   },
   "packageManager": "[email protected]",
@@ -34,36 +34,35 @@
   },
   "dependencies": {
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.7",
-    "@eslint/js": "^9.6.0",
-    "@eslint/eslintrc": "^3.1.0",
+    "@changesets/cli": "^2.27.8",
+    "@eslint/js": "^9.9.1",
     "@tsconfig/node20": "^20.1.4",
-    "@types/eslint__js": "^8.42.3",
-    "@types/eslint": "^8.56.10",
+    "@types/eslint": "^9.6.1",
     "@types/eslint-config-prettier": "^6.11.3",
+    "@types/eslint__js": "^8.42.3",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^20.14.10",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.16.0",
+    "@types/node": "^22.5.3",
+    "@typescript-eslint/eslint-plugin": "^8.4.0",
+    "@typescript-eslint/parser": "^8.4.0",
     "@vue/eslint-config-prettier": "^9.0.0",
     "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/tsconfig": "^0.5.1",
-    "eslint": "^9.6.0",
+    "eslint": "^9.9.1",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-jsdoc": "^48.7.0",
-    "eslint-plugin-no-only-tests": "^3.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-vue": "^9.27.0",
+    "eslint-plugin-jsdoc": "^50.2.2",
+    "eslint-plugin-no-only-tests": "^3.3.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-vue": "^9.28.0",
     "nan": "2.20.0",
     "node-gyp": "10.2.0",
     "npm-run-all2": "^6.2.2",
     "only-allow": "^1.2.1",
     "organize-imports-cli": "^0.10.0",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
     "rimraf": "^5.0.9",
-    "turbo": "^2.0.6",
-    "typescript": "~5.5.3",
-    "typescript-eslint": "^7.16.0",
+    "turbo": "^2.1.1",
+    "typescript": "~5.5.4",
+    "typescript-eslint": "^8.4.0",
     "vue": "3.3.4",
     "vue-tsc": "^2.0.19"
   },

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -35,7 +35,7 @@
     "README.md"
   ],
   "engines": {
-    "node": "^18.20.4 || ^20.15.1 || ^22.4.1",
+    "node": "^18.20.4 || ^20.17.0 || ^22.8.0",
     "yarn": "1.22.22"
   },
   "scripts": {
@@ -51,9 +51,9 @@
     "test:types": "tsc --project ./tsconfig.json --emitDeclarationOnly false --noEmit"
   },
   "devDependencies": {
-    "@vitest/browser": "^2.0.2",
-    "jsdom": "^24.1.0",
-    "vite": "^5.3.3",
-    "vitest": "^2.0.2"
+    "@vitest/browser": "^2.0.5",
+    "jsdom": "^25.0.0",
+    "vite": "^5.4.3",
+    "vitest": "^2.0.5"
   }
 }