Skip to content

Commit

Permalink
Merge branch 'main' into recogito#127-annotating-enabled-reactive
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/text-annotator/src/TextAnnotator.ts
  • Loading branch information
oleksandr-danylchenko committed Sep 10, 2024
2 parents 21249d7 + 7a6b6ab commit ffd4564
Show file tree
Hide file tree
Showing 16 changed files with 125 additions and 133 deletions.
162 changes: 81 additions & 81 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@recogito/text-annotator-monorepo",
"version": "3.0.0-rc.44",
"version": "3.0.0-rc.45",
"description": "Recogito Text Annotator monorepo",
"author": "Rainer Simon",
"repository": {
Expand Down
10 changes: 5 additions & 5 deletions packages/extension-tei/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@recogito/text-annotator-tei",
"version": "3.0.0-rc.44",
"version": "3.0.0-rc.45",
"description": "Recogito Text Annotator TEI extension",
"author": "Rainer Simon",
"license": "BSD-3-Clause",
"type": "module",
"scripts": {
"start": "vite",
"start": "vite --host",
"build": "vite build",
"preview": "vite preview",
"test": "echo 'Skipping tests in @recogito/text-annotator package'"
Expand All @@ -28,11 +28,11 @@
"devDependencies": {
"CETEIcean": "^1.9.3",
"typescript": "5.5.4",
"vite": "^5.4.2",
"vite": "^5.4.3",
"vite-plugin-dts": "^4.1.0"
},
"peerDependencies": {
"@annotorious/core": "^3.0.3",
"@recogito/text-annotator": "3.0.0-rc.44"
"@annotorious/core": "^3.0.5",
"@recogito/text-annotator": "3.0.0-rc.45"
}
}
Loading

0 comments on commit ffd4564

Please sign in to comment.