From a9be4bc26e9e145a11ac2b3e5229600477767af5 Mon Sep 17 00:00:00 2001 From: Volker Killesreiter Date: Fri, 15 Sep 2017 09:58:11 +0200 Subject: [PATCH 1/9] added seo keyword field to article node --- composer.json | 7 +++++- ...tity_form_display.node.article.default.yml | 13 +++++++++-- ...tity_view_display.node.article.default.yml | 6 +++-- ...d.field.node.article.field_seo_keyword.yml | 22 +++++++++++++++++++ .../field.storage.node.field_seo_keyword.yml | 18 +++++++++++++++ .../thunder_article/thunder_article.info.yml | 1 + scripts/development/build-thunder.sh | 4 ++++ thunder.info.yml | 1 + 8 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 modules/thunder_article/config/install/field.field.node.article.field_seo_keyword.yml create mode 100644 modules/thunder_article/config/install/field.storage.node.field_seo_keyword.yml diff --git a/composer.json b/composer.json index bcb20f068..3682e8f46 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,10 @@ "prefer-stable": true, "license": "GPL-2.0+", "repositories": [ + { + "type": "git", + "url": "https://git.drupal.org/sandbox/volkerk/2908463.git" + }, { "type": "composer", "url": "https://packages.drupal.org/8" @@ -143,7 +147,8 @@ "bower-asset/dropzone": "^4.2", "bower-asset/blazy": "^1.6.0", "bower-asset/slick-carousel": "^1.6", - "bower-asset/shariff": "^1.24" + "bower-asset/shariff": "^1.24", + "drupal/yoast_seo_preview": "8.x-1.x-dev as 1.0" }, "replace": { "heiseonline/shariff": "*", diff --git a/modules/thunder_article/config/install/core.entity_form_display.node.article.default.yml b/modules/thunder_article/config/install/core.entity_form_display.node.article.default.yml index 49bc0f58f..78dec4ee8 100644 --- a/modules/thunder_article/config/install/core.entity_form_display.node.article.default.yml +++ b/modules/thunder_article/config/install/core.entity_form_display.node.article.default.yml @@ -6,6 +6,7 @@ dependencies: - field.field.node.article.field_channel - field.field.node.article.field_meta_tags - field.field.node.article.field_paragraphs + - field.field.node.article.field_seo_keyword - field.field.node.article.field_seo_title - field.field.node.article.field_tags - field.field.node.article.field_teaser_media @@ -18,6 +19,7 @@ dependencies: - paragraphs - path - scheduler + - yoast_seo_preview third_party_settings: field_group: group_teaser: @@ -52,6 +54,7 @@ third_party_settings: - field_channel - title - field_seo_title + - field_seo_keyword - field_tags parent_name: '' weight: 3 @@ -98,6 +101,12 @@ content: default_paragraph_type: _none third_party_settings: { } region: content + field_seo_keyword: + weight: 5 + settings: { } + third_party_settings: { } + type: yoast_seo_preview_widget + region: content field_seo_title: type: string_textfield weight: 4 @@ -108,7 +117,7 @@ content: region: content field_tags: type: entity_reference_autocomplete_tags - weight: 5 + weight: 6 settings: match_operator: CONTAINS size: 60 @@ -164,9 +173,9 @@ content: region: content scheduler_settings: weight: 11 + region: content settings: { } third_party_settings: { } - region: content sticky: type: boolean_checkbox settings: diff --git a/modules/thunder_article/config/install/core.entity_view_display.node.article.default.yml b/modules/thunder_article/config/install/core.entity_view_display.node.article.default.yml index ab1cc6cf4..60cd506b0 100644 --- a/modules/thunder_article/config/install/core.entity_view_display.node.article.default.yml +++ b/modules/thunder_article/config/install/core.entity_view_display.node.article.default.yml @@ -5,6 +5,7 @@ dependencies: - field.field.node.article.field_channel - field.field.node.article.field_meta_tags - field.field.node.article.field_paragraphs + - field.field.node.article.field_seo_keyword - field.field.node.article.field_seo_title - field.field.node.article.field_tags - field.field.node.article.field_teaser_media @@ -37,17 +38,18 @@ content: region: content links: weight: 2 + region: content settings: { } third_party_settings: { } - region: content shariff_field: weight: 3 + region: content settings: { } third_party_settings: { } - region: content hidden: field_channel: true field_meta_tags: true + field_seo_keyword: true field_seo_title: true field_teaser_media: true field_teaser_text: true diff --git a/modules/thunder_article/config/install/field.field.node.article.field_seo_keyword.yml b/modules/thunder_article/config/install/field.field.node.article.field_seo_keyword.yml new file mode 100644 index 000000000..7c2470167 --- /dev/null +++ b/modules/thunder_article/config/install/field.field.node.article.field_seo_keyword.yml @@ -0,0 +1,22 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_seo_keyword + - node.type.article + module: + - yoast_seo_preview +id: node.article.field_seo_keyword +field_name: field_seo_keyword +entity_type: node +bundle: article +label: 'SEO keyword' +description: '' +required: false +translatable: false +default_value: + - + value: '' +default_value_callback: '' +settings: { } +field_type: yoast_seo_preview diff --git a/modules/thunder_article/config/install/field.storage.node.field_seo_keyword.yml b/modules/thunder_article/config/install/field.storage.node.field_seo_keyword.yml new file mode 100644 index 000000000..7ff799419 --- /dev/null +++ b/modules/thunder_article/config/install/field.storage.node.field_seo_keyword.yml @@ -0,0 +1,18 @@ +langcode: en +status: true +dependencies: + module: + - node + - yoast_seo_preview +id: node.field_seo_keyword +field_name: field_seo_keyword +entity_type: node +type: yoast_seo_preview +settings: { } +module: yoast_seo_preview +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/modules/thunder_article/thunder_article.info.yml b/modules/thunder_article/thunder_article.info.yml index 35f259f96..badb9234e 100644 --- a/modules/thunder_article/thunder_article.info.yml +++ b/modules/thunder_article/thunder_article.info.yml @@ -27,4 +27,5 @@ dependencies: - thunder:thunder_taxonomy - drupal:user - drupal:views + - yoast_seo_preview package: Thunder diff --git a/scripts/development/build-thunder.sh b/scripts/development/build-thunder.sh index f13ec5229..1173f4fa5 100755 --- a/scripts/development/build-thunder.sh +++ b/scripts/development/build-thunder.sh @@ -16,4 +16,8 @@ composer config repositories.thunder_admin git https://github.com/BurdaMagazinOr composer require "burdamagazinorg/thunder:*" "phpunit/phpunit:~4.8" "behat/mink-selenium2-driver" "behat/mink-goutte-driver" "mikey179/vfsStream" "burdamagazinorg/thunder-dev-tools:*" "burdamagazinorg/robo:*" --no-progress +# add yoast_seo_preview sandbox +composer config repositories.yoast_seo_preview git https://git.drupal.org/sandbox/volkerk/2908463.git +composer require "drupal/yoast_seo_preview" "dev-8.x-1.x as 1.0" + echo " RoboFile.php diff --git a/thunder.info.yml b/thunder.info.yml index 76cd7512f..d1f847a83 100644 --- a/thunder.info.yml +++ b/thunder.info.yml @@ -41,6 +41,7 @@ dependencies: - libraries - simple_sitemap - responsive_preview + - yoast_seo_preview # thunder - thunder_article - thunder_media From de8ad6612be21c0e5be0cbc57befbddad74acdb8 Mon Sep 17 00:00:00 2001 From: Volker Killesreiter Date: Fri, 15 Sep 2017 09:59:59 +0200 Subject: [PATCH 2/9] revert dev provisioning --- composer.json | 7 +------ scripts/development/build-thunder.sh | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 3682e8f46..bcb20f068 100644 --- a/composer.json +++ b/composer.json @@ -24,10 +24,6 @@ "prefer-stable": true, "license": "GPL-2.0+", "repositories": [ - { - "type": "git", - "url": "https://git.drupal.org/sandbox/volkerk/2908463.git" - }, { "type": "composer", "url": "https://packages.drupal.org/8" @@ -147,8 +143,7 @@ "bower-asset/dropzone": "^4.2", "bower-asset/blazy": "^1.6.0", "bower-asset/slick-carousel": "^1.6", - "bower-asset/shariff": "^1.24", - "drupal/yoast_seo_preview": "8.x-1.x-dev as 1.0" + "bower-asset/shariff": "^1.24" }, "replace": { "heiseonline/shariff": "*", diff --git a/scripts/development/build-thunder.sh b/scripts/development/build-thunder.sh index 1173f4fa5..f13ec5229 100755 --- a/scripts/development/build-thunder.sh +++ b/scripts/development/build-thunder.sh @@ -16,8 +16,4 @@ composer config repositories.thunder_admin git https://github.com/BurdaMagazinOr composer require "burdamagazinorg/thunder:*" "phpunit/phpunit:~4.8" "behat/mink-selenium2-driver" "behat/mink-goutte-driver" "mikey179/vfsStream" "burdamagazinorg/thunder-dev-tools:*" "burdamagazinorg/robo:*" --no-progress -# add yoast_seo_preview sandbox -composer config repositories.yoast_seo_preview git https://git.drupal.org/sandbox/volkerk/2908463.git -composer require "drupal/yoast_seo_preview" "dev-8.x-1.x as 1.0" - echo " RoboFile.php From 701a1dd386b6be04cd67bde877405b1c497e7478 Mon Sep 17 00:00:00 2001 From: Volker Killesreiter Date: Fri, 15 Sep 2017 10:03:34 +0200 Subject: [PATCH 3/9] add yoast_seo_preview from sandbox --- composer.json | 7 ++++++- scripts/development/build-thunder.sh | 4 ++++ scripts/travis/04-install-thunder.sh | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bcb20f068..3682e8f46 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,10 @@ "prefer-stable": true, "license": "GPL-2.0+", "repositories": [ + { + "type": "git", + "url": "https://git.drupal.org/sandbox/volkerk/2908463.git" + }, { "type": "composer", "url": "https://packages.drupal.org/8" @@ -143,7 +147,8 @@ "bower-asset/dropzone": "^4.2", "bower-asset/blazy": "^1.6.0", "bower-asset/slick-carousel": "^1.6", - "bower-asset/shariff": "^1.24" + "bower-asset/shariff": "^1.24", + "drupal/yoast_seo_preview": "8.x-1.x-dev as 1.0" }, "replace": { "heiseonline/shariff": "*", diff --git a/scripts/development/build-thunder.sh b/scripts/development/build-thunder.sh index f13ec5229..1173f4fa5 100755 --- a/scripts/development/build-thunder.sh +++ b/scripts/development/build-thunder.sh @@ -16,4 +16,8 @@ composer config repositories.thunder_admin git https://github.com/BurdaMagazinOr composer require "burdamagazinorg/thunder:*" "phpunit/phpunit:~4.8" "behat/mink-selenium2-driver" "behat/mink-goutte-driver" "mikey179/vfsStream" "burdamagazinorg/thunder-dev-tools:*" "burdamagazinorg/robo:*" --no-progress +# add yoast_seo_preview sandbox +composer config repositories.yoast_seo_preview git https://git.drupal.org/sandbox/volkerk/2908463.git +composer require "drupal/yoast_seo_preview" "dev-8.x-1.x as 1.0" + echo " RoboFile.php diff --git a/scripts/travis/04-install-thunder.sh b/scripts/travis/04-install-thunder.sh index dce15f891..827350236 100755 --- a/scripts/travis/04-install-thunder.sh +++ b/scripts/travis/04-install-thunder.sh @@ -45,6 +45,10 @@ composer_create_thunder() { cd ${TEST_DIR} composer config repositories.thunder path ${THUNDER_DIST_DIR} composer require "burdamagazinorg/thunder:*" "phpunit/phpunit:~4.8" "drupal/thunder_admin:dev-2.x" --no-progress + + # add yoast_seo_preview sandbox + composer config repositories.yoast_seo_preview git https://git.drupal.org/sandbox/volkerk/2908463.git + composer require "drupal/yoast_seo_preview" "dev-8.x-1.x as 1.0" } apply_patches() { From 4037f82c8d44a89474fbf2d16236d999946ff3cd Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Mon, 9 Oct 2017 11:28:51 +0200 Subject: [PATCH 4/9] Fix CS issue --- modules/thunder_article/thunder_article.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/thunder_article/thunder_article.info.yml b/modules/thunder_article/thunder_article.info.yml index badb9234e..eb30a9f27 100644 --- a/modules/thunder_article/thunder_article.info.yml +++ b/modules/thunder_article/thunder_article.info.yml @@ -27,5 +27,5 @@ dependencies: - thunder:thunder_taxonomy - drupal:user - drupal:views - - yoast_seo_preview + - yoast_seo_preview:yoast_seo_preview package: Thunder From 8e4773a326897e0df2f20e68e6bbf5a37f15e60a Mon Sep 17 00:00:00 2001 From: Volker Killesreiter Date: Thu, 19 Oct 2017 13:21:46 +0200 Subject: [PATCH 5/9] Add to makefile --- drupal-org.make | 3 +++ drupal-org.make.yml | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/drupal-org.make b/drupal-org.make index e7cc29efc..61f744b1a 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -126,6 +126,9 @@ projects[video_embed_field][version] = 1 projects[views_load_more][type] = module projects[views_load_more][download][url] = https://git.drupal.org/project/views_load_more.git projects[views_load_more][download][branch] = 8.x-1.x +projects[yoast_seo_preview][type] = module +projects[yoast_seo_preview][download][url] = http://git.drupal.org/sandbox/volkerk/2908463.git +projects[yoast_seo_preview][download][branch] = 8.x-1.x libraries[dropzone][type] = library libraries[dropzone][download][type] = get libraries[dropzone][download][url] = https://github.com/enyo/dropzone/archive/v4.3.0.zip diff --git a/drupal-org.make.yml b/drupal-org.make.yml index e6bf6b970..34322b9d2 100644 --- a/drupal-org.make.yml +++ b/drupal-org.make.yml @@ -253,6 +253,12 @@ projects: url: "https://git.drupal.org/project/views_load_more.git" branch: "8.x-1.x" + yoast_seo_preview: + type: "module" + download: + url: "http://git.drupal.org/sandbox/volkerk/2908463.git" + branch: "8.x-1.x" + libraries: dropzone: type: "library" From 0b370b257b2e55c94221338eedc0f9c77cb6ab66 Mon Sep 17 00:00:00 2001 From: Volker Killesreiter Date: Fri, 3 Nov 2017 11:24:11 +0100 Subject: [PATCH 6/9] add isEmpty to FieldType plugin, save and export field settings > fix schema fails on installs using drush make --- .../install/field.field.node.article.field_seo_keyword.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/thunder_article/config/install/field.field.node.article.field_seo_keyword.yml b/modules/thunder_article/config/install/field.field.node.article.field_seo_keyword.yml index 7c2470167..8660b67ea 100644 --- a/modules/thunder_article/config/install/field.field.node.article.field_seo_keyword.yml +++ b/modules/thunder_article/config/install/field.field.node.article.field_seo_keyword.yml @@ -14,9 +14,7 @@ label: 'SEO keyword' description: '' required: false translatable: false -default_value: - - - value: '' +default_value: { } default_value_callback: '' settings: { } field_type: yoast_seo_preview From 80a595537aa382a57e8722834c8e93e57f26e7bb Mon Sep 17 00:00:00 2001 From: Volker Killesreiter Date: Thu, 9 Nov 2017 13:32:35 +0100 Subject: [PATCH 7/9] moved field config to optional --- .../field.field.node.article.field_seo_keyword.yml | 0 .../field.storage.node.field_seo_keyword.yml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename modules/thunder_article/config/{install => optional}/field.field.node.article.field_seo_keyword.yml (100%) rename modules/thunder_article/config/{install => optional}/field.storage.node.field_seo_keyword.yml (100%) diff --git a/modules/thunder_article/config/install/field.field.node.article.field_seo_keyword.yml b/modules/thunder_article/config/optional/field.field.node.article.field_seo_keyword.yml similarity index 100% rename from modules/thunder_article/config/install/field.field.node.article.field_seo_keyword.yml rename to modules/thunder_article/config/optional/field.field.node.article.field_seo_keyword.yml diff --git a/modules/thunder_article/config/install/field.storage.node.field_seo_keyword.yml b/modules/thunder_article/config/optional/field.storage.node.field_seo_keyword.yml similarity index 100% rename from modules/thunder_article/config/install/field.storage.node.field_seo_keyword.yml rename to modules/thunder_article/config/optional/field.storage.node.field_seo_keyword.yml From 5f2269e3c3b98c3c40bb8f418de76049d5765735 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Mon, 19 Feb 2018 16:51:33 +0100 Subject: [PATCH 8/9] Use new shiny module --- composer.json | 8 ++------ drupal-org.make | 5 ++--- scripts/development/build-thunder.sh | 4 ---- scripts/travis/04-install-thunder.sh | 4 ---- thunder.info.yml | 2 +- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 69f7be5bc..ada676fec 100644 --- a/composer.json +++ b/composer.json @@ -28,10 +28,6 @@ "prefer-stable": true, "license": "GPL-2.0-or-later", "repositories": [ - { - "type": "git", - "url": "https://git.drupal.org/sandbox/volkerk/2908463.git" - }, { "type": "composer", "url": "https://packages.drupal.org/8" @@ -147,13 +143,13 @@ "drupal/token": "^1.0", "drupal/video_embed_field": "^1.0", "drupal/views_load_more": "dev-1.x", + "drupal/yoast_seo": "^2.0", "valiton/harbourmaster": "~8.1", "bower-asset/dropzone": "^5.1", "bower-asset/exif-js": "^2.3.0", "bower-asset/blazy": "^1.6.0", "bower-asset/slick-carousel": "^1.6", - "bower-asset/shariff": "^1.24", - "drupal/yoast_seo_preview": "8.x-1.x-dev as 1.0" + "bower-asset/shariff": "^1.24" }, "replace": { "bower-asset/jquery": "*", diff --git a/drupal-org.make b/drupal-org.make index 9d2b4037f..c3f894cc1 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -127,9 +127,8 @@ projects[video_embed_field][version] = 1 projects[views_load_more][type] = module projects[views_load_more][download][url] = https://git.drupal.org/project/views_load_more.git projects[views_load_more][download][branch] = 8.x-1.x -projects[yoast_seo_preview][type] = module -projects[yoast_seo_preview][download][url] = http://git.drupal.org/sandbox/volkerk/2908463.git -projects[yoast_seo_preview][download][branch] = 8.x-1.x +projects[yoast_seo][type] = module +projects[yoast_seo][version] = 2 libraries[dropzone][type] = library libraries[dropzone][download][type] = get libraries[dropzone][download][url] = https://github.com/enyo/dropzone/archive/v5.1.1.zip diff --git a/scripts/development/build-thunder.sh b/scripts/development/build-thunder.sh index 1173f4fa5..f13ec5229 100755 --- a/scripts/development/build-thunder.sh +++ b/scripts/development/build-thunder.sh @@ -16,8 +16,4 @@ composer config repositories.thunder_admin git https://github.com/BurdaMagazinOr composer require "burdamagazinorg/thunder:*" "phpunit/phpunit:~4.8" "behat/mink-selenium2-driver" "behat/mink-goutte-driver" "mikey179/vfsStream" "burdamagazinorg/thunder-dev-tools:*" "burdamagazinorg/robo:*" --no-progress -# add yoast_seo_preview sandbox -composer config repositories.yoast_seo_preview git https://git.drupal.org/sandbox/volkerk/2908463.git -composer require "drupal/yoast_seo_preview" "dev-8.x-1.x as 1.0" - echo " RoboFile.php diff --git a/scripts/travis/04-install-thunder.sh b/scripts/travis/04-install-thunder.sh index 40a99fa57..419cdd339 100755 --- a/scripts/travis/04-install-thunder.sh +++ b/scripts/travis/04-install-thunder.sh @@ -50,10 +50,6 @@ composer_create_thunder() { cd ${TEST_DIR} composer config repositories.thunder path ${THUNDER_DIST_DIR} composer require "burdamagazinorg/thunder:*" "drupal/thunder_admin:dev-2.x" --no-progress - - # add yoast_seo_preview sandbox - composer config repositories.yoast_seo_preview git https://git.drupal.org/sandbox/volkerk/2908463.git - composer require "drupal/yoast_seo_preview" "dev-8.x-1.x as 1.0" } apply_patches() { diff --git a/thunder.info.yml b/thunder.info.yml index f52edcf51..def1b02f3 100644 --- a/thunder.info.yml +++ b/thunder.info.yml @@ -70,7 +70,7 @@ dependencies: - slick_media - responsive_preview - video_embed_media - - yoast_seo_preview + - yoast_seo # thunder - thunder_article - thunder_media From 34282a97c53aa1cdf6dcb98f3e5e3de8039dc220 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Mon, 19 Feb 2018 17:04:58 +0100 Subject: [PATCH 9/9] Fix field types --- .../core.entity_form_display.node.article.default.yml | 4 ++-- .../optional/field.field.node.article.field_seo_keyword.yml | 4 ++-- .../optional/field.storage.node.field_seo_keyword.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/thunder_article/config/optional/core.entity_form_display.node.article.default.yml b/modules/thunder_article/config/optional/core.entity_form_display.node.article.default.yml index a2681bc27..a59bdfcba 100644 --- a/modules/thunder_article/config/optional/core.entity_form_display.node.article.default.yml +++ b/modules/thunder_article/config/optional/core.entity_form_display.node.article.default.yml @@ -19,7 +19,7 @@ dependencies: - paragraphs - path - scheduler - - yoast_seo_preview + - yoast_seo third_party_settings: field_group: group_teaser: @@ -105,7 +105,7 @@ content: weight: 5 settings: { } third_party_settings: { } - type: yoast_seo_preview_widget + type: yoast_seo_widget region: content field_seo_title: type: string_textfield diff --git a/modules/thunder_article/config/optional/field.field.node.article.field_seo_keyword.yml b/modules/thunder_article/config/optional/field.field.node.article.field_seo_keyword.yml index 8660b67ea..6240ea3b6 100644 --- a/modules/thunder_article/config/optional/field.field.node.article.field_seo_keyword.yml +++ b/modules/thunder_article/config/optional/field.field.node.article.field_seo_keyword.yml @@ -5,7 +5,7 @@ dependencies: - field.storage.node.field_seo_keyword - node.type.article module: - - yoast_seo_preview + - yoast_seo id: node.article.field_seo_keyword field_name: field_seo_keyword entity_type: node @@ -17,4 +17,4 @@ translatable: false default_value: { } default_value_callback: '' settings: { } -field_type: yoast_seo_preview +field_type: yoast_seo diff --git a/modules/thunder_article/config/optional/field.storage.node.field_seo_keyword.yml b/modules/thunder_article/config/optional/field.storage.node.field_seo_keyword.yml index 7ff799419..8437cc263 100644 --- a/modules/thunder_article/config/optional/field.storage.node.field_seo_keyword.yml +++ b/modules/thunder_article/config/optional/field.storage.node.field_seo_keyword.yml @@ -3,13 +3,13 @@ status: true dependencies: module: - node - - yoast_seo_preview + - yoast_seo id: node.field_seo_keyword field_name: field_seo_keyword entity_type: node -type: yoast_seo_preview +type: yoast_seo settings: { } -module: yoast_seo_preview +module: yoast_seo locked: false cardinality: 1 translatable: true