From f2eb0f5213be41760fbbb54e3593edbf72eb60ce Mon Sep 17 00:00:00 2001
From: nod_ <nod_@598310.no-reply.drupal.org>
Date: Sun, 28 Jul 2024 04:24:44 +0200
Subject: [PATCH] Revert "Issue #3428614 by catch, nod_, longwave: Resync
 .gitlab-ci.yml and .gitignore following Yarn 4 in 11.x"

This reverts commit 8b2a6cacf25cf22c19ac00d9bef12224706e8547.
---
 .gitlab-ci.yml                         | 20 ++++++--------------
 .gitlab-ci/pipeline.yml                |  4 +---
 core/.cspell.json                      |  2 --
 core/misc/cspell/drupal-dictionary.txt |  1 -
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33ec93a6f3fc..60cea25d09a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -358,9 +358,7 @@ default:
     paths:
       - core/node_modules/
   script:
-    - cd core
-    - corepack enable
-    - yarn install
+    - yarn --cwd ./core install
 
 ################
 # Lint Jobs
@@ -427,10 +425,8 @@ default:
     - when: manual
       allow_failure: true
   script:
-    - cd core
-    - corepack enable
-    - yarn run check:ckeditor5
-    - yarn run lint:core-js-passing --format gitlab
+    - yarn --cwd=./core run -s check:ckeditor5
+    - yarn --cwd=./core run -s lint:core-js-passing --format gitlab
   artifacts:
     reports:
       codequality: eslint-quality-report.json
@@ -453,10 +449,8 @@ default:
     - when: manual
       allow_failure: true
   script:
-    - corepack enable
-    - cd core
-    - yarn run build:css --check
-    - yarn run lint:css --color --custom-formatter=node_modules/stylelint-formatter-gitlab
+    - yarn run --cwd=./core build:css --check
+    - yarn run --cwd=./core lint:css --color --custom-formatter=node_modules/stylelint-formatter-gitlab
   artifacts:
     reports:
       codequality: stylelint-quality-report.json
@@ -473,9 +467,7 @@ default:
         echo "HEAD is $(git rev-parse HEAD). \$CI_MERGE_REQUEST_DIFF_BASE_SHA is ${CI_MERGE_REQUEST_DIFF_BASE_SHA}";
       fi;
     - git diff ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only 2>1 > /dev/null || (echo "Warning, cannot find changed files, converting to full clone." & (git fetch --unshallow --quiet && echo "Fetch successful."))
-    - cd core
-    - corepack enable
-    - git diff ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only | sed "s_^_../_" | yarn run -s spellcheck:core --no-must-find-files --file-list stdin
+    - git diff ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only | sed "s_^_../_" | yarn --cwd=./core run -s spellcheck:core --no-must-find-files --file-list stdin
 
 '📔 Validatable config':
   <<: [ *default-job-settings-lint ]
diff --git a/.gitlab-ci/pipeline.yml b/.gitlab-ci/pipeline.yml
index 21b0808dca8e..ff7436723803 100644
--- a/.gitlab-ci/pipeline.yml
+++ b/.gitlab-ci/pipeline.yml
@@ -195,9 +195,7 @@ variables:
     - echo "DRUPAL_NIGHTWATCH_OUTPUT='"../nightwatch_output"'" >> ./core/.env
     - echo "COLUMNS=1000" >> ./core/.env
     - chown -R www-data:www-data ./sites /var/www
-    - cd core
-    - corepack enable
-    - sudo -u www-data yarn run test:nightwatch --workers=4
+    - sudo -u www-data yarn run --cwd=./core test:nightwatch --workers=4
   after_script:
     - cp /builds/chromedriver.log ./
   artifacts:
diff --git a/core/.cspell.json b/core/.cspell.json
index 1b137046cde1..4253029b2873 100644
--- a/core/.cspell.json
+++ b/core/.cspell.json
@@ -38,8 +38,6 @@
       "MAINTAINERS.txt",
       "package.json",
       "yarn.lock",
-      ".yarnrc.yml",
-      ".yarn/*",
       "misc/cspell/dictionary.txt",
       "phpstan*"
     ],
diff --git a/core/misc/cspell/drupal-dictionary.txt b/core/misc/cspell/drupal-dictionary.txt
index 0f2405c2ea2f..734ad8e1aaac 100644
--- a/core/misc/cspell/drupal-dictionary.txt
+++ b/core/misc/cspell/drupal-dictionary.txt
@@ -1,5 +1,4 @@
 bartik
-corepack
 dblog
 dependee
 dependee's
-- 
GitLab