From b447a535dafbc74c4cdc2ff8bac150e85ef2919d Mon Sep 17 00:00:00 2001 From: Jeffrey Dowdle Date: Thu, 24 Oct 2024 15:14:09 +1100 Subject: [PATCH 1/4] fix(@dpc-sdp/ripple-tide-search): fix issue with search listing dropdown reactivity --- .../ripple-tide-search/components/TideSearchListingPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ripple-tide-search/components/TideSearchListingPage.vue b/packages/ripple-tide-search/components/TideSearchListingPage.vue index bbd62df036..70b32494d8 100644 --- a/packages/ripple-tide-search/components/TideSearchListingPage.vue +++ b/packages/ripple-tide-search/components/TideSearchListingPage.vue @@ -443,7 +443,7 @@ watch( From 2cfc14c59c6c70d80d2c88a2bbbe69ffa3f34099 Mon Sep 17 00:00:00 2001 From: David Featherston Date: Tue, 29 Oct 2024 08:48:38 +1100 Subject: [PATCH 2/4] fix(@dpc-sdp/ripple-tide-landing-page): use getPlainTextFromField for carousel summaries --- .../src/utils/mapping-utils.test.ts | 9 +++++++++ .../ripple-tide-api/src/utils/mapping-utils.ts | 14 ++++++++++++++ packages/ripple-tide-api/types.d.ts | 12 ++++++++++++ .../components/card-carousel/base-mapping.ts | 8 ++++++-- .../components/card-carousel/custom-mapping.ts | 13 +++++++------ .../mapping/components/card-carousel/test-data.ts | 12 ++++++------ 6 files changed, 54 insertions(+), 14 deletions(-) diff --git a/packages/ripple-tide-api/src/utils/mapping-utils.test.ts b/packages/ripple-tide-api/src/utils/mapping-utils.test.ts index 68accf47b2..598867029d 100644 --- a/packages/ripple-tide-api/src/utils/mapping-utils.test.ts +++ b/packages/ripple-tide-api/src/utils/mapping-utils.test.ts @@ -10,6 +10,7 @@ import { getSiteSection, humanizeFilesize, getPlainText, + getPlainTextFromField, getBoolFromString } from './mapping-utils.js' @@ -231,6 +232,14 @@ describe('ripple-tide-api/mapping utils', () => { ) }) + it(`returns the plain text value of a field`, () => { + expect( + getPlainTextFromField(field, 'field_acknowledgement_to_country') + ).toEqual( + 'We acknowledge Aboriginal and Torres Strait Islander people as the First People and traditional owners and custodians of the lands, seas and waters of Australia. We pay our respect to Elders past and present.' + ) + }) + it(`returns a boolean value from supplied string`, () => { expect(getBoolFromString('yes')).toEqual(true) expect(getBoolFromString('no')).toEqual(false) diff --git a/packages/ripple-tide-api/src/utils/mapping-utils.ts b/packages/ripple-tide-api/src/utils/mapping-utils.ts index c68e247375..b5141ef640 100644 --- a/packages/ripple-tide-api/src/utils/mapping-utils.ts +++ b/packages/ripple-tide-api/src/utils/mapping-utils.ts @@ -251,6 +251,19 @@ export const getPlainText = (content: string): string => { return content?.replace(/(\r\n|\n|\r)/g, '')?.trim() } +/** + * @description gets the fields value as plain text + */ +export const getPlainTextFromField = ( + field: {}, + path: string | string[], + fallback = '' +) => { + const content = get(field, path, fallback) + + return content ? getPlainText(content) : content +} + /** * @description converts supplied string value i.e. 'yes', 'no' into true or false */ @@ -274,5 +287,6 @@ export default { getSiteKeyValues, getSiteSection, getPlainText, + getPlainTextFromField, getBoolFromString } diff --git a/packages/ripple-tide-api/types.d.ts b/packages/ripple-tide-api/types.d.ts index 72a4731461..d26f7efcdb 100644 --- a/packages/ripple-tide-api/types.d.ts +++ b/packages/ripple-tide-api/types.d.ts @@ -344,3 +344,15 @@ export function getLinkFromField(field: any, path: string | string[]): any export function humanizeFilesize(fileSize: number): string export function getSiteKeyValues(key: string, src: any): any export function getSiteSection(sectionId: string, src: any): any +export function getMediaPath(field: any, path?: string | string[]): string +export function getDocumentFromField( + field: Record, + path: string +): TideDocumentField +export function getPlainText(content: string): string +export function getPlainTextFromField( + field: string, + path: string | string[], + fallback?: any +): any +export function getBoolFromString(text: string): boolean | null diff --git a/packages/ripple-tide-landing-page/mapping/components/card-carousel/base-mapping.ts b/packages/ripple-tide-landing-page/mapping/components/card-carousel/base-mapping.ts index 5b860de3f9..57e849250a 100644 --- a/packages/ripple-tide-landing-page/mapping/components/card-carousel/base-mapping.ts +++ b/packages/ripple-tide-landing-page/mapping/components/card-carousel/base-mapping.ts @@ -1,4 +1,8 @@ -import { getField, getImageFromField } from '@dpc-sdp/ripple-tide-api' +import { + getField, + getImageFromField, + getPlainTextFromField +} from '@dpc-sdp/ripple-tide-api' import { ITideCardCarouselItem } from './card-carousel-mapping' export const baseIncludes = [ @@ -13,5 +17,5 @@ export const baseMapping = (field): ITideCardCarouselItem => ({ meta: { topic: getField(field, 'field_topic.name', null) }, - summary: getField(field, 'field_landing_page_summary', '') + summary: getPlainTextFromField(field, 'field_landing_page_summary', '') }) diff --git a/packages/ripple-tide-landing-page/mapping/components/card-carousel/custom-mapping.ts b/packages/ripple-tide-landing-page/mapping/components/card-carousel/custom-mapping.ts index abece43ce9..3fd046a851 100644 --- a/packages/ripple-tide-landing-page/mapping/components/card-carousel/custom-mapping.ts +++ b/packages/ripple-tide-landing-page/mapping/components/card-carousel/custom-mapping.ts @@ -1,7 +1,8 @@ import { getField, getImageFromField, - getLinkFromField + getLinkFromField, + getPlainTextFromField } from '@dpc-sdp/ripple-tide-api' const getCardImage = (card) => { @@ -30,7 +31,7 @@ export const mapping = (field) => { dateStart: getField(field, 'field_paragraph_date_range.value', null), dateEnd: getField(field, 'field_paragraph_date_range.end_value', null) }, - summary: getField(field, 'field_paragraph_summary', '') + summary: getPlainTextFromField(field, 'field_paragraph_summary', '') } break case 'paragraph--card_event_auto': @@ -52,7 +53,7 @@ export const mapping = (field) => { null ) }, - summary: getField( + summary: getPlainTextFromField( field, 'field_paragraph_reference.field_landing_page_summary', '' @@ -67,7 +68,7 @@ export const mapping = (field) => { keyDates: field.field_paragraph_keydates.map((date) => ({ title: getField(date, 'field_paragraph_keydate', ''), subtitle: getField(date, 'field_paragraph_title', ''), - content: getField(date, 'field_paragraph_summary', '') + content: getPlainTextFromField(date, 'field_paragraph_summary', '') })) } break @@ -84,7 +85,7 @@ export const mapping = (field) => { topic: getField(field, 'field_paragraph_topic.[0].name', null), date: getField(field, 'field_paragraph_date', null) }, - summary: getField(field, 'field_paragraph_summary', '') + summary: getPlainTextFromField(field, 'field_paragraph_summary', '') } break case 'paragraph--card_promotion_auto': { @@ -110,7 +111,7 @@ export const mapping = (field) => { ? getField(field, 'field_paragraph_reference.created', null) : null }, - summary: getField( + summary: getPlainTextFromField( field, 'field_paragraph_reference.field_landing_page_summary', '' diff --git a/packages/ripple-tide-landing-page/mapping/components/card-carousel/test-data.ts b/packages/ripple-tide-landing-page/mapping/components/card-carousel/test-data.ts index c733e8ee26..c2d58f4f59 100644 --- a/packages/ripple-tide-landing-page/mapping/components/card-carousel/test-data.ts +++ b/packages/ripple-tide-landing-page/mapping/components/card-carousel/test-data.ts @@ -56,7 +56,7 @@ export const rawDataCustom = { }, field_paragraph_location: null, field_paragraph_summary: - 'Adipisicing sint consectetur consequat excepteur exercitation et laboris cillum.', + 'Adipisicing sint consectetur\r\n consequat excepteur exercitation et laboris cillum.', field_paragraph_title: 'Test event', field_paragraph_media: { links: { @@ -720,7 +720,7 @@ export const rawDataCustom = { }, field_landing_page_show_contact: true, field_landing_page_summary: - 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam tincidunt sit amet ligula sit amet lacinia. In a leo nec tortor aliquet faucibus.', + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.\r\n Aliquam tincidunt sit amet ligula sit amet lacinia. In a leo nec tortor aliquet faucibus.', field_news_intro_text: 'Nulla ultricies dignissim leo, posuere vestibulum erat cursus vitae', field_node_author: 'Nulla ultricies', @@ -1617,7 +1617,7 @@ export const rawDataCustom = { revision_translation_affected: null, field_paragraph_keydate: 'June 13th, 2023 and beyond', field_paragraph_link: null, - field_paragraph_summary: 'Key Dates Card Summary', + field_paragraph_summary: 'Key Dates Card Summary\r\n', field_paragraph_title: 'Key Dates Card', id: '7865b901-e85b-47f0-adbc-1690ece4559c', type: 'paragraph--keydates' @@ -1691,7 +1691,7 @@ export const rawDataCustom = { url: '/sdpta-promotion-card-landing-page-fixture', origin_url: '/sdpta-promotion-card-landing-page-fixture' }, - field_paragraph_summary: 'Promotion Card summary', + field_paragraph_summary: 'Promotion Card summary\r\n', field_paragraph_title: 'Promotion Card', field_paragraph_media: { links: { @@ -3038,7 +3038,7 @@ export const rawDataNews = [ field_landing_page_nav_title: null, field_landing_page_show_contact: false, field_landing_page_summary: - 'NP1 Etiam scelerisque lorem sit amet sapien iaculis, nec dignissim augue cursus. Mauris eu purus a neque tristique venenatis sit amet sed sem. Aenean viverra lectus ut tempus sollicitudin.', + 'NP1 Etiam scelerisque lorem sit amet sapien iaculis,\r\n nec dignissim augue cursus. Mauris eu purus a neque tristique venenatis sit amet sed sem. Aenean viverra lectus ut tempus sollicitudin.', field_metatags: null, field_news_date: '2050-07-02T10:00:00+11:00', field_news_intro_text: @@ -5270,7 +5270,7 @@ export const rawDataEvent = [ }, field_landing_page_show_contact: true, field_landing_page_summary: - 'Tell me, O muse, of that ingenious hero who travelled far and wide after he had sacked the famous town of Troy. Many cities did he visit, and many were the nations with whose manners and customs END', + 'Tell me, O muse\r\n, of that ingenious hero who travelled far and wide after he had sacked the famous town of Troy. Many cities did he visit, and many were the nations with whose manners and customs END', field_news_intro_text: 'Nulla ultricies dignissim leo, posuere vestibulum erat cursus vitae', field_node_author: 'Full Name', From 68545a7d0f5ed6540641f9ba9f1b407d37b6d69f Mon Sep 17 00:00:00 2001 From: Dylan Kelly Date: Tue, 29 Oct 2024 11:01:50 +1100 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=F0=9F=94=96=20release=20ripple=20?= =?UTF-8?q?2.19.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ lerna.json | 2 +- packages/eslint-config-ripple/package.json | 2 +- packages/nuxt-ripple-analytics/package.json | 2 +- packages/nuxt-ripple-cli/package.json | 2 +- packages/nuxt-ripple-preview/package.json | 2 +- packages/nuxt-ripple/package.json | 2 +- packages/ripple-sdp-core/package.json | 2 +- packages/ripple-storybook/package.json | 2 +- packages/ripple-test-utils/package.json | 2 +- packages/ripple-tide-api/package.json | 2 +- packages/ripple-tide-event/package.json | 2 +- packages/ripple-tide-grant/package.json | 2 +- packages/ripple-tide-landing-page/package.json | 2 +- packages/ripple-tide-media/package.json | 2 +- packages/ripple-tide-news/package.json | 2 +- packages/ripple-tide-publication/package.json | 2 +- packages/ripple-tide-search/package.json | 2 +- packages/ripple-tide-topic/package.json | 2 +- packages/ripple-tide-webform/package.json | 2 +- packages/ripple-ui-core/package.json | 2 +- packages/ripple-ui-forms/package.json | 2 +- packages/ripple-ui-maps/package.json | 2 +- packages/stylelint-config-ripple/package.json | 2 +- 24 files changed, 27 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 713005eaf6..fb4bc0ac95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v2.19.0 + +[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/2.19.0...v2.19.0) + ## v2.18.0 [compare changes](https://github.com/dpc-sdp/ripple-framework/compare/2.17.2...v2.18.0) diff --git a/lerna.json b/lerna.json index d2259f3762..6a882d8282 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.18.0", + "version": "2.19.0", "npmClient": "pnpm", "exact": true, "command": { diff --git a/packages/eslint-config-ripple/package.json b/packages/eslint-config-ripple/package.json index 98782722a9..e26667a284 100644 --- a/packages/eslint-config-ripple/package.json +++ b/packages/eslint-config-ripple/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/eslint-config-ripple", "description": "ESLint config for Ripple projects", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "index.js", diff --git a/packages/nuxt-ripple-analytics/package.json b/packages/nuxt-ripple-analytics/package.json index 307e45fd06..058ea63a1c 100644 --- a/packages/nuxt-ripple-analytics/package.json +++ b/packages/nuxt-ripple-analytics/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple-analytics", "description": "Nuxt module for handling event tracking.", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "main": "./nuxt.config.ts", "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/nuxt-ripple-cli/package.json b/packages/nuxt-ripple-cli/package.json index a5b7ce7ad9..7f97f0ef11 100644 --- a/packages/nuxt-ripple-cli/package.json +++ b/packages/nuxt-ripple-cli/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple-cli", "description": "A CLI for simplifying common setup and scaffolding tasks", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./dist/index.js", diff --git a/packages/nuxt-ripple-preview/package.json b/packages/nuxt-ripple-preview/package.json index 1d227f1f85..15ba2d1ebd 100644 --- a/packages/nuxt-ripple-preview/package.json +++ b/packages/nuxt-ripple-preview/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple-preview", "description": "Adds support for drupal preview links in Ripple frontend sites", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "main": "./nuxt.config.ts", "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/nuxt-ripple/package.json b/packages/nuxt-ripple/package.json index 73d1834e26..658f86428a 100644 --- a/packages/nuxt-ripple/package.json +++ b/packages/nuxt-ripple/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple", "description": "Nuxt module for integrating Ripple and Tide", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "main": "./nuxt.config.ts", "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/ripple-sdp-core/package.json b/packages/ripple-sdp-core/package.json index 6c225bbd12..2f5b370d0c 100644 --- a/packages/ripple-sdp-core/package.json +++ b/packages/ripple-sdp-core/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-sdp-core", "description": "SDP core content types", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-storybook/package.json b/packages/ripple-storybook/package.json index 55ddf62639..12c58ab41f 100644 --- a/packages/ripple-storybook/package.json +++ b/packages/ripple-storybook/package.json @@ -1,7 +1,7 @@ { "name": "ripple-storybook", "description": "Ripple Storybook instance", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "private": true, "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/ripple-test-utils/package.json b/packages/ripple-test-utils/package.json index 915870f0ea..61f339c634 100644 --- a/packages/ripple-test-utils/package.json +++ b/packages/ripple-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-test-utils", "description": "Test utils for Ripple sites", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "type": "module", "main": "./dist/config/index.js", diff --git a/packages/ripple-tide-api/package.json b/packages/ripple-tide-api/package.json index af08b77643..962690a9e1 100644 --- a/packages/ripple-tide-api/package.json +++ b/packages/ripple-tide-api/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-api", "description": "Ripple API endpoints for Tide Drupal backend", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./dist/index.js", diff --git a/packages/ripple-tide-event/package.json b/packages/ripple-tide-event/package.json index fc90ca9629..d32bad2073 100644 --- a/packages/ripple-tide-event/package.json +++ b/packages/ripple-tide-event/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-event", "description": "Ripple mappings and components for Tide Event Content type", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "main": "./nuxt.config.ts", "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/ripple-tide-grant/package.json b/packages/ripple-tide-grant/package.json index dae9e2e22b..3ab6bb7933 100644 --- a/packages/ripple-tide-grant/package.json +++ b/packages/ripple-tide-grant/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-grant", "description": "Ripple mappings and components for Tide Grant Content type", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-landing-page/package.json b/packages/ripple-tide-landing-page/package.json index 19e8d30e83..f50cdb5c56 100644 --- a/packages/ripple-tide-landing-page/package.json +++ b/packages/ripple-tide-landing-page/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-landing-page", "description": "Ripple mappings and components for Tide landing-page Content type", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-media/package.json b/packages/ripple-tide-media/package.json index 385bf41985..dd66959665 100644 --- a/packages/ripple-tide-media/package.json +++ b/packages/ripple-tide-media/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-media", "description": "Ripple mappings and components for Tide media", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-news/package.json b/packages/ripple-tide-news/package.json index f74339f264..dc6e8dca06 100644 --- a/packages/ripple-tide-news/package.json +++ b/packages/ripple-tide-news/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-news", "description": "Ripple mappings and components for Tide News content type", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-publication/package.json b/packages/ripple-tide-publication/package.json index 46478ee701..414b105520 100644 --- a/packages/ripple-tide-publication/package.json +++ b/packages/ripple-tide-publication/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-publication", "description": "Ripple mappings and components for Tide Publication Content type", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-search/package.json b/packages/ripple-tide-search/package.json index 4183d71caf..35231f5232 100644 --- a/packages/ripple-tide-search/package.json +++ b/packages/ripple-tide-search/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-search", "description": "Ripple search UI and services for connecting to Tide search", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-topic/package.json b/packages/ripple-tide-topic/package.json index cd35e0a1b8..b28ac983d2 100644 --- a/packages/ripple-tide-topic/package.json +++ b/packages/ripple-tide-topic/package.json @@ -9,7 +9,7 @@ "./mapping": "./mapping/index.ts", "./types": "./types.ts" }, - "version": "2.18.0", + "version": "2.19.0", "dependencies": { "@dpc-sdp/nuxt-ripple": "workspace:*", "@dpc-sdp/ripple-tide-api": "workspace:*", diff --git a/packages/ripple-tide-webform/package.json b/packages/ripple-tide-webform/package.json index b19b44ac1a..6fa8582e9a 100644 --- a/packages/ripple-tide-webform/package.json +++ b/packages/ripple-tide-webform/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-webform", "description": "Ripple mappings and components for Tide webforms", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-ui-core/package.json b/packages/ripple-ui-core/package.json index dcb5576105..c5959eee5e 100644 --- a/packages/ripple-ui-core/package.json +++ b/packages/ripple-ui-core/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-ui-core", "description": "Ripple UI Core component library", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "files": [ diff --git a/packages/ripple-ui-forms/package.json b/packages/ripple-ui-forms/package.json index 99e268d00b..f592b3afa2 100644 --- a/packages/ripple-ui-forms/package.json +++ b/packages/ripple-ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-ui-forms", "description": "A form component library built with Formkit", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./dist/rpl-forms.umd.js", diff --git a/packages/ripple-ui-maps/package.json b/packages/ripple-ui-maps/package.json index 8c04b151e2..e31cefe548 100644 --- a/packages/ripple-ui-maps/package.json +++ b/packages/ripple-ui-maps/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-ui-maps", "description": "Ripple UI Core component library", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "files": [ diff --git a/packages/stylelint-config-ripple/package.json b/packages/stylelint-config-ripple/package.json index 4f3ae753f9..de86d745f3 100644 --- a/packages/stylelint-config-ripple/package.json +++ b/packages/stylelint-config-ripple/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/stylelint-config-ripple", "description": "ESLint config for Ripple projects", - "version": "2.18.0", + "version": "2.19.0", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "index.js", From aa7f7c842388fb911364a922caa1e982ab8a1034 Mon Sep 17 00:00:00 2001 From: dylankelly Date: Tue, 29 Oct 2024 17:30:08 +1100 Subject: [PATCH 4/4] fix: release publish commit process --- .github/workflows/publish.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 131281985e..509aeb9fba 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -42,17 +42,19 @@ jobs: run: | git config --global user.email "sdp.devs@dpc.vic.gov.au" git config --global user.name "SDP Deploy" + git fetch origin ${{ github.event.release.target_commitish }} + git checkout ${{ github.event.release.target_commitish }} - name: Commit changes if: ${{ !github.event.release.prerelease }} run: | git add . - git commit -m "chore: release ${{ !github.event.release.name }}" + git commit -m "chore: release ${{ github.event.release.name }}" - name: Push changes if: ${{ !github.event.release.prerelease }} run: | - git push origin ${{ github.ref }} # Pushes back to the same branch + git push origin ${{ github.event.release.target_commitish }} # Pushes back to target branch env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}