Release/0.226.0 (#76)

* Update mserc Drush command. * Update m serializer Drush commands. * Even more cleaning of serializer * CS * Add changelog * Fix process execution. * Fix changelog * more changelog scope * Update Drush version to get drush_log(), and more mserca fixes. * Update changelog * CS * Remove Drush9 backport. * remove links to private docs * Update nightcrawler thresholds (#55) * stop release automation for Christmas and New Years (#57) * DP-16844 core update for security (#59) * drupal core update to 8.7.11 * add change log lfor DP-16844 * DP-16808/16807 Security update serialize javascript (#51) * update serialize-javascript for cloudflare/package-lock.json * update serialize-javascript for cloudflare/yarn.lock * add changelog for DP-16808 * symfony/cache udpate (#56) * add changelog for ticket DP-16805 (#60) * Bump eslint from 2.13.1 to 4.18.2 (#1) * Bump eslint from 2.13.1 to 4.18.2 Bumps [eslint](https://github.com/eslint/eslint) from 2.13.1 to 4.18.2. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](eslint/eslint@v2.13.1...v4.18.2) Signed-off-by: dependabot[bot] <[email protected]> * update eslintignore location in circleci config * move eslintignore file to root level from docroot * update eslintignore * add old_mass_admin_theme to .eslintignore * error fix with eslint --fix * manual eslint fix 1 * add changelog for DP-16844 * corrent JIRA# * corrent JIRA# * correct format Co-authored-by: Yukiko Gannett <[email protected]> * Upgrade to Acquia Cloud API 2 (#52) * Upgrade to Acquia Cloud API 2 * Add changelog * YAML formatting * YAML fix * Remove a no-longer-needed patch * require typhonius/acquia-php-sdk-v2:~1.1 * Acquia cloud environment variables: v1 & v2 Co-authored-by: Youssef Riahi <[email protected]> * Avoid 500 error in decision tree (#66) * update links to KB articles in help text (#62) * update user account and TFA emails and help for watching (#61) * update user account and TFA emails and help for watching * watch email changes; add changelog * removed commented line causing code style error * Dp 16877 remove old admin theme (#64) * remove old admin theme * add changelog * DP-16927 Add intended audience to Drupal API (#65) * code change and changelog * define intended_audience when content type doens't have field_intended_audience to avoid NULL to triger an error. * clean up the ternary condition Co-authored-by: Yukiko Gannett <[email protected]> * restart the release automation (#58) * restart the release automation * add changelog * Update DP-16881.yml fix typo Co-authored-by: Yukiko Gannett <[email protected]> * DP-17023 mayflower version 9.36.0 (#72) * update Mayflower to 9.36.0 * add changelog for DP-17023 * update changelog for release 0.226.0 * fix release date * fix changlog format Co-authored-by: Moshe Weitzman <[email protected]> Co-authored-by: Lisa Mirabile <[email protected]> Co-authored-by: Youssef Riahi <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: joeg8612 <[email protected]>
massgov · Jan 8, 2020 · 00ec34f · 00ec34f
1 parent e4dcc33
commit 00ec34f
Show file tree

Hide file tree

Showing 58 changed files with 1,145 additions and 2,133 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -181,7 +181,7 @@ jobs:
       # Check coding standards with php code sniffer. See phpcs.xml
       - run: phpcs -v -n
       # lint javascript
-      - run: yarn run eslint --debug --ignore-path 'docroot/.eslintignore' 'docroot/modules/custom/**/*.js' 'docroot/themes/custom/**/*.js' 'docroot/profiles/custom/**/*.js' 2>&1
+      - run: yarn run eslint --debug --ignore-path '.eslintignore' 'docroot/modules/custom/**/*.js' 'docroot/themes/custom/**/*.js' 'docroot/profiles/custom/**/*.js' 2>&1
       # Wait for mysql.
       - run: dockerize -wait tcp://localhost:3306 -timeout 2m
       # Run drush updatedb and cim.

diff --git a/.circleci/mysql-rebuild/docker-compose.yml b/.circleci/mysql-rebuild/docker-compose.yml
@@ -13,8 +13,12 @@ services:
       MYSQL_DATABASE: circle
       MYSQL_HOST: mysql
       # Copy vars from host to the container.
+      # Acquia Cloud - v1
       AC_API_KEY:  $AC_API_KEY
       AC_API_USER: $AC_API_USER
+      # Acquia Cloud - v2
+      AC_API2_KEY:  $AC_API2_KEY
+      AC_API2_SECRET: $AC_API2_SECRET
     links:
       - mysql
     working_dir: /var/www

diff --git a/.circleci/nightcrawler/nightcrawler.js b/.circleci/nightcrawler/nightcrawler.js
@@ -100,11 +100,11 @@ crawler.on('response.success', function(response, data) {
 crawler.on('analyze', function(report, analysis) {
   const responses = report.data;
 
-  analysis.addMetric('time', metrics.responseTime(responses, 'Average TTFB', 1000));
+  analysis.addMetric('time', metrics.responseTime(responses, 'Average TTFB', 1250));
   analysis.addMetric('500s', metrics.serverErrors(responses, '500 Requests', 0));
   collectGroups(responses).forEach(function(group) {
     const groupResponses = responses.filter(getGroupFilter(group))
-    analysis.addMetric(group+'.time', metrics.responseTime(groupResponses, 'Average TTFB: ' + group, 2000))
+    analysis.addMetric(group+'.time', metrics.responseTime(groupResponses, 'Average TTFB: ' + group, 2250))
     analysis.addMetric(group+'.500s', metrics.serverErrors(groupResponses, '500 Requests: ' + group, 0));
   })
   responses.forEach(function(response) {

diff --git a/.env.example b/.env.example
@@ -2,9 +2,9 @@
 # Copy and rename this file to .env at root of this project.
 #
 
-#Get your Acquia Cloud API key from https://accounts.acquia.com/account/security
-AC_API_USER=[email protected]
-AC_API_KEY=your-long-key-here
+#Get your Acquia Cloud API key and secret from https://cloud.acquia.com/a/profile/tokens
+AC_API2_KEY=your-long-string-here
+AC_API2_SECRET=your-long-string-here
 
 # New Relic API settings. Ask a release manager for the key.
 MASS_NEWRELIC_APPLICATION=46704875

diff --git a/docroot/.eslintignore → .eslintignore b/docroot/.eslintignore → .eslintignore
@@ -9,14 +9,11 @@ libraries/**/*
 sites/**/libraries/**/*
 profiles/**/libraries/**/*
 **/js_test_files/**/*
+docroot/themes/custom/old_mass_admin_theme/js/**
+docroot/modules/custom/mass_entityreference/js/autocompletefilter.js
 docroot/modules/custom/mass_feedback_form/js/accessible-character-countdown.js
 docroot/modules/custom/mass_feedback_form/js/accessible-character-countdown.min.js
 docroot/modules/custom/mayflower/js/modernizr.min.js
 docroot/themes/custom/mass_theme/js/*
 docroot/themes/custom/mass_admin_theme/js/entity-embed-dialog-alter.js
 docroot/themes/custom/mass_admin_theme/js/selectize.js
-docroot/themes/custom/mass_theme/overrides/js/googleMap.js
-docroot/themes/custom/mass_theme/overrides/js/locationListing.js
-docroot/themes/custom/mass_theme/overrides/js/resultsHeading.js
-docroot/themes/custom/mass_theme/overrides/js/pagination.js
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,37 @@
 
 
+## [0.226.0] - January 8, 2020
+
+### Changed
+- DP-16624: Update contents of emails sent to users for account changes and Watching.
+- DP-16283: Upgrade to Acquia Cloud API 2
+- DP-16767: Update mserc Drush command, and Drush core.
+- DP-16815: Update .eslintignore.
+- DP-16844: Update Drupal core to 8.7.11.
+- DP-16853: Update links to knowledge base articles for restricted access, scheduling.
+- DP-16876: Adjust Nightcrawler failure thresholds to reduce false positives.
+- DP-16877: Remove old admin theme no longer in use.
+- DP-16881: Restart automation after holiday break.
+- DP-16927: Add intended audience to Drupal API
+- DP-17023: Update Mayflower version to 9.36.0.
+
+### Fixed
+- DP-16815: Fix errors in in-house custom js files flagged by eslint.
+
+### Security
+- DP-16805: Security update for the PHP library `symfony/cache` (CVE-2019-18889 - https://nvd.nist.gov/vuln/detail/CVE-2019-18889).
+- DP-16808: Update serialize-javascript for cloudflare.
+- DP-16815: Update eslint from 2.13.1 to 4.18.2.
+
 ## [0.225.0] - December 18, 2019
 
 ### Changed
-  - DP-16764: Stop purge from false exception at end of a deployment.
-  - DP-16689: Exclude purges sent to New Relic.
-  
+- DP-16764: Stop purge from false exception at end of a deployment.
+- DP-16689: Exclude purges sent to New Relic.
+
 ### Added
-  - DP-16429: KPI information added to api/v1/content-metadata REST endpoint
-  
+- DP-16429: KPI information added to api/v1/content-metadata REST endpoint
+
 ## [0.224.1] - December 11, 2019
 
 ### Changed

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ _The official website of the Commonwealth of Massachusetts_
 
 This is the codebase for the Drupal 8 web site `www.mass.gov`. The site's theme, [mass_theme](https://github.com/massgov/openmass/blob/develop/docroot/themes/custom/mass_theme/README.md), is powered by Mayflower, a companion repo available at https://github.com/massgov/mayflower.
 
-See the [Table of Contents](/docs/README.md) for additional documentation related to this repository. In addition, there is [documentation for the Mass Digital team](https://github.com/massgov/DS-Infrastructure/blob/develop/docs/massgov/README.md) that covers topics such as [Releases](https://github.com/massgov/DS-Infrastructure/blob/develop/docs/massgov/releases/release.md). 
+See the [Table of Contents](/docs/README.md) for additional documentation related to this repository.
 
 ## Getting Started
 

diff --git a/cloudflare/package-lock.json b/cloudflare/package-lock.json
diff --git a/cloudflare/package.json b/cloudflare/package.json
@@ -9,6 +9,7 @@
     "content-disposition": "^0.5.3",
     "jest": "^24.1.0",
     "jest-cli": "^24.1.0",
+    "serialize-javascript": "^2.1.2",
     "service-worker-mock": "^2.0.0",
     "webpack": "^4.29.5",
     "webpack-cli": "^3.2.3"

diff --git a/cloudflare/yarn.lock b/cloudflare/yarn.lock
@@ -4654,6 +4654,11 @@ serialize-javascript@^1.7.0:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
   integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
 
+serialize-javascript@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
+
 service-worker-mock@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/service-worker-mock/-/service-worker-mock-2.0.3.tgz#a27380d76e000e5633e13fc7b3601ae6dbcc59f5"

diff --git a/composer.json b/composer.json
@@ -101,7 +101,6 @@
     ],
     "require": {
         "php": ">=7.1",
-        "acquia/acquia-sdk-php": "0.10.8",
         "blakestein/datalayer": "master",
         "christian-riesen/base32": "^1.3.1",
         "components/highlightjs": "9.7.*",
@@ -204,10 +203,10 @@
         "drupal/views_data_export": "1.x-dev",
         "drupal/workbench_moderation": "^1",
         "drupal/workbench_moderation_actions": "1.0-alpha1",
-        "drush/drush": "^9",
+        "drush/drush": "^10",
         "enyo/dropzone": "4.3.0",
         "guzzlehttp/guzzle": "^6.3",
-        "massgov/mayflower-artifacts": "9.33.0",
+        "massgov/mayflower-artifacts": "9.36.0",
         "mikeyp/google_tag": "dev-8.x-1.x#3caa4f0b7f008576936ab7501d483bfcf58a4764",
         "phlak/semver": "^2.0",
         "phpunit/phpunit": "^6",
@@ -227,6 +226,7 @@
         "symfony/validator": "~3.4.0",
         "symfony/yaml": "~3.4.5",
         "twig/twig": "^1.38.2",
+        "typhonius/acquia-php-sdk-v2": "~1.1",
         "vlucas/phpdotenv": "^2.4"
     },
     "require-dev": {