Merge branch '4.0.x' into RUN-3601-CVE-2025-48924

Author: fdevans

.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: cimg/node:18.19.0
+      - image: cimg/node:22.12.0
         environment:
           NODE_OPTIONS="--max-old-space-size=6144"
     resource_class: medium+

.nvmrc

@@ -1 +1 @@
-18.19.0
+22.12.0

README.md

@@ -1,10 +1,10 @@
 # Rundeck Documentation
 Rundeck Documentation project.
 
-## Getting starting
+## Getting Started
 
 ### Dependencies
-* NodeJS `lts/hydrogen` or version `18.19.0` is the currently supported and only version that should be used.
+* NodeJS version `22.12.0` is the currently supported and only version that should be used.
 * NVM is helpful in making sure your machine is using the currently supported versions as we upgrade in the future.
 
 ### Recommended setup steps
@@ -18,10 +18,7 @@ After setting the proper Node version, run this `npm` command before the first y
 npm install
 ```
 
-## API Documentation Guidelines
-
-Our API Documentation is now handled by OpenAPI spec and presented using Swagger UI.
-
+>Note: It may be helpful to delete any existing `node_modules` folder and the `package-lock.json` file before running npm install.
 
 # How To 
 
@@ -78,6 +75,13 @@ git checkout -b 3.2.8
 git push origin
 ```
 
+## Documentation Structure
+
+The documentation is organized as follows:
+- `/docs/` - Main documentation content
+- `/docs/.vuepress/` - VuePress configuration
+- `/docs/.vuepress/public/assets/img/` - Images Folder
+
 # How to Create Release Notes
 
 Rundeck Core PRs are included by default.

docs/.vuepress/client.ts

@@ -1,5 +1,7 @@
 import { defineClientConfig } from '@vuepress/client'
 import '@docsearch/css'
+import Layout from "./layouts/Layout.vue";
+import NotFound from "./layouts/NotFound.vue";
 
 declare const VERSION: string;
 declare const VERSION_FULL: string;
@@ -11,6 +13,10 @@ declare const CLI_VERSION: string;
 
 
 export default defineClientConfig({
+  layouts: {
+    Layout,
+    NotFound,
+  },
   enhance({ app, router, siteData }) {
     Object.defineProperties(app.config.globalProperties, {
       $rundeckVersion: { get: () => VERSION },

docs/.vuepress/components/CustomNavBar.vue

@@ -9,7 +9,6 @@ import { registerComponentsPlugin } from '@vuepress/plugin-register-components';
 import { dateSorter } from "@vuepress/helper";
 import { googleAnalyticsPlugin } from '@vuepress/plugin-google-analytics';
 import { removePwaPlugin } from '@vuepress/plugin-remove-pwa';
-import { prismjsPlugin } from '@vuepress/plugin-prismjs';
 
 // sidebars
 import sidebarAdmin from './sidebar-menus/administration'
@@ -97,7 +96,7 @@ export default defineUserConfig({
 
   //Theme Config
   theme: hopeTheme({
-    debug: true,
+    debug: process.env.NODE_ENV === 'development',
     logo: '/images/RundeckbyPagerDuty.svg',
     repo: 'rundeck/docs',
     docsDir: 'docs',
@@ -322,24 +321,6 @@ export default defineUserConfig({
   },
     { custom: true },
   ),
-  alias: {
-    "@theme-hope/components/HomePage": path.resolve(
-      __dirname,
-      "./components/HomePageAnnounce.vue",
-    ),
-    "@theme-hope/modules/sidebar/components/Sidebar": path.resolve(
-      __dirname,
-      "./components/SidebarAnnounce.vue",
-    ),
-    "@theme-hope/layouts/NotFound": path.resolve(
-      __dirname,
-      "./components/notFoundCustom.vue",
-    ),
-    "@theme-hope/modules/navbar/components/Navbar": path.resolve(
-      __dirname,
-      "./components/CustomNavBar.vue",
-    ),
-  },
   //Plugins Config
   plugins: [
     removePwaPlugin({

docs/.vuepress/components/HomePageAnnounce.vue

@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { Layout } from "vuepress-theme-hope/client";
+import { usePageData } from "@vuepress/client";
+import { computed } from "vue";
+
+const pageData = usePageData();
+const isHomePage = computed(() => pageData.value.frontmatter.home === true);
+</script>
+
+<template>
+  <Layout>
+    <!-- Adding announcement before content (works on all pages) -->
+    <template #heroAfter>
+      <div v-if="isHomePage"class="homepage-announce">
+        <p>
+         <b>The <i>resources.rundeck.com</i> site has been consolidated here!  Check our our <a href='/learning/solutions/'>Solutions</a> page for Automation use cases. </b>
+        </p>
+      </div>
+    </template>
+    
+    <!-- Adding announcement to sidebar -->
+    <template #sidebarTop>
+      <div v-if="!isHomePage" class="sidebar-announce">
+        <p>
+          <b>Process Automation On Prem</b> is now <b>Runbook Automation Self-Hosted</b>
+        </p>
+      </div>
+    </template>
+  </Layout>
+</template>