rebase

.cspell.json

@@ -82,6 +82,7 @@
 		"COMPATBILITY",
 		"confs",
 		"Consolas",
+		"Containerised",
 		"cpath",
 		"cpcommerce",
 		"cpus",
@@ -1081,6 +1082,9 @@
 		"Rsya",
 		"rivo",
 		"mergify",
-		"ncdu"
+		"ncdu",
+		"interactjs",
+		"ocpu",
+		"Twillio"
 	]
 }

.github/workflows/auto-backport-master-to-develop.yml

@@ -6,18 +6,17 @@ on:
       - master
 
 permissions:
-  contents: read
+  contents: write
   pull-requests: write
 
 jobs:
   create-pr:
     runs-on: ubuntu-latest
-    # Skip if the commit message contains merge-related keywords
     if: |
       !contains(github.event.head_commit.message, 'Merge pull request') &&
       !contains(github.event.head_commit.message, 'Merge branch') &&
       !startsWith(github.event.head_commit.message, 'Merge')
-    
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -30,55 +29,61 @@ jobs:
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Get commit details
-        id: commit-info
+      - name: Prepare backport_master branch (Rebase)
         run: |
           git fetch origin develop
+          git fetch origin master
 
-          COMMITS=$(git log origin/develop..HEAD --pretty=format:"- %h %s")
-
-          # Store commits in a file to handle multiline content
+          # Create/update backport_master from develop
+          git checkout -B backport_master origin/develop
+
+          # Rebase onto master to avoid merge commits
+          git rebase origin/master || {
+            echo "Rebase conflict detected, aborting."
+            git rebase --abort
+            exit 1
+          }
+
+          git push origin backport_master --force-with-lease
+
+      - name: Get commit details
+        run: |
+          git fetch origin develop
+          COMMITS=$(git log origin/develop..origin/backport_master --pretty=format:"- %h %s")
           echo "$COMMITS" > commits.txt
 
       - name: Check if PR already exists
         id: check-pr
         run: |
-          # Check if there's already an open PR from master to develop
-          EXISTING_PR=$(gh pr list --head master --base develop --state open --json number --jq '.[0].number // empty')
+          EXISTING_PR=$(gh pr list --head backport_master --base develop --state open --json number --jq '.[0].number // empty')
           echo "existing_pr=$EXISTING_PR" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create Pull Request
         if: steps.check-pr.outputs.existing_pr == ''
         run: |
-          # Read commits from file
           COMMITS_LIST=$(cat commits.txt)
-
-          # Create PR description with merge instruction
-          PR_DESCRIPTION="**Please perform \`Merge & Commit\` to preserve commit history to avoid commit conflicts**
+          PR_DESCRIPTION="**Please perform \`Merge & Commit\` to preserve commit history**
 
           $COMMITS_LIST"
 
-          # Create the PR
           gh pr create \
             --title "chore: Sync Changes from Master to Develop" \
             --body "$PR_DESCRIPTION" \
-            --head master \
+            --head backport_master \
             --base develop
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Update existing PR
         if: steps.check-pr.outputs.existing_pr != ''
         run: |
-          # Read commits from file
           COMMITS_LIST=$(cat commits.txt)
-          PR_DESCRIPTION="**Please perform \`Merge & Commit\` to preserve commit history to avoid commit conflicts**
+          PR_DESCRIPTION="**Please perform \`Merge & Commit\` to preserve commit history**
 
           $COMMITS_LIST"
-
-          # Update the existing PR
+
           gh pr edit ${{ steps.check-pr.outputs.existing_pr }} \
             --body "$PR_DESCRIPTION"
         env:

backbone/tests/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2020, Frappe and contributors
 # For license information, please see license.txt
 import unittest
@@ -8,9 +7,7 @@
 
 
 def run_tests():
-	coverage = Coverage(
-		source=[str(Path(__file__).parent.parent)], omit=["*/tests/*"], branch=True
-	)
+	coverage = Coverage(source=[str(Path(__file__).parent.parent)], omit=["*/tests/*"], branch=True)
 	coverage.start()
 	unittest.main(module=None, argv=["", "discover", "-s", "backbone"], exit=False)
 	coverage.stop()

