build: fix imports and eslint config for use of src folder

.eslintrc.js

@@ -1,7 +1,6 @@
 module.exports = {
   root: true,
   env: {
-    browser: true,
     node: true
   },
   extends: [
@@ -9,11 +8,9 @@ module.exports = {
     'plugin:jsdoc/recommended',
     'plugin:json/recommended',
     'plugin:@typescript-eslint/recommended',
-    '@nuxtjs/eslint-config-typescript',
     'prettier',
     'plugin:prettier/recommended',
     'plugin:promise/recommended',
-    'plugin:nuxt/recommended',
     'plugin:import/errors',
     'plugin:import/warnings',
     'plugin:import/typescript'
@@ -31,28 +28,6 @@ module.exports = {
     '@typescript-eslint/prefer-ts-expect-error': 'error',
     'prefer-arrow-callback': 'error',
     curly: 'error',
-    // Force some component order stuff, formatting and such, for consistency
-    'vue/component-name-in-template-casing': [
-      'error',
-      'kebab-case',
-      {
-        ignores: []
-      }
-    ],
-    'vue/order-in-components': 'error',
-    'vue/v-bind-style': 'error',
-    'vue/v-on-style': 'error',
-    'vue/v-slot-style': 'error',
-    'vue/attributes-order': 'error',
-    'vue/html-self-closing': [
-      'error',
-      {
-        html: {
-          void: 'always'
-        }
-      }
-    ],
-    'vue/multiline-html-element-content-newline': 'error',
     'padding-line-between-statements': [
       'error',
       // Always require blank lines after directives (like 'use-strict'), except between directives
@@ -93,14 +68,60 @@ module.exports = {
     ],
     'lodash/import-scope': ['error', 'method']
   },
+  overrides: [
+    {
+      files: ['client/**/*'],
+      env: {
+        browser: true,
+        node: true
+      },
+      extends: [
+        'eslint:recommended',
+        'plugin:jsdoc/recommended',
+        'plugin:json/recommended',
+        'plugin:@typescript-eslint/recommended',
+        '@nuxtjs/eslint-config-typescript',
+        'prettier',
+        'plugin:prettier/recommended',
+        'plugin:promise/recommended',
+        'plugin:nuxt/recommended',
+        'plugin:import/errors',
+        'plugin:import/warnings',
+        'plugin:import/typescript'
+      ],
+      rules: {
+        // Force some component order stuff, formatting and such, for consistency
+        'vue/component-name-in-template-casing': [
+          'error',
+          'kebab-case',
+          {
+            ignores: []
+          }
+        ],
+        'vue/order-in-components': 'error',
+        'vue/v-bind-style': 'error',
+        'vue/v-on-style': 'error',
+        'vue/v-slot-style': 'error',
+        'vue/attributes-order': 'error',
+        'vue/html-self-closing': [
+          'error',
+          {
+            html: {
+              void: 'always'
+            }
+          }
+        ],
+        'vue/multiline-html-element-content-newline': 'error'
+      },
       settings: {
         'import/resolver': {
           nuxt: {
-        extensions: ['.js', '.ts', '.vue', '.json']
+            extensions: ['.js', '.ts', '.vue', '.json'],
+            nuxtSrcDir: 'client/'
+          }
         }
       }
     },
-  overrides: [
     {
       files: ['**/*.spec.ts'],
       plugins: ['jest', 'jest-formatting'],

.github/labeler.yml

@@ -1,20 +1,25 @@
 tests:
-  - "**/*.spec.js"
+  - '**/*.spec.js'
 
 github_actions:
-  - ".github/workflows/*"
+  - '.github/workflows/*'
 
 vuex:
-  - "store/**/*.ts"
+  - 'client/store/**/*.ts'
 
 plugins:
-  - "plugins/**/*.ts"
+  - 'client/plugins/**/*.ts'
 
 vue:
-  - "**/*.vue"
+  - '**/*.vue'
 
 docker:
-  - "Dockerfile*"
+  - 'Dockerfile*'
 
 ui:
-  - any: ["components/**/*.vue", "layouts/**/*.vue", "pages/**/*.vue"]
+  - any:
+      [
+        'client/components/**/*.vue',
+        'client/layouts/**/*.vue',
+        'client/pages/**/*.vue'
+      ]

.github/workflows/Dockerfile.nginx

@@ -6,6 +6,6 @@ FROM nginx:alpine
 LABEL maintainer="Jellyfin Packaging Team - packaging@jellyfin.org"
 LABEL org.opencontainers.image.source="https://github.com/jellyfin/jellyfin-vue"
 
-COPY dist/ /usr/share/nginx/html/
+COPY client/dist/ /usr/share/nginx/html/
 COPY .docker/nginx.conf /etc/nginx/conf.d/default.conf
 COPY .docker/mime.types /etc/nginx/mime.types

.github/workflows/Dockerfile.ssr

@@ -7,8 +7,8 @@ LABEL maintainer="Jellyfin Packaging Team - packaging@jellyfin.org"
 LABEL org.opencontainers.image.source="https://github.com/jellyfin/jellyfin-vue"
 
 COPY .docker/package.json .docker/package-lock.json ./.docker/nuxt.config.js ./
-COPY .nuxt ./.nuxt
+COPY client/.nuxt ./.nuxt
-COPY static ./static
+COPY client/static ./static
 
 # Install runtime dependencies
 RUN npm ci --production --no-audit

.vscode/settings.json

@@ -1,9 +1,11 @@
 {
   "editor.formatOnSave": true,
   "i18n-ally.keystyle": "nested",
-  "i18n-ally.localesPaths": "locales",
   "i18n-ally.sortKeys": true,
   "vetur.format.defaultFormatter.html": "prettier",
   "i18n-ally.sourceLanguage": "en-US",
-  "editor.defaultFormatter": "esbenp.prettier-vscode"
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "i18n-ally.localesPaths": [
+    "client/locales"
+  ]
 }

Dockerfile

@@ -23,8 +23,8 @@ WORKDIR /app
 COPY .docker/package.json .docker/package-lock.json .docker/nuxt.config.js ./
 
 # Copy client files from the build image
-COPY --from=build /app/.nuxt ./.nuxt
+COPY --from=build /app/client/.nuxt ./.nuxt
-COPY --from=build /app/static ./static
+COPY --from=build /app/client/static ./static
 
 # Install runtime dependencies
 RUN npm ci --production --no-audit

Dockerfile.static

@@ -19,6 +19,6 @@ RUN npm run build:static
 
 # Deploy built distribution to nginx
 FROM nginx:alpine
-COPY --from=build /app/dist/ /usr/share/nginx/html/
+COPY --from=build /app/client/dist/ /usr/share/nginx/html/
 COPY .docker/nginx.conf /etc/nginx/conf.d/default.conf
 COPY .docker/mime.types /etc/nginx/mime.types

client/jest.config.js

@@ -0,0 +1,26 @@
+module.exports = {
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/$1',
+    '^~/(.*)$': '<rootDir>/$1'
+  },
+  moduleFileExtensions: ['ts', 'js', 'vue', 'json'],
+  transform: {
+    '^.+\\.ts$': 'ts-jest',
+    '^.+\\.js$': 'babel-jest',
+    '.*\\.(vue)$': 'vue-jest'
+  },
+  collectCoverageFrom: [
+    '<rootDir>/components/**/*.vue',
+    '<rootDir>/layouts/**/*.vue',
+    '<rootDir>/middleware/**/*.vue',
+    '<rootDir>/middleware/**/*.ts',
+    '<rootDir>/mixins/**/*.vue',
+    '<rootDir>/mixins/**/*.ts',
+    '<rootDir>/pages/**/*.vue',
+    '<rootDir>/plugins/**/*.ts',
+    '<rootDir>/schemes/**/*.ts',
+    '<rootDir>/store/**/*.ts',
+    '<rootDir>/utils/**/*.ts'
+  ],
+  setupFiles: ['jest-canvas-mock', './jest.setup.ts']
+};

client/nuxt.config.ts

@@ -23,11 +23,6 @@ const config: NuxtConfig = {
    ** See https://nuxtjs.org/api/configuration-modern
    */
   modern: 'client',
-  /**
-   * Source directory
-   * See https://nuxtjs.org/docs/2.x/configuration-glossary/configuration-srcdir/
-   */
-  srcDir: 'client/',
   /*
    ** Progress bar between routes
    ** See https://nuxtjs.org/api/configuration-loading

client/pages/settings/index.vue

@@ -128,7 +128,7 @@ import Vue from 'vue';
 import { mapActions } from 'vuex';
 import isEmpty from 'lodash/isEmpty';
 import { SystemInfo } from '@jellyfin/client-axios';
-import { version } from '~/package.json';
+import { version } from '../../../package.json';
 import htmlHelper from '~/mixins/htmlHelper';
 
 export default Vue.extend({

client/store/deviceProfile.ts

@@ -1,7 +1,7 @@
 import { ActionTree, MutationTree } from 'vuex';
 import { v4 as uuidv4 } from 'uuid';
+import { version } from '../../package.json';
 import { browserDetector } from '~/plugins/browserDetection';
-import { version } from '~/package.json';
 
 export interface DeviceState {
   deviceId: string;

client/tsconfig.json

@@ -0,0 +1,31 @@
+{
+  "compilerOptions": {
+    "target": "ES2018",
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "lib": ["ESNext", "ESNext.AsyncIterable", "DOM"],
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "allowJs": true,
+    "sourceMap": true,
+    "strict": true,
+    "noEmit": true,
+    "experimentalDecorators": true,
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["./*"],
+      "@/*": ["./*"]
+    },
+    "types": [
+      "@types/node",
+      "@nuxt/types",
+      "@types/nuxtjs__auth",
+      "@nuxtjs/axios",
+      "@nuxtjs/vuetify",
+      "@nuxtjs/date-fns",
+      "nuxt-i18n",
+      "@types/wicg-mediasession",
+      "jest"
+    ]
+  }
+}

client/utils/__tests__/items.spec.ts

@@ -2,7 +2,7 @@ import {
   getShapeFromCollectionType,
   getShapeFromItemType,
   getLibraryIcon
-} from '../items';
+} from '~/utils/items';
 
 describe('getLibraryIcon', () => {
   it('returns the correct library icon based on library type', () => {

jest.config.js

@@ -1,29 +1,6 @@
 module.exports = {
-  moduleNameMapper: {
-    '^@/(.*)$': '<rootDir>/$1',
-    '^~/(.*)$': '<rootDir>/$1'
-  },
-  moduleFileExtensions: ['ts', 'js', 'vue', 'json'],
-  transform: {
-    '^.+\\.ts$': 'ts-jest',
-    '^.+\\.js$': 'babel-jest',
-    '.*\\.(vue)$': 'vue-jest'
-  },
   collectCoverage: true,
-  collectCoverageFrom: [
+  coverageReporters: ['text', 'cobertura', 'html', 'lcov'],
-    '<rootDir>/components/**/*.vue',
+  projects: ['<rootDir>/client/jest.config.js'],
-    '<rootDir>/layouts/**/*.vue',
+  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$'
-    '<rootDir>/middleware/**/*.vue',
-    '<rootDir>/middleware/**/*.ts',
-    '<rootDir>/mixins/**/*.vue',
-    '<rootDir>/mixins/**/*.ts',
-    '<rootDir>/pages/**/*.vue',
-    '<rootDir>/plugins/**/*.ts',
-    '<rootDir>/schemes/**/*.ts',
-    '<rootDir>/store/**/*.ts',
-    '<rootDir>/utils/**/*.ts'
-  ],
-  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
-  setupFiles: ['jest-canvas-mock', './jest.setup.ts'],
-  coverageReporters: ['text', 'cobertura', 'html', 'lcov']
 };

package.json

@@ -4,16 +4,16 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "dev": "NUXT_SSR=1 nuxt",
+    "dev": "NUXT_SSR=1 nuxt client",
-    "dev:static": "nuxt",
+    "dev:static": "nuxt client",
-    "build": "NUXT_SSR=1 nuxt build",
+    "build": "NUXT_SSR=1 nuxt build client",
-    "build:standalone": "NUXT_SSR=1 nuxt build --standalone",
+    "build:standalone": "NUXT_SSR=1 nuxt build --standalone client",
-    "build:static": "nuxt build",
+    "build:static": "nuxt build client",
-    "prod": "npm run build && npm run start",
+    "prod": "npm run build client && npm run start client",
-    "prod:static": "npm run build:static && npm run start:static",
+    "prod:static": "npm run build:static client && npm run start:static client",
-    "start": "NUXT_SSR=1 nuxt start",
+    "start": "NUXT_SSR=1 nuxt start client",
-    "start:static": "nuxt start",
+    "start:static": "nuxt start client",
-    "generate": "nuxt generate",
+    "generate": "nuxt generate client",
     "lint:js": "eslint --ext .ts,.js,.json,.vue .",
     "lint:style": "stylelint **/*.{vue,css} --ignore-path .gitignore",
     "lint": "npm run lint:js && npm run lint:style",

tsconfig.json

@@ -3,30 +3,11 @@
     "target": "ES2018",
     "module": "ESNext",
     "moduleResolution": "Node",
-    "lib": ["ESNext", "ESNext.AsyncIterable", "DOM"],
+    "lib": ["ESNext", "ESNext.AsyncIterable"],
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "allowJs": true,
-    "sourceMap": true,
     "strict": true,
     "noEmit": true,
-    "experimentalDecorators": true,
     "baseUrl": ".",
-    "paths": {
+    "types": ["@types/node"]
-      "~/*": ["./*"],
-      "@/*": ["./*"]
   },
-    "types": [
+  "exclude": ["node_modules"]
-      "@types/node",
-      "@nuxt/types",
-      "@types/nuxtjs__auth",
-      "@nuxtjs/axios",
-      "@nuxtjs/vuetify",
-      "@nuxtjs/date-fns",
-      "nuxt-i18n",
-      "@types/wicg-mediasession",
-      "jest"
-    ]
-  },
-  "exclude": ["node_modules", ".nuxt", "dist"]
 }

vetur.config.js

@@ -0,0 +1,10 @@
+// vetur.config.js
+/** @type {import('vls').VeturConfig} */
+module.exports = {
+  projects: [
+    {
+      root: './client',
+      package: '../package.json'
+    }
+  ]
+};