Skip to content

chore(deps-dev): bump eslint-config-prettier from 8.3.0 to 9.1.0 #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@
"babel-core": "7.0.0-bridge.0",
"babel-jest": "^27.0.5",
"eslint": "^7.29.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-nuxt": "^2.0.0",
"eslint-plugin-vue": "^7.12.1",
"husky": "^6.0.0",
52 changes: 46 additions & 6 deletions pages/v2/diff.vue
Original file line number Diff line number Diff line change
@@ -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) {