Skip to content

Commit 8789c77

Browse files
hawkeye64hawkeye64
committed
Merge branch 'master' into dev
2 parents d6ae009 + 0d5a388 commit 8789c77

File tree

299 files changed

+94826
-83709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

299 files changed

+94826
-83709
lines changed

‎demo/package.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"name": "quasar-app-extension-pdfviewer",
2+
"name": "quasar-app-extension-pdfviewer-docs",
33
"version": "0.0.1",
44
"description": "QPdfviewer Docs and Examples",
55
"productName": "QPdfviewer docs/examples",
66
"cordovaId": "org.cordova.quasar.app",
7-
"author": "Jeff Galbraith <jeff.galbraith@xendra.com>",
7+
"author": "Jeff Galbraith <galbraith64@gmail.com>",
88
"private": true,
99
"scripts": {
1010
"build": "quasar build && cp ./src/404.html ./dist/spa",
@@ -13,30 +13,30 @@
1313
"test": "echo \"No test specified\" && exit 0"
1414
},
1515
"dependencies": {
16-
"@quasar/extras": "^1.8.2",
17-
"quasar": "^1.12.8"
16+
"@quasar/extras": "^1.12.2",
17+
"quasar": "^1.12.16"
1818
},
1919
"devDependencies": {
20-
"@quasar/app": "^2.0.1",
21-
"@quasar/quasar-app-extension-qmarkdown": "^1.0.29",
20+
"@quasar/app": "^2.2.11",
21+
"@quasar/quasar-app-extension-qmarkdown": "^1.4.3",
2222
"@quasar/quasar-app-extension-qpdfviewer": "file:../.",
2323
"@quasar/quasar-app-extension-qribbon": "^1.0.0-beta.15",
24-
"@vue/eslint-config-standard": "^5.1.2",
24+
"@vue/eslint-config-standard": "^6.1.0",
2525
"babel-eslint": "^10.1.0",
2626
"devtron": "^1.4.0",
2727
"electron": "^9.1.0",
28-
"electron-debug": "^3.1.0",
29-
"electron-devtools-installer": "^3.1.0",
30-
"eslint": "^7.4.0",
28+
"electron-debug": "^3.2.0",
29+
"electron-devtools-installer": "^3.2.0",
30+
"eslint": "^8.6.0",
3131
"eslint-loader": "^4.0.2",
32-
"eslint-plugin-import": "^2.22.0",
32+
"eslint-plugin-import": "^2.25.3",
3333
"eslint-plugin-node": "^11.1.0",
34-
"eslint-plugin-promise": "^4.2.1",
34+
"eslint-plugin-promise": "^6.0.0",
3535
"eslint-plugin-quasar": "^1.0.0",
36-
"eslint-plugin-standard": "^4.0.1",
37-
"eslint-plugin-vue": "^6.2.2",
38-
"quasar-app-extension-example-viewer": "^0.0.25",
39-
"quasar-app-extension-json-api-viewer": "^1.0.15"
36+
"eslint-plugin-standard": "^4.1.0",
37+
"eslint-plugin-vue": "^8.2.0",
38+
"quasar-app-extension-example-viewer": "^1.1.1",
39+
"quasar-app-extension-json-api-viewer": "^1.3.1"
4040
},
4141
"engines": {
4242
"node": ">= 8.9.0",

‎demo/quasar.conf.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ module.exports = function (ctx) {
6363
// Options below are automatically set depending on the env, set them if you want to override
6464
// extractCSS: false,
6565

66-
extendWebpack (cfg) {
67-
cfg.module.rules.push({
68-
enforce: 'pre',
69-
test: /\.(js|vue)$/,
70-
loader: 'eslint-loader',
71-
exclude: /node_modules/
72-
})
73-
},
66+
// extendWebpack (cfg) {
67+
// cfg.module.rules.push({
68+
// enforce: 'pre',
69+
// test: /\.(js|vue)$/,
70+
// loader: 'eslint-loader',
71+
// exclude: /node_modules/
72+
// })
73+
// },
7474

7575
chainWebpack (chain) {
7676
chain.resolve.alias.merge({

‎docs/css/vendor.0e67b25c.css‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎docs/css/vendor.387ce229.css‎

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/fonts/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.40fa1be9.woff‎

-148 KB
Binary file not shown.

‎docs/fonts/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.6b3adb7e.woff‎

150 KB
Binary file not shown.

‎docs/fonts/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.b833408f.woff2‎

117 KB
Binary file not shown.

‎docs/fonts/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.cf9862e8.woff2‎

-115 KB
Binary file not shown.

‎docs/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<!DOCTYPE html><html><head><base href=/app-extension-qpdfviewer/ ><title></title><meta charset=utf-8><meta name=description content=""><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon href=quasar-logo.png type=image/x-icon><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link href=/app-extension-qpdfviewer/css/vendor.0e67b25c.css rel=stylesheet><link href=/app-extension-qpdfviewer/css/app.1978544c.css rel=stylesheet></head><body><script>(function(){
1+
<!DOCTYPE html><html><head><base href=/app-extension-qpdfviewer/ ><title></title><meta charset=utf-8><meta name=description content=""><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon href=quasar-logo.png type=image/x-icon><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link href=/app-extension-qpdfviewer/css/vendor.387ce229.css rel=stylesheet><link href=/app-extension-qpdfviewer/css/app.1978544c.css rel=stylesheet></head><body><script>(function(){
22
let redirect = sessionStorage.redirect;
33
delete sessionStorage.redirect;
44
if (redirect && redirect !== location.href) {
55
history.replaceState(null, null, redirect);
66
}
7-
})();</script><div id=q-app></div><script src=/app-extension-qpdfviewer/js/vendor.714f0aed.js></script><script src=/app-extension-qpdfviewer/js/app.9b99bff4.js></script></body></html>
7+
})();</script><div id=q-app></div><script src=/app-extension-qpdfviewer/js/vendor.d9c9f766.js></script><script src=/app-extension-qpdfviewer/js/app.9b99bff4.js></script></body></html>

‎docs/js/vendor.714f0aed.js‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)