Merge remote-tracking branch 'origin/dev' into dev

Author: hawkeye64

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [hawkeye64, rstoenescu] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with a single custom sponsorship URL

app-extension/README.md

@@ -1,3 +1,5 @@
+> For Qpdfviewer that works with Quasar v2/Vue v3, head to the [next](https://github.com/quasarframework/app-extension-qpdfviewer/tree/next) branch or check out the [documentation](https://qpdfviewer.netlify.app/).
+
 QPdfViewer (@quasar/qpdfviewer)
 ===
 

app-extension/src/component/QPdfviewer.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import ModelToggleMixin from 'quasar/src/mixins/model-toggle.js'
 
-export default Vue.extend({
+export default {
   name: 'QPdfviewer',
 
   mixins: [ModelToggleMixin],
@@ -105,4 +105,4 @@ export default Vue.extend({
     }
     return ''
   }
-})
+}

demo/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "quasar-app-extension-pdfviewer",
+  "name": "quasar-app-extension-pdfviewer-docs",
   "version": "0.0.1",
   "description": "QPdfviewer Docs and Examples",
   "productName": "QPdfviewer docs/examples",
   "cordovaId": "org.cordova.quasar.app",
-  "author": "Jeff Galbraith <jeff.galbraith@xendra.com>",
+  "author": "Jeff Galbraith <galbraith64@gmail.com>",
   "private": true,
   "scripts": {
     "build": "quasar build && cp ./src/404.html ./dist/spa",
@@ -21,17 +21,17 @@
     "@quasar/quasar-app-extension-qmarkdown": "^1.4.4",
     "@quasar/quasar-app-extension-qpdfviewer": "file:../app-extension/.",
     "@quasar/quasar-app-extension-qribbon": "^1.0.0-beta.15",
-    "@vue/eslint-config-standard": "^5.1.2",
+    "@vue/eslint-config-standard": "^6.1.0",
     "babel-eslint": "^10.1.0",
     "devtron": "^1.4.0",
     "electron": "^9.1.0",
-    "electron-debug": "^3.1.0",
-    "electron-devtools-installer": "^3.1.0",
-    "eslint": "^7.4.0",
+    "electron-debug": "^3.2.0",
+    "electron-devtools-installer": "^3.2.0",
+    "eslint": "^8.6.0",
     "eslint-loader": "^4.0.2",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-quasar": "^1.0.0",
     "eslint-plugin-standard": "^4.0.1",
     "eslint-plugin-vue": "^6.2.2",

demo/quasar.conf.js

@@ -63,14 +63,14 @@ module.exports = function (ctx) {
       // Options below are automatically set depending on the env, set them if you want to override
       // extractCSS: false,
 
-      extendWebpack (cfg) {
-        cfg.module.rules.push({
-          enforce: 'pre',
-          test: /\.(js|vue)$/,
-          loader: 'eslint-loader',
-          exclude: /node_modules/
-        })
-      },
+      // extendWebpack (cfg) {
+      //   cfg.module.rules.push({
+      //     enforce: 'pre',
+      //     test: /\.(js|vue)$/,
+      //     loader: 'eslint-loader',
+      //     exclude: /node_modules/
+      //   })
+      // },
 
       chainWebpack (chain) {
         chain.resolve.alias.merge({