diff --git a/.vscode/settings.json b/.vscode/settings.json index c04dcdc5e4..f7fe483b52 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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", diff --git a/examples/nuxt-app/nuxt.config.ts b/examples/nuxt-app/nuxt.config.ts index 38c6b7625d..e05d4f024c 100644 --- a/examples/nuxt-app/nuxt.config.ts +++ b/examples/nuxt-app/nuxt.config.ts @@ -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 diff --git a/examples/nuxt-app/package.json b/examples/nuxt-app/package.json index e82065a2ba..95ed01e6c3 100644 --- a/examples/nuxt-app/package.json +++ b/examples/nuxt-app/package.json @@ -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": { diff --git a/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/nvmrc.t b/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/nvmrc.t index 1a9be571da..707571c832 100644 --- a/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/nvmrc.t +++ b/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/nvmrc.t @@ -1,4 +1,4 @@ --- to: .nvmrc --- -lts/hydrogen +lts/iron diff --git a/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/package.json.t b/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/package.json.t index e0f4c5eff2..82233e3c0e 100644 --- a/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/package.json.t +++ b/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/package.json.t @@ -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", diff --git a/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/playground/nuxt.config.ts.t b/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/playground/nuxt.config.ts.t index 77ead54f3e..fd474b5a92 100644 --- a/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/playground/nuxt.config.ts.t +++ b/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/playground/nuxt.config.ts.t @@ -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', '..' ] }) diff --git a/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/app.config.ts.t b/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/app.config.ts.t index 2433364398..6ff9fc8b44 100644 --- a/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/app.config.ts.t +++ b/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/app.config.ts.t @@ -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: {} } -}) \ No newline at end of file +}) diff --git a/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/nuxt.config.ts.t b/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/nuxt.config.ts.t index baf786fdf9..346c342add 100644 --- a/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/nuxt.config.ts.t +++ b/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/nuxt.config.ts.t @@ -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' - ] }) diff --git a/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/package.json.t b/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/package.json.t index 07468c0a23..b7b3fb64be 100644 --- a/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/package.json.t +++ b/packages/nuxt-ripple-cli/src/commands/init/_templates/site/latest/package.json.t @@ -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 %>", diff --git a/packages/nuxt-ripple/components/TideBaseLayout.vue b/packages/nuxt-ripple/components/TideBaseLayout.vue index 127e820deb..aaf3ad5d0d 100644 --- a/packages/nuxt-ripple/components/TideBaseLayout.vue +++ b/packages/nuxt-ripple/components/TideBaseLayout.vue @@ -97,8 +97,7 @@