backbone/tests/test_hypervisor.py

@@ -1,13 +1,13 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2020, Frappe and contributors
 # For license information, please see license.txt
-import unittest
 from unittest.mock import MagicMock
 
+from frappe.tests.utils import FrappeTestCase
+
 from backbone.hypervisor import Hypervisor
 
 
-class TestHypervisor(unittest.TestCase):
+class TestHypervisor(FrappeTestCase):
 	def test_preinstall_pass(self):
 		shell = MagicMock()
 		shell.execute.return_value.returncode = 0

commitlint.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	extends: ['@commitlint/config-conventional'],
 	rules: {
 		'header-max-length': [2, 'always', 72],

dashboard/auto-imports.d.ts

@@ -0,0 +1,10 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// noinspection JSUnusedGlobalSymbols
+// Generated by unplugin-auto-import
+// biome-ignore lint: disable
+export {}
+declare global {
+
+}

dashboard/index.html

@@ -5,7 +5,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width,initial-scale=1.0" />
 		<title>Frappe Cloud</title>
-		<link rel="icon" href="/favicon.png" type="image/x-icon" />
+		<link rel="icon" href="/assets/press/dashboard/favicon.png" type="image/x-icon" />
 	</head>
 
 	<body class="h-full">
@@ -22,13 +22,6 @@
 		<!-- For Teleports -->
 		<div id="modals"></div>
 		<div id="popovers"></div>
-
-		<script>
-			{% for key in boot %}
-			window["{{ key }}"] = {{ boot[key] | tojson }};
-			{% endfor %}
-		</script>
-		<!-- <script type="module" src="/src/main.js"></script> -->
-		<script type="module" src="/src2/main.js"></script>
+		<script type="module" src="/src/main.js"></script>
 	</body>
 </html>

dashboard/package.json

@@ -4,10 +4,8 @@
 	"private": true,
 	"type": "module",
 	"scripts": {
-		"dev": "yarn generate-theme-config && vite",
-		"build": "yarn generate-theme-config && vite build --base=/assets/press/dashboard/ && yarn copy-html-entry",
-		"copy-html-entry": "cp ../press/public/dashboard/index.html ../press/www/dashboard.html",
-		"generate-theme-config": "node ./generateThemeConfig.cjs",
+		"dev": "vite",
+		"build": "vite build",
 		"test": "vitest",
 		"coverage": "vitest run --coverage",
 		"lint": "eslint src"
@@ -30,7 +28,7 @@
 		"echarts": "^5.4.3",
 		"feather-icons": "^4.26.0",
 		"frappe-charts": "2.0.0-rc22",
-		"frappe-ui": "^0.1.108",
+		"frappe-ui": "0.1.168",
 		"fuse.js": "6.6.2",
 		"libarchive.js": "^1.3.0",
 		"lodash": "^4.17.19",
@@ -43,11 +41,11 @@
 		"sql-formatter": "^15.4.10",
 		"unplugin-icons": "^0.17.0",
 		"unplugin-vue-components": "^0.25.2",
-		"vue": "^3.4.12",
+		"vue": "^3.5.15",
 		"vue-codemirror": "^6.1.1",
 		"vue-echarts": "^6.6.1",
 		"vue-qrcode": "^2.2.2",
-		"vue-router": "^4.0.5",
+		"vue-router": "^4.1.6",
 		"vue-sonner": "^1.2.5"
 	},
 	"devDependencies": {
@@ -75,7 +73,7 @@
 		"postcss-easy-import": "^4.0.0",
 		"prettier": "^2.5.1",
 		"prettier-plugin-tailwindcss": "^0.1.8",
-		"tailwindcss": "^3.2",
+		"tailwindcss": "^3.4",
 		"typescript": "^5.4.3",
 		"vite": "5.0.13",
 		"vite-plugin-rewrite-all": "^1.0.1",