Merge pull request #30 from filips123/revert-updated-dependencies

Author: filips123

website/package.json

@@ -21,44 +21,43 @@
   },
   "dependencies": {
     "@mdi/js": "^5.9.55",
-    "@sentry/tracing": "^6.11.0",
-    "@sentry/vue": "^6.11.0",
+    "@sentry/tracing": "^6.3.5",
+    "@sentry/vue": "^6.3.5",
     "pulltorefreshjs": "^0.1.22",
     "register-service-worker": "^1.7.2",
-    "vue": "^2.6.14",
+    "vue": "^2.6.12",
     "vue-class-component": "^7.2.6",
     "vue-property-decorator": "^9.1.2",
-    "vue-router": "^3.5.2",
-    "vuetify": "^2.5.8",
+    "vue-router": "^3.5.1",
+    "vuetify": "^2.4.11",
     "vuex": "https://github.com/filips123/vuex#preservestate-options-dist",
     "vuex-module-decorators": "https://github.com/filips123/vuex-module-decorators#combined-dist",
     "vuex-persist": "^3.1.3"
   },
   "devDependencies": {
-    "@types/pulltorefreshjs": "^0.1.5",
-    "@typescript-eslint/eslint-plugin": "^4.29.3",
-    "@typescript-eslint/parser": "^4.29.3",
-    "@vue/cli-plugin-babel": "~5.0.0-beta.3",
-    "@vue/cli-plugin-eslint": "~5.0.0-beta.3",
-    "@vue/cli-plugin-pwa": "~5.0.0-beta.3",
-    "@vue/cli-plugin-router": "~5.0.0-beta.3",
-    "@vue/cli-plugin-typescript": "~5.0.0-beta.3",
-    "@vue/cli-plugin-vuex": "~5.0.0-beta.3",
-    "@vue/cli-service": "~5.0.0-beta.3",
-    "@vue/eslint-config-standard": "^6.1.0",
+    "@types/pulltorefreshjs": "^0.1.4",
+    "@typescript-eslint/eslint-plugin": "^4.22.1",
+    "@typescript-eslint/parser": "^4.22.1",
+    "@vue/cli-plugin-babel": "^4.5.12",
+    "@vue/cli-plugin-eslint": "^4.5.12",
+    "@vue/cli-plugin-pwa": "^4.5.12",
+    "@vue/cli-plugin-router": "^4.5.12",
+    "@vue/cli-plugin-typescript": "^4.5.12",
+    "@vue/cli-plugin-vuex": "^4.5.12",
+    "@vue/cli-service": "^4.5.12",
+    "@vue/eslint-config-standard": "^6.0.0",
     "@vue/eslint-config-typescript": "^7.0.0",
-    "@vue/preload-webpack-plugin": "^2.0.0",
-    "eslint": "^7.32.0",
-    "eslint-plugin-import": "^2.24.2",
+    "eslint": "^7.25.0",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
-    "eslint-plugin-vue": "^7.17.0",
-    "sass": "~1.32.13",
-    "sass-loader": "~10.2.0",
-    "typescript": "~4.3.5",
-    "vue-cli-plugin-vuetify": "^2.4.2",
-    "vue-template-compiler": "^2.6.14",
-    "vuetify-loader": "^1.7.3"
+    "eslint-plugin-vue": "^7.9.0",
+    "sass": "^1.32.12",
+    "sass-loader": "^10.1.1",
+    "typescript": " ^4.2.4",
+    "vue-cli-plugin-vuetify": "^2.4.0",
+    "vue-template-compiler": "^2.6.12",
+    "vuetify-loader": "^1.7.2"
   }
 }

website/src/registerSentry.ts

@@ -4,7 +4,7 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 
 import { init } from '@sentry/vue'
-import { VueRouterInstrumentation } from '@sentry/vue/dist/router'
+import { VueRouterInstrumentation } from '@sentry/vue/dist/vuerouter'
 import { captureException } from '@sentry/browser'
 import { Transaction, TransactionContext } from '@sentry/types'
 import { Integrations } from '@sentry/tracing'

website/src/shims-tsx.d.ts

@@ -2,10 +2,12 @@ import Vue, { VNode } from 'vue'
 
 declare global {
   namespace JSX {
+    // tslint:disable no-empty-interface
     interface Element extends VNode {}
+    // tslint:disable no-empty-interface
     interface ElementClass extends Vue {}
     interface IntrinsicElements {
-      [elem: string]: any
+      [elem: string]: any;
     }
   }
 }

website/src/shims-vuetify.d.ts

@@ -1,3 +1,5 @@
+import 'vuetify/types'
+
 declare module 'vuetify/lib/framework' {
   import Vuetify from 'vuetify'
   export default Vuetify

website/src/views/Timetable.vue

@@ -44,8 +44,8 @@ import { daysInWeek } from '@/utils/days'
 
 @Component({
   components: {
-    TimetableWeek: () => import(/* webpackChunkName: "desktop" */ '@/components/timetable/TimetableWeek.vue'),
     TimetableDay: () => import(/* webpackChunkName: "mobile" */ '@/components/timetable/TimetableDay.vue'),
+    TimetableWeek: () => import(/* webpackChunkName: "desktop" */ '@/components/timetable/TimetableWeek.vue'),
     Loading
   }
 })

website/tsconfig.json

@@ -4,13 +4,12 @@
     "module": "esnext",
     "strict": true,
     "jsx": "preserve",
+    "importHelpers": true,
     "moduleResolution": "node",
     "experimentalDecorators": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
-    "useDefineForClassFields": true,
     "sourceMap": true,
     "baseUrl": ".",
     "types": [

website/vue.config.js

@@ -1,6 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-
-const PreloadWebpackPlugin = require('@vue/preload-webpack-plugin')
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 process.env.VUE_APP_VERSION = require('./package.json').version
 
 module.exports = {
@@ -12,14 +10,15 @@ module.exports = {
 
   pwa: {
     name: process.env.VUE_APP_TITLE,
-    manifestPath: 'site.webmanifest',
 
     themeColor: '#007300',
     msTileColor: '#007300',
 
+    manifestPath: 'site.webmanifest',
+
     workboxOptions: {
       navigateFallback: '/index.html',
-      navigateFallbackDenylist: [/\./]
+      navigateFallbackBlacklist: [/\./]
     },
 
     manifestOptions: {
@@ -64,15 +63,13 @@ module.exports = {
     }
   },
 
-  configureWebpack: {
-    plugins: [
-      new PreloadWebpackPlugin({
-        rel: 'preload',
-        include: {
-          type: 'allChunks',
-          chunks: ['app', 'chunk-vendors', 'home', 'timetable']
-        }
-      })
-    ]
+  chainWebpack: config => {
+    config.plugin('preload').tap(options => {
+      options[0].include = {
+        type: 'allChunks',
+        chunks: ['app', 'chunk-vendors', 'home', 'timetable']
+      }
+      return options
+    })
   }
 }