From ae3e179359faed3ce341882b7cf6cd29e225645a Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Wed, 7 Jun 2023 12:45:55 -0600 Subject: [PATCH 01/18] Exclude .js from php linters --- defaults/install/phpcs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/install/phpcs.xml b/defaults/install/phpcs.xml index 0fe430df..cacd6a09 100644 --- a/defaults/install/phpcs.xml +++ b/defaults/install/phpcs.xml @@ -16,7 +16,7 @@ - + From efbfd0c4d83d512984e43cfc27db786a6fc5c6cd Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Wed, 7 Jun 2023 12:46:34 -0600 Subject: [PATCH 02/18] Install node dependencies and lint custom js in code-review target --- defaults/install/build.xml | 41 +++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/defaults/install/build.xml b/defaults/install/build.xml index 7544d3d6..49495416 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -110,7 +110,7 @@ - + @@ -127,6 +127,10 @@ + + + + @@ -148,6 +152,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 08144811c59637cca5d8851cee349757e4bcc3dd Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Mon, 26 Jun 2023 09:57:18 -0600 Subject: [PATCH 03/18] Add config options for eslint directories and extensions --- defaults.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/defaults.yml b/defaults.yml index 507c204c..f590bcde 100644 --- a/defaults.yml +++ b/defaults.yml @@ -302,3 +302,19 @@ styleguide: root: 'styleguide' # Command to compile the style guide assets, for use during the build and artifact steps. command: 'yarn default' + +# Configuration for linting custom javascript. +# +# Update these properties to reflect the directories and extensions used for +# your project's custom javascript. +# @see https://eslint.org/docs/latest/use/core-concepts +eslint: + # Run eslint on custom modules AND themes, this must be a single value. + # @see: https://eslint.org/docs/latest/use/command-line-interface#run-the-cli + # + # If you need mulstiple directories that don't match a single pattern, you + # may need to add multiple build targets for eslint using each directory. + directory: "${drupal.root}/**/custom/" + # Run eslint on files with .es6.js extension. + # @see: https://eslint.org/docs/latest/use/command-line-interface#--ext + extensions: ".es6.js" From 53cbedb813adda654d032dda16a482022e44cb84 Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Mon, 26 Jun 2023 09:57:43 -0600 Subject: [PATCH 04/18] Use core's actual eslint dependency and our new eslint config options --- defaults/install/build.xml | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/defaults/install/build.xml b/defaults/install/build.xml index 49495416..31d3d24f 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -150,43 +150,34 @@ + + + - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + From a36cb40c2edd9a9b9e9d64c7159b72dbc8bb699e Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Mon, 26 Jun 2023 09:57:43 -0600 Subject: [PATCH 05/18] Revert "Use core's actual eslint dependency and our new eslint config options" This reverts commit 53cbedb813adda654d032dda16a482022e44cb84. --- defaults/install/build.xml | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/defaults/install/build.xml b/defaults/install/build.xml index 31d3d24f..49495416 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -150,34 +150,43 @@ - - - - + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - From 9da91530821ed7d24847a485261f03853efc8842 Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Thu, 13 Jul 2023 09:12:01 -0600 Subject: [PATCH 06/18] Use built in tools for running eslint (node) and checking dependencies (yarn) --- defaults.yml | 2 +- defaults/install/build.xml | 29 ++++++++++------------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/defaults.yml b/defaults.yml index f590bcde..4cfa580a 100644 --- a/defaults.yml +++ b/defaults.yml @@ -312,7 +312,7 @@ eslint: # Run eslint on custom modules AND themes, this must be a single value. # @see: https://eslint.org/docs/latest/use/command-line-interface#run-the-cli # - # If you need mulstiple directories that don't match a single pattern, you + # If you need multiple directories that don't match a single pattern, you # may need to add multiple build targets for eslint using each directory. directory: "${drupal.root}/**/custom/" # Run eslint on files with .es6.js extension. diff --git a/defaults/install/build.xml b/defaults/install/build.xml index 49495416..de171e4b 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -130,7 +130,7 @@ - + @@ -154,35 +154,26 @@ + + - + + + - - - - - - - - - - - - - - - + + - + - + From d44aeec50b927761d1e3ce02dcd8bab82425eb18 Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Thu, 13 Jul 2023 09:26:55 -0600 Subject: [PATCH 07/18] TEMP: update acquia memcache build install steps based on their docs https://docs.acquia.com/cloud-platform/performance/memcached/enable/ The old file is no longer available and causes the-build-installer to fail --- defaults/install_site/drupal/settings.acquia.php | 6 ++++++ targets/install.xml | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/defaults/install_site/drupal/settings.acquia.php b/defaults/install_site/drupal/settings.acquia.php index 0bf60ccd..cffcc577 100644 --- a/defaults/install_site/drupal/settings.acquia.php +++ b/defaults/install_site/drupal/settings.acquia.php @@ -15,4 +15,10 @@ // Include the Acquia database connection and other config. if (file_exists('/var/www/site-php')) { require "/var/www/site-php/{$_ENV['AH_SITE_GROUP']}/{$_ENV['AH_SITE_GROUP']}-settings.inc"; + + // Memcached settings for Acquia Hosting + $memcache_settings_file = DRUPAL_ROOT . "/../vendor/acquia/memcache-settings/memcache.settings.php"; + if (file_exists($memcache_settings_file)) { + require_once $memcache_settings_file; + } } diff --git a/targets/install.xml b/targets/install.xml index 3636b0f1..30ccdc77 100644 --- a/targets/install.xml +++ b/targets/install.xml @@ -280,7 +280,14 @@ - + + + + + + + + From f7bf34ab2fdc445b51e4c555e91d44f11e330dee Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Thu, 13 Jul 2023 10:54:42 -0600 Subject: [PATCH 08/18] Use yarn to execute eslint binary --- defaults/install/build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/install/build.xml b/defaults/install/build.xml index de171e4b..06267cd5 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -129,8 +129,8 @@ - - + + From 5ed8b94f2876b72362195c298346e17e7c929ed7 Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Thu, 13 Jul 2023 11:21:10 -0600 Subject: [PATCH 09/18] remove dependency on node dependencies from code-review task we add it to the new eslint task instead --- defaults/install/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/install/build.xml b/defaults/install/build.xml index 06267cd5..fd4be8c7 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -110,7 +110,7 @@ - + From 42fbcb08427decf67234dd77e7dd1fed72c2ba43 Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Thu, 13 Jul 2023 11:21:43 -0600 Subject: [PATCH 10/18] create discrete eslint phing task --- defaults/install/build.xml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/defaults/install/build.xml b/defaults/install/build.xml index fd4be8c7..b25efe05 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -127,10 +127,8 @@ - - - - + + @@ -145,6 +143,13 @@ + + + + + + + From 1e5dd5da09a9839a9c76487d0b42a3ce39788206 Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Thu, 13 Jul 2023 11:22:24 -0600 Subject: [PATCH 11/18] use recommended yarn cli command for checking installed packages see note: https://classic.yarnpkg.com/en/docs/cli/check#toc-yarn-check --- defaults/install/build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/install/build.xml b/defaults/install/build.xml index b25efe05..32bbf2e4 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -160,7 +160,7 @@ - + @@ -171,7 +171,7 @@ - + From f15aee891ea60dbb1dacddffa1148269ecdb0519 Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Thu, 13 Jul 2023 11:25:55 -0600 Subject: [PATCH 12/18] Don't touch settings file which is being removed anyway This was a temporary and unnecessary change --- defaults/install_site/drupal/settings.acquia.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/defaults/install_site/drupal/settings.acquia.php b/defaults/install_site/drupal/settings.acquia.php index cffcc577..0bf60ccd 100644 --- a/defaults/install_site/drupal/settings.acquia.php +++ b/defaults/install_site/drupal/settings.acquia.php @@ -15,10 +15,4 @@ // Include the Acquia database connection and other config. if (file_exists('/var/www/site-php')) { require "/var/www/site-php/{$_ENV['AH_SITE_GROUP']}/{$_ENV['AH_SITE_GROUP']}-settings.inc"; - - // Memcached settings for Acquia Hosting - $memcache_settings_file = DRUPAL_ROOT . "/../vendor/acquia/memcache-settings/memcache.settings.php"; - if (file_exists($memcache_settings_file)) { - require_once $memcache_settings_file; - } } From c1d7ef49796687a096c5cea09a0b948f2e060ebd Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Thu, 13 Jul 2023 11:45:11 -0600 Subject: [PATCH 13/18] Clean up comments for the eslint target --- defaults/install/build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/install/build.xml b/defaults/install/build.xml index 32bbf2e4..b7445f56 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -142,9 +142,9 @@ - - + + From 0a5eec85c7cdedd95f7c7551cc21921623b1316d Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Thu, 13 Jul 2023 11:47:37 -0600 Subject: [PATCH 14/18] Make the directions clearer for multiple eslint directory patterns --- defaults.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/defaults.yml b/defaults.yml index 4cfa580a..9b8bd165 100644 --- a/defaults.yml +++ b/defaults.yml @@ -313,7 +313,8 @@ eslint: # @see: https://eslint.org/docs/latest/use/command-line-interface#run-the-cli # # If you need multiple directories that don't match a single pattern, you - # may need to add multiple build targets for eslint using each directory. + # may need to add multiple config values here and add a for loop to the build + # target for eslint. directory: "${drupal.root}/**/custom/" # Run eslint on files with .es6.js extension. # @see: https://eslint.org/docs/latest/use/command-line-interface#--ext From 946638abd85f134aed6e7e41874debc9085d33a9 Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Thu, 13 Jul 2023 11:49:02 -0600 Subject: [PATCH 15/18] Add more context for eslint ext argument. --- defaults.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/defaults.yml b/defaults.yml index 9b8bd165..3bbf5c7c 100644 --- a/defaults.yml +++ b/defaults.yml @@ -317,5 +317,6 @@ eslint: # target for eslint. directory: "${drupal.root}/**/custom/" # Run eslint on files with .es6.js extension. + # This can be a comma separated list. # @see: https://eslint.org/docs/latest/use/command-line-interface#--ext extensions: ".es6.js" From 5c3c00436fad618439c504d4aff31dd4e2dd0929 Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Thu, 13 Jul 2023 11:55:21 -0600 Subject: [PATCH 16/18] I think we should allow ignore files, patterns to be used. For example, custom modules might come with their own eslint setup. --- defaults/install/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/install/build.xml b/defaults/install/build.xml index b7445f56..6bfd99ac 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -146,7 +146,7 @@ - + From 893856df3621f4c645a6d6e3c6f1d5186ff4f7d4 Mon Sep 17 00:00:00 2001 From: Ray Walters Date: Wed, 16 Aug 2023 16:21:01 -0400 Subject: [PATCH 17/18] dev-37 - Use php 8.1.18. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0cef7d7f..c50ce873 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: build: working_directory: ~/project docker: - - image: cimg/php:8.1-browsers + - image: cimg/php:8.1.18-browsers - image: cimg/mysql:5.7 command: --max_allowed_packet=16M environment: From 042cee7da6db828a9b9209ff6ba82c6496ef0b96 Mon Sep 17 00:00:00 2001 From: Ray Walters Date: Wed, 16 Aug 2023 16:27:46 -0400 Subject: [PATCH 18/18] Revert "dev-37 - Use php 8.1.18." This reverts commit 893856df3621f4c645a6d6e3c6f1d5186ff4f7d4. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c50ce873..0cef7d7f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: build: working_directory: ~/project docker: - - image: cimg/php:8.1.18-browsers + - image: cimg/php:8.1-browsers - image: cimg/mysql:5.7 command: --max_allowed_packet=16M environment: