Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post-release (@getodk/[email protected]) dependency updates & related chores #266

Merged
merged 6 commits into from
Jan 7, 2025
Merged

Post-release (@getodk/[email protected]) dependency updates & related chores #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
744b38e
Remove `@getodk/ui-solid` package
eyelidlessness Dec 16, 2024
7ea1dc7
Bump Node version matrix
eyelidlessness Dec 16, 2024
be174df
Update tree-sitter (etc)
eyelidlessness Dec 18, 2024
a0b5298
Minor quality of life improvement: don’t treat `scripts` as a workspa…
eyelidlessness Dec 17, 2024
1066d74
Update most other (non-tree-sitter) dependencies*
eyelidlessness Dec 17, 2024
70fb0fb
Fix lint errors introduced by updated eslint etc
eyelidlessness Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,3 @@
*.jpg -text

*.xlsx binary

packages/tree-sitter-xpath/src/*.json linguist-generated
packages/tree-sitter-xpath/src/parser.c linguist-generated
packages/tree-sitter-xpath/src/tree_sitter/* linguist-generated

packages/tree-sitter-xpath/bindings/** linguist-generated
packages/tree-sitter-xpath/binding.gyp linguist-generated
packages/tree-sitter-xpath/setup.py linguist-generated
packages/tree-sitter-xpath/Makefile linguist-generated
packages/tree-sitter-xpath/Package.swift linguist-generated
96 changes: 24 additions & 72 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

strategy:
matrix:
node-version: ['18.20.4', '20.17.0', '22.9.0']
node-version: ['18.20.5', '20.18.1', '22.12.0']

steps:
- uses: 'actions/checkout@v4'
Expand Down Expand Up @@ -58,12 +58,6 @@ jobs:
examples/*/dist
packages/*/dist
packages/web-forms/dist-demo
packages/tree-sitter-xpath/grammar.js
packages/tree-sitter-xpath/src/grammar.json
packages/tree-sitter-xpath/src/parser.c
packages/tree-sitter-xpath/src/tree_sitter/parser.h
packages/tree-sitter-xpath/tree-sitter-xpath.wasm
packages/tree-sitter-xpath/types
key: build-${{ matrix.node-version }}-${{ github.sha }}

# `@getodk/xpath` tests (currently) expect this time zone
Expand All @@ -83,7 +77,7 @@ jobs:

strategy:
matrix:
node-version: ['22.9.0']
node-version: ['22.12.0']

steps:
- uses: 'actions/checkout@v4'
Expand All @@ -109,12 +103,6 @@ jobs:
examples/*/dist
packages/*/dist
packages/web-forms/dist-demo
packages/tree-sitter-xpath/grammar.js
packages/tree-sitter-xpath/src/grammar.json
packages/tree-sitter-xpath/src/parser.c
packages/tree-sitter-xpath/src/tree_sitter/parser.h
packages/tree-sitter-xpath/tree-sitter-xpath.wasm
packages/tree-sitter-xpath/types
key: build-${{ matrix.node-version }}-${{ github.sha }}
fail-on-cache-miss: true

Expand All @@ -130,16 +118,16 @@ jobs:
strategy:
matrix:
target: ['Node']
node-version: ['18.20.4', '20.17.0', '22.9.0']
node-version: ['18.20.5', '20.18.1', '22.12.0']
include:
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: chromium
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: firefox
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: webkit

steps:
Expand All @@ -166,12 +154,6 @@ jobs:
examples/*/dist
packages/*/dist
packages/web-forms/dist-demo
packages/tree-sitter-xpath/grammar.js
packages/tree-sitter-xpath/src/grammar.json
packages/tree-sitter-xpath/src/parser.c
packages/tree-sitter-xpath/src/tree_sitter/parser.h
packages/tree-sitter-xpath/tree-sitter-xpath.wasm
packages/tree-sitter-xpath/types
key: build-${{ matrix.node-version }}-${{ github.sha }}
fail-on-cache-miss: true

Expand All @@ -195,16 +177,16 @@ jobs:
strategy:
matrix:
target: ['Node']
node-version: ['18.20.4', '20.17.0', '22.9.0']
node-version: ['18.20.5', '20.18.1', '22.12.0']
include:
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: chromium
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: firefox
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: webkit

steps:
Expand All @@ -231,12 +213,6 @@ jobs:
examples/*/dist
packages/*/dist
packages/web-forms/dist-demo
packages/tree-sitter-xpath/grammar.js
packages/tree-sitter-xpath/src/grammar.json
packages/tree-sitter-xpath/src/parser.c
packages/tree-sitter-xpath/src/tree_sitter/parser.h
packages/tree-sitter-xpath/tree-sitter-xpath.wasm
packages/tree-sitter-xpath/types
key: build-${{ matrix.node-version }}-${{ github.sha }}
fail-on-cache-miss: true

Expand All @@ -260,16 +236,16 @@ jobs:
strategy:
matrix:
target: ['Node']
node-version: ['18.20.4', '20.17.0', '22.9.0']
node-version: ['18.20.5', '20.18.1', '22.12.0']
include:
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: chromium
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: firefox
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: webkit

steps:
Expand All @@ -296,12 +272,6 @@ jobs:
examples/*/dist
packages/*/dist
packages/web-forms/dist-demo
packages/tree-sitter-xpath/grammar.js
packages/tree-sitter-xpath/src/grammar.json
packages/tree-sitter-xpath/src/parser.c
packages/tree-sitter-xpath/src/tree_sitter/parser.h
packages/tree-sitter-xpath/tree-sitter-xpath.wasm
packages/tree-sitter-xpath/types
key: build-${{ matrix.node-version }}-${{ github.sha }}
fail-on-cache-miss: true

Expand All @@ -325,16 +295,16 @@ jobs:
strategy:
matrix:
target: ['Node']
node-version: ['18.20.4', '20.17.0', '22.9.0']
node-version: ['18.20.5', '20.18.1', '22.12.0']
include:
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: chromium
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: firefox
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: webkit

steps:
Expand All @@ -361,12 +331,6 @@ jobs:
examples/*/dist
packages/*/dist
packages/web-forms/dist-demo
packages/tree-sitter-xpath/grammar.js
packages/tree-sitter-xpath/src/grammar.json
packages/tree-sitter-xpath/src/parser.c
packages/tree-sitter-xpath/src/tree_sitter/parser.h
packages/tree-sitter-xpath/tree-sitter-xpath.wasm
packages/tree-sitter-xpath/types
key: build-${{ matrix.node-version }}-${{ github.sha }}
fail-on-cache-miss: true

Expand Down Expand Up @@ -395,7 +359,7 @@ jobs:

strategy:
matrix:
node-version: ['18.20.4', '20.17.0', '22.9.0']
node-version: ['18.20.5', '20.18.1', '22.12.0']

steps:
- uses: 'actions/checkout@v4'
Expand All @@ -421,12 +385,6 @@ jobs:
examples/*/dist
packages/*/dist
packages/web-forms/dist-demo
packages/tree-sitter-xpath/grammar.js
packages/tree-sitter-xpath/src/grammar.json
packages/tree-sitter-xpath/src/parser.c
packages/tree-sitter-xpath/src/tree_sitter/parser.h
packages/tree-sitter-xpath/tree-sitter-xpath.wasm
packages/tree-sitter-xpath/types
key: build-${{ matrix.node-version }}-${{ github.sha }}
fail-on-cache-miss: true

Expand All @@ -440,16 +398,16 @@ jobs:
strategy:
matrix:
target: ['Node']
node-version: ['18.20.4', '20.17.0', '22.9.0']
node-version: ['18.20.5', '20.18.1', '22.12.0']
include:
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: chromium
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: firefox
- target: 'Web'
node-version: '22.9.0'
node-version: '22.12.0'
browser: webkit

steps:
Expand All @@ -476,12 +434,6 @@ jobs:
examples/*/dist
packages/*/dist
packages/web-forms/dist-demo
packages/tree-sitter-xpath/grammar.js
packages/tree-sitter-xpath/src/grammar.json
packages/tree-sitter-xpath/src/parser.c
packages/tree-sitter-xpath/src/tree_sitter/parser.h
packages/tree-sitter-xpath/tree-sitter-xpath.wasm
packages/tree-sitter-xpath/types
key: build-${{ matrix.node-version }}-${{ github.sha }}
fail-on-cache-miss: true

Expand All @@ -503,7 +455,7 @@ jobs:
- if: ${{ matrix.target == 'Web' && matrix.browser != 'webkit' }}
run: 'yarn workspace @getodk/web-forms test-browser:${{ matrix.browser }}'

- if: ${{ matrix.node-version == '22.9.0' && matrix.target == 'Node' }}
- if: ${{ matrix.node-version == '22.12.0' && matrix.target == 'Node' }}
uses: actions/upload-artifact@v4
with:
name: dist-demo
Expand Down
98 changes: 0 additions & 98 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,104 +25,6 @@ packages/**/dist
# Generated documentation
packages/*/api-docs

## ============================================================================
## Specific to tree-sitter and/or @getodk/tree-sitter-xpath
##
## The tree-sitter-xpath build process generates a slew of files, many of
## which we ignore. This section includes two sub-sections:
##
## 1. A set of ignores derived from tree-sitter's own generated .gitignore
## file, with its patterns adjusted to their place in the
## tree-sitter-xpath package directory.
##
## 2. A set of additive ignore patterns which are not addressed by those
## derived patterns, but which we also regard as either build artifacts
## or detritus left behind in their creation.
##
## Not specified here: a few **other files** are generated by tree-sitter
## which are not appropriate to ignore, because their presence would cause
## conflicts with editor and/or version control. For more detail, see:
##
## ./packages/tree-sitter-xpath/scripts/build/shared.mjs
## ============================================================================

# ----------------------------------------------------------------------------
# 1. Derived from the .gitignore generated by tree-sitter
# ----------------------------------------------------------------------------

# Rust artifacts
packages/tree-sitter-xpath/Cargo.lock
packages/tree-sitter-xpath/target/

# Node artifacts
packages/tree-sitter-xpath/build/
packages/tree-sitter-xpath/prebuilds/
packages/tree-sitter-xpath/node_modules/
packages/tree-sitter-xpath/*.tgz

# Swift artifacts
packages/tree-sitter-xpath/.build/

# Go artifacts
packages/tree-sitter-xpath/go.mod
packages/tree-sitter-xpath/go.sum
packages/tree-sitter-xpath/_obj/

# Python artifacts
packages/tree-sitter-xpath/.venv/
packages/tree-sitter-xpath/dist/
packages/tree-sitter-xpath/*.egg-info
packages/tree-sitter-xpath/*.whl

# C artifacts
packages/tree-sitter-xpath/*.a
packages/tree-sitter-xpath/*.so
packages/tree-sitter-xpath/*.so.*
packages/tree-sitter-xpath/*.dylib
packages/tree-sitter-xpath/*.dll
packages/tree-sitter-xpath/*.pc

# Example dirs
packages/tree-sitter-xpath/examples/*/

