Merge branch 'renovate/stencila-schema-1.x'

stencila · Mar 17, 2021 · 2f131ae · 2f131ae
2 parents 3109f0d + 59c0827
commit 2f131ae
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
   "dependencies": {
     "@stencila/executa": "^1.15.7",
     "@stencila/logga": "^4.0.0",
-    "@stencila/schema": "^0.47.2",
+    "@stencila/schema": "^1.1.0",
     "@stencila/thema": "^2.22.1",
     "ajv": "^6.12.6",
     "appdata-path": "^1.0.0",

diff --git a/src/codecs/jsonld/__file_snapshots__/article.jsonld b/src/codecs/jsonld/__file_snapshots__/article.jsonld
@@ -1,5 +1,5 @@
 {
-  "@context": "http://schema.stenci.la/v0/jsonld/",
+  "@context": "http://schema.stenci.la/v1/jsonld/",
   "type": "Article",
   "authors": [
     {

diff --git a/src/codecs/xml/__file_snapshots__/kitchen-sink.xml b/src/codecs/xml/__file_snapshots__/kitchen-sink.xml
@@ -1,4 +1,4 @@
-<stencila xmlns="https://schema.stenci.la/v0/xml">
+<stencila xmlns="https://schema.stenci.la/v1/xml">
     <Array>
         <Null/>
         <Boolean>true</Boolean>

diff --git a/src/util/schemas.ts b/src/util/schemas.ts
@@ -7,8 +7,7 @@
  * that effort.
  */
 
-import stencila from '@stencila/schema'
-import JsonSchema from '@stencila/schema/dist/ts/jsonSchema'
+import stencila, { JsonSchema } from '@stencila/schema'
 import Ajv from 'ajv'
 import betterAjvErrors from 'better-ajv-errors'
 import fs from 'fs-extra'
@@ -206,7 +205,7 @@ const codecCoerce: Ajv.SchemaValidateFunction = async (
   return true
 }
 
-coercers.addKeyword('codec', {
+coercers.addKeyword('parser', {
   type: 'string',
   modifying: true,
   async: true,