From a10f32088a82ca295b5b4d1d23f9bd96d1fde77d Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Sun, 16 Jul 2017 10:41:47 +0300
Subject: [PATCH] Issue #2894493: [Varbase Project] Cleanup Composer for easier
updates
---
composer.json | 307 +++++++++++++++------------------
src/composer/ScriptHandler.php | 8 +-
2 files changed, 147 insertions(+), 168 deletions(-)
diff --git a/composer.json b/composer.json
index 2c2edec2..0359efee 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,145 @@
{
"name": "vardot/varbase",
- "description": "Drupal Bundled with Necessities | by Vardot",
+ "description": "Varbase: The Ultimate Drupal 8 Bootstrap Distribution | by Vardot",
"type": "drupal-profile",
"license": "GPL-2.0+",
"minimum-stability": "dev",
"prefer-stable": true,
+ "authors": [
+ {
+ "name": "Mohammed J. Razem",
+ "homepage": "https://github.com/moerazem",
+ "role": "Maintainer"
+ },
+ {
+ "name": "Rajab Natshah",
+ "homepage": "https://github.com/Natshah",
+ "role": "Maintainer"
+ }
+ ],
+ "support": {
+ "issues": "http://drupal.org/project/issues/varbase",
+ "source": "http://cgit.drupalcode.org/varbase"
+ },
+ "repositories": [
+ {
+ "type": "composer",
+ "url": "https://packages.drupal.org/8"
+ }
+ ],
+ "require": {
+ "php": ">=5.6",
+ "composer/installers": "^1.2.0",
+ "cweagans/composer-patches": "^1.6.0",
+ "drupal-composer/drupal-scaffold": "^2.2.0",
+ "drupal/drupal-library-installer-plugin": "~0.3",
+ "drupal/core": "8.3.5",
+ "drupal/config_update": "1.3",
+ "drupal/ctools": "3.0",
+ "drupal/token": "1.0",
+ "drupal/page_manager": "4.0-beta2",
+ "drupal/panels": "4.1",
+ "drupal/panelizer": "4.0",
+ "drupal/bootstrap_layouts": "5.x-dev#dfc2f7ab34564b245cc5253c9366283f3fac6a67",
+ "drupal/ds": "3.1",
+ "drupal/views_bootstrap": "3.x-dev#b34caf9ede249c2a9c90ee5dfb8a9020f5048858",
+ "drupal/field_group": "1.0-rc6",
+ "drupal/smart_trim": "1.0",
+ "drupal/advanced_text_formatter": "1.0-beta3",
+ "drupal/block_class": "1.0-alpha1",
+ "drupal/menu_block": "1.4",
+ "drupal/extlink": "1.0",
+ "drupal/linkit": "4.3",
+ "drupal/image_resize_filter": "1.x-dev#c3f4b23b02005859092aaff746b9f21b794adc58",
+ "drupal/features": "3.5",
+ "drupal/views_infinite_scroll": "1.3",
+ "drupal/embed": "1.0",
+ "drupal/entity": "1.0-alpha4",
+ "drupal/entity_browser": "1.0",
+ "drupal/dropzonejs": "1.0-alpha7",
+ "drupal/entity_embed": "1.0-beta2",
+ "drupal/inline_entity_form": "1.0-beta1",
+ "drupal/media_entity": "1.6",
+ "drupal/media_entity_document": "1.1",
+ "drupal/media_entity_image": "1.2",
+ "drupal/video_embed_field": "1.5",
+ "drupal/crop": "1.2",
+ "drupal/focal_point": "1.0-beta4",
+ "drupal/pathologic": "1.x-dev#e0473546e51cbeaa3acb34e3208a0c503ca85613",
+ "drupal/ckeditor_bidi": "2.0",
+ "drupal/ace_editor": "1.x-dev#55dc97d7fcc1aba55a16176f94d72a8ba7002c72",
+ "drupal/entityqueue": "1.x-dev#e17c172fe1bfdab2194b06b848cad92bc6824e49",
+ "drupal/imagemagick": "1.0-alpha6",
+ "drupal/imageapi_optimize": "2.0-alpha3",
+ "drupal/ultimate_cron": "2.0-alpha1",
+ "drupal/persistent_login": "1.0-alpha3",
+ "drupal/userprotect": "1.0",
+ "drupal/roleassign": "1.0-alpha2",
+ "drupal/admin_toolbar": "1.19",
+ "drupal/adminimal_admin_toolbar": "1.4",
+ "drupal/pathauto": "1.0",
+ "drupal/redirect": "1.0-alpha5",
+ "drupal/metatag": "1.1",
+ "drupal/simple_sitemap": "2.9",
+ "drupal/google_analytics": "2.1",
+ "drupal/yoast_seo": "1.3",
+ "drupal/l10n_client": "1.x-dev#9bf8d597732870bdca301512c71b6e5d74d48db2",
+ "drupal/coffee": "1.0-beta2",
+ "drupal/responsive_preview": "1.0-alpha6",
+ "drupal/webform": "5.0-beta15",
+ "drupal/content_lock": "1.0-alpha2",
+ "drupal/node_edit_protection": "1.x-dev#902339c08222f838030c07aaea23bdc51ababebd",
+ "drupal/rabbit_hole": "1.0-beta3",
+ "drupal/fast_404": "1.0-alpha2",
+ "drupal/diff": "1.0-rc1",
+ "drupal/masquerade": "2.0-beta1",
+ "drupal/menu_admin_per_menu": "1.0-rc1",
+ "drupal/drd_agent": "3.1",
+ "drupal/libraries_ui": "1.0",
+ "drupal/devel": "1.0-rc2",
+ "drupal/bootstrap": "3.5",
+ "drupal/adminimal_theme": "1.3",
+ "drupal/blazy": "1.0-rc2",
+ "drupal/slick": "1.0",
+ "drupal/slick_views": "1.0-rc2",
+ "drupal/slick_media": "1.0",
+ "drupal/username_enumeration_prevention": "1.0-beta1",
+ "drupal/password_policy": "3.0-alpha3",
+ "drupal/seckit": "1.0-alpha2",
+ "drupal/security_review": "1.x-dev#35ebae445bb260e961e47c4c58efe7c50c228999",
+ "drupal/honeypot": "1.27",
+ "drupal/shield": "1.1",
+ "drupal/captcha": "1.0-beta1",
+ "drupal/recaptcha": "2.2",
+ "drupal/search_api": "1.2",
+ "drupal/mailsystem": "4.1",
+ "drupal/smtp": "1.0-beta3",
+ "drupal/maxlength": "1.0-beta1",
+ "drupal/menu_position": "1.x-dev#1e3a6778acc74a35174d297052ec44995d5e5137",
+ "drupal/mail_edit": "1.x-dev#bcd0041830d8581b36e6211f0c8eabd8caf9652b",
+ "drupal/taxonomy_access_fix": "2.1",
+ "drupal/better_exposed_filters": "3.0-alpha2",
+ "drupal/link_attributes": "1.0",
+ "drupal/paragraphs": "1.x-dev#a1d6710872f141d294b3d4e4e6ec806303f90330",
+ "drupal/color_field": "2.0-rc2",
+ "drupal/entity_reference_revisions": "1.3",
+ "drupal/viewsreference": "1.0-beta1",
+ "drupal/libraries": "3.x-dev#061ead081c92a6209b09eaf23b4e3103f360946e",
+ "drupal/layout_plugin": "1.0-alpha23",
+ "drupal/xmlsitemap": "1.0-alpha2",
+ "drupal/anchor_link": "1.5",
+ "drupal/entity_browser_enhanced": "1.0-beta5",
+ "drupal/vmi": "1.0-beta2",
+ "drupal/varbase_bootstrap_paragraphs": "4.0-alpha1",
+ "drupal/varbase_editor": "4.15",
+ "drupal/varbase_heroslider_media": "4.0-beta5",
+ "drupal/varbase_carousels": "4.0-beta2",
+ "mkalkbrenner/php-htmldiff-advanced": "~0.0.8",
+ "enyo/dropzone": "4.3.0",
+ "vardot/blazy": "1.8.2.1",
+ "vardot/slick": "1.6.0.1",
+ "vardot/ace-builds": "1.2.6.1"
+ },
"require-dev": {
"drush/drush": "^8.0.0",
"drupal/drupal-extension": "^3.2",
@@ -34,51 +169,6 @@
"src/composer/ScriptHandler.php"
]
},
- "repositories": [
- {
- "type": "composer",
- "url": "https://packages.drupal.org/8"
- },
- {
- "type": "package",
- "package": {
- "name": "kenwheeler/slick",
- "version": "1.6.0",
- "type": "drupal-library",
- "source": {
- "url": "https://github.com/kenwheeler/slick",
- "type": "git",
- "reference": "origin/master"
- }
- }
- },
- {
- "type": "package",
- "package": {
- "name": "dinbror/blazy",
- "version": "1.8.2",
- "type": "drupal-library",
- "source": {
- "url": "https://github.com/dinbror/blazy",
- "type": "git",
- "reference": "origin/master"
- }
- }
- },
- {
- "type": "package",
- "package": {
- "name": "ajaxorg/ace-builds",
- "version": "1.2.6",
- "type": "library",
- "source": {
- "url": "https://github.com/ajaxorg/ace-builds",
- "type": "git",
- "reference": "origin/master"
- }
- }
- }
- ],
"scripts": {
"post-install-cmd": [
"@composer drupal-scaffold",
@@ -96,15 +186,15 @@
"installer-paths": {
"docroot/core": ["drupal/core"],
"docroot/profiles/{$name}": ["type:drupal-profile"],
- "docroot/modules/contrib/{$name}": ["type:drupal-module"],
- "docroot/themes/contrib/{$name}": ["type:drupal-theme"],
- "docroot/libraries/{$name}": ["type:drupal-library"]
+ "docroot/profiles/varbase/modules/contrib/{$name}": ["type:drupal-module"],
+ "docroot/profiles/varbase/themes/contrib/{$name}": ["type:drupal-theme"],
+ "docroot/profiles/varbase/libraries/{$name}": ["type:drupal-library"]
},
"branch-alias": {
"dev-8.x-4.x": "8.4.x-dev"
},
"drupal-libraries": {
- "library-directory": "docroot/libraries",
+ "library-directory": "docroot/profiles/varbase/libraries",
"libraries": [
{
"name": "dropzone",
@@ -112,15 +202,15 @@
},
{
"name": "blazy",
- "package": "dinbror/blazy"
+ "package": "vardot/blazy"
},
{
"name": "slick",
- "package": "kenwheeler/slick"
+ "package": "vardot/slick"
},
{
"name": "ace",
- "package": "ajaxorg/ace-builds"
+ "package": "vardot/ace-builds"
}
]
},
@@ -168,116 +258,5 @@
"https://www.drupal.org/files/issues/2883131-19-menu_position_save_new_rules_and_config.patch"
}
}
- },
- "require": {
- "cweagans/composer-patches": "^1.5.0",
- "composer/installers": "^1.2.0",
- "drupal/drupal-library-installer-plugin": "~0.3",
- "mkalkbrenner/php-htmldiff-advanced": "~0.0.8",
- "enyo/dropzone": "4.3.0",
- "dinbror/blazy": "1.8.2",
- "kenwheeler/slick": "1.6.0",
- "ajaxorg/ace-builds": "1.2.6",
- "drupal/core": "8.3.5",
- "drupal/config_update": "1.3",
- "drupal/ctools": "3.0",
- "drupal/token": "1.0",
- "drupal/page_manager": "4.0-beta2",
- "drupal/panels": "4.1",
- "drupal/panelizer": "4.0",
- "drupal/bootstrap_layouts": "5.x-dev#dfc2f7ab34564b245cc5253c9366283f3fac6a67",
- "drupal/ds": "3.1",
- "drupal/views_bootstrap": "3.x-dev#b34caf9ede249c2a9c90ee5dfb8a9020f5048858",
- "drupal/field_group": "1.0-rc6",
- "drupal/smart_trim": "1.0",
- "drupal/advanced_text_formatter": "1.0-beta3",
- "drupal/block_class": "1.0-alpha1",
- "drupal/menu_block": "1.4",
- "drupal/extlink": "1.0",
- "drupal/linkit": "4.3",
- "drupal/image_resize_filter": "1.x-dev#c3f4b23b02005859092aaff746b9f21b794adc58",
- "drupal/features": "3.5",
- "drupal/views_infinite_scroll": "1.3",
- "drupal/embed": "1.0",
- "drupal/entity": "1.0-alpha4",
- "drupal/entity_browser": "1.0",
- "drupal/dropzonejs": "1.0-alpha7",
- "drupal/entity_embed": "1.0-beta2",
- "drupal/inline_entity_form": "1.0-beta1",
- "drupal/media_entity": "1.6",
- "drupal/media_entity_document": "1.1",
- "drupal/media_entity_image": "1.2",
- "drupal/video_embed_field": "1.5",
- "drupal/crop": "1.2",
- "drupal/focal_point": "1.0-beta4",
- "drupal/pathologic": "1.x-dev#e0473546e51cbeaa3acb34e3208a0c503ca85613",
- "drupal/ckeditor_bidi": "2.0",
- "drupal/ace_editor": "1.x-dev#55dc97d7fcc1aba55a16176f94d72a8ba7002c72",
- "drupal/entityqueue": "1.x-dev#e17c172fe1bfdab2194b06b848cad92bc6824e49",
- "drupal/imagemagick": "1.0-alpha6",
- "drupal/imageapi_optimize": "2.0-alpha3",
- "drupal/ultimate_cron": "2.0-alpha1",
- "drupal/persistent_login": "1.0-alpha3",
- "drupal/userprotect": "1.0",
- "drupal/roleassign": "1.0-alpha2",
- "drupal/admin_toolbar": "1.19",
- "drupal/adminimal_admin_toolbar": "1.4",
- "drupal/pathauto": "1.0",
- "drupal/redirect": "1.0-alpha5",
- "drupal/metatag": "1.1",
- "drupal/simple_sitemap": "2.9",
- "drupal/google_analytics": "2.1",
- "drupal/yoast_seo": "1.3",
- "drupal/l10n_client": "1.x-dev#9bf8d597732870bdca301512c71b6e5d74d48db2",
- "drupal/coffee": "1.0-beta2",
- "drupal/responsive_preview": "1.0-alpha6",
- "drupal/webform": "5.0-beta15",
- "drupal/content_lock": "1.0-alpha2",
- "drupal/node_edit_protection": "1.x-dev#902339c08222f838030c07aaea23bdc51ababebd",
- "drupal/rabbit_hole": "1.0-beta3",
- "drupal/fast_404": "1.0-alpha2",
- "drupal/diff": "1.0-rc1",
- "drupal/masquerade": "2.0-beta1",
- "drupal/menu_admin_per_menu": "1.0-rc1",
- "drupal/drd_agent": "3.1",
- "drupal/libraries_ui": "1.0",
- "drupal/devel": "1.0-rc2",
- "drupal/bootstrap": "3.5",
- "drupal/adminimal_theme": "1.3",
- "drupal/blazy": "1.0-rc2",
- "drupal/slick": "1.0",
- "drupal/slick_views": "1.0-rc2",
- "drupal/slick_media": "1.0",
- "drupal/username_enumeration_prevention": "1.0-beta1",
- "drupal/password_policy": "3.0-alpha3",
- "drupal/seckit": "1.0-alpha2",
- "drupal/security_review": "1.x-dev#35ebae445bb260e961e47c4c58efe7c50c228999",
- "drupal/honeypot": "1.27",
- "drupal/shield": "1.1",
- "drupal/captcha": "1.0-beta1",
- "drupal/recaptcha": "2.2",
- "drupal/search_api": "1.2",
- "drupal/mailsystem": "4.1",
- "drupal/smtp": "1.0-beta3",
- "drupal/maxlength": "1.0-beta1",
- "drupal/menu_position": "1.x-dev#1e3a6778acc74a35174d297052ec44995d5e5137",
- "drupal/mail_edit": "1.x-dev#bcd0041830d8581b36e6211f0c8eabd8caf9652b",
- "drupal/taxonomy_access_fix": "2.1",
- "drupal/better_exposed_filters": "3.0-alpha2",
- "drupal/link_attributes": "1.0",
- "drupal/paragraphs": "1.x-dev#a1d6710872f141d294b3d4e4e6ec806303f90330",
- "drupal/color_field": "2.0-rc2",
- "drupal/entity_reference_revisions": "1.3",
- "drupal/viewsreference": "1.0-beta1",
- "drupal/libraries": "3.x-dev#061ead081c92a6209b09eaf23b4e3103f360946e",
- "drupal/layout_plugin": "1.0-alpha23",
- "drupal/xmlsitemap": "1.0-alpha2",
- "drupal/anchor_link": "1.5",
- "drupal/entity_browser_enhanced": "1.0-beta5",
- "drupal/vmi": "1.0-beta2",
- "drupal/varbase_bootstrap_paragraphs": "4.0-alpha1",
- "drupal/varbase_editor": "4.15",
- "drupal/varbase_heroslider_media": "4.0-beta5",
- "drupal/varbase_carousels": "4.0-beta2"
}
}
diff --git a/src/composer/ScriptHandler.php b/src/composer/ScriptHandler.php
index 876a49de..69416058 100644
--- a/src/composer/ScriptHandler.php
+++ b/src/composer/ScriptHandler.php
@@ -61,10 +61,10 @@ class ScriptHandler {
copy(getcwd() . '/src/assets/development.services.yml', $drupal_root . '/sites/development.services.yml');
}
- // Copy ACE librarary into /modules/contrib/ace_editor/libraries.
- if ($fs->exists($drupal_root . '/libraries/ace/src-min-noconflict/ace.js')) {
- mkdir($drupal_root . '/modules/contrib/ace_editor/libraries', 0777, TRUE);
- rename($drupal_root . '/libraries/ace', $drupal_root . '/modules/contrib/ace_editor/libraries/ace');
+ // Copy ACE librarary into /profiles/varbase/modules/contrib/ace_editor/libraries.
+ if ($fs->exists($drupal_root . '/profiles/varbase/libraries/ace/src-min-noconflict/ace.js')) {
+ mkdir($drupal_root . '/profiles/varbase/modules/contrib/ace_editor/libraries', 0777, TRUE);
+ rename($drupal_root . '/profiles/varbase/libraries/ace', $drupal_root . '/profiles/varbase/modules/contrib/ace_editor/libraries/ace');
}
}
--
GitLab