Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ jobs:
run: pnpm --dir nuxt test:coverage

- name: Upload coverage report to Codecov
# Pinned to an immutable SHA (v5.5.5) rather than the mutable @v5 tag —
# Pinned to an immutable SHA (v7.0.0) rather than the mutable @v7 tag —
# this step receives CODECOV_TOKEN, so a moved tag shouldn't be able to
# run different code with access to it.
uses: codecov/codecov-action@0fb7174895f61a3b6b78fc075e0cd60383518dac # v5.5.5
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
if: ${{ env.CODECOV_TOKEN != '' }}
with:
files: ./nuxt/coverage/lcov.info
Expand Down
32 changes: 16 additions & 16 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ workflow:
# ---------------------------------------------------------------------------
lint:
stage: lint
image: node:22
image: node:22.23.2
extends: .setup
script:
- pnpm --dir nuxt lint

commitlint:
stage: lint
image: node:22
image: node:22.23.2
extends: .setup
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
Expand All @@ -77,7 +77,7 @@ commitlint:

lint:docs:
stage: lint
image: node:22
image: node:22.23.2
extends: .setup
script:
- pnpm --dir nuxt lint:md
Expand All @@ -88,21 +88,21 @@ lint:docs:

lint:style:
stage: lint
image: node:22
image: node:22.23.2
extends: .setup
script:
- pnpm --dir nuxt lint:style

lint:knip:
stage: lint
image: node:22
image: node:22.23.2
extends: .setup
script:
- pnpm --dir nuxt lint:knip

linkcheck:
stage: lint
image: node:22
image: node:22.23.2
before_script: []
allow_failure: true
script:
Expand All @@ -123,7 +123,7 @@ linkcheck:
# ---------------------------------------------------------------------------
test:
stage: test
image: node:22
image: node:22.23.2
extends: .setup
script:
- pnpm --dir nuxt test:coverage
Expand All @@ -134,7 +134,7 @@ test:

typecheck:
stage: test
image: node:22
image: node:22.23.2
extends: .setup
script:
- pnpm --dir nuxt typecheck
Expand All @@ -144,7 +144,7 @@ typecheck:
# ---------------------------------------------------------------------------
build:
stage: build
image: node:22
image: node:22.23.2
extends: .setup
script:
- pnpm --dir nuxt generate
Expand All @@ -161,7 +161,7 @@ build:
# ---------------------------------------------------------------------------
visual:
stage: visual
image: node:22
image: node:22.23.2
extends: .setup
needs: [build]
script:
Expand All @@ -180,7 +180,7 @@ visual:

visual:seo:
stage: visual
image: node:22
image: node:22.23.2
extends: .setup
needs: [build]
script:
Expand All @@ -192,7 +192,7 @@ visual:seo:
# differ). Download the -snapshots/ artifact and commit the PNGs.
visual:update:
stage: visual
image: node:22
image: node:22.23.2
extends: .setup
needs: [build]
rules:
Expand All @@ -211,7 +211,7 @@ visual:update:
# snapshots) — same x86_64-only caveat as visual:update above.
visual:seo:update:
stage: visual
image: node:22
image: node:22.23.2
extends: .setup
needs: [build]
rules:
Expand All @@ -231,15 +231,15 @@ visual:seo:update:
# ---------------------------------------------------------------------------
audit:size:
stage: audit
image: node:22
image: node:22.23.2
extends: .setup
needs: [build]
script:
- pnpm --dir nuxt run size

audit:seo:
stage: audit
image: node:22
image: node:22.23.2
extends: .setup
needs: [build]
script:
Expand Down Expand Up @@ -276,7 +276,7 @@ audit:seo:
# ---------------------------------------------------------------------------
preview:live:
stage: preview
image: node:22
image: node:22.23.2
timeout: 1h
variables:
PREVIEW_KEEP_ALIVE_MINUTES: "55"
Expand Down
12 changes: 8 additions & 4 deletions drupal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"require": {
"php": ">=8.3",
"composer/installers": "^2.2",
"cweagans/composer-patches": "^1.7",
"cweagans/composer-patches": "^2.0.0",
"drupal-tome/tome_drush": "dev-master",
"drupal/admin_audit_trail": "^1.0",
"drupal/admin_toolbar": "^3.6",
Expand Down Expand Up @@ -166,9 +166,13 @@
},
"enable-patching": true,
"patches": {
"drupal/core": {
"EntityReferenceFieldItemNormalizer::constructValue() rejects any incoming target_type for dynamic_entity_reference fields (no fixed target_type setting to compare against), so Tome content import fails on any paragraph using a dynamic_entity_reference field (e.g. field_link on the card/link paragraph types)": "./patch/entity-reference-normalizer-dynamic-entity-reference-target-type.diff"
},
"drupal/core": [
{
"description": "EntityReferenceFieldItemNormalizer::constructValue() rejects any incoming target_type for dynamic_entity_reference fields (no fixed target_type setting to compare against), so Tome content import fails on any paragraph using a dynamic_entity_reference field (e.g. field_link on the card/link paragraph types)",
"url": "./patch/entity-reference-normalizer-dynamic-entity-reference-target-type.diff",
"depth": 1
}
],
"drupal/dynamic_entity_reference": {
"https://www.drupal.org/project/dynamic_entity_reference/issues/3262121#comment-14396414": "./patch/3262121-by-realityloop-Rename-Label-to-Item-to.patch"
},
Expand Down
99 changes: 87 additions & 12 deletions drupal/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading