Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(@dpc-sdp/ripple-sdp-core): ✨ combine tide layers into sdp-core #1165

Closed
wants to merge 6 commits into from
Closed

feat(@dpc-sdp/ripple-sdp-core): ✨ combine tide layers into sdp-core #1165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a52627
feat(@dpc-sdp/ripple-sdp-core): :sparkles: combine tide layers into s…
waitingallday May 15, 2024
03c1fd3
Merge branch 'develop' into feat/sdp-core
waitingallday Jun 26, 2024
c90b445
Merge branch 'develop' into feat/sdp-core
waitingallday Jul 16, 2024
9b010c3
Merge branch 'develop' into feat/sdp-core
waitingallday Jul 16, 2024
23d411b
Merge branch 'develop' into feat/sdp-core
waitingallday Jul 19, 2024
1c837be
Merge branch 'develop' into feat/sdp-core
waitingallday Jul 19, 2024
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
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"eslint-config-ripple",
"@dpc-sdp/ripple-ui-maps",
"@dpc-sdp/ripple-tide-webform",
"ripple-storybook"
"ripple-storybook",
"@dpc-sdp/ripple-sdp-core"
],
"cSpell.words": [
"colour",
Expand Down
12 changes: 1 addition & 11 deletions examples/nuxt-app/nuxt.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,7 @@ export default defineNuxtConfig({
// See https://nuxt.com/docs/getting-started/layers - each content type is a added as a Nuxt layer
extends: [
'@dpc-sdp/nuxt-ripple',
'@dpc-sdp/nuxt-ripple-analytics',
'@dpc-sdp/nuxt-ripple-preview',
'@dpc-sdp/ripple-tide-event',
'@dpc-sdp/ripple-tide-topic',
'@dpc-sdp/ripple-tide-landing-page',
'@dpc-sdp/ripple-tide-grant',
'@dpc-sdp/ripple-tide-publication',
'@dpc-sdp/ripple-tide-media',
'@dpc-sdp/ripple-tide-news',
'@dpc-sdp/ripple-tide-search',
'@dpc-sdp/ripple-tide-webform',
'@dpc-sdp/ripple-sdp-core',
'./layers/ripple-ui-forms-ext'
],
// Nuxt devtools
Expand Down
12 changes: 1 addition & 11 deletions examples/nuxt-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,8 @@
},
"dependencies": {
"@dpc-sdp/nuxt-ripple": "workspace:*",
"@dpc-sdp/nuxt-ripple-analytics": "workspace:*",
"@dpc-sdp/nuxt-ripple-cli": "workspace:*",
"@dpc-sdp/nuxt-ripple-preview": "workspace:*",
"@dpc-sdp/ripple-tide-event": "workspace:*",
"@dpc-sdp/ripple-tide-grant": "workspace:*",
"@dpc-sdp/ripple-tide-landing-page": "workspace:*",
"@dpc-sdp/ripple-tide-media": "workspace:*",
"@dpc-sdp/ripple-tide-news": "workspace:*",
"@dpc-sdp/ripple-tide-publication": "workspace:*",
"@dpc-sdp/ripple-tide-search": "workspace:*",
"@dpc-sdp/ripple-tide-topic": "workspace:*",
"@dpc-sdp/ripple-tide-webform": "workspace:*",
"@dpc-sdp/ripple-sdp-core": "workspace:*",
"@dpc-sdp/ripple-ui-maps": "workspace:*"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/nvmrc.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
to: .nvmrc
---
lts/hydrogen
lts/iron
11 changes: 1 addition & 10 deletions packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/package.json.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,9 @@ to: package.json
"@babel/preset-typescript": "^7.21.5",
"@dpc-sdp/eslint-config-ripple": "<%= rplVersion %>",
"@dpc-sdp/nuxt-ripple": "<%= rplVersion %>",
"@dpc-sdp/nuxt-ripple-analytics": "<%= rplVersion %>",
"@dpc-sdp/nuxt-ripple-preview": "<%= rplVersion %>",
"@dpc-sdp/ripple-sdp-core": "<%= rplVersion %>",
"@dpc-sdp/ripple-test-utils": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-api": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-event": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-topic": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-grant": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-landing-page": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-media": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-news": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-publication": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-search": "<%= rplVersion %>",
"cypress": "^13.6.6",
"eslint": "^8.28.0",
"jest-environment-jsdom": "^29.5.0",
Expand Down
11 changes: 1 addition & 10 deletions ...ges/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/playground/nuxt.config.ts.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,7 @@ export default defineNuxtConfig({
// See https://nuxt.com/docs/getting-started/layers - each content type is added as a Nuxt layer
extends: [
'@dpc-sdp/nuxt-ripple',
'@dpc-sdp/nuxt-ripple-analytics',
'@dpc-sdp/nuxt-ripple-preview',
'@dpc-sdp/ripple-tide-event',
'@dpc-sdp/ripple-tide-topic',
'@dpc-sdp/ripple-tide-landing-page',
'@dpc-sdp/ripple-tide-grant',
'@dpc-sdp/ripple-tide-publication',
'@dpc-sdp/ripple-tide-media',
'@dpc-sdp/ripple-tide-news',
'@dpc-sdp/ripple-tide-search',
'@dpc-sdp/ripple-sdp-core',
'..'
]
})
4 changes: 2 additions & 2 deletions packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/app.config.ts.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export default defineAppConfig({
ripple: {
packages: getDpcPkgs({ ...pkg.dependencies, ...pkg.devDependencies }),
version: pkg.dependencies['@dpc-sdp/nuxt-ripple'],
// featureFlags and theme are usually populated from the Tide site taxonomy values. Use these for local testing development. See https://ripple.sdp.vic.gov.au/framework/guides/brand-application
// featureFlags and theme are usually populated from the Tide site taxonomy values. Use these for local testing development. See https://ripple.sdp.vic.gov.au/framework/guides/brand-application
featureFlags: {},
theme: {}
}
})
})
17 changes: 1 addition & 16 deletions packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/nuxt.config.ts.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,7 @@ export default defineNuxtConfig({
extends: [
// Core layers
'@dpc-sdp/nuxt-ripple',
'@dpc-sdp/nuxt-ripple-analytics',
'@dpc-sdp/nuxt-ripple-preview',
'@dpc-sdp/ripple-tide-webform',

'@dpc-sdp/ripple-sdp-core'
// Custom layers

// Content types
'@dpc-sdp/ripple-tide-event',
'@dpc-sdp/ripple-tide-topic',
'@dpc-sdp/ripple-tide-landing-page',
'@dpc-sdp/ripple-tide-grant',
'@dpc-sdp/ripple-tide-publication',
'@dpc-sdp/ripple-tide-media',
'@dpc-sdp/ripple-tide-news',
'@dpc-sdp/ripple-tide-search',
'@dpc-sdp/ripple-tide-webform'

]
})
12 changes: 1 addition & 11 deletions packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/package.json.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,7 @@ to: package.json
},
"dependencies": {
"@dpc-sdp/nuxt-ripple": "<%= rplVersion %>",
"@dpc-sdp/nuxt-ripple-analytics": "<%= rplVersion %>",
"@dpc-sdp/nuxt-ripple-preview": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-event": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-grant": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-landing-page": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-media": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-news": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-publication": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-search": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-topic": "<%= rplVersion %>",
"@dpc-sdp/ripple-tide-webform": "<%= rplVersion %>"
"@dpc-sdp/ripple-sdp-core": "<%= rplVersion %>"
},
"devDependencies": {
"@dpc-sdp/eslint-config-ripple": "<%= rplVersion %>",
Expand Down
3 changes: 1 addition & 2 deletions packages/nuxt-ripple/components/TideBaseLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@

<script setup lang="ts">
// @ts-ignore
import { useRoute, useNuxtApp, useTideLanguage } from '#imports'
import { computed, onMounted, provide } from 'vue'
import { computed, onMounted, provide, useRoute, useNuxtApp, useTideLanguage } from '#imports'
import { TideSiteData } from '../types'
import { TideTopicTag } from '../mapping/base/topic-tags/topic-tags-mapping'
import { TideSiteSection } from '@dpc-sdp/ripple-tide-api/types'
Expand Down
17 changes: 10 additions & 7 deletions packages/nuxt-ripple/components/TideHeroHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<script setup lang="ts">
import { computed, inject } from 'vue'
import { computed, inject } from '#imports'
import { TideHeroHeader } from '../types'
import type { IRplFeatureFlags } from '@dpc-sdp/ripple-tide-api/types'
import { TideImageField } from '@dpc-sdp/ripple-tide-api/types'
import {
TideImageField,
type IRplFeatureFlags
} from '@dpc-sdp/ripple-tide-api/types'
import type { IRplImageType } from '@dpc-sdp/ripple-ui-core'

interface Props {
header: TideHeroHeader
Expand Down Expand Up @@ -83,16 +86,16 @@ const headerTheme = computed(() => {
<template>
<RplHeroHeader
:title="header.title"
:links="headerLinks"
:links="headerLinks || undefined"
:theme="headerTheme"
:logo="header?.logoImage"
:logo="header?.logoImage as IRplImageType"
:behindNav="behindNav"
:breadcrumbs="hasBreadcrumbs"
:cornerTop="cornerTop"
:cornerBottom="cornerBottom"
:background="header?.backgroundImage"
:background="header?.backgroundImage as IRplImageType"
:primaryAction="header?.primaryAction"
:secondaryAction="secondaryAction"
:secondaryAction="secondaryAction || undefined"
:class="{ [`${language}`]: language }"
:dir="direction"
>
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt-ripple/components/TideSidebarContactUs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { computed } from 'vue'
import {
TideAddress,
TideContact
} from '../../../mapping/sidebar-contacts/sidebar-contacts-mapping-types'
} from '../mapping/base/sidebar-contacts/sidebar-contacts-mapping-types'

interface Props {
contacts: TideContact[]
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt-ripple/components/TideSidebarRelatedLinks.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<script setup lang="ts">
import { computed } from '#imports'
import { TideLink } from '../../../../types'
import { TideLink } from '../types'

interface Props {
title: string
Expand Down
Empty file added packages/ripple-sdp-core/CHANGELOG.md
View file
Open in desktop
Empty file.
Loading
Loading