Verified Commit ad10de38 authored by Dave Long's avatar Dave Long
Browse files

Issue #3109556 by finnsky, nod_, longwave, effulgentsia, Ambient.Impact:... 

Issue #3109556 by finnsky, nod_, longwave, effulgentsia, Ambient.Impact: Update from Yarn 1 to Yarn 4
parent 1e80a22b

.gitlab-ci.yml

+14 −6
Original line number Diff line number Diff line
@@ -305,7 +305,9 @@ default: 
    paths:

      - core/node_modules/

  script:

    - yarn --cwd ./core install

    - cd core

    - corepack enable

    - yarn install



################

# Lint Jobs
@@ -370,8 +372,10 @@ default: 
    - when: manual

      allow_failure: true

  script:

    - yarn --cwd=./core run -s check:ckeditor5

    - yarn --cwd=./core run -s lint:core-js-passing --format gitlab

    - cd core

    - corepack enable

    - yarn run check:ckeditor5

    - yarn run lint:core-js-passing --format gitlab

  artifacts:

    reports:

      codequality: eslint-quality-report.json
@@ -392,8 +396,10 @@ default: 
    - when: manual

      allow_failure: true

  script:

    - yarn run --cwd=./core build:css --check

    - yarn run --cwd=./core lint:css --color --custom-formatter=node_modules/stylelint-formatter-gitlab

    - corepack enable

    - cd core

    - yarn run build:css --check

    - yarn run lint:css --color --custom-formatter=node_modules/stylelint-formatter-gitlab

  artifacts:

    reports:

      codequality: stylelint-quality-report.json
@@ -409,7 +415,9 @@ default: 
      else

        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 | sed "s_^_../_" | yarn --cwd=./core run -s spellcheck:core --no-must-find-files --file-list stdin

    - cd core

    - corepack enable

    - git diff ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only | sed "s_^_../_" | yarn run spellcheck:core --no-must-find-files --file-list stdin



'📔 Validatable config':

  <<: [ *default-job-settings-lint ]

.gitlab-ci/pipeline.yml

+3 −1
Original line number Diff line number Diff line
@@ -195,7 +195,9 @@ variables: 
    - echo "DRUPAL_NIGHTWATCH_OUTPUT='"../nightwatch_output"'" >> ./core/.env

    - echo "COLUMNS=1000" >> ./core/.env

    - chown -R www-data:www-data ./sites /var/www

    - sudo -u www-data yarn run --cwd=./core test:nightwatch --workers=4

    - cd core

    - corepack enable

    - sudo -u www-data yarn run test:nightwatch --workers=4

  after_script:

    - cp /builds/chromedriver.log ./

  artifacts:

core/.cspell.json

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
      "MAINTAINERS.txt",

      "package.json",

      "yarn.lock",

      ".yarnrc.yml",

      ".yarn/*",

      "misc/cspell/dictionary.txt",

      "phpstan*"

    ],

core/.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
node_modules

yarn-error.log



# Ignore yarn files

# @see https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored

.yarn/*



# Ignore overrides of core's phpcs.xml.dist and phpunit.xml.dist.

phpcs.xml

phpunit.xml

core/.yarnrc.yml

0 → 100644
+1 −0
Original line number Diff line number Diff line 
nodeLinker: node-modules