From 9b05dc1ab1f8348f5aa7c3bb68147273e2eb744b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Biron?= Date: Thu, 12 Sep 2024 10:05:16 +0200 Subject: [PATCH] Update engine to v2.2.1 (#23) * Bump engine to. v2.2.1 * Update config * Trust semver publishing --- config/production.json | 82 +++++++++++++++++++++--------------------- package-lock.json | 29 ++++++++++----- package.json | 4 +-- 3 files changed, 63 insertions(+), 52 deletions(-) diff --git a/config/production.json b/config/production.json index a78763e..9542a4f 100644 --- a/config/production.json +++ b/config/production.json @@ -1,51 +1,49 @@ { - "name": "kenya", - "services": { - "repository": "https://github.com/OpenTermsArchive/kenya-declarations.git", - "declarationsPath": "./declarations" - }, - "recorder": { - "versions": { - "storage": { - "git": { - "snapshotIdentiferTemplate": "https://github.com/OpenTermsArchive/kenya-snapshots/commit/%SNAPSHOT_ID", - "repository": "git@github.com:OpenTermsArchive/kenya-versions.git", - "path": "./data/versions" + "@opentermsarchive/engine": { + "recorder": { + "versions": { + "storage": { + "git": { + "snapshotIdentiferTemplate": "https://github.com/OpenTermsArchive/kenya-snapshots/commit/%SNAPSHOT_ID", + "repository": "git@github.com:OpenTermsArchive/kenya-versions.git", + "path": "./data/versions" + } + } + }, + "snapshots": { + "storage": { + "git": { + "repository": "git@github.com:OpenTermsArchive/kenya-snapshots.git", + "path": "./data/snapshots" + } } } }, - "snapshots": { - "storage": { - "git": { - "repository": "git@github.com:OpenTermsArchive/kenya-snapshots.git", - "path": "./data/snapshots" - } + "fetcher": { + "language": "en" + }, + "notifier": { + "sendInBlue": { + "updatesListId": 0, + "updateTemplateId": 0 } - } - }, - "fetcher": { - "language": "en" - }, - "notifier": { - "sendInBlue": { - "updatesListId": 0, - "updateTemplateId": 0 - } - }, - "reporter": { - "githubIssues": { - "repositories": { - "declarations": "OpenTermsArchive/kenya-declarations", - "versions": "OpenTermsArchive/kenya-versions", - "snapshots": "OpenTermsArchive/kenya-snapshots" + }, + "reporter": { + "githubIssues": { + "repositories": { + "declarations": "OpenTermsArchive/kenya-declarations", + "versions": "OpenTermsArchive/kenya-versions", + "snapshots": "OpenTermsArchive/kenya-snapshots" + } } + }, + "dataset": { + "title": "kenya", + "versionsRepositoryURL": "https://github.com/OpenTermsArchive/kenya-versions" + }, + "collection-api": { + "port": 3000, + "basePath": "/collection-api" } - }, - "dataset": { - "title": "kenya", - "versionsRepositoryURL": "https://github.com/OpenTermsArchive/kenya-versions" - }, - "api": { - "port": 3000 } } diff --git a/package-lock.json b/package-lock.json index 47e7de9..026472f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "demo-declarations", + "name": "kenya-declarations", "lockfileVersion": 3, "requires": true, "packages": { "": { "license": "AGPL-3.0", "dependencies": { - "@opentermsarchive/engine": "~2.0.1" + "@opentermsarchive/engine": "^2.2.1" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -1815,9 +1815,9 @@ "license": "MIT" }, "node_modules/@opentermsarchive/engine": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@opentermsarchive/engine/-/engine-2.0.1.tgz", - "integrity": "sha512-umH4LjUI4gU73PtIGUr1U68TRhC3+EKUW+VMRO5mv83MzLiZV+sdvJJAK4h6wzwgDp0GjDSRdFxSPEc0lMx16w==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@opentermsarchive/engine/-/engine-2.2.1.tgz", + "integrity": "sha512-TD6HZqQq0ReKSbCA29KBRSTJqVIyH1eCGzO103Ar8coadbq+edV0vitv4/LDmUsMNizDDwyAGKH47s+no1z01Q==", "dependencies": { "@accordproject/markdown-cicero": "^0.15.2", "@accordproject/markdown-pdf": "^0.15.2", @@ -1833,7 +1833,8 @@ "chai-exclude": "^2.1.0", "commander": "^9.4.1", "config": "^3.3.6", - "croner": "^4.3.6", + "croner": "^8.0.2", + "cronstrue": "^2.50.0", "cross-env": "^7.0.3", "datauri": "^4.1.0", "dotenv": "^10.0.0", @@ -3922,8 +3923,20 @@ } }, "node_modules/croner": { - "version": "4.4.1", - "license": "MIT" + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/croner/-/croner-8.1.1.tgz", + "integrity": "sha512-1VdUuRnQP4drdFkS8NKvDR1NBgevm8TOuflcaZEKsxw42CxonjW/2vkj1AKlinJb4ZLwBcuWF9GiPr7FQc6AQA==", + "engines": { + "node": ">=18.0" + } + }, + "node_modules/cronstrue": { + "version": "2.50.0", + "resolved": "https://registry.npmjs.org/cronstrue/-/cronstrue-2.50.0.tgz", + "integrity": "sha512-ULYhWIonJzlScCCQrPUG5uMXzXxSixty4djud9SS37DoNxDdkeRocxzHuAo4ImRBUK+mAuU5X9TSwEDccnnuPg==", + "bin": { + "cronstrue": "bin/cli.js" + } }, "node_modules/cross-env": { "version": "7.0.3", diff --git a/package.json b/package.json index b9b0e11..654d2d5 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,13 @@ "test:schema": "ota validate --schema-only", "test:modified": "ota validate --modified", "start": "ota track", - "start:api": "ota serve", + "start:collection-api": "ota serve", "start:schedule": "npm run start -- --schedule", "start:modified": "git diff -z --name-only HEAD $(git merge-base HEAD origin/main) -- ./declarations/ | tr '\\0' '\\n' | grep -v .history | grep -v .filters | sed 's/declarations\\///g' | sed 's/.json//g' | sed 's/.*/\"&\"/' | xargs -r npm run start -- --services", "dataset": "ota dataset", "dataset:schedule": "npm run dataset -- --publish --remove-local-copy --schedule" }, "dependencies": { - "@opentermsarchive/engine": "~2.0.1" + "@opentermsarchive/engine": "^2.2.1" } }