diff --git a/package-lock.json b/package-lock.json index 430f7e8..4b7b85a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,16 +5,16 @@ "requires": true, "dependencies": { "@apiglobal/typedrequest": { - "version": "1.0.53", - "resolved": "https://verdaccio.lossless.one/@apiglobal%2ftypedrequest/-/typedrequest-1.0.53.tgz", - "integrity": "sha512-9KfG+ZfhryepIY1Q++OIMSU6k3Qy1MGRPXPLXQyPua5uXgHTPgT59+pczwpTAo1Mru4o0H87Xtwt596HV7FGsg==", + "version": "1.0.54", + "resolved": "https://verdaccio.lossless.one/@apiglobal%2ftypedrequest/-/typedrequest-1.0.54.tgz", + "integrity": "sha512-6oUUVZWLM/fCoeY3jy3xRuX85EUkiPr6Nbg2JwS8LmxPAl7JhZif9812/rRbxOuDk8gk6NuYZUnOoDVi1SuRLQ==", "requires": { "@apiglobal/typedrequest-interfaces": "^1.0.15", "@pushrocks/isounique": "^1.0.4", "@pushrocks/lik": "^4.0.17", "@pushrocks/smartdelay": "^2.0.10", "@pushrocks/smartpromise": "^3.0.6", - "@pushrocks/webrequest": "^2.0.10" + "@pushrocks/webrequest": "^2.0.12" } }, "@apiglobal/typedrequest-interfaces": { @@ -1962,9 +1962,9 @@ } }, "@pushrocks/smartpromise": { - "version": "3.0.6", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-3.0.6.tgz", - "integrity": "sha512-vlQlBGNVIjfClgnsfgQBU6GIKcskYSFzEcKLt18ngPzPEcjKklXcxaqzLXpnoxR+KBh30QPE8255ncYHXuPPOg==" + "version": "3.1.3", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-3.1.3.tgz", + "integrity": "sha512-KENdm++8uuzxDz1cbUbXtz6InfReP28TYC5zxRgRtwsXh7ZWUkSA+/82IbO97PcSCAfIpg7dwj77G6KGSsTKEQ==" }, "@pushrocks/smartpuppeteer": { "version": "1.0.15", @@ -2001,7 +2001,6 @@ "version": "2.0.19", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrx/-/smartrx-2.0.19.tgz", "integrity": "sha512-xKuN2qKpewq4LLwQfGRv6+hG+gFjzoKB6uij3M0NpaPcj/BbO3afnbOv+sczGThf/goMxTTKdQRPXYOp8Rt+Cw==", - "dev": true, "requires": { "@pushrocks/lik": "^4.0.17", "@pushrocks/smartpromise": "^3.0.6", @@ -2012,7 +2011,6 @@ "version": "6.6.3", "resolved": "https://verdaccio.lossless.one/rxjs/-/rxjs-6.6.3.tgz", "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", - "dev": true, "requires": { "tslib": "^1.9.0" } @@ -2157,40 +2155,73 @@ } }, "@pushrocks/webrequest": { - "version": "2.0.10", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fwebrequest/-/webrequest-2.0.10.tgz", - "integrity": "sha512-uQ8MvKclGqdLaUjah3SUsr8RplvtEUDXpFYjyO1dsHabbLWNVPQipt70CAMvS/8hOzDDD/G+dUEHIz2yZSVKNQ==", + "version": "2.0.13", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fwebrequest/-/webrequest-2.0.13.tgz", + "integrity": "sha512-FNRthRBrBmc3Eu+NRkVrPudbmWMphph/Y15feHo7tUj7Y4MhP0uSy2/95vM3b5LcXQldOEH3GA9SB7VYJ1+VPw==", "requires": { - "@pushrocks/smartdelay": "^2.0.9", - "@pushrocks/smartenv": "^4.0.10", - "node-fetch": "^2.6.0" + "@pushrocks/smartdelay": "^2.0.10", + "@pushrocks/smartenv": "^4.0.15", + "@pushrocks/smartjson": "^4.0.5", + "node-fetch": "^2.6.1" }, "dependencies": { - "@pushrocks/smartdelay": { - "version": "2.0.10", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartdelay/-/smartdelay-2.0.10.tgz", - "integrity": "sha512-JOFpEfYiKnqcQYoUrL/jDyBDZUmlgJNm5U30MQQ3f+yci+rlFnMY5VvBBEYn5WgoX0ilwU+E15mtpDWhXcmhzg==", + "@pushrocks/smartenv": { + "version": "4.0.16", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartenv/-/smartenv-4.0.16.tgz", + "integrity": "sha512-NwYMONDc/NjY6BGvzZzLMteF83kPQTF9BCGfqWbktUUruEtdqL+nGw6ecoLFi2b5u7XPb8jK1TKIcSvpNJ7SyA==", "requires": { - "@pushrocks/smartpromise": "^3.0.6" + "@pushrocks/smartpromise": "^3.0.6", + "@types/node": "^14.11.2" + } + }, + "@pushrocks/smartjson": { + "version": "4.0.5", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartjson/-/smartjson-4.0.5.tgz", + "integrity": "sha512-i4kBjZSbs1t8swcAPEdPkDJHci2higzvMIkNUKTgXWrcxUFMuOis/B5huUnnIqg/Td8R+mAdf/B/CMfgjABTlg==", + "requires": { + "@types/buffer-json": "^2.0.0", + "@types/fast-json-stable-stringify": "^2.0.0", + "buffer-json": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "lodash.clonedeep": "^4.5.0" } } } }, "@pushrocks/websetup": { - "version": "2.0.18", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fwebsetup/-/websetup-2.0.18.tgz", - "integrity": "sha512-SQr7TSu51JlbfrEzK+klX3esUDf2m7NZ3/sG5y80ytaAGWXMtOKy08zpvCsuOtSK75ZKafoav9bWMemmzXWsuw==", + "version": "3.0.3", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fwebsetup/-/websetup-3.0.3.tgz", + "integrity": "sha512-BEI2b+Owjh5uSLzhBHCOo/HLwR/QbfjoHJKn7ruyili4jWzQFnH17ws3la1arNQrPcZKw0dtj/0/nbcUfc1qMw==", "requires": { - "@tsclass/tsclass": "^3.0.18" + "@pushrocks/smartpromise": "^3.1.3", + "@tsclass/tsclass": "^3.0.29" } }, "@pushrocks/webstore": { - "version": "1.0.14", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fwebstore/-/webstore-1.0.14.tgz", - "integrity": "sha512-RmI6m1VOW92Vw6I+HUKSrDRJ8vyUBaHpusOoMv0QXraSiwyPlEudEFzi0Ji0nN4++i+ejKIxOuD/gh/jruA4NA==", + "version": "1.0.16", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fwebstore/-/webstore-1.0.16.tgz", + "integrity": "sha512-LyJR1rEN8XgONAaAyOKn9XxgHbgvSo/lGXO9/iqve5lL53S8FIUJ0PzKW5EdquZuLqPjleTp7O8n2agnHTT3Uw==", "requires": { - "@pushrocks/smartpromise": "^3.0.6", - "idb": "^5.0.6" + "@apiglobal/typedrequest-interfaces": "^1.0.15", + "@pushrocks/lik": "^4.0.17", + "@pushrocks/smartjson": "^4.0.5", + "@pushrocks/smartpromise": "^3.1.3", + "@pushrocks/smartrx": "^2.0.19", + "idb": "^5.0.7" + }, + "dependencies": { + "@pushrocks/smartjson": { + "version": "4.0.5", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartjson/-/smartjson-4.0.5.tgz", + "integrity": "sha512-i4kBjZSbs1t8swcAPEdPkDJHci2higzvMIkNUKTgXWrcxUFMuOis/B5huUnnIqg/Td8R+mAdf/B/CMfgjABTlg==", + "requires": { + "@types/buffer-json": "^2.0.0", + "@types/fast-json-stable-stringify": "^2.0.0", + "buffer-json": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "lodash.clonedeep": "^4.5.0" + } + } } }, "@rollup/plugin-commonjs": { @@ -2280,11 +2311,19 @@ } }, "@tsclass/tsclass": { - "version": "3.0.18", - "resolved": "https://verdaccio.lossless.one/@tsclass%2ftsclass/-/tsclass-3.0.18.tgz", - "integrity": "sha512-MsdARWRqNMNDi6qFvblF8OUq8H2SrEW3gYxXvvW01b18QpbEastkEc6TWxg7nKY6cP1EglmWKaCCxWj8CKFU5A==", + "version": "3.0.29", + "resolved": "https://verdaccio.lossless.one/@tsclass%2ftsclass/-/tsclass-3.0.29.tgz", + "integrity": "sha512-LmFE1efF6gBP0CiAW7MUZKo35Z7DKuLaf1Fp5lqrNC6TKAeoayDi4W1CwPktex9GhyxgLds5Ef0stJ7rEjTFrg==", "requires": { - "@pushrocks/tapbundle": "^3.2.1" + "@pushrocks/tapbundle": "^3.2.9", + "type-fest": "^0.16.0" + }, + "dependencies": { + "type-fest": { + "version": "0.16.0", + "resolved": "https://verdaccio.lossless.one/type-fest/-/type-fest-0.16.0.tgz", + "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==" + } } }, "@types/body-parser": { @@ -2297,6 +2336,11 @@ "@types/node": "*" } }, + "@types/buffer-json": { + "version": "2.0.0", + "resolved": "https://verdaccio.lossless.one/@types%2fbuffer-json/-/buffer-json-2.0.0.tgz", + "integrity": "sha512-nFKOrY93Tvv5Tobws+YbkGlPOJsn1nVpZah3BlSyQ4EniFm97KLvSr54tZ5xQp8mlf/XxbYwskNCYQB9EdrPlQ==" + }, "@types/chai": { "version": "4.2.11", "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.2.11.tgz", @@ -2389,8 +2433,7 @@ "@types/fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://verdaccio.lossless.one/@types%2ffast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha512-mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ==", - "dev": true + "integrity": "sha512-mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ==" }, "@types/figures": { "version": "3.0.1", @@ -2457,10 +2500,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "14.11.5", - "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.11.5.tgz", - "integrity": "sha512-jVFzDV6NTbrLMxm4xDSIW/gKnk8rQLF9wAzLWIOg+5nU6ACrIMndeBdXci0FGtqJbP9tQvm6V39eshc96TO2wQ==", - "dev": true + "version": "14.14.6", + "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.14.6.tgz", + "integrity": "sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw==" }, "@types/parcel-bundler": { "version": "1.12.1", @@ -3382,6 +3424,11 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, + "buffer-json": { + "version": "2.0.0", + "resolved": "https://verdaccio.lossless.one/buffer-json/-/buffer-json-2.0.0.tgz", + "integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==" + }, "buffer-xor": { "version": "1.0.3", "resolved": "https://verdaccio.lossless.one/buffer-xor/-/buffer-xor-1.0.3.tgz", @@ -5376,8 +5423,7 @@ "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://verdaccio.lossless.one/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "fast-levenshtein": { "version": "2.0.6", @@ -6698,9 +6744,9 @@ "dev": true }, "idb": { - "version": "5.0.6", - "resolved": "https://verdaccio.lossless.one/idb/-/idb-5.0.6.tgz", - "integrity": "sha512-/PFvOWPzRcEPmlDt5jEvzVZVs0wyd/EvGvkDIcbBpGuMMLQKrTPG0TxvE2UJtgZtCQCmOtM2QD7yQJBVEjKGOw==" + "version": "5.0.7", + "resolved": "https://verdaccio.lossless.one/idb/-/idb-5.0.7.tgz", + "integrity": "sha512-tXkkEtzOEolCKNLpxEvE5ctPqUhgTEi+wPWVWIWavl/Z0/NjSJx0o/79z4/etJWpEpVjhbQNZ7fvmp/UFv/Yog==" }, "ieee754": { "version": "1.1.13", @@ -7428,8 +7474,7 @@ "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://verdaccio.lossless.one/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" }, "lodash.isarguments": { "version": "3.1.0", @@ -7833,9 +7878,9 @@ "dev": true }, "node-fetch": { - "version": "2.6.0", - "resolved": "https://verdaccio.lossless.one/node-fetch/-/node-fetch-2.6.0.tgz", - "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + "version": "2.6.1", + "resolved": "https://verdaccio.lossless.one/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" }, "node-forge": { "version": "0.7.6", diff --git a/package.json b/package.json index 1f80709..627e156 100644 --- a/package.json +++ b/package.json @@ -17,21 +17,21 @@ "@gitzone/tsbundle": "^1.0.78", "@gitzone/tstest": "^1.0.52", "@pushrocks/tapbundle": "^3.2.9", - "@types/node": "^14.11.5", + "@types/node": "^14.14.6", "tslint": "^6.1.3", "tslint-config-prettier": "^1.15.0" }, "dependencies": { - "@apiglobal/typedrequest": "^1.0.53", + "@apiglobal/typedrequest": "^1.0.54", "@designestate/dees-comms": "^1.0.7", "@pushrocks/lik": "^4.0.17", "@pushrocks/smartdelay": "^2.0.10", - "@pushrocks/smartpromise": "^3.0.6", + "@pushrocks/smartpromise": "^3.1.3", "@pushrocks/smartrouter": "^1.0.4", "@pushrocks/smartstate": "^1.0.17", - "@pushrocks/webrequest": "^2.0.10", - "@pushrocks/websetup": "^2.0.18", - "@pushrocks/webstore": "^1.0.14", + "@pushrocks/webrequest": "^2.0.13", + "@pushrocks/websetup": "^3.0.3", + "@pushrocks/webstore": "^1.0.16", "lit-element": "^2.4.0", "sweet-scroll": "^4.0.0" }, diff --git a/ts/domtools.classes.domtools.ts b/ts/domtools.classes.domtools.ts index 231e7d3..4b48618 100644 --- a/ts/domtools.classes.domtools.ts +++ b/ts/domtools.classes.domtools.ts @@ -5,6 +5,7 @@ import { TViewport } from './domtools.breakpoints'; import { Scroller } from './domtools.classes.scroller'; import { delayForRandom } from '@pushrocks/smartdelay'; +import { WebSetup } from '@pushrocks/websetup'; export interface IDomToolsState { virtualViewport: TViewport; @@ -63,6 +64,8 @@ export class DomTools { bodyElement: null, }; + public websetup: WebSetup; + public smartstate = new plugins.smartstate.Smartstate(); public domToolsStatePart = this.smartstate.getStatePart('domtools', { virtualViewport: 'native', @@ -142,7 +145,7 @@ export class DomTools { } public async setWebsiteInfo(optionsArg: plugins.websetup.IWebSetupConstructorOptions) { - const websetup = new plugins.websetup.WebSetup(optionsArg); - await websetup.setup(); + this.websetup = new plugins.websetup.WebSetup(optionsArg); + await this.websetup.readyPromise; } }