# Grammar volatiles
packages/tree-sitter-xpath/*.wasm
packages/tree-sitter-xpath/*.obj
packages/tree-sitter-xpath/*.o

# ----------------------------------------------------------------------------
# 2. Additional ignore patterns beyond those generated by tree-sitter
#
# Note that some of these may be redundant to those above. Most of these
# patterns predate tree-sitter's generation of .gitignore. Keeping them intact
# may make it easier to untangle this nonsense if tree-sitter stops generating
# such files on every build.
# ----------------------------------------------------------------------------

packages/tree-sitter-xpath/bindings/
packages/tree-sitter-xpath/build/
packages/tree-sitter-xpath/src/tree_sitter
packages/tree-sitter-xpath/src/grammar.json
packages/tree-sitter-xpath/src/node-types.json
packages/tree-sitter-xpath/src/parser.c
packages/tree-sitter-xpath/target/
packages/tree-sitter-xpath/types/tree-sitter-xpath-parser.d.ts
packages/tree-sitter-xpath/binding.gyp
packages/tree-sitter-xpath/Cargo.lock
packages/tree-sitter-xpath/Cargo.toml
packages/tree-sitter-xpath/grammar.js
packages/tree-sitter-xpath/grammar.js.map
packages/tree-sitter-xpath/Makefile
packages/tree-sitter-xpath/Package.swift
packages/tree-sitter-xpath/pyproject.toml
packages/tree-sitter-xpath/setup.py
packages/tree-sitter-xpath/tree-sitter-xpath.wasm


## ============================================================================
## End of patterns specific to tree-sitter and/or @getodk/tree-sitter-xpath
## ============================================================================

# Test artifcats
## Playwright, apparently
packages/*/playwright-report
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ https://github.com/getodk/web-forms/assets/447837/9b25e1bc-d209-462c-8e9e-3259bd
- [xforms-engine](/packages/xforms-engine): implementation of the [ODK XForms specification](https://getodk.github.io/xforms-spec/)
- [xpath](/packages/xpath): XPath evaluator with ODK XForms extensions
- [scenario](/packages/scenario): engine client used to express tests on forms
- [ui-solid](/packages/ui-solid): form-filling frontend built with Solid, likely not as up-to-date as the Vue client

## Project status

Expand Down
2 changes: 1 addition & 1 deletion eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ export default tseslint.config(
'packages/tree-sitter-xpath/grammar.js',
'packages/tree-sitter-xpath/bindings/**/*',
'packages/tree-sitter-xpath/types/**/*',
'packages/ui-solid/**/*',
'packages/web-forms/dist-demo/**/*',
'packages/xforms-engine/api-docs/**/*',
'**/vendor',
Expand Down Expand Up @@ -408,6 +407,7 @@ export default tseslint.config(
'packages/*/playwright.config.ts',
'packages/*/vite.config.ts',
'packages/*/vitest.config.ts',
'packages/tree-sitter-xpath/vite.config.mts',
'packages/xforms-engine/vite.*.config.ts',
'packages/*/tools/**/*',
'packages/tree-sitter-xpath/scripts/build/*.mjs',
Expand Down
Loading
Loading