Skip to content

Commit

Permalink
⬆️ Upgrade packages and fix build issues (#2969)
Browse files Browse the repository at this point in the history
  • Loading branch information
moisout authored Sep 22, 2024
1 parent 69ef1c3 commit 1ba9554
Show file tree
Hide file tree
Showing 22 changed files with 2,894 additions and 2,368 deletions.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
FROM node:20-bookworm AS build
WORKDIR /home/build

ENV CI=true

COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./

COPY server/package.json ./server/
Expand All @@ -9,7 +11,7 @@ COPY client/package.json ./client/
COPY client/scripts ./client/scripts
COPY patches ./patches

RUN npm install -g pnpm@9.1.3
RUN npm install -g pnpm@9.10.0

RUN pnpm install --frozen-lockfile

Expand Down
22 changes: 14 additions & 8 deletions client/app/components/buttons/BadgeButton.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
<script setup lang="ts">
const props = defineProps<{
href?: string;
click?: () => void;
loading?: boolean;
internalLink?: boolean;
disabled?: boolean;
selected?: boolean;
}>();
const props = withDefaults(
defineProps<{
href?: string;
click?: () => void;
loading?: boolean;
internalLink?: boolean;
disabled?: boolean;
selected?: boolean;
}>(),
{
href: undefined,
click: undefined
}
);
const clickFunction = (e: Event): void => {
if (props.click instanceof Function) {
Expand Down
2 changes: 1 addition & 1 deletion client/app/components/user/Session.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import humanizeDuration from 'humanize-duration';
import { type ApiDto } from '@viewtube/shared';
import type { ApiDto } from '@viewtube/shared';
import { useMessagesStore } from '~/store/messages';
import dayjs from 'dayjs';
Expand Down
2 changes: 1 addition & 1 deletion client/app/components/watch/PlaylistSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</template>

<script lang="ts">
import { type Result } from 'ytpl';
import type { Result } from 'ytpl';
export default defineComponent({
name: 'PlaylistSection',
Expand Down
2 changes: 1 addition & 1 deletion client/app/composables/api/search.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { ApiDto } from '@viewtube/shared';
import { type LocationQuery } from 'vue-router';
import type { LocationQuery } from 'vue-router';

export type FilterType = { filterValue: any; filterType?: any; filterName: any };

Expand Down
2 changes: 1 addition & 1 deletion client/app/pages/playlist.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { type Continuation } from 'ytpl';
import type { Continuation } from 'ytpl';
import BadgeButton from '~/components/buttons/BadgeButton.vue';
import VideoEntry from '~/components/list/VideoEntry.vue';
import Spinner from '~/components/Spinner.vue';
Expand Down
2 changes: 1 addition & 1 deletion client/app/pages/watch.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { type Result } from 'ytpl';
import type { Result } from 'ytpl';
import NextUpVideo from '~/components/watch/NextUpVideo.vue';
import Spinner from '~/components/Spinner.vue';
import SubscribeButton from '~/components/buttons/SubscribeButton.vue';
Expand Down
2 changes: 1 addition & 1 deletion client/app/plugins/authentication.server.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useUserStore } from '~/store/user';
import { parseCookies } from 'h3';
import { type Pinia } from 'pinia';
import type { Pinia } from 'pinia';

/**
* This plugin runs user authentication server-side,
Expand Down
2 changes: 1 addition & 1 deletion client/app/store/messages.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia';
import { type MessageType } from '~/types/MessageType';
import type { MessageType } from '~/types/MessageType';

export const useMessagesStore = defineStore('messages', {
state: () => ({
Expand Down
4 changes: 2 additions & 2 deletions client/app/store/settings.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useUserStore } from '~/store/user';
import destr from 'destr';
import { defineStore } from 'pinia';
import { type UnwrapNestedRefs } from 'vue';
import type { UnwrapNestedRefs } from 'vue';
import { useUserStore } from '~/store/user';

export type SegmentOption = 'skip' | 'ask' | 'none';
type ThemeVariant = 'default' | 'light' | 'black' | 'green';
Expand Down
2 changes: 1 addition & 1 deletion client/app/utils/storeSetters.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { type UnwrapRef } from 'vue-demi';
import type { UnwrapRef } from 'vue-demi';

type SetActionsType<T> = {
[Key in keyof T & string as `set${Capitalize<Key>}`]: (newValue: UnwrapRef<T[Key]>) => void;
Expand Down
2 changes: 1 addition & 1 deletion client/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ export default defineNuxtConfig({
}
},

compatibilityDate: '2024-07-03'
compatibilityDate: '2024-09-11'
});
42 changes: 21 additions & 21 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,48 @@
"build:metadata": "node ./buildMetadata.mjs"
},
"devDependencies": {
"@iconify-json/mdi": "1.1.67",
"@nuxt/devtools": "1.3.9",
"@nuxt/eslint": "0.3.13",
"@iconify-json/mdi": "1.2.0",
"@nuxt/devtools": "1.4.2",
"@nuxt/eslint": "0.5.7",
"@pinia-plugin-persistedstate/nuxt": "1.2.1",
"@pinia/nuxt": "0.5.1",
"@pinia/nuxt": "0.5.4",
"@types/humanize-duration": "3.27.4",
"@types/node": "20.14.12",
"@types/node": "22.5.4",
"@types/papaparse": "5.3.14",
"@types/qrcode": "1.5.5",
"@types/sanitize-html": "2.11.0",
"@types/sanitize-html": "2.13.0",
"@types/ua-parser-js": "0.7.39",
"@unocss/nuxt": "0.61.5",
"@unocss/preset-icons": "0.61.5",
"@unocss/nuxt": "0.62.3",
"@unocss/preset-icons": "0.62.3",
"@viewtube/shared": "workspace:*",
"@vueuse/core": "10.11.0",
"@vueuse/nuxt": "10.11.0",
"@vueuse/core": "11.0.3",
"@vueuse/nuxt": "11.0.3",
"consola": "3.2.3",
"cross-env": "7.0.3",
"dashjs": "4.7.4",
"dayjs": "1.11.12",
"dayjs": "1.11.13",
"destr": "2.0.3",
"hls.js": "1.5.13",
"hls.js": "1.5.15",
"human-number": "2.0.4",
"humanize-duration": "3.32.1",
"keen-slider": "6.8.6",
"modern-js-ripple": "1.1.3",
"nuxi": "3.12.0",
"nuxt": "3.12.4",
"nuxi": "3.13.1",
"nuxt": "3.13.1",
"papaparse": "5.4.1",
"pinia": "2.1.7",
"qrcode": "1.5.3",
"pinia": "2.2.2",
"qrcode": "1.5.4",
"rx-player": "4.1.0",
"sanitize-html": "2.13.0",
"sass": "1.77.8",
"swiper": "11.1.7",
"sass": "1.78.0",
"swiper": "11.1.12",
"tippy.js": "6.3.7",
"typescript": "5.5.4",
"typescript": "5.6.2",
"ua-parser-js": "2.0.0-beta.3",
"ufo": "1.5.4",
"vue": "3.4.33",
"vue": "3.5.4",
"vue-datepicker-next": "1.0.3",
"vue-tsc": "2.0.26",
"vue-tsc": "2.1.6",
"x2js": "3.4.4",
"ytpl": "2.3.0"
}
Expand Down
19 changes: 8 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "moisout",
"country": "Switzerland",
"email": "viewtube@m-o.dev",
"version": "0.17.0",
"version": "0.17.1",
"license": "AGPLv3",
"engines": {
"node": ">=20.11.0",
Expand Down Expand Up @@ -37,26 +37,23 @@
"not Edge 18"
],
"devDependencies": {
"@types/node": "20.14.12",
"@types/node": "22.5.4",
"@typescript-eslint/parser": "8.0.0-alpha.47",
"eslint": "9.7.0",
"eslint-plugin-cypress": "3.3.0",
"globals": "15.8.0",
"knip": "5.26.0",
"eslint": "9.10.0",
"eslint-plugin-cypress": "3.5.0",
"globals": "15.9.0",
"knip": "5.30.1",
"prettier": "3.3.3",
"prettier-plugin-organize-imports": "4.0.0",
"typescript": "5.5.4"
"typescript": "5.6.2"
},
"pnpm": {
"patchedDependencies": {
"papaparse@5.4.1": "patches/papaparse@5.4.1.patch"
},
"overrides": {
"has": "npm:@nolyfill/has@latest",
"side-channel": "npm:@nolyfill/side-channel@latest",
"@typescript-eslint/eslint-plugin": "8.0.0-alpha.47",
"@typescript-eslint/parser": "8.0.0-alpha.47",
"@typescript-eslint/utils": "8.0.0-alpha.47"
"side-channel": "npm:@nolyfill/side-channel@latest"
}
}
}
Loading

0 comments on commit 1ba9554

Please sign in to comment.