From 6b000a697f4b9a89aecf668c55fde3b78d24f0f1 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Mon, 5 Feb 2024 16:35:33 -0700 Subject: [PATCH 1/9] Closes #3151 Update NodeJS in ProboCI config to version 20.11.0. --- .probo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.probo.yaml b/.probo.yaml index 0e3582dc91..aac545154c 100644 --- a/.probo.yaml +++ b/.probo.yaml @@ -32,7 +32,7 @@ steps: - sudo npm cache clean -f --silent --no-progress - sudo npm install -g --no-progress yarn - sudo npm install -g --no-progress n - - sudo n 18.12.1 + - sudo n 20.11.0 - cd $SRC_DIR/az-quickstart-scaffolding/web/profiles/custom/az_quickstart - yarn install - yarn run eslint --color . From 2ecfecb24be72e626e817118112dffd2b8246012 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Mon, 5 Feb 2024 16:55:55 -0700 Subject: [PATCH 2/9] Update packages and rebuild --- .../az_select_menu/js/az-select-menu.js | 2 +- package.json | 8 ++--- themes/custom/az_barrio/js/az-ajax.js | 29 +++++-------------- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/modules/custom/az_select_menu/js/az-select-menu.js b/modules/custom/az_select_menu/js/az-select-menu.js index 73bfae9423..b006238084 100644 --- a/modules/custom/az_select_menu/js/az-select-menu.js +++ b/modules/custom/az_select_menu/js/az-select-menu.js @@ -8,7 +8,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; } -function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } } +function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } } function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } (function ($, Drupal, window, document, once) { Drupal.azSelectMenu = Drupal.azSelectMenu || {}; diff --git a/package.json b/package.json index 8aeae9a83a..3cccc7836d 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,10 @@ "eslint-plugin-yml": "^1.2.0", "glob": "^8.0.3", "minimist": "^1.2.2", - "mkdirp": "^1.0.4", - "nightwatch": "^1.6.3", - "prettier": "^2.1.2", - "terser": "^5.14.2" + "mkdirp": "^3.0.1", + "nightwatch": "^2.4.2", + "prettier": "^3.0.3", + "terser": "^5.19.0" }, "babel": { "env": { diff --git a/themes/custom/az_barrio/js/az-ajax.js b/themes/custom/az_barrio/js/az-ajax.js index 100bf0b980..c06bc5b93d 100644 --- a/themes/custom/az_barrio/js/az-ajax.js +++ b/themes/custom/az_barrio/js/az-ajax.js @@ -1,9 +1,9 @@ /** - * DO NOT EDIT THIS FILE. - * See the following change record for more information, - * https://www.drupal.org/node/2815083 - * @preserve - **/ +* DO NOT EDIT THIS FILE. +* See the following change record for more information, +* https://www.drupal.org/node/2815083 +* @preserve +**/ (function (Drupal) { var Z_INDEX = 1261; var TOP_POSITION = '48.5%'; @@ -11,22 +11,9 @@ var SPINNER_SIZE = '3rem'; var spinnerPositionClass = 'js-az-spinner-position'; var style = document.createElement('style'); - style.textContent = '\n .' - .concat(spinnerPositionClass, ' {\n position: fixed;\n z-index: ') - .concat(Z_INDEX, ';\n top: ') - .concat(TOP_POSITION, ';\n left: ') - .concat(LEFT_POSITION, ';\n }\n '); + style.textContent = "\n .".concat(spinnerPositionClass, " {\n position: fixed;\n z-index: ").concat(Z_INDEX, ";\n top: ").concat(TOP_POSITION, ";\n left: ").concat(LEFT_POSITION, ";\n }\n "); document.head.appendChild(style); Drupal.theme.ajaxProgressIndicatorFullscreen = function () { - return '\n
\n \n
', - ); + return "\n
\n \n
"); }; -})(Drupal); +})(Drupal); \ No newline at end of file From 8d33368b52e445cbe4cd5face4b55e3f2828ee2b Mon Sep 17 00:00:00 2001 From: Chris Green Date: Mon, 5 Feb 2024 17:02:29 -0700 Subject: [PATCH 3/9] Update prettier --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3cccc7836d..0199a64b00 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "eslint-config-prettier": "^8.4.0", "eslint-plugin-import": "^2.25.4", "eslint-plugin-jquery": "^1.5.1", - "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-prettier": "5.0.0", "eslint-plugin-yml": "^1.2.0", "glob": "^8.0.3", "minimist": "^1.2.2", From 3f8b56de5b7deaf9fd3db6c2f90764305eb157d5 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Mon, 5 Feb 2024 17:04:51 -0700 Subject: [PATCH 4/9] update prettier --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0199a64b00..ffeb4111c2 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "minimist": "^1.2.2", "mkdirp": "^3.0.1", "nightwatch": "^2.4.2", - "prettier": "^3.0.3", + "prettier": "^5.0", "terser": "^5.19.0" }, "babel": { From b2cc20dc9ea078c96fb02d60559ab25598210f1f Mon Sep 17 00:00:00 2001 From: Chris Green Date: Mon, 5 Feb 2024 17:07:06 -0700 Subject: [PATCH 5/9] update eslint-plugin-prettier --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ffeb4111c2..8d62ff063b 100644 --- a/package.json +++ b/package.json @@ -27,13 +27,13 @@ "eslint-config-prettier": "^8.4.0", "eslint-plugin-import": "^2.25.4", "eslint-plugin-jquery": "^1.5.1", - "eslint-plugin-prettier": "5.0.0", + "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-yml": "^1.2.0", "glob": "^8.0.3", "minimist": "^1.2.2", "mkdirp": "^3.0.1", "nightwatch": "^2.4.2", - "prettier": "^5.0", + "prettier": "^3.0.3", "terser": "^5.19.0" }, "babel": { From 2c94cc76cb324647971add47914d6fde2b2f1eec Mon Sep 17 00:00:00 2001 From: Chris Green Date: Wed, 7 Feb 2024 09:55:34 -0700 Subject: [PATCH 6/9] Update package.json Co-authored-by: Joe Parsons <471936+joeparsons@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d62ff063b..16c788fa16 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "eslint-config-prettier": "^8.4.0", "eslint-plugin-import": "^2.25.4", "eslint-plugin-jquery": "^1.5.1", - "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-yml": "^1.2.0", "glob": "^8.0.3", "minimist": "^1.2.2", From 35a2f6e543b9a5643d3973cd09c03dbeb9f4da7c Mon Sep 17 00:00:00 2001 From: Chris Green Date: Wed, 7 Feb 2024 09:56:55 -0700 Subject: [PATCH 7/9] Update .eslintrc.json --- .eslintrc.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 674b4a4649..d3ae965289 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -26,9 +26,10 @@ "Shepherd": true, "Sortable": true, "once": true, - "CKEDITOR": true, "CKEditor5": true, - "tabbable": true + "tabbable": true, + "slugify": true, + "bodyScrollLock" : true }, "rules": { "prettier/prettier": "error", From 434f9d6ca7da481b7d7ec7817ce12c2400eeddbb Mon Sep 17 00:00:00 2001 From: Chris Green Date: Fri, 9 Feb 2024 10:26:20 -0700 Subject: [PATCH 8/9] Update .lando.yml --- .lando.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.lando.yml b/.lando.yml index e5f6382bdc..ce8dd25558 100644 --- a/.lando.yml +++ b/.lando.yml @@ -47,7 +47,7 @@ services: - composer install - ln -s /usr/local/quickstart-install-profile/.vscode /app/.vscode node: - type: node:18 + type: node:20 build: - yarn install chromedriver: From c73f53c3e4cd187524d69ace02906d83733cdf16 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Fri, 10 May 2024 10:30:38 -0700 Subject: [PATCH 9/9] Update .probo.yaml --- .probo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.probo.yaml b/.probo.yaml index b3f5a68405..5bf85b0695 100644 --- a/.probo.yaml +++ b/.probo.yaml @@ -32,7 +32,7 @@ steps: - sudo npm cache clean -f --silent --no-progress - sudo npm install -g --no-progress yarn - sudo npm install -g --no-progress n - - sudo n 20.11.0 + - sudo n 20.13.0 - cd $SRC_DIR/az-quickstart-scaffolding/web/profiles/custom/az_quickstart - yarn install - yarn run eslint --color .