Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/sour-dolls-behave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@getodk/common': minor
'@getodk/xpath': minor
'@getodk/web-forms': minor
---

Moved monorepo tree-sitter-xpath into separate repo
42 changes: 0 additions & 42 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ jobs:
- uses: 'actions/cache@v5'
id: cache-build
with:
# Note: the tree-sitter-xpath .js and .wasm paths are standard for
# tree-sitter's build output. They also litter a bunch of other files
# in various build phases, several under `src` (which is why the
# grammar's TypeScript source is not there).
path: |
examples/*/dist
packages/*/dist
Expand Down Expand Up @@ -353,44 +349,6 @@ jobs:
- if: ${{ matrix.target == 'Web' }}
run: 'yarn workspace @getodk/xpath test-browser:${{ matrix.browser }}'

tree-sitter-xpath:
name: '@getodk/tree-sitter-xpath'
needs: ['install-and-build']
runs-on: 'ubuntu-latest'

strategy:
fail-fast: false
matrix:
node-version: ['20.19.3', '22.12.0', '24.11.0']

steps:
- uses: 'actions/checkout@v5'

- uses: 'volta-cli/action@v5'
with:
node-version: '${{ matrix.node-version }}'

- uses: 'actions/cache@v5'
id: cache-install
with:
path: |
node_modules
**/node_modules
key: install-${{ matrix.node-version }}-${{ hashFiles('yarn.lock', '.yarnrc.yml', '.github/workflows/ci.yml', 'examples/*/yarn.lock', 'packages/*/package.json', 'packages/*/yarn.lock') }}
fail-on-cache-miss: true

- uses: 'actions/cache@v5'
id: cache-build
with:
path: |
examples/*/dist
packages/*/dist
packages/web-forms/dist-demo
key: build-${{ matrix.node-version }}-${{ github.sha }}
fail-on-cache-miss: true

- run: 'yarn workspace @getodk/tree-sitter-xpath test'

web-forms:
name: '@getodk/web-forms'
needs: ['install-and-build']
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,6 @@ For developers, see [TRANSLATIONS.md](./packages/web-forms/TRANSLATIONS.md) for
### Requirements

- [Volta](https://volta.sh/) to ensure consistent `node` and `yarn` versions.
- [docker](https://www.docker.com/) to build the `tree-sitter-xpath` package.

### Running locally

Expand Down
5 changes: 0 additions & 5 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ export default defineConfig(
'packages/**/*.min.js',
'packages/**/dist/**/*',
'packages/common/fixtures/test-javarosa/**/*',
'packages/tree-sitter-xpath/grammar.js',
'packages/tree-sitter-xpath/bindings/**/*',
'packages/tree-sitter-xpath/types/**/*',
'packages/web-forms/dist-demo/**/*',
'packages/web-forms/scripts/**/*',
'packages/xforms-engine/api-docs/**/*',
Expand Down Expand Up @@ -390,10 +387,8 @@ export default defineConfig(
'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',
],
rules: {
'no-restricted-imports': 'off',
Expand Down
12 changes: 0 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@
"feature-matrix": "node scripts/feature-matrix/render.js",
"translations:pull": "tx pull -a -f --mode translator"
},
"dependenciesMeta": {
"tree-sitter": {
"built": true
},
"tree-sitter-cli": {
"built": true
}
},
"dependencies": {
"@changesets/changelog-github": "^0.5.1",
"@changesets/cli": "^2.29.7",
Expand Down Expand Up @@ -79,10 +71,6 @@
"vue-eslint-parser": "^10.4.0",
"vue-tsc": "^3.1.5"
},
"resolutions": {
"tree-sitter": "0.22.1",
"@asgerf/dts-tree-sitter/tree-sitter": "0.22.1"
},
"devDependencies": {
"@transifex/cli": "^7.1.5"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/common/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ Being an internal package, for now there is no build step: downstream packages s
- downstream package setup concerns
- consideration for downstream build and bundle impact
- usage in a package intended for both internal and external purposes (i.e.
packages such as `@getodk/tree-sitter-xpath` or `@getodk/xpath` which are used
in `@getodk/xforms-engine` but may also be used on their own)
packages such as `@getodk/xpath` which are used in `@getodk/xforms-engine`
but may also be used on their own)
44 changes: 0 additions & 44 deletions packages/tree-sitter-xpath/CHANGELOG.md

This file was deleted.

3 changes: 0 additions & 3 deletions packages/tree-sitter-xpath/README.md

This file was deleted.

3 changes: 0 additions & 3 deletions packages/tree-sitter-xpath/index.d.ts

This file was deleted.

51 changes: 0 additions & 51 deletions packages/tree-sitter-xpath/package.json

This file was deleted.

38 changes: 0 additions & 38 deletions packages/tree-sitter-xpath/scripts/build/parser-types.mjs

This file was deleted.

52 changes: 0 additions & 52 deletions packages/tree-sitter-xpath/scripts/build/pre.mjs

This file was deleted.

Loading