From 81e88ea9265bb361e5dc1963c9054847490240cc Mon Sep 17 00:00:00 2001 From: Martin Vanbrabant Date: Thu, 30 Oct 2025 07:20:40 +0100 Subject: [PATCH 1/4] Version back to (unreleased) --- main/src/version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/version.js b/main/src/version.js index 7e4f0f8..54ae999 100644 --- a/main/src/version.js +++ b/main/src/version.js @@ -1,5 +1,5 @@ // Maintain the version string on the development branch: // - during development: set to (unreleased); // - right before merging to the main branch for making a new release: set to the new release tag (see https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/tags). -const version = "v2.2.0"; +const version = "(unreleased)"; export default version; From 907c777cfc684eb968f2be0616d0ef262b317d9b Mon Sep 17 00:00:00 2001 From: Martin Vanbrabant Date: Thu, 30 Oct 2025 07:35:32 +0100 Subject: [PATCH 2/4] Corrected a wrong comment - no code changes --- .../ListResultTable/QueryResultList/QueryResultList.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/components/ListResultTable/QueryResultList/QueryResultList.jsx b/main/src/components/ListResultTable/QueryResultList/QueryResultList.jsx index 662ab87..1676975 100644 --- a/main/src/components/ListResultTable/QueryResultList/QueryResultList.jsx +++ b/main/src/components/ListResultTable/QueryResultList/QueryResultList.jsx @@ -150,7 +150,7 @@ function strip(obj, level = 0) { if (level === 0 && k === 'id') { // skip id at top level } else if (level === 1 && k === 'datatype' && v && typeof v === 'object') { - // remove x.datatype.termType; promote x.datatype.value to x.datatype + // remove x.datatype.termType const { termType, ...rest } = v; result[k] = strip(rest, level + 1); } else { From 4e5543a9e0518a42d03d6a704c965b38f202ec19 Mon Sep 17 00:00:00 2001 From: Martin Vanbrabant Date: Thu, 30 Oct 2025 13:37:10 +0100 Subject: [PATCH 3/4] Added a top level package.json --- CHANGELOG.md | 4 ++++ README.md | 12 +++--------- main/package-lock.json | 1 - main/package.json | 1 - package-lock.json | 12 ++++++++++++ package.json | 10 ++++++++++ test/package-lock.json | 1 - test/package.json | 1 - 8 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 package-lock.json create mode 100644 package.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d7ec64..43639f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- Added a top level package.json (#246). + ## [2.2.0] - 2025-10-30 ### Changed diff --git a/README.md b/README.md index 78d9804..fb27efd 100644 --- a/README.md +++ b/README.md @@ -65,15 +65,15 @@ The instructions below explain when and how to use the `select-config.cjs` scrip ## Getting started -The Web application is located in directory `main`. -Go to that directory. - To install: ```bash npm install ``` +The Web application is located in directory `main`. +Go to that directory. + To select the appropriate configuration (here shown for `demo`): ```bash @@ -104,12 +104,6 @@ Resources: Go to directory `test`. -To install, execute: - -```bash -npm install -``` - Spin up resources: ```bash diff --git a/main/package-lock.json b/main/package-lock.json index ee9e5e4..cbddca7 100644 --- a/main/package-lock.json +++ b/main/package-lock.json @@ -6,7 +6,6 @@ "packages": { "": { "name": "miravi-a-linked-data-viewer", - "version": "1.0.0", "dependencies": { "@comunica/query-sparql": "^4.2.0", "@inrupt/solid-client": "^1.30.0", diff --git a/main/package.json b/main/package.json index 7241fee..de5289a 100644 --- a/main/package.json +++ b/main/package.json @@ -1,7 +1,6 @@ { "name": "miravi-a-linked-data-viewer", "private": true, - "version": "1.0.0", "type": "module", "scripts": { "dev": "vite", diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..5147230 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,12 @@ +{ + "name": "miravi-a-linked-data-viewer-top-level", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "miravi-a-linked-data-viewer-top-level", + "hasInstallScript": true, + "license": "MIT" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..91480ed --- /dev/null +++ b/package.json @@ -0,0 +1,10 @@ +{ + "name": "miravi-a-linked-data-viewer-top-level", + "description": "Miravi - a linked data viewer", + "private": true, + "license": "MIT", + "author": "Martin Vanbrabant", + "scripts": { + "postinstall": "cd main && npm install && cd ../test && npm install" + } +} diff --git a/test/package-lock.json b/test/package-lock.json index a933471..93e4011 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -6,7 +6,6 @@ "packages": { "": { "name": "tools-for-miravi-a-linked-data-viewer", - "version": "1.0.0", "dependencies": { "@solid/community-server": "^6.0.1", "concurrently": "^9.1.2", diff --git a/test/package.json b/test/package.json index d3e2844..894738b 100644 --- a/test/package.json +++ b/test/package.json @@ -1,7 +1,6 @@ { "name": "tools-for-miravi-a-linked-data-viewer", "private": true, - "version": "1.0.0", "type": "module", "scripts": { "serve": "bash scripts/prepare-dir-to-serve.sh && http-server -p 5173 serve-this", From 0ff09b0d3e0233f2e05f8c4322f9322d016c9921 Mon Sep 17 00:00:00 2001 From: Martin Vanbrabant Date: Thu, 30 Oct 2025 13:43:30 +0100 Subject: [PATCH 4/4] Set version for Release v2.2.1 --- CHANGELOG.md | 5 ++++- main/src/version.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43639f0..7f15e10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [2.2.1] - 2025-10-30 + ### Added - Added a top level package.json (#246). @@ -303,4 +305,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.1.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v2.1.0 [2.1.1]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v2.1.1 [2.2.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v2.2.0 -[Unreleased]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/compare/v2.2.0...HEAD +[2.2.1]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v2.2.1 +[Unreleased]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/compare/v2.2.1...HEAD diff --git a/main/src/version.js b/main/src/version.js index 54ae999..c13a93a 100644 --- a/main/src/version.js +++ b/main/src/version.js @@ -1,5 +1,5 @@ // Maintain the version string on the development branch: // - during development: set to (unreleased); // - right before merging to the main branch for making a new release: set to the new release tag (see https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/tags). -const version = "(unreleased)"; +const version = "v2.2.1"; export default version;