From 3ca7790279a99f4b70855be76ffd39f2e988945e Mon Sep 17 00:00:00 2001 From: baptisten Date: Wed, 17 May 2023 14:03:48 -0700 Subject: [PATCH 1/2] added json api extra module --- composer-manifest.yaml | 3 + composer.json | 1 + composer.lock | 179 +++++++++++++++++- .../jsonapi_extras.settings.yml | 5 + 4 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 config/config-default/jsonapi_extras.settings.yml diff --git a/composer-manifest.yaml b/composer-manifest.yaml index 42e1eb07..3b2f1e46 100644 --- a/composer-manifest.yaml +++ b/composer-manifest.yaml @@ -81,6 +81,7 @@ packages: drupal/honeypot: 2.1.1 drupal/inline_entity_form: 1.0.0-rc11 drupal/insert_view_adv: 'dev-2.0.x:5d3dd71fa9d3f878eacd93452873b29fc808d857' + drupal/jsonapi_extras: 3.23.0 drupal/key: 1.15.0 drupal/linkit: 5.0.0-beta13 drupal/log_stdout: 1.3.0 @@ -139,6 +140,7 @@ packages: drupal/workbench: 1.3.0 drupal/xmlsitemap: 1.2.0 drush/drush: 10.3.6 + e0ipso/shaper: 1.2.4 egulias/email-validator: 3.2.5 enshrined/svg-sanitize: 0.15.4 enyo/dropzone: 5.5.0 @@ -154,6 +156,7 @@ packages: html2text/html2text: 4.3.1 joachim-n/composer-manifest: 1.1.4 judicialcouncil/courtyard-artifact: 0.1.347 + justinrainbow/json-schema: 5.2.12 laminas/laminas-diactoros: 2.14.0 laminas/laminas-escaper: 2.9.0 laminas/laminas-feed: 2.17.0 diff --git a/composer.json b/composer.json index 27d86919..66d42433 100644 --- a/composer.json +++ b/composer.json @@ -137,6 +137,7 @@ "drupal/honeypot": "^2.1", "drupal/inline_entity_form": "^1.0@RC", "drupal/insert_view_adv": "2.0.x-dev@dev", + "drupal/jsonapi_extras": "^3.23", "drupal/key": "^1.10", "drupal/linkit": "^5.0@beta", "drupal/login_emailusername": "^1.1", diff --git a/composer.lock b/composer.lock index dcc26393..d7b4f73d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "20b1e7ddc2667c34cca474c82d9d5a08", + "content-hash": "90140d388bce5792c1800af09d0237a3", "packages": [ { "name": "asm89/stack-cors", @@ -5319,6 +5319,67 @@ "issues": "https://drupal.org/project/issues/insert_view_adv" } }, + { + "name": "drupal/jsonapi_extras", + "version": "3.23.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/jsonapi_extras.git", + "reference": "8.x-3.23" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/jsonapi_extras-8.x-3.23.zip", + "reference": "8.x-3.23", + "shasum": "2f3518bc1372f01a1ccebcffaa4e7e08478103e0" + }, + "require": { + "drupal/core": "^9.2 || ^10", + "e0ipso/shaper": "^1" + }, + "require-dev": { + "drupal/jsonapi": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-3.23", + "datestamp": "1669374477", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Mateu Aguiló Bosch", + "homepage": "https://www.drupal.org/user/3366066", + "email": "mateu.aguilo.bosch@gmail.com" + }, + { + "name": "Martin Kolar", + "homepage": "https://www.drupal.org/u/mkolar" + }, + { + "name": "Karel Majzlik", + "homepage": "https://www.drupal.org/u/karlos007" + }, + { + "name": "Björn Brala", + "homepage": "https://www.drupal.org/u/bbrala" + } + ], + "description": "JSON:API Extras provides a means to override and provide limited configurations to the default zero-configuration implementation provided by the JSON:API module.", + "homepage": "https://www.drupal.org/project/jsonapi_extras", + "support": { + "source": "https://git.drupalcode.org/project/jsonapi_extras" + } + }, { "name": "drupal/key", "version": "1.15.0", @@ -8834,6 +8895,52 @@ ], "time": "2020-11-11T04:36:51+00:00" }, + { + "name": "e0ipso/shaper", + "version": "1.2.4", + "source": { + "type": "git", + "url": "https://github.com/e0ipso/shaper.git", + "reference": "7d73018ec4fe8de9730dfe755067cc02460e1a38" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/e0ipso/shaper/zipball/7d73018ec4fe8de9730dfe755067cc02460e1a38", + "reference": "7d73018ec4fe8de9730dfe755067cc02460e1a38", + "shasum": "" + }, + "require": { + "justinrainbow/json-schema": "^5.2" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.4", + "phpunit/phpcov": "^8.2", + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Shaper\\": "src", + "Shaper\\Tests\\": "tests/src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0" + ], + "authors": [ + { + "name": "Mateu Aguiló Bosch", + "email": "mateu.aguilo.bosch@gmail.com" + } + ], + "description": "Lightweight library to handle in and out transformations in PHP.", + "support": { + "issues": "https://github.com/e0ipso/shaper/issues", + "source": "https://github.com/e0ipso/shaper/tree/1.2.4" + }, + "time": "2021-05-19T09:42:57+00:00" + }, { "name": "egulias/email-validator", "version": "3.2.5", @@ -9636,6 +9743,76 @@ "description": "A build artifact of the Courtyard Pattern Lab pattern library.", "time": "2022-11-15T23:39:15+00:00" }, + { + "name": "justinrainbow/json-schema", + "version": "5.2.12", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", + "json-schema/json-schema-test-suite": "1.2.0", + "phpunit/phpunit": "^4.8.35" + }, + "bin": [ + "bin/validate-json" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "JsonSchema\\": "src/JsonSchema/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bruno Prieto Reis", + "email": "bruno.p.reis@gmail.com" + }, + { + "name": "Justin Rainbow", + "email": "justin.rainbow@gmail.com" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Robert Schönthal", + "email": "seroscho@googlemail.com" + } + ], + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", + "keywords": [ + "json", + "schema" + ], + "support": { + "issues": "https://github.com/justinrainbow/json-schema/issues", + "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" + }, + "time": "2022-04-13T08:02:27+00:00" + }, { "name": "laminas/laminas-diactoros", "version": "2.14.0", diff --git a/config/config-default/jsonapi_extras.settings.yml b/config/config-default/jsonapi_extras.settings.yml new file mode 100644 index 00000000..298061fc --- /dev/null +++ b/config/config-default/jsonapi_extras.settings.yml @@ -0,0 +1,5 @@ +_core: + default_config_hash: MkHeCM1mSSJO-NAGk-71UEfY-Pm136zlecHR7qU2w00 +path_prefix: jsonapi +include_count: false +default_disabled: true From 68638ca913f5b3238b8e0b2a4635ee6f249abd8b Mon Sep 17 00:00:00 2001 From: baptisten Date: Wed, 17 May 2023 14:28:19 -0700 Subject: [PATCH 2/2] missing core.extensions --- config/config-default/core.extension.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/config-default/core.extension.yml b/config/config-default/core.extension.yml index aed4570e..6af74fe3 100644 --- a/config/config-default/core.extension.yml +++ b/config/config-default/core.extension.yml @@ -78,6 +78,7 @@ module: jcc_forms: 0 jcc_twig: 0 jsonapi: 0 + jsonapi_extras: 0 key: 0 language: 0 link: 0