From bf7a51f91c76de2ccc277657e4ae5257eff452d5 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Mon, 14 Dec 2020 10:39:45 +0100 Subject: [PATCH 1/9] updated for D9 --- composer.json | 29 ++++------ config/install/better_messages.settings.yml | 61 --------------------- config/install/config_ignore.settings.yml | 5 -- config/install/toolbar_themes.settings.yml | 7 --- figli_starter_kit.info.yml | 12 +--- readme.md | 38 ++++++------- 6 files changed, 30 insertions(+), 122 deletions(-) delete mode 100644 config/install/better_messages.settings.yml delete mode 100644 config/install/config_ignore.settings.yml delete mode 100644 config/install/toolbar_themes.settings.yml diff --git a/composer.json b/composer.json index 7949e03..1e9054f 100644 --- a/composer.json +++ b/composer.json @@ -1,40 +1,38 @@ { - "name": "bachir/d8_starterkit_profile", + "name": "bachir/d9_starterkit_profile", "type": "drupal-profile", "description": "Starter kit install profil by figureslibres", "keywords": ["Drupal","FiguresLibres", "StarterKit"], "require": { - "drupal/core": "8.*", "components/highlightjs": "9.7.*", "cweagans/composer-patches": "^1.6", "d3/d3": "3.5.*", - "drush/drush": "^9.5", + "drush/drush": "^10", "drupal/console": "^1.8", "drupal/adminimal_theme": "^1.3", "drupal/admin_toolbar": "^2", "drupal/address": "^1.4", - "drupal/advanced_text_formatter": "^1.0@beta", + "drupal/advanced_text_formatter": "^2.0", "drupal/audiofield": "^1.6", "drupal/autocomplete_deluxe": "^2.0@RC", "drupal/autologout": "^1.0", "drupal/betterlogin": "^1.2", "drupal/better_exposed_filters": "^5.0@beta", - "drupal/better_messages": "^1.0@alpha", "drupal/block_class": "^1.0", "drupal/bulkdelete": "1.x-dev", "drupal/cshs": "1.x-dev", - "drupal/config_ignore": "^2.1", + "drupal/config_ignore": "^2.3@RC", "drupal/config_filter": "^1.0", - "drupal/config_devel": "^1.2", + "drupal/config_devel": "^1.x-dev@dev", "drupal/config_update": "^1.5", "drupal/content_lock": "^2.1", "drupal/context": "^4.0@beta", - "drupal/date_range_formatter": "^3.1", + "drupal/date_range_formatter": "9.0.x-dev@dev", "drupal/devel": "^4.0", "drupal/domain": "dev-1.x", "drupal/domain_alias": "dev-1.x", "drupal/domain_config": "dev-1.x", - "drupal/domain_site_settings": "^1.3", + "drupal/domain_site_settings": "1.x-dev@dev", "drupal/email_registration": "^1.0@RC", "drupal/embed": "^1.0", "drupal/entity_browser": "^2.0", @@ -47,9 +45,9 @@ "drupal/honeypot": "^2.0", "drupal/imagemagick": "^3.1", "drupal/inline_entity_form": "^1.0@RC", - "drupal/linkit": "^4.3", + "drupal/linkit": "^5.0@beta", "drupal/link_attributes": "^1.5", - "drupal/login_destination": "1.x-dev", + "drupal/login_destination": "2.x-dev@dev", "drupal/maillog": "1.x-dev", "drupal/mailsystem": "^4.1", "drupal/matomo": "^1.7", @@ -69,17 +67,15 @@ "drupal/search_api_db": "^1.10", "drupal/smart_trim": "^1.1", "drupal/smtp": "^1.0@beta", - "drupal/synonyms": "^1.0@alpha", + "drupal/synonyms": "1.x-dev@dev", "drupal/translation_views": "^1.0@alpha", "drupal/token": "^1.5", - "drupal/toolbar_themes": "^1.0@alpha", "drupal/ultimate_cron": "^2.0@alpha", "drupal/url_to_video_filter": "^2.0", "drupal/video_embed_field": "^2.0", "drupal/views_bulk_operations": "^3.9", "drupal/views_bulk_edit": "^2.2", - "drupal/views_ef_fieldset": "^1.2", - "drupal/workflow": "1.x-dev" + "drupal/views_ef_fieldset": "^1.2" }, "repositories": [ { @@ -112,7 +108,6 @@ } ], "extra": { - "patches": { - } + "patches": {} } } diff --git a/config/install/better_messages.settings.yml b/config/install/better_messages.settings.yml deleted file mode 100644 index 7c2376c..0000000 --- a/config/install/better_messages.settings.yml +++ /dev/null @@ -1,61 +0,0 @@ -position: tr -vertical: 50 -horizontal: 5 -fixed: 1 -width: 600px -autoclose: 4 -opendelay: 0.3 -disable_autoclose: 1 -show_countdown: 0 -hover_autoclose: 1 -popin: - effect: fadeIn - duration: normal -popout: - effect: fadeIn - duration: fast -jquery_ui: - draggable: 1 - resizable: 1 -visibility: - message_type: - id: message_type - message_types: { } - negate: false - context_mapping: - better_messages: '@better_messages.context:better_messages' - 'entity_bundle:node': - id: 'entity_bundle:node' - bundles: { } - negate: false - context_mapping: - node: '@node.node_route_context:node' - domain: - id: domain - domains: { } - negate: false - context_mapping: - 'entity:domain': '@domain.current_domain_context:entity:domain' - language: - id: language - langcodes: { } - negate: false - context_mapping: - language: '@language.current_language_context:language_interface' - node_type: - id: node_type - bundles: { } - negate: false - context_mapping: - node: '@node.node_route_context:node' - request_path: - id: request_path - pages: '' - negate: false - user_role: - id: user_role - roles: { } - negate: false - context_mapping: - user: '@user.current_user_context:current_user' -langcode: fr diff --git a/config/install/config_ignore.settings.yml b/config/install/config_ignore.settings.yml deleted file mode 100644 index 09055f4..0000000 --- a/config/install/config_ignore.settings.yml +++ /dev/null @@ -1,5 +0,0 @@ -ignored_config_entities: - 0: system.performance - 2: devel.settings - 4: piwik.settings -langcode: fr diff --git a/config/install/toolbar_themes.settings.yml b/config/install/toolbar_themes.settings.yml deleted file mode 100644 index e3cb573..0000000 --- a/config/install/toolbar_themes.settings.yml +++ /dev/null @@ -1,7 +0,0 @@ -default_theme: toolbar_admin_menu -icons: 1 -tabs: 0 -langcode: fr -actions: - submit: Submit -font_size: '10' diff --git a/figli_starter_kit.info.yml b/figli_starter_kit.info.yml index 15e23b9..b44aadd 100644 --- a/figli_starter_kit.info.yml +++ b/figli_starter_kit.info.yml @@ -1,7 +1,7 @@ name: figli starter kit type: profile description: 'Figli Starter kit install Profile' -core: 8.x +core_version_requirement: ^8 || ^9 dependencies: # Drupal core @@ -52,12 +52,10 @@ dependencies: - 'autologout' - 'better_exposed_filters' - 'betterlogin' - - 'better_messages' - 'block_class' - 'bulkdelete' - 'cshs' - 'config_devel' - - 'config_filter' - 'config_ignore' - 'config_translation' - 'config_update' @@ -69,7 +67,6 @@ dependencies: - 'ctools' - 'ctools_block' - 'ctools_views' - - 'date_range_formatter' - 'devel' - 'devel_generate' - 'domain' @@ -86,7 +83,6 @@ dependencies: - 'filter_perms' - 'honeypot' - 'inline_entity_form' - - 'kint' - 'link_attributes' - 'linkit' - 'maillog' @@ -102,24 +98,18 @@ dependencies: - 'persistent_login' - 'redirect' - 'token' - - 'toolbar_themes' - 'translation_views' - 'redis' - 'search_api' - 'search_api_db' - 'smart_trim' - 'smtp' - - 'synonyms' - 'url_to_video_filter' - 'ultimate_cron' - 'video_embed_field' - 'views_bulk_edit' - 'views_bulk_operations' - 'views_ef_fieldset' - - 'workflow' - - 'workflow_access' - - 'workflow_operations' - - 'workflow_ui' themes: - 'adminimal_theme' diff --git a/readme.md b/readme.md index 9ea05b6..733e910 100644 --- a/readme.md +++ b/readme.md @@ -6,41 +6,37 @@ ### install drupal with composer ``` cd public_html -composer create-project drupal/drupal . +composer create-project drupal/recommended-project . ``` ### clone this profile into profiles folder ``` cd profiles -git clone -o figli https://figureslibres.io/gogs/bachir/d8-starterkit-profile.git +git clone -o figli https://figureslibres.io/gogs/bachir/drupal-starterkit-profile.git ``` ### include the profile's composer file to the main drupal's composer file -in composer.js replace +install composer-merge-plugin ``` -"merge-plugin": { - "include": [ - "core/composer.json" - ], - "recurse": true, - "replace": false, - "merge-extra": false -} +composer require wikimedia/composer-merge-plugin ``` -by +then in main drupal's composer.js file add this in extra ``` -"merge-plugin": { - "include": [ - "core/composer.json", - "profiles/d8-starterkit-profile/composer.json" - ], - "recurse": true, - "replace": false, - "merge-extra": true +"extra": { + ... + "merge-plugin": { + "include": [ + "web/profiles/d8-starterkit-profile/composer.json" + ], + "recurse": true, + "replace": false, + "merge-extra": true + } + ... } ``` -### install dependencies with composer +### install the profile's merged dependencies with composer ``` cd ../ composer update From dac1e242fad779beb344609795f5e3ddeda87a72 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Mon, 14 Dec 2020 12:27:57 +0100 Subject: [PATCH 2/9] updated menu_block to dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1e9054f..f99ad09 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "drupal/matomo": "^1.7", "drupal/maxlength": "^1.0@beta", "drupal/menu_admin_per_menu": "^1.0", - "drupal/menu_block": "^1.5", + "drupal/menu_block": "1.x-dev@dev", "drupal/menu_position": "1.x-dev", "drupal/pagerer": "^2.0", "drupal/pathauto": "^1.3", From 4bac4c5d386bc8fe7fbd02b22adb6451d3bd5ee1 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 8 Feb 2021 10:30:01 +0100 Subject: [PATCH 3/9] commenterd ultimate cron as it bugs --- figli_starter_kit.info.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/figli_starter_kit.info.yml b/figli_starter_kit.info.yml index b44aadd..2138120 100644 --- a/figli_starter_kit.info.yml +++ b/figli_starter_kit.info.yml @@ -1,7 +1,7 @@ name: figli starter kit type: profile description: 'Figli Starter kit install Profile' -core_version_requirement: ^8 || ^9 +core_version_requirement: ^8 || ^9 dependencies: # Drupal core @@ -105,7 +105,7 @@ dependencies: - 'smart_trim' - 'smtp' - 'url_to_video_filter' - - 'ultimate_cron' + # - 'ultimate_cron' - 'video_embed_field' - 'views_bulk_edit' - 'views_bulk_operations' From 7054143a59ee84402f246f42d13df65c86aba7ba Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 15 Mar 2021 14:03:35 +0100 Subject: [PATCH 4/9] readme --- readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 733e910..709c075 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# Figli Drupal 8 Starterkit Profile +# Figli Drupal 9 Starterkit Profile ## install @@ -32,7 +32,7 @@ then in main drupal's composer.js file add this in extra "replace": false, "merge-extra": true } - ... + ... } ``` @@ -53,4 +53,4 @@ chmod g+r sites/default/settings.php ``` ### run drupal install as usual -by accessing your site and choosing the figli_starter_kit profile +by accessing your site and choosing the figli_starter_kit profile From 2d215b008eea1d6e585fd272325204ad70995157 Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 23 Mar 2021 22:33:52 +0100 Subject: [PATCH 5/9] removed domain modules dependencie --- figli_starter_kit.info.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/figli_starter_kit.info.yml b/figli_starter_kit.info.yml index 2138120..e68174b 100644 --- a/figli_starter_kit.info.yml +++ b/figli_starter_kit.info.yml @@ -69,10 +69,10 @@ dependencies: - 'ctools_views' - 'devel' - 'devel_generate' - - 'domain' - - 'domain_alias' - - 'domain_config' - - 'domain_site_settings' + # - 'domain' + # - 'domain_alias' + # - 'domain_config' + # - 'domain_site_settings' - 'email_registration' - 'embed' - 'entity_browser' From 0f966eab9933bcb64838d08f1a4de33d86e54fb3 Mon Sep 17 00:00:00 2001 From: bach Date: Wed, 24 Mar 2021 11:07:33 +0100 Subject: [PATCH 6/9] re-enabled domain --- figli_starter_kit.info.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/figli_starter_kit.info.yml b/figli_starter_kit.info.yml index e68174b..2138120 100644 --- a/figli_starter_kit.info.yml +++ b/figli_starter_kit.info.yml @@ -69,10 +69,10 @@ dependencies: - 'ctools_views' - 'devel' - 'devel_generate' - # - 'domain' - # - 'domain_alias' - # - 'domain_config' - # - 'domain_site_settings' + - 'domain' + - 'domain_alias' + - 'domain_config' + - 'domain_site_settings' - 'email_registration' - 'embed' - 'entity_browser' From 901f678e72140c3c655f612c41f61db8966703f1 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 19 Apr 2021 12:33:13 +0200 Subject: [PATCH 7/9] added kint-php/kint dependencie --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f99ad09..3b07e1f 100644 --- a/composer.json +++ b/composer.json @@ -75,7 +75,8 @@ "drupal/video_embed_field": "^2.0", "drupal/views_bulk_operations": "^3.9", "drupal/views_bulk_edit": "^2.2", - "drupal/views_ef_fieldset": "^1.2" + "drupal/views_ef_fieldset": "^1.2", + "kint-php/kint": "^3.3" }, "repositories": [ { From de13ff6617db598930ded07a2992840809c58f26 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 19 Apr 2021 12:41:15 +0200 Subject: [PATCH 8/9] added drupal/devel_kint_extras dependencie --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3b07e1f..2970912 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,8 @@ "drupal/views_bulk_operations": "^3.9", "drupal/views_bulk_edit": "^2.2", "drupal/views_ef_fieldset": "^1.2", - "kint-php/kint": "^3.3" + "kint-php/kint": "^3.3", + "drupal/devel_kint_extras": "^1.0" }, "repositories": [ { From 5069345d9dffca8ff935d7a01d2bc97a1272f063 Mon Sep 17 00:00:00 2001 From: bach Date: Wed, 21 Apr 2021 12:17:53 +0200 Subject: [PATCH 9/9] removed domain dependencies --- config/install/basic.settings.yml | 21 ------------------- config/install/domain.settings.yml | 5 ----- config/install/domain_alias.settings.yml | 7 ------- ...ain_site_settings.domainconfigsettings.yml | 1 - figli_starter_kit.info.yml | 8 +++---- 5 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 config/install/basic.settings.yml delete mode 100644 config/install/domain.settings.yml delete mode 100644 config/install/domain_alias.settings.yml delete mode 100644 config/install/domain_site_settings.domainconfigsettings.yml diff --git a/config/install/basic.settings.yml b/config/install/basic.settings.yml deleted file mode 100644 index 894309d..0000000 --- a/config/install/basic.settings.yml +++ /dev/null @@ -1,21 +0,0 @@ -browser_sync: - enabled: false - host: localhost - port: 3000 -clear_registry: false -ie_enabled: false -ie_enabled_versions: - ie8: false - ie9: false -langcode: fr -features: - node_user_picture: false - comment_user_picture: true - comment_user_verification: true - favicon: true -logo: - use_default: false - path: '' -favicon: - use_default: false - path: '' diff --git a/config/install/domain.settings.yml b/config/install/domain.settings.yml deleted file mode 100644 index d25b6d9..0000000 --- a/config/install/domain.settings.yml +++ /dev/null @@ -1,5 +0,0 @@ -allow_non_ascii: false -www_prefix: false -login_paths: /user/login\r\n/user/password -css_classes: '' -langcode: fr diff --git a/config/install/domain_alias.settings.yml b/config/install/domain_alias.settings.yml deleted file mode 100644 index 9a5a515..0000000 --- a/config/install/domain_alias.settings.yml +++ /dev/null @@ -1,7 +0,0 @@ -environments: - - default - - local - - development - - staging - - testing -langcode: fr diff --git a/config/install/domain_site_settings.domainconfigsettings.yml b/config/install/domain_site_settings.domainconfigsettings.yml deleted file mode 100644 index ad8609d..0000000 --- a/config/install/domain_site_settings.domainconfigsettings.yml +++ /dev/null @@ -1 +0,0 @@ -domain_site_settings: null diff --git a/figli_starter_kit.info.yml b/figli_starter_kit.info.yml index 2138120..e68174b 100644 --- a/figli_starter_kit.info.yml +++ b/figli_starter_kit.info.yml @@ -69,10 +69,10 @@ dependencies: - 'ctools_views' - 'devel' - 'devel_generate' - - 'domain' - - 'domain_alias' - - 'domain_config' - - 'domain_site_settings' + # - 'domain' + # - 'domain_alias' + # - 'domain_config' + # - 'domain_site_settings' - 'email_registration' - 'embed' - 'entity_browser'