From b28e17d84310d8ce51a92149656ddbbd7fd1c8a9 Mon Sep 17 00:00:00 2001
From: Peter Sefton <peter.sefton@uts.edu.au>
Date: Thu, 12 Nov 2020 14:00:56 +1100
Subject: [PATCH] Update ro-crate-depoist to work with latest RO-Crate
---
package-lock.json | 54 +++++++++++++++++++++++++++++++++------------
package.json | 2 +-
ro-crate-deposit.js | 2 +-
3 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 38818d2..703e6da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@types/node": {
- "version": "13.5.0",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-13.5.0.tgz",
- "integrity": "sha512-Onhn+z72D2O2Pb2ql2xukJ55rglumsVo1H6Fmyi8mlU9SvKdBk/pUSUAiBY/d9bAOF7VVWajX3sths/+g6ZiAQ=="
+ "version": "14.14.7",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz",
+ "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg=="
},
"a-sync-waterfall": {
"version": "1.0.1",
@@ -156,6 +156,14 @@
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
"integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
},
+ "axios": {
+ "version": "0.19.2",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+ "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+ "requires": {
+ "follow-redirects": "1.5.10"
+ }
+ },
"base": {
"version": "0.11.2",
"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
@@ -434,9 +442,9 @@
}
},
"commander": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.0.tgz",
- "integrity": "sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw=="
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+ "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
},
"component-emitter": {
"version": "1.3.0",
@@ -794,6 +802,24 @@
"locate-path": "^3.0.0"
}
},
+ "follow-redirects": {
+ "version": "1.5.10",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+ "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+ "requires": {
+ "debug": "=3.1.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ }
+ }
+ },
"for-in": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -1438,9 +1464,9 @@
},
"dependencies": {
"readable-stream": {
- "version": "3.5.0",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
- "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
@@ -1785,8 +1811,7 @@
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "optional": true
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"nan": {
"version": "2.14.0",
@@ -2197,10 +2222,11 @@
"optional": true
},
"ro-crate": {
- "version": "1.2.20",
- "resolved": "https://registry.npmjs.org/ro-crate/-/ro-crate-1.2.20.tgz",
- "integrity": "sha512-MeWO1axgM7OW5v5/elt12d2pFroxnSyDGQrNQg5VBFu1WV3O4do5pQhtf1eFwnFsDG27JtwKKskyy7PWRqfLDg==",
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/ro-crate/-/ro-crate-1.6.1.tgz",
+ "integrity": "sha512-uHR9+UdOq2cZufHXGBLMRPgF8dP8vQVKYhv77tKNVNKPnZ+59CYmBPJ9CaVgUKsMcUKLpjUwp0O2XpFfHuIeww==",
"requires": {
+ "axios": "^0.19.2",
"cheerio": "^1.0.0-rc.3",
"commander": "^4.0.1",
"ejs": "^2.7.1",
diff --git a/package.json b/package.json
index 7731676..4b131aa 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"jsonld": "^1.8.1",
"nunjucks": "^3.2.0",
"ocfl": "^1.0.9",
- "ro-crate": "^1.2.20",
+ "ro-crate": "^1.6.1",
"uuid": "^3.4.0",
"yargs": "^13.3.0"
}
diff --git a/ro-crate-deposit.js b/ro-crate-deposit.js
index 90d73ea..a1d8f1b 100644
--- a/ro-crate-deposit.js
+++ b/ro-crate-deposit.js
@@ -27,7 +27,7 @@ async function connectRepo(repoPath) {
async function checkin(repo, repoName, rocratePath) {
- const rocrateFile = path.join(rocratePath, "ro-crate-metadata.jsonld");
+ const rocrateFile = path.join(rocratePath, "ro-crate-metadata.json");
try {
const jsonld = await fs.readJson(rocrateFile);
const crate = new ROCrate(jsonld);
--
GitLab