From c21f17c0a4d6285302fcdfb1e657519ec02b1341 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 6 Jun 2023 19:36:17 -0600 Subject: [PATCH 1/2] Updated composer.json to use YPackagist packagist instead of directly referencing repos. --- composer.json | 117 +++++--------------------------------------------- 1 file changed, 11 insertions(+), 106 deletions(-) diff --git a/composer.json b/composer.json index 750efc9..6f04690 100644 --- a/composer.json +++ b/composer.json @@ -12,116 +12,21 @@ "type": "composer", "url": "https://packages.drupal.org/8" }, - "dropzone-js": { - "type": "package", - "package": { - "name": "dropzone/dropzone", - "version": "5.7.2", - "type": "drupal-library", - "dist": { - "type": "zip", - "url": "https://github.com/dropzone/dropzone/archive/v5.7.2.zip" - } - } - }, - "jquery-ui-touch-punch": { - "type": "package", - "package": { - "name": "furf/jquery-ui-touch-punch", - "version": "1.0", - "type": "drupal-library", - "source": { - "url": "https://github.com/furf/jquery-ui-touch-punch.git", - "type": "git", - "reference": "master" - } - } - }, - "ckeditor-fakeobjects": { - "type": "package", - "package": { - "name": "ckeditor/fakeobjects", - "version": "4.16", - "type": "drupal-library", - "dist": { - "type": "zip", - "url": "https://download.ckeditor.com/fakeobjects/releases/fakeobjects_4.16.0.zip" - } - } - }, - "ckeditor-indent-block": { - "type": "package", - "package": { - "name": "ckeditor/indentblock", - "version": "4.15", - "type": "drupal-library", - "dist": { - "type": "zip", - "url": "https://download.ckeditor.com/indentblock/releases/indentblock_4.15.0.zip" - } - } - }, - "ckeditor-link": { - "type": "package", - "package": { - "name": "ckeditor/link", - "version": "4.16", - "type": "drupal-library", - "dist": { - "type": "zip", - "url": "https://download.ckeditor.com/link/releases/link_4.16.0.zip" - } - } - }, - "ckeditor-youtube": { - "type": "package", - "package": { - "name": "ckeditor/youtube", - "version": "2.1.18", - "type": "drupal-library", - "dist": { - "type": "zip", - "url": "https://download.ckeditor.com/youtube/releases/youtube_2.1.18.zip" - } - } - }, - "alerts_module_d8": { - "type": "package", - "package": { - "name": "yellowpencil/alerts_module_d8", - "version": "1.0", - "type": "drupal-custom-module", - "source": { - "url": "git@git.yellowpencil.com:yellowpencil/alerts_module_d8.git", - "type": "git", - "reference": "origin/master" - } - } - }, - "drupal_admin_guide": { - "type": "package", - "package": { - "name": "yellowpencil/drupal_admin_guide", - "version": "1.0", - "type": "drupal-custom-module", - "source": { - "url": "https://git.yellowpencil.com/yellowpencil/drupal_admin_guide.git", - "type": "git", - "reference": "origin/main" - } - } + "ypackagist": { + "type": "composer", + "url": "https://ypackagist.onpointsuite.com" } }, "require": { "behat/behat": "^3.8", "behat/mink": "^1.8", "behat/mink-extension": "^2.3", - "ckeditor/fakeobjects": "^4.16", - "ckeditor/indentblock": "^4.15", - "ckeditor/link": "^4.16", - "ckeditor/youtube": "^2.1", + "drupal-library/ckeditor-fakeobjects": "4.16", + "drupal-library/ckeditor-indentblock": "4.15", + "drupal-library/ckeditor-link": "4.16", + "drupal-library/ckeditor-youtube": "2.1.18", "composer/installers": "^1.9", - "dropzone/dropzone": "^5.7.2", + "drupal-library/dropzone": "5.7.2", "drupal/admin_toolbar": "^3.0", "drupal/admin_toolbar_tools": "^3.0", "drupal/administerusersbyrole": "^3.0", @@ -181,11 +86,11 @@ "drupal/webform": "^6.0", "drupal/webp": "^1.0@beta", "drush/drush": "^10.3", - "furf/jquery-ui-touch-punch": "*", + "drupal-library/jquery-ui-touch-punch": "1.0", "kint-php/kint": "^3.3", "kint-php/kint-js": "^2.0", "kint-php/kint-twig": "^3.0", - "yellowpencil/alerts_module_d8": "^1.0", - "yellowpencil/drupal_admin_guide": "^1.0" + "drupal-module/yp_admin_guide": "1.0", + "drupal-module/yp_alerts_module": "1.0", } } From 6891f56df02a6be49f2a7ea67193282a010ece38 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 7 Jun 2023 10:29:31 -0600 Subject: [PATCH 2/2] Invalid JSON needed to be fixed. --- composer.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6f04690..cdc796e 100644 --- a/composer.json +++ b/composer.json @@ -91,6 +91,11 @@ "kint-php/kint-js": "^2.0", "kint-php/kint-twig": "^3.0", "drupal-module/yp_admin_guide": "1.0", - "drupal-module/yp_alerts_module": "1.0", + "drupal-module/yp_alerts_module": "1.0" + }, + "config": { + "allow-plugins": { + "composer/installers": true + } } }