From 98aa82dbbc71957eb99795eca64b1be01babede3 Mon Sep 17 00:00:00 2001
From: Nikhil Mehta <nikhil.001mehta@gmail.com>
Date: Tue, 5 Dec 2023 16:35:23 +0530
Subject: [PATCH 1/2] fix: added missing titles in diffview of v2
---
pages/v2/diff.vue | 52 +++++++++++++++++++++++++++++++++++++++++------
1 file changed, 46 insertions(+), 6 deletions(-)
diff --git a/pages/v2/diff.vue b/pages/v2/diff.vue
index 2e4875e..7708741 100644
--- a/pages/v2/diff.vue
+++ b/pages/v2/diff.vue
@@ -4,8 +4,45 @@
<main class="outline-none" tabindex="0">
<DiffActionBar :diff-navigator="diffNavigator" />
<section
- class="flex items-stretch w-full gap-4 font-mono text-gray-800 dark:text-gray-50"
+ class="
+ flex
+ items-stretch
+ flex-wrap
+ w-full
+ gap-4
+ font-mono
+ text-gray-800
+ dark:text-gray-50
+ "
>
+ <div class="flex space-around w-full gap-4">
+ <p
+ class="
+ flex-grow-0 flex-shrink-0
+ w-1/2
+ text-lg
+ font-bold
+ text-center
+ capitalize
+ break-all
+ "
+ >
+ <span class="inline-block w-4/5">{{ lhsLabel }}</span>
+ </p>
+ <p
+ class="
+ flex-grow-0 flex-shrink-0
+ w-1/2
+ text-lg
+ font-bold
+ text-center
+ capitalize
+ break-all
+ "
+ >
+ <span class="inline-block w-4/5">{{ rhsLabel }}</span>
+ </p>
+ </div>
<div
id="monaco-diff-viewer"
class="w-full h-screen p-2 border border-gray-600 rounded-md editor"
@@ -19,7 +56,10 @@
import pako from 'pako'
import loader from '@monaco-editor/loader'
import Vue from 'vue'
-import { getMonacoEditorDefaultOptions, undoUrlSafeBase64 } from '../../helpers/utils'
+import {
+ getMonacoEditorDefaultOptions,
+ undoUrlSafeBase64,
+} from '../../helpers/utils'
import DiffActionBar from '~/components/v2/diffActionBar.vue'
import Navbar from '~/components/v2/navbar.vue'
import { v2DiffData } from '~/helpers/types'
@@ -28,8 +68,8 @@ export default Vue.extend({
layout: 'main',
data(): v2DiffData {
return {
- lhs: "",
- rhs: "",
+ lhs: '',
+ rhs: '',
rhsLabel: '',
lhsLabel: '',
monacoDiffEditor: {},
@@ -53,7 +93,7 @@ export default Vue.extend({
mounted() {
const monacoDiffViewerEl = document.getElementById('monaco-diff-viewer')
const theme = this.$cookies.isDarkMode ? 'vs-dark' : 'light'
- const monacoEditorOptions = getMonacoEditorDefaultOptions(theme);
+ const monacoEditorOptions = getMonacoEditorDefaultOptions(theme)
loader.init().then((monaco) => {
if (monacoDiffViewerEl) {
this.monacoDiffEditor = monaco.editor.createDiffEditor(
@@ -62,7 +102,7 @@ export default Vue.extend({
...monacoEditorOptions,
readOnly: true,
wordWrap: 'on',
- diffAlgorithm: 'advanced'
+ diffAlgorithm: 'advanced',
}
) as any
if (this.monacoDiffEditor) {
From ca341fd36a4e091db59445d0872a782ae92c3a80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 00:18:47 +0000
Subject: [PATCH 2/2] fix(deps): bump actions/setup-node from 2.1.5 to 4.0.2
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.1.5 to 4.0.2.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2.1.5...v4.0.2)
---
updated-dependencies:
- dependency-name: actions/setup-node
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6578c26..35ed6a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
uses: actions/checkout@master
- name: Setup node env 🏗
- uses: actions/setup-node@v2.1.5
+ uses: actions/setup-node@v4.0.2
with:
node-version: ${{ matrix.node }}
check-latest: true