Skip to content

Commit

Permalink
Merge branch 'main' into chore/upgrade_node_22.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
reiroop authored Dec 1, 2024
2 parents 2e2e10f + a93c8ac commit 3ecd0a0
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 41 deletions.
2 changes: 1 addition & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import tseslint from 'typescript-eslint'
/** @type {import('eslint').Linter.Config[]} */
export default [
{
ignores: ['**/dist/**']
ignores: ['**/dist/**', 'public/mockServiceWorker.js']
},
{
files: ['**/*.{js,mjs,cjs,ts,vue}']
Expand Down
44 changes: 21 additions & 23 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"axios": "^1.7.7",
"luxon": "^3.5.0",
"markdown-it": "^14.1.0",
"pinia": "^2.2.5",
"pinia": "^2.2.6",
"vue": "^3.5.10",
"vue-router": "^4.4.5",
"vue-toastification": "^2.0.0-rc.5"
Expand Down Expand Up @@ -47,8 +47,8 @@
"eslint-plugin-vue": "^9.30.0",
"esno": "^4.8.0",
"execa": "^9.5.1",
"globals": "^15.11.0",
"msw": "^2.6.0",
"globals": "^15.12.0",
"msw": "^2.6.1",
"postcss": "^8.4.47",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.8",
Expand Down
2 changes: 1 addition & 1 deletion public/mockServiceWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* - Please do NOT serve this file on production.
*/

const PACKAGE_VERSION = '2.6.0'
const PACKAGE_VERSION = '2.6.1'
const INTEGRITY_CHECKSUM = '07a8241b182f8a246a7cd39894799a9e'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()
Expand Down
7 changes: 4 additions & 3 deletions src/components/shared/InputSelectSingle.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<script lang="ts" setup>
import { ChevronDownIcon } from '@heroicons/vue/24/solid'
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
import { ChevronDownIcon } from '@heroicons/vue/24/solid';
import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
type ValueValue = Record<string, unknown> | string | null
// eslint-disable-next-line @typescript-eslint/no-explicit-any
type ValueValue = Record<string, any> | string | null
interface Value {
key: string
Expand Down
11 changes: 6 additions & 5 deletions src/components/shared/MarkdownTextarea.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts" setup>
import { computed, ref } from 'vue'
import InputTextarea from './InputTextarea.vue'
import MarkdownIt from './MarkdownIt.vue'
import InputSelectSingle from '/@/components/shared/InputSelectSingle.vue'
import { computed, ref } from 'vue';
import InputTextarea from './InputTextarea.vue';
import MarkdownIt from './MarkdownIt.vue';
import InputSelectSingle from '/@/components/shared/InputSelectSingle.vue';
type TabType = 'input' | 'preview'
interface Props {
Expand Down Expand Up @@ -31,7 +31,8 @@ const templateOptions = computed(
}) ?? []
)
function setTemplate(template: Record<string, unknown> | string | null) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- FIXME: InputSelectSingleを直す
function setTemplate(template: Record<string, any> | string | null) {
if (typeof template !== 'string') {
return
}
Expand Down
7 changes: 2 additions & 5 deletions src/env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

declare module '*.vue' {
import type { DefineComponent } from 'vue'
const component: DefineComponent<
Record<string, unknown>,
Record<string, unknown>,
unknown
>
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-empty-object-type
const component: DefineComponent<{}, {}, any>
export default component
}

Expand Down

0 comments on commit 3ecd0a0

Please sign in to comment.