Merge pull request #1346 from dpc-sdp/feature/update-cli-sdp-core

update CLI scaffold scripts to use SDP core packages
dpc-sdp · Oct 4, 2024 · 7d410fa · 7d410fa
2 parents 12989bd + 5fc111c
commit 7d410fa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 47 deletions.
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
@@ -35,16 +35,7 @@ to: package.json
     "@dpc-sdp/nuxt-ripple": "<%= rplVersion %>",
     "@dpc-sdp/nuxt-ripple-analytics": "<%= rplVersion %>",
     "@dpc-sdp/nuxt-ripple-preview": "<%= 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 %>",
+    "@dpc-sdp/ripple-sdp-core": "<%= rplVersion %>",
     "cypress": "^13.6.6",
     "eslint": "^8.28.0",
     "jest-environment-jsdom": "^29.5.0",

diff --git a/...ges/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/playground/nuxt.config.ts.t b/...ges/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/playground/nuxt.config.ts.t
@@ -20,17 +20,12 @@ export default defineNuxtConfig({
   },
   // See https://nuxt.com/docs/getting-started/layers - each content type is added as a Nuxt layer
   extends: [
+    // Core layers
     '@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'
+    // Custom layers
     '..'
   ]
 })
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
@@ -8,20 +8,7 @@ export default defineNuxtConfig({
     '@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
@@ -14,24 +14,14 @@ to: package.json
     "preview": "nuxi preview",
     "start": "node .output/server/index.mjs"
   },
-  "dependencies": {
+  "devDependencies": {
+    "@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-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 %>"
-  },
-  "devDependencies": {
-    "@dpc-sdp/eslint-config-ripple": "<%= rplVersion %>",
-    "nuxt": "3.13.2",
-    "eslint": "^8.28.0"
+    "@dpc-sdp/ripple-sdp-core": "<%= rplVersion %>",    
+    "eslint": "^8.28.0",
+    "nuxt": "3.13.2"
   },
   "engines": {
     "node": "^18.15.0 || ^20.9.0",