From 1991e79ed2a3b349f86ff27a4f3889fcecdcd9e7 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Mon, 2 Nov 2020 12:24:15 +0100 Subject: [PATCH] Add landingpage and lazyloading voor 3d map --- package-lock.json | 901 ++++++++++-------- package.json | 10 +- src/app/app-routing.module.ts | 82 +- src/app/app.module.ts | 5 +- .../landingpage/landingpage.component.html | 138 +++ .../landingpage/landingpage.component.scss | 133 +++ .../landingpage/landingpage.component.spec.ts | 25 + src/app/landingpage/landingpage.component.ts | 19 + src/app/map3d/map3d-router.module.ts | 36 + src/app/map3d/map3d.module.ts | 19 + src/assets/images/FarmMaps logo.png | Bin 0 -> 41719 bytes src/assets/images/bg-masthead.jpg | Bin 0 -> 118763 bytes src/assets/images/bg-showcase-1.jpg | Bin 0 -> 145993 bytes src/assets/images/bg-showcase-2.jpg | Bin 0 -> 39807 bytes src/assets/images/bg-showcase-3.jpg | Bin 0 -> 67679 bytes src/assets/images/pexels-pixabay-207247.jpg | Bin 0 -> 230162 bytes src/assets/images/testimonials-1.jpg | Bin 0 -> 26544 bytes src/assets/images/testimonials-2.jpg | Bin 0 -> 50745 bytes src/assets/images/testimonials-3.jpg | Bin 0 -> 62959 bytes src/styles.css | 98 +- 20 files changed, 992 insertions(+), 474 deletions(-) create mode 100644 src/app/landingpage/landingpage.component.html create mode 100644 src/app/landingpage/landingpage.component.scss create mode 100644 src/app/landingpage/landingpage.component.spec.ts create mode 100644 src/app/landingpage/landingpage.component.ts create mode 100644 src/app/map3d/map3d-router.module.ts create mode 100644 src/app/map3d/map3d.module.ts create mode 100644 src/assets/images/FarmMaps logo.png create mode 100644 src/assets/images/bg-masthead.jpg create mode 100644 src/assets/images/bg-showcase-1.jpg create mode 100644 src/assets/images/bg-showcase-2.jpg create mode 100644 src/assets/images/bg-showcase-3.jpg create mode 100644 src/assets/images/pexels-pixabay-207247.jpg create mode 100644 src/assets/images/testimonials-1.jpg create mode 100644 src/assets/images/testimonials-2.jpg create mode 100644 src/assets/images/testimonials-3.jpg diff --git a/package-lock.json b/package-lock.json index 72464f3..dfe8501 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,15 +61,15 @@ } }, "@angular-devkit/build-angular": { - "version": "0.1001.3", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1001.3.tgz", - "integrity": "sha512-TQhNNfBeWLLOcXitmBTl2l95/9/2OcVVGyI5bxbpcCn8f9ioRVa2DvIxQLR92aoGkTrp7Vgd12xu07DSuuQwvg==", + "version": "0.1002.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1002.0.tgz", + "integrity": "sha512-cPkdp1GceokGHc79Wg0hACMqqmnJ4W3H9kY4c9qp1Xz18b3vk1aq09JNawOpfUN09S9vBCnn4glg22lRyqmJNA==", "dev": true, "requires": { - "@angular-devkit/architect": "0.1001.3", - "@angular-devkit/build-optimizer": "0.1001.3", - "@angular-devkit/build-webpack": "0.1001.3", - "@angular-devkit/core": "10.1.3", + "@angular-devkit/architect": "0.1002.0", + "@angular-devkit/build-optimizer": "0.1002.0", + "@angular-devkit/build-webpack": "0.1002.0", + "@angular-devkit/core": "10.2.0", "@babel/core": "7.11.1", "@babel/generator": "7.11.0", "@babel/plugin-transform-runtime": "7.11.0", @@ -77,7 +77,7 @@ "@babel/runtime": "7.11.2", "@babel/template": "7.10.4", "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "@ngtools/webpack": "10.1.3", + "@ngtools/webpack": "10.2.0", "autoprefixer": "9.8.6", "babel-loader": "8.1.0", "browserslist": "^4.9.1", @@ -107,7 +107,7 @@ "postcss-loader": "3.0.0", "raw-loader": "4.0.1", "regenerator-runtime": "0.13.7", - "resolve-url-loader": "3.1.1", + "resolve-url-loader": "3.1.2", "rimraf": "3.0.2", "rollup": "2.26.5", "rxjs": "6.6.2", @@ -133,6 +133,41 @@ "worker-plugin": "5.0.0" }, "dependencies": { + "@angular-devkit/architect": { + "version": "0.1002.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1002.0.tgz", + "integrity": "sha512-twM8V03ujBIGVpgV1PBlSDodUdxtUb7WakutfWafAvEHUsgwzfvQz2VtKWvjNZ9AiYjnCuwkQaclqVv0VHNo9w==", + "dev": true, + "requires": { + "@angular-devkit/core": "10.2.0", + "rxjs": "6.6.2" + } + }, + "@angular-devkit/core": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz", + "integrity": "sha512-XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==", + "dev": true, + "requires": { + "ajv": "6.12.4", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.6.2", + "source-map": "0.7.3" + } + }, + "ajv": { + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "core-js": { "version": "3.6.4", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz", @@ -149,9 +184,9 @@ } }, "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true } } @@ -184,9 +219,9 @@ } }, "@angular-devkit/build-optimizer": { - "version": "0.1001.3", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1001.3.tgz", - "integrity": "sha512-tQy4ADOVDL0hJcykpZzqfInQV6ft499E3g+D0jcZL/imSsxH4EaaBA2HCc0JTeAFjmkI32OhD9T8G/swqqBcVw==", + "version": "0.1002.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1002.0.tgz", + "integrity": "sha512-ACnm9doPMbRtSy1UZN5ir7smeLMx0g0oW7jX3jyPepeQKZ+9U1Bn09t10NLZQH+Z509jWZgvNJH/aOh85P6euw==", "dev": true, "requires": { "loader-utils": "2.0.0", @@ -205,16 +240,51 @@ } }, "@angular-devkit/build-webpack": { - "version": "0.1001.3", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1001.3.tgz", - "integrity": "sha512-XpAEWRWIdh/bk2UHkP7iIjEiVwkQkAWoZPNYMJzg3iN/iAAdUDPiNBTXhFZEZjFEWT0RXl4iKW2hr5LFvpe6lw==", + "version": "0.1002.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1002.0.tgz", + "integrity": "sha512-TLBBQ6ANOLKXOPxpCOnxAtoknwHA7XhsLuueN06w5qqF+QNNbWUMPoieKFGs2TnotfCgbiq6x57IDEZTyT6V0w==", "dev": true, "requires": { - "@angular-devkit/architect": "0.1001.3", - "@angular-devkit/core": "10.1.3", + "@angular-devkit/architect": "0.1002.0", + "@angular-devkit/core": "10.2.0", "rxjs": "6.6.2" }, "dependencies": { + "@angular-devkit/architect": { + "version": "0.1002.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1002.0.tgz", + "integrity": "sha512-twM8V03ujBIGVpgV1PBlSDodUdxtUb7WakutfWafAvEHUsgwzfvQz2VtKWvjNZ9AiYjnCuwkQaclqVv0VHNo9w==", + "dev": true, + "requires": { + "@angular-devkit/core": "10.2.0", + "rxjs": "6.6.2" + } + }, + "@angular-devkit/core": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz", + "integrity": "sha512-XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==", + "dev": true, + "requires": { + "ajv": "6.12.4", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.6.2", + "source-map": "0.7.3" + } + }, + "ajv": { + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "rxjs": { "version": "6.6.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", @@ -225,9 +295,9 @@ } }, "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true } } @@ -622,23 +692,10 @@ } }, "@babel/compat-data": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz", - "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==", - "dev": true, - "requires": { - "browserslist": "^4.12.0", - "invariant": "^2.2.4", - "semver": "^5.5.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz", + "integrity": "sha512-725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==", + "dev": true }, "@babel/core": { "version": "7.11.1", @@ -717,15 +774,14 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz", - "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz", + "integrity": "sha512-jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g==", "dev": true, "requires": { - "@babel/compat-data": "^7.10.4", + "@babel/compat-data": "^7.12.1", + "@babel/helper-validator-option": "^7.12.1", "browserslist": "^4.12.0", - "invariant": "^2.2.4", - "levenary": "^1.1.1", "semver": "^5.5.0" }, "dependencies": { @@ -738,28 +794,27 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz", - "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz", + "integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==", "dev": true, "requires": { "@babel/helper-function-name": "^7.10.4", - "@babel/helper-member-expression-to-functions": "^7.10.5", + "@babel/helper-member-expression-to-functions": "^7.12.1", "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-replace-supers": "^7.12.1", "@babel/helper-split-export-declaration": "^7.10.4" } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz", - "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz", + "integrity": "sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.10.4", "@babel/helper-regex": "^7.10.4", - "regexpu-core": "^4.7.0" + "regexpu-core": "^4.7.1" } }, "@babel/helper-define-map": { @@ -774,12 +829,12 @@ } }, "@babel/helper-explode-assignable-expression": { - "version": "7.11.4", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz", - "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz", + "integrity": "sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "^7.12.1" } }, "@babel/helper-function-name": { @@ -812,35 +867,37 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz", - "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", + "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", "dev": true, "requires": { - "@babel/types": "^7.11.0" + "@babel/types": "^7.12.1" } }, "@babel/helper-module-imports": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", - "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz", + "integrity": "sha512-ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "^7.12.1" } }, "@babel/helper-module-transforms": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz", - "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz", + "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4", - "@babel/helper-simple-access": "^7.10.4", + "@babel/helper-module-imports": "^7.12.1", + "@babel/helper-replace-supers": "^7.12.1", + "@babel/helper-simple-access": "^7.12.1", "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/helper-validator-identifier": "^7.10.4", "@babel/template": "^7.10.4", - "@babel/types": "^7.11.0", + "@babel/traverse": "^7.12.1", + "@babel/types": "^7.12.1", "lodash": "^4.17.19" } }, @@ -869,46 +926,44 @@ } }, "@babel/helper-remap-async-to-generator": { - "version": "7.11.4", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz", - "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz", + "integrity": "sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.10.4", "@babel/helper-wrap-function": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/types": "^7.12.1" } }, "@babel/helper-replace-supers": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz", - "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz", + "integrity": "sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.10.4", + "@babel/helper-member-expression-to-functions": "^7.12.1", "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/traverse": "^7.12.1", + "@babel/types": "^7.12.1" } }, "@babel/helper-simple-access": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz", - "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz", + "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==", "dev": true, "requires": { - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/types": "^7.12.1" } }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz", - "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz", + "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==", "dev": true, "requires": { - "@babel/types": "^7.11.0" + "@babel/types": "^7.12.1" } }, "@babel/helper-split-export-declaration": { @@ -926,10 +981,16 @@ "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", "dev": true }, + "@babel/helper-validator-option": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz", + "integrity": "sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==", + "dev": true + }, "@babel/helper-wrap-function": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz", - "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==", + "version": "7.12.3", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz", + "integrity": "sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==", "dev": true, "requires": { "@babel/helper-function-name": "^7.10.4", @@ -939,14 +1000,14 @@ } }, "@babel/helpers": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz", - "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz", + "integrity": "sha512-9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==", "dev": true, "requires": { "@babel/template": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/traverse": "^7.12.1", + "@babel/types": "^7.12.1" } }, "@babel/highlight": { @@ -961,36 +1022,36 @@ } }, "@babel/parser": { - "version": "7.11.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz", - "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==", + "version": "7.12.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz", + "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==", "dev": true }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz", - "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz", + "integrity": "sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-remap-async-to-generator": "^7.10.4", + "@babel/helper-remap-async-to-generator": "^7.12.1", "@babel/plugin-syntax-async-generators": "^7.8.0" } }, "@babel/plugin-proposal-class-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz", - "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz", + "integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.10.4", + "@babel/helper-create-class-features-plugin": "^7.12.1", "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz", - "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz", + "integrity": "sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", @@ -998,9 +1059,9 @@ } }, "@babel/plugin-proposal-export-namespace-from": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz", - "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz", + "integrity": "sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", @@ -1008,9 +1069,9 @@ } }, "@babel/plugin-proposal-json-strings": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz", - "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz", + "integrity": "sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", @@ -1018,9 +1079,9 @@ } }, "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz", - "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz", + "integrity": "sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", @@ -1028,9 +1089,9 @@ } }, "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz", - "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz", + "integrity": "sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", @@ -1038,9 +1099,9 @@ } }, "@babel/plugin-proposal-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz", - "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz", + "integrity": "sha512-MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", @@ -1048,20 +1109,20 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz", - "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz", + "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-transform-parameters": "^7.10.4" + "@babel/plugin-transform-parameters": "^7.12.1" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz", - "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz", + "integrity": "sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", @@ -1069,33 +1130,33 @@ } }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz", - "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz", + "integrity": "sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0", + "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", "@babel/plugin-syntax-optional-chaining": "^7.8.0" } }, "@babel/plugin-proposal-private-methods": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz", - "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz", + "integrity": "sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.10.4", + "@babel/helper-create-class-features-plugin": "^7.12.1", "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz", - "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz", + "integrity": "sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4", + "@babel/helper-create-regexp-features-plugin": "^7.12.1", "@babel/helper-plugin-utils": "^7.10.4" } }, @@ -1109,9 +1170,9 @@ } }, "@babel/plugin-syntax-class-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz", - "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz", + "integrity": "sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" @@ -1199,56 +1260,56 @@ } }, "@babel/plugin-syntax-top-level-await": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz", - "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz", + "integrity": "sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz", - "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz", + "integrity": "sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz", - "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz", + "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-module-imports": "^7.12.1", "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-remap-async-to-generator": "^7.10.4" + "@babel/helper-remap-async-to-generator": "^7.12.1" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz", - "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz", + "integrity": "sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.11.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz", - "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz", + "integrity": "sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-classes": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz", - "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz", + "integrity": "sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.10.4", @@ -1256,52 +1317,52 @@ "@babel/helper-function-name": "^7.10.4", "@babel/helper-optimise-call-expression": "^7.10.4", "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-replace-supers": "^7.12.1", "@babel/helper-split-export-declaration": "^7.10.4", "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz", - "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz", + "integrity": "sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-destructuring": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz", - "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz", + "integrity": "sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz", - "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz", + "integrity": "sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4", + "@babel/helper-create-regexp-features-plugin": "^7.12.1", "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz", - "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz", + "integrity": "sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz", - "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz", + "integrity": "sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==", "dev": true, "requires": { "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4", @@ -1309,18 +1370,18 @@ } }, "@babel/plugin-transform-for-of": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz", - "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz", + "integrity": "sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-function-name": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz", - "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz", + "integrity": "sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==", "dev": true, "requires": { "@babel/helper-function-name": "^7.10.4", @@ -1328,128 +1389,128 @@ } }, "@babel/plugin-transform-literals": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz", - "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz", + "integrity": "sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz", - "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz", + "integrity": "sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz", - "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz", + "integrity": "sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.5", + "@babel/helper-module-transforms": "^7.12.1", "@babel/helper-plugin-utils": "^7.10.4", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz", - "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz", + "integrity": "sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.4", + "@babel/helper-module-transforms": "^7.12.1", "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-simple-access": "^7.10.4", + "@babel/helper-simple-access": "^7.12.1", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz", - "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz", + "integrity": "sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==", "dev": true, "requires": { "@babel/helper-hoist-variables": "^7.10.4", - "@babel/helper-module-transforms": "^7.10.5", + "@babel/helper-module-transforms": "^7.12.1", "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-validator-identifier": "^7.10.4", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz", - "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz", + "integrity": "sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.4", + "@babel/helper-module-transforms": "^7.12.1", "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz", - "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz", + "integrity": "sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.12.1" } }, "@babel/plugin-transform-new-target": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz", - "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz", + "integrity": "sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-object-super": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz", - "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz", + "integrity": "sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4" + "@babel/helper-replace-supers": "^7.12.1" } }, "@babel/plugin-transform-parameters": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz", - "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz", + "integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.10.4", "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-property-literals": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz", - "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz", + "integrity": "sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-regenerator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz", - "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz", + "integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==", "dev": true, "requires": { "regenerator-transform": "^0.14.2" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz", - "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz", + "integrity": "sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" @@ -1476,28 +1537,28 @@ } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz", - "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz", + "integrity": "sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-spread": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz", - "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz", + "integrity": "sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0" + "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz", - "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz", + "integrity": "sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", @@ -1505,40 +1566,39 @@ } }, "@babel/plugin-transform-template-literals": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz", - "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz", + "integrity": "sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz", - "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz", + "integrity": "sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz", - "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz", + "integrity": "sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz", - "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz", + "integrity": "sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4", + "@babel/helper-create-regexp-features-plugin": "^7.12.1", "@babel/helper-plugin-utils": "^7.10.4" } }, @@ -1660,29 +1720,29 @@ } }, "@babel/traverse": { - "version": "7.11.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz", - "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz", + "integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.11.5", + "@babel/generator": "^7.12.1", "@babel/helper-function-name": "^7.10.4", "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.11.5", - "@babel/types": "^7.11.5", + "@babel/parser": "^7.12.1", + "@babel/types": "^7.12.1", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" }, "dependencies": { "@babel/generator": { - "version": "7.11.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz", - "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz", + "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==", "dev": true, "requires": { - "@babel/types": "^7.11.5", + "@babel/types": "^7.12.1", "jsesc": "^2.5.1", "source-map": "^0.5.0" } @@ -1696,9 +1756,9 @@ } }, "@babel/types": { - "version": "7.11.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", - "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz", + "integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -1707,25 +1767,25 @@ } }, "@farmmaps/common": { - "version": "0.0.1-prerelease.434", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.434.tgz", - "integrity": "sha512-4xDbu8GV7iP05ZfHx2IoA0imvbdmCM+bUnNQ8kUAGvvudgg4pzDsItFG5PkQBnYd7IfpLiwOLXHCFAa6SvijCg==", + "version": "0.0.1-prerelease.454", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.454.tgz", + "integrity": "sha512-qG4p/+7nHkqDU0ZtaBoNFoTWuVimyVEcDKAy9G0fQ+grDw/btos5jDzB0ON7ufituGrSwe5D5NT/1m4BTLu9PQ==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map": { - "version": "0.0.1-prerelease.434", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.434.tgz", - "integrity": "sha512-DGp6cRGSpyJ/TxnQ3XH1enXJO1vQgULixU9i2HGgs5/2Gc65Cps3oPRObYrzjwPEOATfDGGthzdveeL5+cpGMg==", + "version": "0.0.1-prerelease.454", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.454.tgz", + "integrity": "sha512-wn1bNxlUCPMEwUZrs72hL/2+W33iwzSXCZY5+MmeQRH76XhvtHUj4dNyHAPday88BB9ttkYItRCMDFnRLCvnrA==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map3d": { - "version": "0.0.1-prerelease.434", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.434.tgz", - "integrity": "sha512-EbtdamVsJlop2EHJRYUzrXsz2356CCjyRYbrPKNCrhMtXhKLk2hRW2of5C4+LVdcutCudJbAa6zll9k6Nb905w==", + "version": "0.0.1-prerelease.454", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.454.tgz", + "integrity": "sha512-W9wSW6Rmot0ij9U/Id5Dzbnua96hK6jp4Hw0yzLJtwrC3nxxexqnZsgYhS7UN9y1U6DsTOmqFISpLe3JG3N+ZQ==", "requires": { "tslib": "^2.0.0" } @@ -1792,14 +1852,56 @@ } }, "@ngtools/webpack": { - "version": "10.1.3", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.1.3.tgz", - "integrity": "sha512-wEg3hY0u+HMAIypClOVnpjYaNwBp+yY0pEb1yNc3Id8bBlw76Y+wk+kGplESelkNQKlfwKDaMFk+7EjGkOrmng==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.2.0.tgz", + "integrity": "sha512-W4SSFNQhIiC8JRhIn3c4mb1+fsFKiHp+THVMAUNo+wRZEt/rgzsCdnqv0EmQJJojZhnilUIyB/wVYJu2+S/Bxg==", "dev": true, "requires": { - "@angular-devkit/core": "10.1.3", + "@angular-devkit/core": "10.2.0", "enhanced-resolve": "4.3.0", "webpack-sources": "1.4.3" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz", + "integrity": "sha512-XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==", + "dev": true, + "requires": { + "ajv": "6.12.4", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.6.2", + "source-map": "0.7.3" + } + }, + "ajv": { + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "rxjs": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "@nodelib/fs.scandir": { @@ -2269,56 +2371,19 @@ } }, "acorn": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", - "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", "dev": true }, "adjust-sourcemap-loader": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz", - "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz", + "integrity": "sha512-YBrGyT2/uVQ/c6Rr+t6ZJXniY03YtHGMJQYal368burRGYKqhx9qGTWqcBU5s1CwYY9E/ri63RYyG1IacMZtqw==", "dev": true, "requires": { - "assert": "1.4.1", - "camelcase": "5.0.0", - "loader-utils": "1.2.3", - "object-path": "0.11.4", - "regex-parser": "2.2.10" - }, - "dependencies": { - "camelcase": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", - "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==", - "dev": true - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true - }, - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", - "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^2.0.0", - "json5": "^1.0.1" - } - } + "loader-utils": "^2.0.0", + "regex-parser": "^2.2.11" } }, "adm-zip": { @@ -2576,12 +2641,30 @@ } }, "assert": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", - "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", + "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", "dev": true, "requires": { + "object-assign": "^4.1.1", "util": "0.10.3" + }, + "dependencies": { + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true + }, + "util": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "dev": true, + "requires": { + "inherits": "2.0.1" + } + } } }, "assert-plus": { @@ -3229,9 +3312,9 @@ "dev": true }, "camelcase": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz", - "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz", + "integrity": "sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ==", "dev": true }, "caniuse-api": { @@ -3317,9 +3400,9 @@ }, "dependencies": { "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true } } @@ -5302,9 +5385,9 @@ "dev": true }, "fastq": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", - "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz", + "integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -5608,9 +5691,9 @@ "dev": true }, "gensync": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", - "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==", + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true }, "get-caller-file": { @@ -8303,26 +8386,11 @@ "vm-browserify": "^1.0.1" }, "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true - }, - "util": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", - "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", - "dev": true, - "requires": { - "inherits": "2.0.3" - } } } }, @@ -8577,30 +8645,31 @@ "dev": true }, "object-is": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", - "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz", + "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==", "dev": true, "requires": { "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "es-abstract": "^1.18.0-next.1" }, "dependencies": { "es-abstract": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", - "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-regex": "^1.1.0", - "object-inspect": "^1.7.0", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", "object-keys": "^1.1.1", - "object.assign": "^4.1.0", + "object.assign": "^4.1.1", "string.prototype.trimend": "^1.0.1", "string.prototype.trimstart": "^1.0.1" } @@ -8613,12 +8682,6 @@ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true }, - "object-path": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz", - "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=", - "dev": true - }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", @@ -9521,9 +9584,9 @@ } }, "postcss-load-config": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.1.tgz", - "integrity": "sha512-D2ENobdoZsW0+BHy4x1CAkXtbXtYWYRIxL/JbtRBqrRGOPtJ2zoga/bEZWhV/ShWB5saVxJMzbMdSyA/vv4tXw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz", + "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", "dev": true, "requires": { "cosmiconfig": "^5.0.0", @@ -10820,9 +10883,9 @@ } }, "regex-parser": { - "version": "2.2.10", - "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz", - "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==", + "version": "2.2.11", + "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz", + "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==", "dev": true }, "regexp.prototype.flags": { @@ -10836,20 +10899,20 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", - "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-regex": "^1.1.0", - "object-inspect": "^1.7.0", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", "object-keys": "^1.1.1", - "object.assign": "^4.1.0", + "object.assign": "^4.1.1", "string.prototype.trimend": "^1.0.1", "string.prototype.trimstart": "^1.0.1" } @@ -10994,12 +11057,12 @@ "dev": true }, "resolve-url-loader": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz", - "integrity": "sha512-K1N5xUjj7v0l2j/3Sgs5b8CjrrgtC70SmdCuZiJ8tSyb5J+uk3FoeZ4b7yTnH6j7ngI+Bc5bldHJIa8hYdu2gQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz", + "integrity": "sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==", "dev": true, "requires": { - "adjust-sourcemap-loader": "2.0.0", + "adjust-sourcemap-loader": "3.0.0", "camelcase": "5.3.1", "compose-function": "3.0.3", "convert-source-map": "1.7.0", @@ -11203,9 +11266,9 @@ "dev": true }, "run-parallel": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", - "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz", + "integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==", "dev": true }, "run-queue": { @@ -12651,9 +12714,9 @@ "dev": true }, "timers-browserify": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", - "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", + "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", "dev": true, "requires": { "setimmediate": "^1.0.4" @@ -13097,18 +13160,18 @@ "dev": true }, "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", + "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", "dev": true, "requires": { - "inherits": "2.0.1" + "inherits": "2.0.3" }, "dependencies": { "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true } } @@ -14159,9 +14222,9 @@ "dev": true }, "whatwg-url": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz", - "integrity": "sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz", + "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==", "dev": true, "requires": { "lodash.sortby": "^4.7.0", diff --git a/package.json b/package.json index 4c72c89..15eba6d 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ "@angular/platform-browser": "~10.1.3", "@angular/platform-browser-dynamic": "~10.1.3", "@angular/router": "~10.1.3", - "@farmmaps/common": ">=0.0.1-prerelease.434 <0.0.1", - "@farmmaps/common-map": ">=0.0.1-prerelease.434 <0.0.1", - "@farmmaps/common-map3d": ">=0.0.1-prerelease.434 <0.0.1", + "@farmmaps/common": ">=0.0.1-prerelease.454 <0.0.1", + "@farmmaps/common-map": ">=0.0.1-prerelease.454 <0.0.1", + "@farmmaps/common-map3d": ">=0.0.1-prerelease.454 <0.0.1", "@microsoft/signalr": "^3.1.3", "@ng-bootstrap/ng-bootstrap": "^7.0", "@ngrx/effects": "^10.0", @@ -46,12 +46,12 @@ "moment": "^2.27.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.1001.3", + "@angular-builders/custom-webpack": "~10.0.1", + "@angular-devkit/build-angular": "^0.1002.0", "@angular-devkit/build-ng-packagr": "~0.1001.3", "@angular/cli": "^10.1.3", "@angular/compiler-cli": "~10.1.3", "@angular/language-service": "~10.1.3", - "@angular-builders/custom-webpack": "~10.0.1", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "~2.0.3", "@types/node": "^12.11.1", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 40efa4b..c0c1d20 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,21 +1,33 @@ import { NgModule } from '@angular/core'; -import { RouterModule ,UrlSegment} from '@angular/router'; +import { RouterModule, UrlSegment } from '@angular/router'; -import { AuthGuard,FullScreenGuard } from '@farmmaps/common'; -import { MapComponent } from '@farmmaps/common-map'; -import { Switch2D3DComponent } from '@farmmaps/common-map3d'; +import { AuthGuard, FullScreenGuard } from '@farmmaps/common'; +//import { MapComponent } from '@farmmaps/common-map'; +//import { Switch2D3DComponent } from '@farmmaps/common-map3d'; import { LogoComponent } from './logo/logo.component'; import { MenuComponent } from './menu/menu.component'; -import {RegisterDeviceComponent} from './registerdevice/registerdevice.component'; -import {NotImplementedComponent} from '@farmmaps/common'; +import { RegisterDeviceComponent } from './registerdevice/registerdevice.component'; +import { NotImplementedComponent } from '@farmmaps/common'; import { NavBarGuard } from 'projects/common/src/public-api'; -import {TestComponent} from './test/test.component'; +import { TestComponent } from './test/test.component'; +import { LandingpageComponent } from './landingpage/landingpage.component'; export function urlMatcher(url: UrlSegment[]) { - return {consumed:url}; + return { consumed: url }; } const routes = [ + + { + path: '', + canActivate: [NavBarGuard], + component: LandingpageComponent + }, + { + path: '', + component: LogoComponent, + outlet: 'header-logo' + }, { path: '', component: LogoComponent, @@ -27,50 +39,26 @@ const routes = [ outlet: 'side-panel-menu' }, { - path: '', - redirectTo: 'map', - pathMatch: 'full' - }, - { - path:'editor/:type/item/:itemcode', - canActivate:[NavBarGuard], + path: 'editor/:type/item/:itemcode', + canActivate: [NavBarGuard], component: NotImplementedComponent }, { - path:'viewer/:type/item/:itemcode', - canActivate:[NavBarGuard], + path: 'viewer/:type/item/:itemcode', + canActivate: [NavBarGuard], component: NotImplementedComponent }, - { path: 'map', canActivateChild: [AuthGuard],canActivate:[FullScreenGuard], children: [ - { - path: '', - component: MapComponent - }, - { - path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState', - component: MapComponent , - children: [ - { - path:'', - component: Switch2D3DComponent, - outlet: 'map-controls' - } - ] - }, - { - path: ':queryState', - component: MapComponent - } - ]}, - { - path:'registerdevice/:deviceToken', - canActivate:[FullScreenGuard], - component:RegisterDeviceComponent - }, - { - path:'test', - component: TestComponent - } + { path: 'map', loadChildren: () => import('../../projects/common-map/src/public-api').then(m => m.AppCommonMapModule), canActivateChild: [AuthGuard], canActivate: [FullScreenGuard] }, + { path: 'map3d', loadChildren: () => import('./map3d/map3d.module').then(m => m.Map3DModule), canActivateChild: [AuthGuard], canActivate: [FullScreenGuard] }, + { + path: 'registerdevice/:deviceToken', + canActivate: [FullScreenGuard], + component: RegisterDeviceComponent + }, + { + path: 'test', + component: TestComponent + } ]; @NgModule({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ac145aa..354f3e5 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -23,6 +23,7 @@ import { SecureOAuthStorage} from '@farmmaps/common'; import { OAuthStorage } from 'angular-oauth2-oidc'; import {Id4AuthconfigFactory} from './id4AuthconfigFactory'; import { TestComponent } from './test/test.component'; +import { LandingpageComponent } from './landingpage/landingpage.component'; export const BOOTSTRAP_EFFECTS = new InjectionToken('Bootstrap Effects'); @@ -67,13 +68,13 @@ export const metaReducers: MetaReducer[] = [debug]; LogoComponent, MenuComponent, RegisterDeviceComponent, - TestComponent + TestComponent, + LandingpageComponent ], imports: [ AppRoutingModule, AppCommonModule, AppCommonServiceModule.forRoot(), - AppCommonMapModule.forRoot(), BrowserModule, StoreModule.forRoot({},{metaReducers,runtimeChecks: { // TODO fix this should all be true strictStateImmutability: false, diff --git a/src/app/landingpage/landingpage.component.html b/src/app/landingpage/landingpage.component.html new file mode 100644 index 0000000..c380b5b --- /dev/null +++ b/src/app/landingpage/landingpage.component.html @@ -0,0 +1,138 @@ +
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Fully Responsive

+

This theme will look great on any device, no matter the size!

+
+
+
+
+
+

Bootstrap 4 Ready

+

Featuring the latest build of the new Bootstrap 4 framework!

+
+
+
+
+
+

Easy to Use

+

Ready to use with your own content, or customize the source files!

+
+
+
+
+
+
+
+
+
+
+

Fully Responsive Design

+

When you use a theme created with Bootstrap, you know that the theme will look great on any device, whether it's a phone, tablet, or desktop the page will behave responsively!

+
+
+
+
+
+

Updated For Bootstrap 4

+

Newly improved, and full of great utility classes, Bootstrap 4 is leading the way in mobile responsive web development! All of the themes are now using Bootstrap 4!

+
+
+
+
+
+

Easy to Use & Customize

+

Landing Page is just HTML and CSS with a splash of SCSS for users who demand some deeper customization options. Out of the box, just add your content and images, and your new landing page will be ready to go!

+
+
+
+
+
+
+

What people are saying...

+
+
+
+
Margaret E.
+

"This is fantastic! Thanks so much guys!"

+
+
+
+
+
Fred S.
+

"Bootstrap is amazing. I've been using it to create lots of super nice landing pages."

+
+
+
+
+
Sarah W.
+

"Thanks so much for making these free resources available to us!"

+
+
+
+
+
+
+
+
+
+
+

Ready to get started? Sign up now!

+
+
+
+
+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/app/landingpage/landingpage.component.scss b/src/app/landingpage/landingpage.component.scss new file mode 100644 index 0000000..a362474 --- /dev/null +++ b/src/app/landingpage/landingpage.component.scss @@ -0,0 +1,133 @@ +@import "~bootstrap/scss/bootstrap.scss"; + +/*! + * Start Bootstrap - Landing Page v5.0.8 (https://startbootstrap.com/themes/landing-page) + * Copyright 2013-2020 Start Bootstrap + * Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-landing-page/blob/master/LICENSE) + */ + + body { + font-family: 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif; + } + + h1, + h2, + h3, + h4, + h5, + h6 { + font-family: 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-weight: 700; + } + + header.masthead { + position: relative; + background-color: #343a40; + background-size: cover; + padding-top: 8rem; + padding-bottom: 8rem; + } + + header.masthead .overlay { + position: absolute; + background-color: #212529; + height: 100%; + width: 100%; + top: 0; + left: 0; + opacity: 0.3; + } + + header.masthead h1 { + font-size: 2rem; + } + + @media (min-width: 768px) { + header.masthead { + padding-top: 12rem; + padding-bottom: 12rem; + } + header.masthead h1 { + font-size: 3rem; + } + } + + .showcase .showcase-text { + padding: 3rem; + } + + .showcase .showcase-img { + min-height: 30rem; + background-size: cover; + } + + @media (min-width: 768px) { + .showcase .showcase-text { + padding: 7rem; + } + } + + .features-icons { + padding-top: 7rem; + padding-bottom: 7rem; + } + + .features-icons .features-icons-item { + max-width: 20rem; + } + + .features-icons .features-icons-item .features-icons-icon { + height: 7rem; + } + + .features-icons .features-icons-item .features-icons-icon i { + font-size: 4.5rem; + } + + .features-icons .features-icons-item:hover .features-icons-icon i { + font-size: 5rem; + } + + .testimonials { + padding-top: 7rem; + padding-bottom: 7rem; + } + + .testimonials .testimonial-item { + max-width: 18rem; + } + + .testimonials .testimonial-item img { + max-width: 12rem; + box-shadow: 0px 5px 5px 0px #adb5bd; + } + + .call-to-action { + position: relative; + background-color: #343a40; + background-size: cover; + padding-top: 7rem; + padding-bottom: 7rem; + } + + .call-to-action .overlay { + position: absolute; + background-color: #212529; + height: 100%; + width: 100%; + top: 0; + left: 0; + opacity: 0.3; + } + + footer.footer { + padding-top: 4rem; + padding-bottom: 4rem; + } + + +#header { + background: url("/images/pexels-pixabay-207247.jpg"); + background-size: cover; + height: 100vh; +} \ No newline at end of file diff --git a/src/app/landingpage/landingpage.component.spec.ts b/src/app/landingpage/landingpage.component.spec.ts new file mode 100644 index 0000000..fb77e15 --- /dev/null +++ b/src/app/landingpage/landingpage.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TestComponent } from './landingpage.component'; + +describe('TestComponent', () => { + let component: TestComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ TestComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(TestComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/landingpage/landingpage.component.ts b/src/app/landingpage/landingpage.component.ts new file mode 100644 index 0000000..465c6c8 --- /dev/null +++ b/src/app/landingpage/landingpage.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; +import { ItemService} from '@farmmaps/common'; +import { Observable} from 'rxjs'; + +@Component({ + selector: 'app-test', + templateUrl: './landingpage.component.html', + styleUrls: ['./landingpage.component.scss'] +}) +export class LandingpageComponent implements OnInit { + + //public gradientItems:Observable + + constructor(private itemService$:ItemService) { + } + + ngOnInit(): void { + } +} diff --git a/src/app/map3d/map3d-router.module.ts b/src/app/map3d/map3d-router.module.ts new file mode 100644 index 0000000..deec725 --- /dev/null +++ b/src/app/map3d/map3d-router.module.ts @@ -0,0 +1,36 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { Switch2D3DComponent} from '../../../projects/common-map3d/src/public-api'; +import { MapComponent} from '../../../projects/common-map/src/public-api'; + +const routes = [ + { + path: '', + component: MapComponent + }, + { + path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState', + component: MapComponent, + children: [ + { + path: '', + component: Switch2D3DComponent, + outlet: 'map-controls' + } + ] + }, + { + path: ':queryState', + component: MapComponent + } + ]; + + @NgModule({ + imports: [ + RouterModule.forChild(routes), + ], + exports: [ + RouterModule + ] + }) + export class Map3DRouterModule { } \ No newline at end of file diff --git a/src/app/map3d/map3d.module.ts b/src/app/map3d/map3d.module.ts new file mode 100644 index 0000000..3549548 --- /dev/null +++ b/src/app/map3d/map3d.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { CommonMap3dModule} from '../../../projects/common-map3d/src/public-api'; +import { AppCommonMapModule} from '../../../projects/common-map/src/public-api'; +import {Map3DRouterModule} from './map3d-router.module'; + + + + @NgModule({ + imports: [ + Map3DRouterModule, + AppCommonMapModule, + CommonMap3dModule + ], + exports: [ + RouterModule + ] + }) + export class Map3DModule { } \ No newline at end of file diff --git a/src/assets/images/FarmMaps logo.png b/src/assets/images/FarmMaps logo.png new file mode 100644 index 0000000000000000000000000000000000000000..90c1810bd518cb174feeb6a252de374f4ba365b1 GIT binary patch literal 41719 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