diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4d75ad03cc..cb620ad84d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -727,7 +727,7 @@ jobs: working-directory: ghost/core/core/server/data/tinybird services: tinybird: - image: tinybirdco/tinybird-local:latest@sha256:e9f78aab41aed68bbbd376b9abb58ea28b167288186ce81bb11b9d154a01040f + image: tinybirdco/tinybird-local:latest@sha256:49f65a4197ae7ff4aa923ec53e969c03220fbc1ddc38fba5edfe6832aacbb5db ports: - 7181:7181 steps: diff --git a/apps/admin-x-settings/src/utils/generate-embed-code.ts b/apps/admin-x-settings/src/utils/generate-embed-code.ts index 0e1515bf377..be5c8d4673b 100644 --- a/apps/admin-x-settings/src/utils/generate-embed-code.ts +++ b/apps/admin-x-settings/src/utils/generate-embed-code.ts @@ -55,7 +55,7 @@ export const generateCode = ({ if (layout === 'all-in-one') { if (settings.icon && settings.icon !== '') { - options.icon = settings.icon.replace(/\/content\/images\//, '/content/images/size/w192h192/'); + options.icon = settings.icon.replace(/\/content\/images\/(?:size\/[^/]+\/)*/, '/content/images/size/w192h192/'); } options.title = settings.title; options.description = settings.description; diff --git a/apps/admin-x-settings/test/unit/utils/generate-embed-code.test.ts b/apps/admin-x-settings/test/unit/utils/generate-embed-code.test.ts index d3fedcf6fe0..0d52bf4e577 100644 --- a/apps/admin-x-settings/test/unit/utils/generate-embed-code.test.ts +++ b/apps/admin-x-settings/test/unit/utils/generate-embed-code.test.ts @@ -33,10 +33,16 @@ describe('generateCode', function () { assert.equal(generateCode(genOptions), '
'); }); - it('generated an embed with an icon', function () { + it('generated an embed with an icon that has no size segment', function () { + genOptions.settings.icon = 'https://example.com/content/images/2023/09/snoopy.png'; + genOptions.layout = 'all-in-one'; + assert.equal(generateCode(genOptions), ''); + }); + + it('generated an embed with an icon that already has a size segment', function () { genOptions.settings.icon = 'https://example.com/content/images/size/w256h256/2023/09/snoopy.png'; genOptions.layout = 'all-in-one'; - assert.equal(generateCode(genOptions), ''); + assert.equal(generateCode(genOptions), ''); }); it('renders a full preview', function () { diff --git a/compose.dev.analytics.yaml b/compose.dev.analytics.yaml index e217d8f49cf..d8b836094df 100644 --- a/compose.dev.analytics.yaml +++ b/compose.dev.analytics.yaml @@ -29,7 +29,7 @@ services: condition: service_completed_successfully tinybird-local: - image: tinybirdco/tinybird-local:latest@sha256:e9f78aab41aed68bbbd376b9abb58ea28b167288186ce81bb11b9d154a01040f + image: tinybirdco/tinybird-local:latest@sha256:49f65a4197ae7ff4aa923ec53e969c03220fbc1ddc38fba5edfe6832aacbb5db container_name: ghost-dev-tinybird platform: linux/amd64 stop_grace_period: 2s diff --git a/compose.dev.yaml b/compose.dev.yaml index 04e8d04255e..d6d22388896 100644 --- a/compose.dev.yaml +++ b/compose.dev.yaml @@ -127,7 +127,7 @@ services: condition: service_healthy stripe: - image: stripe/stripe-cli:latest@sha256:49adc22954b07ace90944d0c2816cd8d4c08f527548f150785aff7c4d1109d42 + image: stripe/stripe-cli:latest@sha256:91f8f262453f9ab3690bd4aaa3ba27e6902b5b8fb62a635bad20246e414fbadc container_name: ghost-dev-stripe entrypoint: ["/entrypoint.sh"] profiles: ["stripe"]