Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkeye64 committed Jan 1, 2022
2 parents d6ae009 + 0d5a388 commit 8789c77
Show file tree
Hide file tree
Showing 299 changed files with 94,826 additions and 83,709 deletions.
32 changes: 16 additions & 16 deletions demo/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -13,30 +13,30 @@
"test": "echo \"No test specified\" && exit 0"
},
"dependencies": {
"@quasar/extras": "^1.8.2",
"quasar": "^1.12.8"
"@quasar/extras": "^1.12.2",
"quasar": "^1.12.16"
},
"devDependencies": {
"@quasar/app": "^2.0.1",
"@quasar/quasar-app-extension-qmarkdown": "^1.0.29",
"@quasar/app": "^2.2.11",
"@quasar/quasar-app-extension-qmarkdown": "^1.4.3",
"@quasar/quasar-app-extension-qpdfviewer": "file:../.",
"@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",
"quasar-app-extension-example-viewer": "^0.0.25",
"quasar-app-extension-json-api-viewer": "^1.0.15"
"eslint-plugin-standard": "^4.1.0",
"eslint-plugin-vue": "^8.2.0",
"quasar-app-extension-example-viewer": "^1.1.1",
"quasar-app-extension-json-api-viewer": "^1.3.1"
},
"engines": {
"node": ">= 8.9.0",
Expand Down
16 changes: 8 additions & 8 deletions demo/quasar.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
15 changes: 0 additions & 15 deletions docs/css/vendor.0e67b25c.css

This file was deleted.

15 changes: 15 additions & 0 deletions docs/css/vendor.387ce229.css

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!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(){
<!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(){
let redirect = sessionStorage.redirect;
delete sessionStorage.redirect;
if (redirect && redirect !== location.href) {
history.replaceState(null, null, redirect);
}
})();</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>
})();</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>
44 changes: 0 additions & 44 deletions docs/js/vendor.714f0aed.js

This file was deleted.

44 changes: 44 additions & 0 deletions docs/js/vendor.d9c9f766.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quasar/quasar-app-extension-qpdfviewer",
"version": "1.0.0-beta.8",
"version": "1.0.0",
"description": "QPdfviewer is an app extension for viewing PDF files",
"author": "Jeff Galbraith <[email protected]>",
"main": "src/index.js",
Expand Down Expand Up @@ -34,11 +34,11 @@
"viewer"
],
"devDependencies": {
"@vue/eslint-config-standard": "^5.1.2",
"@vue/eslint-config-standard": "^6.1.0",
"babel-eslint": "^10.1.0",
"eslint": "^7.2.0",
"eslint": "^8.6.0",
"eslint-loader": "^4.0.2",
"eslint-plugin-vue": "^6.2.2"
"eslint-plugin-vue": "^8.2.0"
},
"dependencies": {}
}
Loading

0 comments on commit 8789c77

Please sign in to comment.