From cd924a69a39d0b9c4b75c9a820f8120efd3f9206 Mon Sep 17 00:00:00 2001 From: Lu Nelson Date: Fri, 9 Aug 2019 19:20:37 +0200 Subject: [PATCH] clean the output from setup-typo a bit --- package-lock.json | 2226 ++++++++++--------- package.json | 2 +- scss/_setup-root.scss | 6 +- scss/_setup-theme.scss | 4 +- scss/_setup-typo.scss | 18 +- tests/_visual/app.scss | 35 +- tests/_visual/fonts/_neutral.scss | 2 +- tests/renders/output-core-root.dartsass.css | 4 - tests/renders/output-core-root.libsass.css | 4 - tests/renders/output-theme.dartsass.css | 4 +- tests/renders/output-theme.libsass.css | 4 +- tests/renders/output-typo.dartsass.css | 17 +- tests/renders/output-typo.libsass.css | 17 +- tests/snapshots/output-core-root.scss.md | 8 - tests/snapshots/output-core-root.scss.snap | Bin 556 -> 542 bytes tests/snapshots/output-theme.scss.md | 8 +- tests/snapshots/output-theme.scss.snap | Bin 18569 -> 18555 bytes tests/snapshots/output-typo.scss.md | 34 +- tests/snapshots/output-typo.scss.snap | Bin 1666 -> 1653 bytes 19 files changed, 1233 insertions(+), 1160 deletions(-) diff --git a/package-lock.json b/package-lock.json index c5982c3..0b65802 100644 --- a/package-lock.json +++ b/package-lock.json @@ -155,36 +155,45 @@ } }, "@babel/core": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.5.tgz", - "integrity": "sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz", + "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.4.4", - "@babel/helpers": "^7.4.4", - "@babel/parser": "^7.4.5", + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.5.5", + "@babel/helpers": "^7.5.5", + "@babel/parser": "^7.5.5", "@babel/template": "^7.4.4", - "@babel/traverse": "^7.4.5", - "@babel/types": "^7.4.4", + "@babel/traverse": "^7.5.5", + "@babel/types": "^7.5.5", "convert-source-map": "^1.1.0", "debug": "^4.1.0", "json5": "^2.1.0", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "resolve": "^1.3.2", "semver": "^5.4.1", "source-map": "^0.5.0" }, "dependencies": { + "@babel/code-frame": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", + "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", + "dev": true, + "requires": { + "@babel/highlight": "^7.0.0" + } + }, "@babel/generator": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz", - "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz", + "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==", "dev": true, "requires": { - "@babel/types": "^7.4.4", + "@babel/types": "^7.5.5", "jsesc": "^2.5.1", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "source-map": "^0.5.0", "trim-right": "^1.0.1" } @@ -199,9 +208,9 @@ } }, "@babel/parser": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz", - "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", + "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==", "dev": true }, "@babel/template": { @@ -216,30 +225,30 @@ } }, "@babel/traverse": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz", - "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz", + "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.4.4", + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.5.5", "@babel/helper-function-name": "^7.1.0", "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.4.5", - "@babel/types": "^7.4.4", + "@babel/parser": "^7.5.5", + "@babel/types": "^7.5.5", "debug": "^4.1.0", "globals": "^11.1.0", - "lodash": "^4.17.11" + "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", + "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } }, @@ -252,6 +261,12 @@ "ms": "^2.1.1" } }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -309,15 +324,24 @@ "@babel/types": "^7.4.4" }, "dependencies": { + "@babel/code-frame": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", + "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", + "dev": true, + "requires": { + "@babel/highlight": "^7.0.0" + } + }, "@babel/generator": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz", - "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz", + "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==", "dev": true, "requires": { - "@babel/types": "^7.4.4", + "@babel/types": "^7.5.5", "jsesc": "^2.5.1", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "source-map": "^0.5.0", "trim-right": "^1.0.1" } @@ -332,36 +356,36 @@ } }, "@babel/parser": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz", - "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", + "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==", "dev": true }, "@babel/traverse": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz", - "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz", + "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.4.4", + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.5.5", "@babel/helper-function-name": "^7.1.0", "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.4.5", - "@babel/types": "^7.4.4", + "@babel/parser": "^7.5.5", + "@babel/types": "^7.5.5", "debug": "^4.1.0", "globals": "^11.1.0", - "lodash": "^4.17.11" + "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", + "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } }, @@ -374,6 +398,12 @@ "ms": "^2.1.1" } }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -383,26 +413,32 @@ } }, "@babel/helper-define-map": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz", - "integrity": "sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz", + "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==", "dev": true, "requires": { "@babel/helper-function-name": "^7.1.0", - "@babel/types": "^7.4.4", - "lodash": "^4.17.11" + "@babel/types": "^7.5.5", + "lodash": "^4.17.13" }, "dependencies": { "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", + "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true } } }, @@ -446,25 +482,50 @@ }, "dependencies": { "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", + "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true } } }, "@babel/helper-member-expression-to-functions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz", - "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz", + "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.5.5" + }, + "dependencies": { + "@babel/types": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", + "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + } } }, "@babel/helper-module-imports": { @@ -477,17 +538,17 @@ } }, "@babel/helper-module-transforms": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz", - "integrity": "sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz", + "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/helper-simple-access": "^7.1.0", "@babel/helper-split-export-declaration": "^7.4.4", "@babel/template": "^7.4.4", - "@babel/types": "^7.4.4", - "lodash": "^4.17.11" + "@babel/types": "^7.5.5", + "lodash": "^4.17.13" }, "dependencies": { "@babel/helper-split-export-declaration": { @@ -500,9 +561,9 @@ } }, "@babel/parser": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz", - "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", + "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==", "dev": true }, "@babel/template": { @@ -517,15 +578,21 @@ } }, "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", + "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true } } }, @@ -545,12 +612,20 @@ "dev": true }, "@babel/helper-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.4.tgz", - "integrity": "sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz", + "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==", "dev": true, "requires": { - "lodash": "^4.17.11" + "lodash": "^4.17.13" + }, + "dependencies": { + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + } } }, "@babel/helper-remap-async-to-generator": { @@ -567,26 +642,35 @@ } }, "@babel/helper-replace-supers": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz", - "integrity": "sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz", + "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.0.0", + "@babel/helper-member-expression-to-functions": "^7.5.5", "@babel/helper-optimise-call-expression": "^7.0.0", - "@babel/traverse": "^7.4.4", - "@babel/types": "^7.4.4" + "@babel/traverse": "^7.5.5", + "@babel/types": "^7.5.5" }, "dependencies": { + "@babel/code-frame": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", + "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", + "dev": true, + "requires": { + "@babel/highlight": "^7.0.0" + } + }, "@babel/generator": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz", - "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz", + "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==", "dev": true, "requires": { - "@babel/types": "^7.4.4", + "@babel/types": "^7.5.5", "jsesc": "^2.5.1", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "source-map": "^0.5.0", "trim-right": "^1.0.1" } @@ -601,36 +685,36 @@ } }, "@babel/parser": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz", - "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", + "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==", "dev": true }, "@babel/traverse": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz", - "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz", + "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.4.4", + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.5.5", "@babel/helper-function-name": "^7.1.0", "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.4.5", - "@babel/types": "^7.4.4", + "@babel/parser": "^7.5.5", + "@babel/types": "^7.5.5", "debug": "^4.1.0", "globals": "^11.1.0", - "lodash": "^4.17.11" + "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", + "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } }, @@ -643,6 +727,12 @@ "ms": "^2.1.1" } }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -683,25 +773,25 @@ } }, "@babel/helpers": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz", - "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz", + "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==", "dev": true, "requires": { "@babel/template": "^7.4.4", - "@babel/traverse": "^7.4.4", - "@babel/types": "^7.4.4" + "@babel/traverse": "^7.5.5", + "@babel/types": "^7.5.5" }, "dependencies": { "@babel/generator": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz", - "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz", + "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==", "dev": true, "requires": { - "@babel/types": "^7.4.4", + "@babel/types": "^7.5.5", "jsesc": "^2.5.1", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "source-map": "^0.5.0", "trim-right": "^1.0.1" } @@ -716,9 +806,9 @@ } }, "@babel/parser": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz", - "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", + "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==", "dev": true }, "@babel/template": { @@ -733,30 +823,41 @@ } }, "@babel/traverse": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz", - "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz", + "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.4.4", + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.5.5", "@babel/helper-function-name": "^7.1.0", "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.4.5", - "@babel/types": "^7.4.4", + "@babel/parser": "^7.5.5", + "@babel/types": "^7.5.5", "debug": "^4.1.0", "globals": "^11.1.0", - "lodash": "^4.17.11" + "lodash": "^4.17.13" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", + "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", + "dev": true, + "requires": { + "@babel/highlight": "^7.0.0" + } + } } }, "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", + "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } }, @@ -769,6 +870,12 @@ "ms": "^2.1.1" } }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -825,15 +932,6 @@ "integrity": "sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==", "dev": true }, - "@babel/plugin-external-helpers": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.2.0.tgz", - "integrity": "sha512-QFmtcCShFkyAsNtdCM3lJPmRe1iB+vPZymlB4LnDIKEBj2yKQLQKtoxXxJ8ePT5fwMl4QGg303p4mB0UsSI2/g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, "@babel/plugin-proposal-async-generator-functions": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz", @@ -845,6 +943,16 @@ "@babel/plugin-syntax-async-generators": "^7.2.0" } }, + "@babel/plugin-proposal-dynamic-import": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz", + "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-syntax-dynamic-import": "^7.2.0" + } + }, "@babel/plugin-proposal-json-strings": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz", @@ -856,9 +964,9 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz", - "integrity": "sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz", + "integrity": "sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -941,9 +1049,9 @@ } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz", - "integrity": "sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz", + "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", @@ -961,27 +1069,35 @@ } }, "@babel/plugin-transform-block-scoping": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz", - "integrity": "sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz", + "integrity": "sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "lodash": "^4.17.11" + "lodash": "^4.17.13" + }, + "dependencies": { + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + } } }, "@babel/plugin-transform-classes": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz", - "integrity": "sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz", + "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-define-map": "^7.4.4", + "@babel/helper-define-map": "^7.5.5", "@babel/helper-function-name": "^7.1.0", "@babel/helper-optimise-call-expression": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.4.4", + "@babel/helper-replace-supers": "^7.5.5", "@babel/helper-split-export-declaration": "^7.4.4", "globals": "^11.1.0" }, @@ -996,15 +1112,21 @@ } }, "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", + "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true } } }, @@ -1018,9 +1140,9 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz", - "integrity": "sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz", + "integrity": "sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" @@ -1038,9 +1160,9 @@ } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz", - "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz", + "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" @@ -1094,34 +1216,37 @@ } }, "@babel/plugin-transform-modules-amd": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz", - "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz", + "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==", "dev": true, "requires": { "@babel/helper-module-transforms": "^7.1.0", - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.0.0", + "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz", - "integrity": "sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz", + "integrity": "sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==", "dev": true, "requires": { "@babel/helper-module-transforms": "^7.4.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-simple-access": "^7.1.0" + "@babel/helper-simple-access": "^7.1.0", + "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz", - "integrity": "sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz", + "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==", "dev": true, "requires": { "@babel/helper-hoist-variables": "^7.4.4", - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.0.0", + "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-umd": { @@ -1153,13 +1278,13 @@ } }, "@babel/plugin-transform-object-super": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz", - "integrity": "sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz", + "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.1.0" + "@babel/helper-replace-supers": "^7.5.5" } }, "@babel/plugin-transform-parameters": { @@ -1277,43 +1402,45 @@ } }, "@babel/preset-env": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.5.tgz", - "integrity": "sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz", + "integrity": "sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0", "@babel/plugin-proposal-async-generator-functions": "^7.2.0", + "@babel/plugin-proposal-dynamic-import": "^7.5.0", "@babel/plugin-proposal-json-strings": "^7.2.0", - "@babel/plugin-proposal-object-rest-spread": "^7.4.4", + "@babel/plugin-proposal-object-rest-spread": "^7.5.5", "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", "@babel/plugin-syntax-async-generators": "^7.2.0", + "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/plugin-syntax-json-strings": "^7.2.0", "@babel/plugin-syntax-object-rest-spread": "^7.2.0", "@babel/plugin-syntax-optional-catch-binding": "^7.2.0", "@babel/plugin-transform-arrow-functions": "^7.2.0", - "@babel/plugin-transform-async-to-generator": "^7.4.4", + "@babel/plugin-transform-async-to-generator": "^7.5.0", "@babel/plugin-transform-block-scoped-functions": "^7.2.0", - "@babel/plugin-transform-block-scoping": "^7.4.4", - "@babel/plugin-transform-classes": "^7.4.4", + "@babel/plugin-transform-block-scoping": "^7.5.5", + "@babel/plugin-transform-classes": "^7.5.5", "@babel/plugin-transform-computed-properties": "^7.2.0", - "@babel/plugin-transform-destructuring": "^7.4.4", + "@babel/plugin-transform-destructuring": "^7.5.0", "@babel/plugin-transform-dotall-regex": "^7.4.4", - "@babel/plugin-transform-duplicate-keys": "^7.2.0", + "@babel/plugin-transform-duplicate-keys": "^7.5.0", "@babel/plugin-transform-exponentiation-operator": "^7.2.0", "@babel/plugin-transform-for-of": "^7.4.4", "@babel/plugin-transform-function-name": "^7.4.4", "@babel/plugin-transform-literals": "^7.2.0", "@babel/plugin-transform-member-expression-literals": "^7.2.0", - "@babel/plugin-transform-modules-amd": "^7.2.0", - "@babel/plugin-transform-modules-commonjs": "^7.4.4", - "@babel/plugin-transform-modules-systemjs": "^7.4.4", + "@babel/plugin-transform-modules-amd": "^7.5.0", + "@babel/plugin-transform-modules-commonjs": "^7.5.0", + "@babel/plugin-transform-modules-systemjs": "^7.5.0", "@babel/plugin-transform-modules-umd": "^7.2.0", "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5", "@babel/plugin-transform-new-target": "^7.4.4", - "@babel/plugin-transform-object-super": "^7.2.0", + "@babel/plugin-transform-object-super": "^7.5.5", "@babel/plugin-transform-parameters": "^7.4.4", "@babel/plugin-transform-property-literals": "^7.2.0", "@babel/plugin-transform-regenerator": "^7.4.5", @@ -1324,7 +1451,7 @@ "@babel/plugin-transform-template-literals": "^7.4.4", "@babel/plugin-transform-typeof-symbol": "^7.2.0", "@babel/plugin-transform-unicode-regex": "^7.4.4", - "@babel/types": "^7.4.4", + "@babel/types": "^7.5.5", "browserslist": "^4.6.0", "core-js-compat": "^3.1.1", "invariant": "^2.2.2", @@ -1333,16 +1460,22 @@ }, "dependencies": { "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", + "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + }, "semver": { "version": "5.7.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", @@ -1425,121 +1558,240 @@ } }, "@lunelson/penny": { - "version": "2.0.0-alpha.11", - "resolved": "https://registry.npmjs.org/@lunelson/penny/-/penny-2.0.0-alpha.11.tgz", - "integrity": "sha512-A2XV4h2ybm2y8aJswVCCNjatm/xy7EztAHslqU/dA3ZQ1RQt128zrRiXv/k266bCDipk+LM6fx2oqUpr1VJVwQ==", - "dev": true, - "requires": { - "@babel/core": "^7.1.2", - "@babel/plugin-external-helpers": "^7.0.0", - "@babel/plugin-proposal-object-rest-spread": "^7.0.0", - "@babel/plugin-syntax-dynamic-import": "^7.0.0", - "@babel/polyfill": "^7.0.0", - "@babel/preset-env": "^7.1.0", - "acorn": "^6.0.2", - "ajv": "^6.5.4", - "anymatch": "^2.0.0", - "autoprefixer": "^9.3.1", - "babel-loader": "^8.0.4", - "babel-plugin-module-resolver": "^3.1.1", - "browser-sync": "^2.26.3", - "casual": "^1.5.19", - "chance": "^1.0.16", - "change-case": "^3.0.2", - "chokidar": "^2.0.4", - "commander": "^2.19.0", - "cosmiconfig": "^5.0.6", - "cp-file": "^6.0.0", + "version": "2.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/@lunelson/penny/-/penny-2.0.0-alpha.14.tgz", + "integrity": "sha512-tLXjS2rQz4EntHplruArzjPAEw8Niix0OSKUh/u2g6LKMyGMmwyWCfjI1GVTwGbYwR28OuJODlautSg8HtX8Fg==", + "dev": true, + "requires": { + "@babel/core": "^7.4.5", + "@babel/plugin-proposal-object-rest-spread": "^7.4.4", + "@babel/plugin-syntax-dynamic-import": "^7.2.0", + "@babel/polyfill": "^7.4.4", + "@babel/preset-env": "^7.4.5", + "acorn": "^6.1.1", + "ajv": "^6.10.0", + "anymatch": "^3.0.2", + "autoprefixer": "^9.6.0", + "babel-loader": "^8.0.6", + "babel-plugin-module-resolver": "^3.2.0", + "browser-sync": "^2.26.7", + "casual": "^1.6.2", + "chance": "^1.0.18", + "change-case": "^3.1.0", + "chokidar": "^3.0.1", + "commander": "^2.20.0", + "core-js": "^3.1.4", + "cosmiconfig": "^5.2.1", + "cp-file": "^7.0.0", "cross-env": "^5.2.0", - "css-loader": "^2.1.0", + "css-loader": "^3.0.0", "csv-load-sync": "^1.0.0", - "date-fns": "^1.29.0", - "dayjs": "^1.7.7", - "del": "^3.0.0", + "date-fns": "^1.30.1", + "dayjs": "^1.8.14", + "del": "^4.1.1", "eazy-logger": "^3.0.2", "faker": "^4.1.0", - "file-loader": "^3.0.1", + "file-loader": "^4.0.0", "filter-files": "^0.4.0", "findup-sync": "^3.0.0", - "gray-matter": "^4.0.1", + "gray-matter": "^4.0.2", "http2": "^3.3.7", - "image-size": "^0.6.3", + "image-size": "^0.7.4", "js-string-escape": "^1.0.1", - "junk": "^2.1.0", + "junk": "^3.1.0", "lodash": "^4.17.11", "markdown-it": "^8.4.2", - "markdown-it-attrs": "^2.3.2", + "markdown-it-attrs": "^2.4.1", "markdown-it-deflist": "^2.0.3", "markdown-it-emoji": "^1.4.0", "markdown-it-footnote": "^3.0.1", + "markdown-it-implicit-figures": "^0.9.0", "markdown-it-mark": "^2.0.0", "markdown-it-mentions": "^1.0.0", "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mini-css-extract-plugin": "^0.5.0", - "moment": "^2.22.2", - "node-dev": "^3.1.3", - "node-sass": "^4.9.4", + "micromatch": "^4.0.2", + "mini-css-extract-plugin": "^0.7.0", + "moment": "^2.24.0", + "node-dev": "^4.0.0", + "node-sass": "^4.12.0", "node-sass-utils": "^1.1.2", - "parseurl": "^1.3.2", - "postcss": "^7.0.5", + "parseurl": "^1.3.3", + "postcss": "^7.0.17", "postcss-clean": "^1.1.0", "postcss-loader": "^3.0.0", - "posthtml": "^0.11.3", + "posthtml": "^0.11.4", "posthtml-alt-always": "^1.0.1", "posthtml-collect-styles": "0.0.1", "posthtml-doctype": "^1.1.1", "posthtml-minifier": "^0.1.0", "prevent-widows": "^1.0.2", - "pug": "^2.0.3", + "pug": "^2.0.4", "pug-plain-loader": "^1.0.0", - "qs": "^6.5.2", - "raw-loader": "^1.0.0", + "qs": "^6.7.0", + "raw-loader": "^3.0.0", "read-data": "^1.1.0", "recursive-readdir": "^2.2.2", - "resolve": "^1.8.1", + "resolve": "^1.11.1", "sass-loader": "^7.1.0", "serve-favicon": "^2.5.0", - "strip-ansi": "^5.0.0", - "to-readable-stream": "^1.0.0", - "uglifyjs-webpack-plugin": "^2.0.1", - "update-notifier": "^2.5.0", - "url-loader": "^1.1.2", + "strip-ansi": "^5.2.0", + "to-readable-stream": "^2.1.0", + "uglifyjs-webpack-plugin": "^2.1.3", + "update-notifier": "^3.0.0", + "url-loader": "^2.0.1", "url-pattern": "^1.0.3", - "vue": "^2.5.21", - "vue-loader": "^15.5.1", - "vue-template-compiler": "^2.5.21", - "webpack": "^4.23.1", + "vue": "^2.6.10", + "vue-loader": "^15.7.0", + "vue-template-compiler": "^2.6.10", + "webpack": "^4.35.0", "write": "^1.0.3", - "yn": "^3.0.0" + "yn": "^3.1.0" }, "dependencies": { + "ajv": { + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "dev": true, + "requires": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, - "del": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", - "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "dev": true + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "globby": "^6.1.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "p-map": "^1.1.1", - "pify": "^3.0.0", - "rimraf": "^2.2.8" + "fill-range": "^7.0.1" } }, - "pify": { + "chokidar": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz", + "integrity": "sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==", + "dev": true, + "requires": { + "anymatch": "^3.0.1", + "braces": "^3.0.2", + "fsevents": "^2.0.6", + "glob-parent": "^5.0.0", + "is-binary-path": "^2.1.0", + "is-glob": "^4.0.1", + "normalize-path": "^3.0.0", + "readdirp": "^3.1.1" + } + }, + "core-js": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.0.tgz", + "integrity": "sha512-gybgLzmr7SQRSF6UzGYXducx4eE10ONQlyEnQoqiGPbmbn7zLkb73tPfc4YbZN0lvcTQwoLNPjq4RuCaCumGyQ==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz", + "integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==", + "dev": true, + "optional": true + }, + "glob-parent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", + "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "normalize-path": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true + }, + "readdirp": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.1.tgz", + "integrity": "sha512-XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ==", + "dev": true, + "requires": { + "picomatch": "^2.0.4" + } + }, + "resolve": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", + "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -1548,6 +1800,21 @@ "requires": { "ansi-regex": "^4.1.0" } + }, + "to-readable-stream": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-2.1.0.tgz", + "integrity": "sha512-o3Qa6DGg1CEXshSdvWNX2sN4QHqg03SPq7U6jPXRahlQdl5dK8oXjkU/2/sGrnOZKeGV1zLSO8qPwyKklPPE7w==", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } } } }, @@ -1657,9 +1924,9 @@ "dev": true }, "@vue/component-compiler-utils": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz", - "integrity": "sha512-IHjxt7LsOFYc0DkTncB7OXJL7UzwOLPPQCfEUNyxL2qt+tF12THV+EO33O1G2Uk4feMSWua3iD39Itszx0f0bw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz", + "integrity": "sha512-am+04/0UX7ektcmvhYmrf84BDVAD8afFOf4asZjN84q8xzxFclbk5x0MtxuKGfp+zjN5WWPJn3fjFAWtDdIGSw==", "dev": true, "requires": { "consolidate": "^0.15.1", @@ -1920,15 +2187,9 @@ } }, "acorn": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", - "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", - "dev": true - }, - "acorn-dynamic-import": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", - "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz", + "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==", "dev": true }, "acorn-globals": { @@ -1973,9 +2234,9 @@ "dev": true }, "ajv-keywords": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz", - "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz", + "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==", "dev": true }, "align-text": { @@ -2007,18 +2268,18 @@ "dev": true }, "ansi-align": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", - "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", + "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", "dev": true, "requires": { - "string-width": "^2.0.0" + "string-width": "^3.0.0" }, "dependencies": { "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, "is-fullwidth-code-point": { @@ -2028,22 +2289,23 @@ "dev": true }, "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { + "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "strip-ansi": "^5.1.0" } }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^4.1.0" } } } @@ -2069,20 +2331,22 @@ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, - "ansicolors": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz", - "integrity": "sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=", - "dev": true - }, "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz", + "integrity": "sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==", "dev": true, "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "dependencies": { + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + } } }, "aproba": { @@ -2257,9 +2521,9 @@ "dev": true }, "async-limiter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", - "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", "dev": true }, "asynckit": { @@ -2275,18 +2539,18 @@ "dev": true }, "autoprefixer": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.0.tgz", - "integrity": "sha512-kuip9YilBqhirhHEGHaBTZKXL//xxGnzvsD0FtBQa6z+A69qZD6s/BAX9VzDF1i9VKDquTJDQaPLSEhOnL6FvQ==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz", + "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==", "dev": true, "requires": { - "browserslist": "^4.6.1", - "caniuse-lite": "^1.0.30000971", + "browserslist": "^4.6.3", + "caniuse-lite": "^1.0.30000980", "chalk": "^2.4.2", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.16", - "postcss-value-parser": "^3.3.1" + "postcss": "^7.0.17", + "postcss-value-parser": "^4.0.0" }, "dependencies": { "ansi-styles": { @@ -3459,6 +3723,15 @@ } } }, + "babel-plugin-dynamic-import-node": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz", + "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==", + "dev": true, + "requires": { + "object.assign": "^4.1.0" + } + }, "babel-plugin-espower": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-3.0.1.tgz", @@ -3576,9 +3849,9 @@ "dev": true }, "base64-js": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", - "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", "dev": true }, "base64id": { @@ -3651,24 +3924,25 @@ "dev": true }, "boxen": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", - "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-3.2.0.tgz", + "integrity": "sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==", "dev": true, "requires": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", + "ansi-align": "^3.0.0", + "camelcase": "^5.3.1", + "chalk": "^2.4.2", + "cli-boxes": "^2.2.0", + "string-width": "^3.0.0", "term-size": "^1.2.0", + "type-fest": "^0.3.0", "widest-line": "^2.0.0" }, "dependencies": { "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, "ansi-styles": { @@ -3681,9 +3955,9 @@ } }, "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, "chalk": { @@ -3704,22 +3978,23 @@ "dev": true }, "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { + "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "strip-ansi": "^5.1.0" } }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^4.1.0" } }, "supports-color": { @@ -3730,6 +4005,12 @@ "requires": { "has-flag": "^3.0.0" } + }, + "type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", + "dev": true } } }, @@ -3936,9 +4217,9 @@ }, "dependencies": { "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==", "dev": true } } @@ -3978,14 +4259,14 @@ } }, "browserslist": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.3.tgz", - "integrity": "sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==", + "version": "4.6.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", + "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000975", - "electron-to-chromium": "^1.3.164", - "node-releases": "^1.1.23" + "caniuse-lite": "^1.0.30000984", + "electron-to-chromium": "^1.3.191", + "node-releases": "^1.1.25" } }, "bs-recipes": { @@ -4050,9 +4331,9 @@ "dev": true }, "cacache": { - "version": "11.3.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", - "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz", + "integrity": "sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==", "dev": true, "requires": { "bluebird": "^3.5.5", @@ -4060,6 +4341,7 @@ "figgy-pudding": "^3.5.1", "glob": "^7.1.4", "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", "lru-cache": "^5.1.1", "mississippi": "^3.0.0", "mkdirp": "^0.5.1", @@ -4086,9 +4368,9 @@ } }, "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", + "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", "dev": true }, "lru-cache": { @@ -4253,27 +4535,11 @@ } }, "caniuse-lite": { - "version": "1.0.30000977", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000977.tgz", - "integrity": "sha512-RTXL32vdfAc2g9aoDL6vnBzbOO/3sM+T+YX4m7W9iFZnl3qIz7WYoZZpcZpALud8xq4+N56rnruX/NQy9HQu6A==", - "dev": true - }, - "capture-stack-trace": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz", - "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==", + "version": "1.0.30000989", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz", + "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==", "dev": true }, - "cardinal": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz", - "integrity": "sha1-fMEFXYItISlU0HsIXeolHMe8VQU=", - "dev": true, - "requires": { - "ansicolors": "~0.3.2", - "redeyed": "~2.1.0" - } - }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -4411,9 +4677,9 @@ } }, "chownr": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", - "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz", + "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==", "dev": true }, "chrome-trace-event": { @@ -4563,9 +4829,9 @@ "dev": true }, "cli-boxes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", - "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz", + "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==", "dev": true }, "cli-cursor": { @@ -4579,18 +4845,9 @@ }, "cli-spinners": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.1.0.tgz", - "integrity": "sha512-8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA==", - "dev": true - }, - "cli-table": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz", - "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=", - "dev": true, - "requires": { - "colors": "1.0.3" - } + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.1.0.tgz", + "integrity": "sha512-8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA==", + "dev": true }, "cli-truncate": { "version": "1.1.0", @@ -4635,16 +4892,6 @@ } } }, - "cli-usage": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/cli-usage/-/cli-usage-0.1.9.tgz", - "integrity": "sha512-MIJJnLu89KTRoGN1ix9dwvKYUPUP7tUL+YGKNH/7mFmy8n3aWNznQKK8FU7PsFVQxePW5rxBp0lupzeSjRiXTA==", - "dev": true, - "requires": { - "marked": "^0.6.2", - "marked-terminal": "^3.2.0" - } - }, "clipboard": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz", @@ -4675,15 +4922,14 @@ "dev": true }, "clone-deep": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", - "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, "requires": { - "for-own": "^1.0.0", "is-plain-object": "^2.0.4", - "kind-of": "^6.0.0", - "shallow-clone": "^1.0.0" + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" } }, "clone-response": { @@ -4735,12 +4981,6 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", - "dev": true - }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -4874,9 +5114,9 @@ } }, "configstore": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", - "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz", + "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==", "dev": true, "requires": { "dot-prop": "^4.1.0", @@ -5022,30 +5262,23 @@ "dev": true }, "core-js-compat": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.4.tgz", - "integrity": "sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.0.tgz", + "integrity": "sha512-vQve8j3tGPPqIkrsK442hbVwDIGXcngLPnislJaCNJIG1aBWPD0IqRhpxEwjtUOYpzLap8xA7CoGlJBT1ZkcDA==", "dev": true, "requires": { - "browserslist": "^4.6.2", - "core-js-pure": "3.1.4", - "semver": "^6.1.1" + "browserslist": "^4.6.6", + "semver": "^6.3.0" }, "dependencies": { "semver": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.2.tgz", - "integrity": "sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } }, - "core-js-pure": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.4.tgz", - "integrity": "sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==", - "dev": true - }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -5087,22 +5320,30 @@ } }, "cp-file": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz", - "integrity": "sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz", + "integrity": "sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==", "dev": true, "requires": { "graceful-fs": "^4.1.2", - "make-dir": "^2.0.0", + "make-dir": "^3.0.0", "nested-error-stacks": "^2.0.0", - "pify": "^4.0.1", - "safe-buffer": "^5.0.1" + "p-event": "^4.1.0" }, "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "make-dir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz", + "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } @@ -5117,15 +5358,6 @@ "elliptic": "^6.0.0" } }, - "create-error-class": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", - "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", - "dev": true, - "requires": { - "capture-stack-trace": "^1.0.0" - } - }, "create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", @@ -5220,22 +5452,23 @@ "dev": true }, "css-loader": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz", - "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.2.0.tgz", + "integrity": "sha512-QTF3Ud5H7DaZotgdcJjGMvyDj5F3Pn1j/sC6VBEOVp94cbwqyIBdcs/quzj4MC1BKQSrTpQznegH/5giYbhnCQ==", "dev": true, "requires": { - "camelcase": "^5.2.0", - "icss-utils": "^4.1.0", + "camelcase": "^5.3.1", + "cssesc": "^3.0.0", + "icss-utils": "^4.1.1", "loader-utils": "^1.2.3", "normalize-path": "^3.0.0", - "postcss": "^7.0.14", + "postcss": "^7.0.17", "postcss-modules-extract-imports": "^2.0.0", - "postcss-modules-local-by-default": "^2.0.6", + "postcss-modules-local-by-default": "^3.0.2", "postcss-modules-scope": "^2.1.0", - "postcss-modules-values": "^2.0.0", - "postcss-value-parser": "^3.3.0", - "schema-utils": "^1.0.0" + "postcss-modules-values": "^3.0.0", + "postcss-value-parser": "^4.0.0", + "schema-utils": "^2.0.0" }, "dependencies": { "camelcase": { @@ -5323,9 +5556,9 @@ } }, "dayjs": { - "version": "1.8.14", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.14.tgz", - "integrity": "sha512-AVhDmRTe541iWirnoeFSSDDGvCT6HWaNQ4z2WmmzXMGZj6ph6ydao2teKq/eUtR43GPJXlYFD+C/SotG1P9wUQ==", + "version": "1.8.15", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.15.tgz", + "integrity": "sha512-HYHCI1nohG52B45vCQg8Re3hNDZbMroWPkhz50yaX7Lu0ATyjGsTdoYZBpjED9ar6chqTx2dmSmM8A51mojnAg==", "dev": true }, "de-indent": { @@ -5407,6 +5640,15 @@ "integrity": "sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==", "dev": true }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, "define-property": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", @@ -5582,13 +5824,27 @@ "dev": true }, "dom-serializer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", - "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz", + "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==", "dev": true, "requires": { - "domelementtype": "^1.3.0", - "entities": "^1.1.1" + "domelementtype": "^2.0.1", + "entities": "^2.0.0" + }, + "dependencies": { + "domelementtype": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz", + "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==", + "dev": true + }, + "entities": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz", + "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==", + "dev": true + } } }, "domain-browser": { @@ -5659,24 +5915,12 @@ } }, "dynamic-dedupe": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.2.0.tgz", - "integrity": "sha1-UPfChoSDHs8cFwqrZ6HVMRzdds4=", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz", + "integrity": "sha1-BuRMIj9eTpTXjvnbI6ZRXOL5YqE=", "dev": true, "requires": { - "xtend": "~2.0.6" - }, - "dependencies": { - "xtend": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz", - "integrity": "sha1-XqZXptukRwacLlnFihE4ywxebO4=", - "dev": true, - "requires": { - "is-object": "~0.1.2", - "object-keys": "~0.2.0" - } - } + "xtend": "^4.0.0" } }, "easy-extender": { @@ -5714,15 +5958,15 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.173", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.173.tgz", - "integrity": "sha512-weH16m8as+4Fy4XJxrn/nFXsIqB7zkxERhvj/5YX2HE4HB8MCu98Wsef4E3mu0krIT27ic0bGsr+TvqYrUn6Qg==", + "version": "1.3.221", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.221.tgz", + "integrity": "sha512-YbNA7KgCvLq9ZaEa7wpYP7IP4LrJ4+b36oeF1lYBSJ0zVGVN7uo3Ct9qDUm/M3VDOWj03RVgsMFF8PdL8UjhzA==", "dev": true }, "elliptic": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz", - "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz", + "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==", "dev": true, "requires": { "bn.js": "^4.4.0", @@ -6281,13 +6525,13 @@ } }, "file-loader": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz", - "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.2.0.tgz", + "integrity": "sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==", "dev": true, "requires": { - "loader-utils": "^1.0.2", - "schema-utils": "^1.0.0" + "loader-utils": "^1.2.3", + "schema-utils": "^2.0.0" } }, "filewatcher": { @@ -6465,21 +6709,6 @@ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true - }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -7296,22 +7525,33 @@ } }, "got": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", - "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", + "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", "dev": true, "requires": { - "create-error-class": "^3.0.0", + "@sindresorhus/is": "^0.14.0", + "@szmarczak/http-timer": "^1.1.2", + "cacheable-request": "^6.0.0", + "decompress-response": "^3.3.0", "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-redirect": "^1.0.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "lowercase-keys": "^1.0.0", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "unzip-response": "^2.0.1", - "url-parse-lax": "^1.0.0" + "get-stream": "^4.1.0", + "lowercase-keys": "^1.0.1", + "mimic-response": "^1.0.1", + "p-cancelable": "^1.0.0", + "to-readable-stream": "^1.0.0", + "url-parse-lax": "^3.0.0" + }, + "dependencies": { + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + } } }, "graceful-fs": { @@ -7399,6 +7639,12 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, + "has-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", + "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", + "dev": true + }, "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", @@ -7729,18 +7975,24 @@ "dev": true }, "http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", + "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", "dev": true, "requires": { "depd": "~1.1.2", - "inherits": "2.0.3", + "inherits": "2.0.4", "setprototypeof": "1.1.1", "statuses": ">= 1.5.0 < 2", "toidentifier": "1.0.0" }, "dependencies": { + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -7791,12 +8043,6 @@ "safer-buffer": ">= 2.1.2 < 3" } }, - "icss-replace-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", - "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", - "dev": true - }, "icss-utils": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz", @@ -7831,9 +8077,9 @@ "dev": true }, "image-size": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.6.3.tgz", - "integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA==", + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.7.4.tgz", + "integrity": "sha512-GqPgxs+VkOr12aWwjSkyRzf5atzObWpFtiRuDgxCl2I/SDpZOKZFRD3iIAeAN6/usmn8SeLWRt7a8JRYK0Whbw==", "dev": true }, "immutable": { @@ -7930,6 +8176,12 @@ "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", "dev": true }, + "infer-owner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", + "dev": true + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -7973,12 +8225,6 @@ "integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==", "dev": true }, - "is": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/is/-/is-0.2.7.tgz", - "integrity": "sha1-OzSixI81mXLzUEKEkZOucmS2NWI=", - "dev": true - }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", @@ -8136,9 +8382,9 @@ } }, "is-npm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", - "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-3.0.0.tgz", + "integrity": "sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA==", "dev": true }, "is-number": { @@ -8176,33 +8422,12 @@ "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", "dev": true }, - "is-object": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz", - "integrity": "sha1-AO+8CIFsM8/ErIJR0TLhDcZQmNc=", - "dev": true - }, "is-observable": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-2.0.0.tgz", "integrity": "sha512-fhBZv3eFKUbyHXZ1oHujdo2tZ+CNbdpdzzlENgCGZUC8keoGxUew2jYFLYcUB4qo7LDD03o4KK11m/QYD7kEjg==", "dev": true }, - "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", - "dev": true - }, - "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "dev": true, - "requires": { - "is-path-inside": "^1.0.0" - } - }, "is-path-inside": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", @@ -8233,12 +8458,6 @@ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", "dev": true }, - "is-redirect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", - "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", - "dev": true - }, "is-regex": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", @@ -8254,12 +8473,6 @@ "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==", "dev": true }, - "is-retry-allowed": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", - "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", - "dev": true - }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -8458,9 +8671,9 @@ } }, "junk": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/junk/-/junk-2.1.0.tgz", - "integrity": "sha1-9DG0t/By3FAKXxDOf07HGTDnATQ=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", + "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==", "dev": true }, "keyv": { @@ -8479,12 +8692,12 @@ "dev": true }, "latest-version": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", - "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", + "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", "dev": true, "requires": { - "package-json": "^4.0.0" + "package-json": "^6.3.0" } }, "lazy-cache": { @@ -8512,9 +8725,9 @@ "dev": true }, "linkify-it": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.1.0.tgz", - "integrity": "sha512-4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz", + "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==", "dev": true, "requires": { "uc.micro": "^1.0.1" @@ -8667,66 +8880,6 @@ "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", "dev": true }, - "lodash._arraycopy": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz", - "integrity": "sha1-due3wfH7klRzdIeKVi7Qaj5Q9uE=", - "dev": true - }, - "lodash._arrayeach": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz", - "integrity": "sha1-urFWsqkNPxu9XGU0AzSeXlkz754=", - "dev": true - }, - "lodash._baseassign": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", - "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", - "dev": true, - "requires": { - "lodash._basecopy": "^3.0.0", - "lodash.keys": "^3.0.0" - } - }, - "lodash._baseclone": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz", - "integrity": "sha1-MDUZv2OT/n5C802LYw73eU41Qrc=", - "dev": true, - "requires": { - "lodash._arraycopy": "^3.0.0", - "lodash._arrayeach": "^3.0.0", - "lodash._baseassign": "^3.0.0", - "lodash._basefor": "^3.0.0", - "lodash.isarray": "^3.0.0", - "lodash.keys": "^3.0.0" - } - }, - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true - }, - "lodash._basefor": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz", - "integrity": "sha1-dVC06SGO8J+tJDQ7YSAhx5tMIMI=", - "dev": true - }, - "lodash._bindcallback": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz", - "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=", - "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -8745,18 +8898,6 @@ "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", "dev": true }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, "lodash.isfinite": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz", @@ -8769,35 +8910,12 @@ "integrity": "sha1-Tpho1FJXXXUK/9NYyXlUPcIO1Xc=", "dev": true }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "^3.0.0", - "lodash.isarguments": "^3.0.0", - "lodash.isarray": "^3.0.0" - } - }, "lodash.merge": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==", "dev": true }, - "lodash.tail": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", - "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", - "dev": true - }, - "lodash.toarray": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", - "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=", - "dev": true - }, "log-symbols": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", @@ -8989,98 +9107,47 @@ "dev": true }, "markdown-it-footnote": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/markdown-it-footnote/-/markdown-it-footnote-3.0.1.tgz", - "integrity": "sha1-fzcwdHysyG4v4L+KF6cQ80eRUXo=", - "dev": true - }, - "markdown-it-mark": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/markdown-it-mark/-/markdown-it-mark-2.0.0.tgz", - "integrity": "sha1-RqGqlHEFrtgYiXjgoBYXnkBPQsc=", - "dev": true - }, - "markdown-it-mentions": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/markdown-it-mentions/-/markdown-it-mentions-1.0.0.tgz", - "integrity": "sha512-zZnkEWHfnIXCwzgv9WJh0Wo6iuwLJaApfOMQfKEqjYM5A98XXEChPRqI7jvZAdzPGfCfaBFv0GUQqUYw4DeSjg==", - "dev": true, - "requires": { - "markdown-it-regexp": "^0.4.0" - } - }, - "markdown-it-prism": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/markdown-it-prism/-/markdown-it-prism-2.0.2.tgz", - "integrity": "sha512-tBRK+L36D2m4NauUr9teyFYJXBtw6XtuCdCJJWeNabSBwKlgI3oil4TfHHWd0bunwSf8zkmXEZkJzDVgVkfp+g==", - "dev": true, - "requires": { - "prismjs": "^1.16.0" - } - }, - "markdown-it-regexp": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/markdown-it-regexp/-/markdown-it-regexp-0.4.0.tgz", - "integrity": "sha1-1k1xPuzsVc5M/esyF1DswJniwtw=", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/markdown-it-footnote/-/markdown-it-footnote-3.0.2.tgz", + "integrity": "sha512-JVW6fCmZWjvMdDQSbOT3nnOQtd9iAXmw7hTSh26+v42BnvXeVyGMDBm5b/EZocMed2MbCAHiTX632vY0FyGB8A==", "dev": true }, - "marked": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.2.tgz", - "integrity": "sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==", + "markdown-it-implicit-figures": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/markdown-it-implicit-figures/-/markdown-it-implicit-figures-0.9.0.tgz", + "integrity": "sha512-ykLQZmhy8QnNEm6NgImIrr+/QMe7gSnHgLhNAjz9GGCNdSLR7C/SLFNwGdUZq7vK3a0myWiOYE0tpaZuB0rWWw==", "dev": true }, - "marked-terminal": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-3.2.0.tgz", - "integrity": "sha512-Yr1yVS0BbDG55vx7be1D0mdv+jGs9AW563o/Tt/7FTsId2J0yqhrTeXAqq/Q0DyyXltIn6CSxzesQuFqXgafjQ==", - "dev": true, - "requires": { - "ansi-escapes": "^3.1.0", - "cardinal": "^2.1.1", - "chalk": "^2.4.1", - "cli-table": "^0.3.1", - "node-emoji": "^1.4.1", - "supports-hyperlinks": "^1.0.1" - }, - "dependencies": { - "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "markdown-it-mark": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/markdown-it-mark/-/markdown-it-mark-2.0.0.tgz", + "integrity": "sha1-RqGqlHEFrtgYiXjgoBYXnkBPQsc=", + "dev": true + }, + "markdown-it-mentions": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/markdown-it-mentions/-/markdown-it-mentions-1.0.0.tgz", + "integrity": "sha512-zZnkEWHfnIXCwzgv9WJh0Wo6iuwLJaApfOMQfKEqjYM5A98XXEChPRqI7jvZAdzPGfCfaBFv0GUQqUYw4DeSjg==", + "dev": true, + "requires": { + "markdown-it-regexp": "^0.4.0" + } + }, + "markdown-it-prism": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/markdown-it-prism/-/markdown-it-prism-2.0.2.tgz", + "integrity": "sha512-tBRK+L36D2m4NauUr9teyFYJXBtw6XtuCdCJJWeNabSBwKlgI3oil4TfHHWd0bunwSf8zkmXEZkJzDVgVkfp+g==", + "dev": true, + "requires": { + "prismjs": "^1.16.0" } }, + "markdown-it-regexp": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/markdown-it-regexp/-/markdown-it-regexp-0.4.0.tgz", + "integrity": "sha1-1k1xPuzsVc5M/esyF1DswJniwtw=", + "dev": true + }, "matcher": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/matcher/-/matcher-2.0.0.tgz", @@ -9131,9 +9198,9 @@ }, "dependencies": { "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==", "dev": true } } @@ -9288,14 +9355,40 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz", - "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.7.0.tgz", + "integrity": "sha512-RQIw6+7utTYn8DBGsf/LpRgZCJMpZt+kuawJ/fju0KiOL6nAaTBNmCJwS7HtwSCXfS47gCkmtBFS7HdsquhdxQ==", "dev": true, "requires": { "loader-utils": "^1.1.0", + "normalize-url": "1.9.1", "schema-utils": "^1.0.0", "webpack-sources": "^1.1.0" + }, + "dependencies": { + "normalize-url": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", + "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", + "dev": true, + "requires": { + "object-assign": "^4.0.1", + "prepend-http": "^1.0.0", + "query-string": "^4.1.0", + "sort-keys": "^1.0.0" + } + }, + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + } } }, "minimalistic-assert": { @@ -9388,24 +9481,6 @@ } } }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "dev": true, - "requires": { - "for-in": "^0.1.3", - "is-extendable": "^0.1.1" - }, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", - "dev": true - } - } - }, "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", @@ -9518,28 +9593,19 @@ } }, "node-dev": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/node-dev/-/node-dev-3.1.3.tgz", - "integrity": "sha1-WCcZIj69711jBZ5qf7zSOZ/A+E0=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/node-dev/-/node-dev-4.0.0.tgz", + "integrity": "sha512-XwaUAv2bb7Y9bhCT8dsel5XquRQczG5z4QYhh2otdUMuhRAgtDjFxZEKK4Tsa57vL2ye8ojfLIAZOTBx+Ui9zw==", "dev": true, "requires": { "dateformat": "~1.0.4-1.2.3", - "dynamic-dedupe": "^0.2.0", + "dynamic-dedupe": "^0.3.0", "filewatcher": "~3.0.0", "minimist": "^1.1.3", - "node-notifier": "^4.0.2", + "node-notifier": "^5.4.0", "resolve": "^1.0.0" } }, - "node-emoji": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", - "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==", - "dev": true, - "requires": { - "lodash.toarray": "^4.4.0" - } - }, "node-gyp": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", @@ -9614,30 +9680,18 @@ } }, "node-notifier": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-4.6.1.tgz", - "integrity": "sha1-BW0UJE89zBzq3+aK+c/wxUc6M/M=", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.1.tgz", + "integrity": "sha512-p52B+onAEHKW1OF9MGO/S7k/ahGEHfhP5/tvwYzog/5XLYOd8ZuD6vdNZdUuWMONRnKPneXV43v3s6Snx1wsCQ==", "dev": true, "requires": { - "cli-usage": "^0.1.1", - "growly": "^1.2.0", - "lodash.clonedeep": "^3.0.0", - "minimist": "^1.1.1", - "semver": "^5.1.0", - "shellwords": "^0.1.0", - "which": "^1.0.5" + "growly": "^1.3.0", + "is-wsl": "^1.1.0", + "semver": "^5.5.0", + "shellwords": "^0.1.1", + "which": "^1.3.0" }, "dependencies": { - "lodash.clonedeep": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz", - "integrity": "sha1-oKHkDYKl6on/WxR7hETtY9koJ9s=", - "dev": true, - "requires": { - "lodash._baseclone": "^3.0.0", - "lodash._bindcallback": "^3.0.0" - } - }, "semver": { "version": "5.7.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", @@ -9647,9 +9701,9 @@ } }, "node-releases": { - "version": "1.1.23", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.23.tgz", - "integrity": "sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==", + "version": "1.1.26", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.26.tgz", + "integrity": "sha512-fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ==", "dev": true, "requires": { "semver": "^5.3.0" @@ -9864,15 +9918,10 @@ } }, "object-keys": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz", - "integrity": "sha1-zd7AKZiwkb5CvxA1rjLknxy26mc=", - "dev": true, - "requires": { - "foreach": "~2.0.1", - "indexof": "~0.0.1", - "is": "~0.2.6" - } + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true }, "object-path": { "version": "0.9.2", @@ -9889,6 +9938,18 @@ "isobject": "^3.0.0" } }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + } + }, "object.pick": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", @@ -10087,6 +10148,15 @@ "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", "dev": true }, + "p-event": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.1.0.tgz", + "integrity": "sha512-4vAd06GCsgflX4wHN1JqrMzBh/8QZ4j+rzp0cd2scXRwuBEv+QR3wrVA5aLhWDLw4y2WgDKvzWF3CCLmVM1UgA==", + "dev": true, + "requires": { + "p-timeout": "^2.0.1" + } + }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -10111,11 +10181,14 @@ "p-limit": "^2.0.0" } }, - "p-map": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", - "dev": true + "p-timeout": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", + "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", + "dev": true, + "requires": { + "p-finally": "^1.0.0" + } }, "p-try": { "version": "2.0.0", @@ -10144,21 +10217,21 @@ } }, "package-json": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", - "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", + "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", "dev": true, "requires": { - "got": "^6.7.1", - "registry-auth-token": "^3.0.1", - "registry-url": "^3.0.3", - "semver": "^5.1.0" + "got": "^9.6.0", + "registry-auth-token": "^4.0.0", + "registry-url": "^5.0.0", + "semver": "^6.2.0" }, "dependencies": { "semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } @@ -10687,6 +10760,19 @@ "postcss": "^7.0.0", "postcss-load-config": "^2.0.0", "schema-utils": "^1.0.0" + }, + "dependencies": { + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + } } }, "postcss-modules-extract-imports": { @@ -10699,14 +10785,15 @@ } }, "postcss-modules-local-by-default": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz", - "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz", + "integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==", "dev": true, "requires": { - "postcss": "^7.0.6", - "postcss-selector-parser": "^6.0.0", - "postcss-value-parser": "^3.3.1" + "icss-utils": "^4.1.1", + "postcss": "^7.0.16", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.0.0" } }, "postcss-modules-scope": { @@ -10720,12 +10807,12 @@ } }, "postcss-modules-values": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz", - "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz", + "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==", "dev": true, "requires": { - "icss-replace-symbols": "^1.1.0", + "icss-utils": "^4.0.0", "postcss": "^7.0.6" } }, @@ -10741,9 +10828,9 @@ } }, "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz", + "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==", "dev": true }, "posthtml": { @@ -10948,9 +11035,9 @@ }, "dependencies": { "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==", "dev": true } } @@ -11135,6 +11222,16 @@ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", "dev": true }, + "query-string": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", + "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", + "dev": true, + "requires": { + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" + } + }, "querystring": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", @@ -11179,25 +11276,25 @@ "dev": true }, "raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz", + "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==", "dev": true, "requires": { "bytes": "3.1.0", - "http-errors": "1.7.2", + "http-errors": "1.7.3", "iconv-lite": "0.4.24", "unpipe": "1.0.0" } }, "raw-loader": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz", - "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-3.1.0.tgz", + "integrity": "sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==", "dev": true, "requires": { "loader-utils": "^1.1.0", - "schema-utils": "^1.0.0" + "schema-utils": "^2.0.1" } }, "rc": { @@ -11376,15 +11473,6 @@ "strip-indent": "^1.0.1" } }, - "redeyed": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz", - "integrity": "sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs=", - "dev": true, - "requires": { - "esprima": "~4.0.0" - } - }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", @@ -11401,15 +11489,15 @@ } }, "regenerator-runtime": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", - "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==", + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", + "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==", "dev": true }, "regenerator-transform": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.0.tgz", - "integrity": "sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz", + "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==", "dev": true, "requires": { "private": "^0.1.6" @@ -11426,9 +11514,9 @@ } }, "regexp-tree": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.10.tgz", - "integrity": "sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==", + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz", + "integrity": "sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==", "dev": true }, "regexpu-core": { @@ -11446,22 +11534,22 @@ } }, "registry-auth-token": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz", - "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.0.0.tgz", + "integrity": "sha512-lpQkHxd9UL6tb3k/aHAVfnVtn+Bcs9ob5InuFLLEDqSqeq+AljB8GZW9xY0x7F+xYwEcjKe07nyoxzEYz6yvkw==", "dev": true, "requires": { - "rc": "^1.1.6", + "rc": "^1.2.8", "safe-buffer": "^5.0.1" } }, "registry-url": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", - "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", + "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", "dev": true, "requires": { - "rc": "^1.0.1" + "rc": "^1.2.8" } }, "regjsgen": { @@ -11819,23 +11907,22 @@ } }, "sass-loader": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz", - "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.2.0.tgz", + "integrity": "sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==", "dev": true, "requires": { - "clone-deep": "^2.0.1", + "clone-deep": "^4.0.1", "loader-utils": "^1.0.1", - "lodash.tail": "^4.1.1", "neo-async": "^2.5.0", - "pify": "^3.0.0", + "pify": "^4.0.1", "semver": "^5.5.0" }, "dependencies": { "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true }, "semver": { @@ -11847,13 +11934,12 @@ } }, "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz", + "integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==", "dev": true, "requires": { "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", "ajv-keywords": "^3.1.0" } }, @@ -12145,22 +12231,12 @@ } }, "shallow-clone": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", - "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, "requires": { - "is-extendable": "^0.1.1", - "kind-of": "^5.0.0", - "mixin-object": "^2.0.1" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } + "kind-of": "^6.0.2" } }, "shebang-command": { @@ -12506,6 +12582,15 @@ } } }, + "sort-keys": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", + "dev": true, + "requires": { + "is-plain-obj": "^1.0.0" + } + }, "source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", @@ -12532,9 +12617,9 @@ } }, "source-map-support": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", - "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -12776,6 +12861,12 @@ "limiter": "^1.0.5" } }, + "strict-uri-encode": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", + "dev": true + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -12904,41 +12995,6 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true }, - "supports-hyperlinks": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz", - "integrity": "sha512-HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw==", - "dev": true, - "requires": { - "has-flag": "^2.0.0", - "supports-color": "^5.0.0" - }, - "dependencies": { - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - }, - "dependencies": { - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - } - } - } - } - }, "swap-case": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz", @@ -12982,14 +13038,14 @@ } }, "terser": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.0.0.tgz", - "integrity": "sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.3.tgz", + "integrity": "sha512-on13d+cnpn5bMouZu+J8tPYQecsdRJCJuxFJ+FVoPBoLJgk5bCBkp+Uen2hWyi0KIUm6eDarnlAlH+KgIx/PuQ==", "dev": true, "requires": { - "commander": "^2.19.0", + "commander": "^2.20.0", "source-map": "~0.6.1", - "source-map-support": "~0.5.10" + "source-map-support": "~0.5.12" }, "dependencies": { "source-map": { @@ -13001,23 +13057,33 @@ } }, "terser-webpack-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz", - "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz", + "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==", "dev": true, "requires": { - "cacache": "^11.3.2", - "find-cache-dir": "^2.0.0", + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", "is-wsl": "^1.1.0", - "loader-utils": "^1.2.3", "schema-utils": "^1.0.0", "serialize-javascript": "^1.7.0", "source-map": "^0.6.1", - "terser": "^4.0.0", - "webpack-sources": "^1.3.0", + "terser": "^4.1.2", + "webpack-sources": "^1.4.0", "worker-farm": "^1.7.0" }, "dependencies": { + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -13052,12 +13118,6 @@ "integrity": "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0=", "dev": true }, - "timed-out": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", - "dev": true - }, "timers-browserify": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", @@ -13405,22 +13465,33 @@ "dev": true }, "uglifyjs-webpack-plugin": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.1.3.tgz", - "integrity": "sha512-/lRkCaFbI6pT3CxsQHDhBcqB6tocOnqba0vJqJ2DzSWFLRgOIiip8q0nVFydyXk+n8UtF7ZuS6hvWopcYH5FuA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.2.0.tgz", + "integrity": "sha512-mHSkufBmBuJ+KHQhv5H0MXijtsoA1lynJt1lXOaotja8/I0pR4L9oGaPIZw+bQBOFittXZg9OC1sXSGO9D9ZYg==", "dev": true, "requires": { - "cacache": "^11.3.2", + "cacache": "^12.0.2", "find-cache-dir": "^2.1.0", "is-wsl": "^1.1.0", "schema-utils": "^1.0.0", "serialize-javascript": "^1.7.0", "source-map": "^0.6.1", - "uglify-js": "^3.5.12", - "webpack-sources": "^1.3.0", + "uglify-js": "^3.6.0", + "webpack-sources": "^1.4.0", "worker-farm": "^1.7.0" }, "dependencies": { + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -13616,12 +13687,6 @@ } } }, - "unzip-response": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", - "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=", - "dev": true - }, "upath": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", @@ -13629,19 +13694,21 @@ "dev": true }, "update-notifier": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", - "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-3.0.1.tgz", + "integrity": "sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ==", "dev": true, "requires": { - "boxen": "^1.2.1", + "boxen": "^3.0.0", "chalk": "^2.0.1", - "configstore": "^3.0.0", + "configstore": "^4.0.0", + "has-yarn": "^2.1.0", "import-lazy": "^2.1.0", - "is-ci": "^1.0.10", + "is-ci": "^2.0.0", "is-installed-globally": "^0.1.0", - "is-npm": "^1.0.0", - "latest-version": "^3.0.0", + "is-npm": "^3.0.0", + "is-yarn-global": "^0.3.0", + "latest-version": "^5.0.0", "semver-diff": "^2.0.0", "xdg-basedir": "^3.0.0" }, @@ -13666,21 +13733,6 @@ "supports-color": "^5.3.0" } }, - "ci-info": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", - "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==", - "dev": true - }, - "is-ci": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz", - "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==", - "dev": true, - "requires": { - "ci-info": "^1.5.0" - } - }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -13741,14 +13793,14 @@ } }, "url-loader": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz", - "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.1.0.tgz", + "integrity": "sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A==", "dev": true, "requires": { - "loader-utils": "^1.1.0", - "mime": "^2.0.3", - "schema-utils": "^1.0.0" + "loader-utils": "^1.2.3", + "mime": "^2.4.4", + "schema-utils": "^2.0.0" }, "dependencies": { "mime": { @@ -13760,12 +13812,20 @@ } }, "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, "requires": { - "prepend-http": "^1.0.1" + "prepend-http": "^2.0.0" + }, + "dependencies": { + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + } } }, "url-pattern": { @@ -13926,12 +13986,12 @@ "dev": true }, "vue-loader": { - "version": "15.7.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.0.tgz", - "integrity": "sha512-x+NZ4RIthQOxcFclEcs8sXGEWqnZHodL2J9Vq+hUz+TDZzBaDIh1j3d9M2IUlTjtrHTZy4uMuRdTi8BGws7jLA==", + "version": "15.7.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.1.tgz", + "integrity": "sha512-fwIKtA23Pl/rqfYP5TSGK7gkEuLhoTvRYW+TU7ER3q9GpNLt/PjG5NLv3XHRDiTg7OPM1JcckBgds+VnAc+HbA==", "dev": true, "requires": { - "@vue/component-compiler-utils": "^2.5.1", + "@vue/component-compiler-utils": "^3.0.0", "hash-sum": "^1.0.2", "loader-utils": "^1.1.0", "vue-hot-reload-api": "^2.3.0", @@ -13993,41 +14053,65 @@ } }, "webpack": { - "version": "4.35.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.35.0.tgz", - "integrity": "sha512-M5hL3qpVvtr8d4YaJANbAQBc4uT01G33eDpl/psRTBCfjxFTihdhin1NtAKB1ruDwzeVdcsHHV3NX+QsAgOosw==", + "version": "4.39.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz", + "integrity": "sha512-/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==", "dev": true, "requires": { "@webassemblyjs/ast": "1.8.5", "@webassemblyjs/helper-module-context": "1.8.5", "@webassemblyjs/wasm-edit": "1.8.5", "@webassemblyjs/wasm-parser": "1.8.5", - "acorn": "^6.0.5", - "acorn-dynamic-import": "^4.0.0", - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0", - "chrome-trace-event": "^1.0.0", + "acorn": "^6.2.1", + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1", + "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^4.1.0", - "eslint-scope": "^4.0.0", + "eslint-scope": "^4.0.3", "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.3.0", - "loader-utils": "^1.1.0", - "memory-fs": "~0.4.1", - "micromatch": "^3.1.8", - "mkdirp": "~0.5.0", - "neo-async": "^2.5.0", - "node-libs-browser": "^2.0.0", + "loader-runner": "^2.4.0", + "loader-utils": "^1.2.3", + "memory-fs": "^0.4.1", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.1", + "neo-async": "^2.6.1", + "node-libs-browser": "^2.2.1", "schema-utils": "^1.0.0", - "tapable": "^1.1.0", - "terser-webpack-plugin": "^1.1.0", - "watchpack": "^1.5.0", - "webpack-sources": "^1.3.0" + "tapable": "^1.1.3", + "terser-webpack-plugin": "^1.4.1", + "watchpack": "^1.6.0", + "webpack-sources": "^1.4.1" + }, + "dependencies": { + "ajv": { + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "dev": true, + "requires": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + } } }, "webpack-sources": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz", - "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", "dev": true, "requires": { "source-list-map": "^2.0.0", @@ -14287,9 +14371,9 @@ "dev": true }, "yn": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.0.tgz", - "integrity": "sha512-kKfnnYkbTfrAdd0xICNFw7Atm8nKpLcLv9AZGEt+kczL/WQVai4e2V6ZN8U/O+iI6WrNuJjNNOyu4zfhl9D3Hg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", "dev": true } } diff --git a/package.json b/package.json index b6d3b83..6535cb9 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "test:visual": "penny serve tests/_visual" }, "devDependencies": { - "@lunelson/penny": "next", + "@lunelson/penny": "^2.0.0-alpha.14", "@lunelson/sass-calc": "latest", "@lunelson/sass-lerp": "latest", "@lunelson/sass-maps-next": "latest", diff --git a/scss/_setup-root.scss b/scss/_setup-root.scss index 47c0c7e..375c0f4 100644 --- a/scss/_setup-root.scss +++ b/scss/_setup-root.scss @@ -15,7 +15,7 @@ @include --output-medium-props(); } } - html { - font-size: var(--font-size); - } + // html { + // font-size: var(--font-size); + // } } diff --git a/scss/_setup-theme.scss b/scss/_setup-theme.scss index 2f5e424..5dc45b0 100644 --- a/scss/_setup-theme.scss +++ b/scss/_setup-theme.scss @@ -40,8 +40,8 @@ $colors: () !default; } body { - background-color: rgb(var(--color-#{$type})); - color: rgb(var(--contrast-#{$type})); + color: rgb(var(--fg-default)); + background-color: rgb(var(--bg-default)); } #{stateful-base-class('fg', false)} { diff --git a/scss/_setup-typo.scss b/scss/_setup-typo.scss index 011cf1a..4b35424 100644 --- a/scss/_setup-typo.scss +++ b/scss/_setup-typo.scss @@ -13,7 +13,12 @@ @mixin homework-setup-typo( $trim: true, $trim-excl: div table figure img svg video iframe object section aside header footer article ) { - body { font-family: var(--font-family); } + html { + // NB: --font-size variable is set in setup-root(), it is responsive by $medium + font-size: var(--font-size); + font-family: var(--font-family); + line-height: var(--line-height); + } // normalize $fonts $fonts: if(length($fonts) > 0, $fonts, $fonts-defaults) !global; @@ -28,9 +33,9 @@ // make first font in $fonts the default @if $f == nth(map-keys($fonts), 1) { --font-family: var(--font-family-#{$f}); - --font-feature-settings: var(--font-feature-settings-#{$f}); --line-height: var(--line-height-#{$f}); --letter-spacing: var(--letter-spacing-#{$f}); + --font-feature-settings: var(--font-feature-settings-#{$f}); } $ff: map-get($font, 'font-family'); @@ -40,9 +45,9 @@ // output variant properties --font-family-#{$f}: #{$ff}; - --font-feature-settings-#{$f}: #{inspect($ffs)}; --line-height-#{$f}: #{decalc($lh)}; --letter-spacing-#{$f}: #{decalc($ls)}; + --font-feature-settings-#{$f}: #{inspect($ffs)}; @if $trim { $oc: map-get($font, 'dist-capline'); @@ -80,12 +85,10 @@ #{base-class('f', false)}, #{selector-combine(base-class('plain'), '*', '>')} { font-size: var(--font-size); // TODO allow a lerp calc() expression here too - font-family: var(--font-family); + line-height: calc(var(--line-height)); // raw calc values + letter-spacing: calc(var(--letter-spacing)); // raw calc values font-feature-settings: var(--font-feature-settings); - // NB using calc(var()) below because these are raw calc values - line-height: calc(var(--line-height)); - letter-spacing: calc(var(--letter-spacing)); } @if $trim { @@ -116,7 +119,6 @@ #{base-class('f-#{$f}')} { --font-family: var(--font-family-#{$f}); - --line-height: var(--line-height-#{$f}); --letter-spacing: var(--letter-spacing-#{$f}); --font-feature-settings: var(--font-feature-settings-#{$f}); diff --git a/tests/_visual/app.scss b/tests/_visual/app.scss index 90ae481..b84ed0e 100644 --- a/tests/_visual/app.scss +++ b/tests/_visual/app.scss @@ -11,17 +11,17 @@ */ -@import 'fonts/messina-sans'; -@import 'fonts/messina-serif'; -@import 'fonts/messina-modern'; - -@import 'fonts/hack'; -@import 'fonts/google'; -@import 'fonts/neutral'; -@import 'fonts/gt-america'; -@import 'fonts/maison-neue'; +// @import 'fonts/messina-sans'; +// @import 'fonts/messina-serif'; +// @import 'fonts/messina-modern'; + +// @import 'fonts/hack'; +// @import 'fonts/google'; +// @import 'fonts/neutral'; +// @import 'fonts/gt-america'; +// @import 'fonts/maison-neue'; @import 'fonts/theinhardt'; -@import 'fonts/untitled-sans'; +// @import 'fonts/untitled-sans'; @import 'prism'; @@ -80,13 +80,20 @@ $media: ( $fonts: ( // sans: $theinhardt, - sans: $neutral, - mono: $hack, + sans: ( + family: ('Arial'), + dist-capline: 0.1, + dist-baseline: 0.1, + spacing: 1px, + spacing-max: 0.75, + spacing-end: 100 + ), + // mono: $hack, // sans: $messina-sans, // sans: $source-sans-pro, - serif: $messina-serif, + // serif: $messina-serif, // serif: $source-serif-pro, - modern: $messina-modern, + // modern: $messina-modern, // mono: $source-code-pro ); diff --git a/tests/_visual/fonts/_neutral.scss b/tests/_visual/fonts/_neutral.scss index fdefd7b..113cfdf 100644 --- a/tests/_visual/fonts/_neutral.scss +++ b/tests/_visual/fonts/_neutral.scss @@ -43,7 +43,7 @@ $neutral: ( font-family: "Neutral", + letter-spacing: calc(0.5px - 0.025em), dist-capline: 0.1, dist-baseline: 0.1, - letter-spacing: calc(0.5px - 0.025em), ); diff --git a/tests/renders/output-core-root.dartsass.css b/tests/renders/output-core-root.dartsass.css index 2e16a56..0d5f261 100644 --- a/tests/renders/output-core-root.dartsass.css +++ b/tests/renders/output-core-root.dartsass.css @@ -87,8 +87,4 @@ } } -html { - font-size: var(--font-size); -} - /* ( a: ( font-size: 16px, inner-x: 1rem, inner-y: 1.5rem, outer-top: 2rem, outer-right: calc(31.25vw + -6.25rem), outer-bottom: 2rem, outer-left: calc(31.25vw + -6.25rem), column-count: 12, font-mods: ( sans: ( m: 18px 1.3, l: 24px 1.2 ), serif: ( m: 18px 1.3, l: 24px 1.2 ) ), inner-mods: ( s: 0.5, m: 1, l: 2 ), inner-y-mods: ( s: 0.5, m: 3.5rem, l: 2 ), outer-width: 30rem, breakpoint: 30em ), b: ( font-size: 16px, inner-x: 1rem, inner-y: 1.5rem, outer-top: 2rem, outer-right: calc(31.25vw + -6.25rem), outer-bottom: 2rem, outer-left: calc(31.25vw + -6.25rem), column-count: 12, font-mods: ( sans: ( m: 18px 1.3, l: 24px 1.2 ), serif: ( m: 18px 1.3, l: 30px 1.1 ) ), inner-mods: ( s: 0.5, m: 1, l: 2 ), inner-y-mods: ( s: 0.5, m: 3.5rem, l: 2 ), outer-width: 40rem, breakpoint: 40em ), c: ( font-size: 18px, inner-x: 1rem, inner-y: 1.5rem, outer-top: 2rem, outer-right: 200px, outer-bottom: 2rem, outer-left: 200px, column-count: 12, font-mods: ( sans: ( m: 18px 1.3, l: 24px 1.2 ), serif: ( m: 18px 1.3, l: 30px 1.1 ) ), inner-mods: ( s: 0.5, m: 1, l: 2 ), inner-y-mods: ( s: 0.5, m: 3.5rem, l: 2 ), outer-width: 53.3333333333rem, breakpoint: 60em ) ) */ \ No newline at end of file diff --git a/tests/renders/output-core-root.libsass.css b/tests/renders/output-core-root.libsass.css index f4f5dc1..9c4d52f 100644 --- a/tests/renders/output-core-root.libsass.css +++ b/tests/renders/output-core-root.libsass.css @@ -111,10 +111,6 @@ } } -html { - font-size: var(--font-size); -} - /* ( a: ( font-size: 16px, diff --git a/tests/renders/output-theme.dartsass.css b/tests/renders/output-theme.dartsass.css index bd66deb..600b1a6 100644 --- a/tests/renders/output-theme.dartsass.css +++ b/tests/renders/output-theme.dartsass.css @@ -46,8 +46,8 @@ } body { - background-color: rgb(var(--color-lite)); - color: rgb(var(--contrast-lite)); + color: rgb(var(--fg-default)); + background-color: rgb(var(--bg-default)); } [class^=fg-]:not([class$=fg-]), [class*=" fg-"]:not([class$=fg-]), [class*=__fg-]:not([class*=" __fg-"]):not([class*="__fg- "]):not([class$=__fg-]):not([class^=__fg-]) { diff --git a/tests/renders/output-theme.libsass.css b/tests/renders/output-theme.libsass.css index 77117fd..3b34502 100644 --- a/tests/renders/output-theme.libsass.css +++ b/tests/renders/output-theme.libsass.css @@ -46,8 +46,8 @@ } body { - background-color: rgb(var(--color-lite)); - color: rgb(var(--contrast-lite)); + color: rgb(var(--fg-default)); + background-color: rgb(var(--bg-default)); } [class^="fg-"]:not([class$="fg-"]), [class*=" fg-"]:not([class$="fg-"]), [class*="__fg-"]:not([class*=" __fg-"]):not([class*="__fg- "]):not([class$="__fg-"]):not([class^="__fg-"]) { diff --git a/tests/renders/output-typo.dartsass.css b/tests/renders/output-typo.dartsass.css index 4b7f055..38019f2 100644 --- a/tests/renders/output-typo.dartsass.css +++ b/tests/renders/output-typo.dartsass.css @@ -1,32 +1,34 @@ -body { +html { + font-size: var(--font-size); font-family: var(--font-family); + line-height: var(--line-height); } :root { --font-family: var(--font-family-sans); - --font-feature-settings: var(--font-feature-settings-sans); --line-height: var(--line-height-sans); --letter-spacing: var(--letter-spacing-sans); + --font-feature-settings: var(--font-feature-settings-sans); --font-family-sans: MessinaSans; - --font-feature-settings-sans: (); --line-height-sans: 1.4em; --letter-spacing-sans: 0px; + --font-feature-settings-sans: (); --dist-capline-sans: 0em; --dist-baseline-sans: 0em; --trim-sides-sans: 0; --trim-adjacent-sans: 0.125em; --font-family-serif: MessinaSerif; - --font-feature-settings-serif: (); --line-height-serif: 1.4em; --letter-spacing-serif: 0px; + --font-feature-settings-serif: (); --dist-capline-serif: 0em; --dist-baseline-serif: 0em; --trim-sides-serif: 0; --trim-adjacent-serif: 0.125em; --font-family-modern: MessinaModern; - --font-feature-settings-modern: (); --line-height-modern: 1.4em; --letter-spacing-modern: 0px; + --font-feature-settings-modern: (); --dist-capline-modern: 0em; --dist-baseline-modern: 0em; --trim-sides-modern: 0; @@ -81,9 +83,9 @@ body { .plain > *, [class^=plain-]:not([class$=plain-]) > *, [class*=" plain-"]:not([class$=plain-]) > * { font-size: var(--font-size); font-family: var(--font-family); - font-feature-settings: var(--font-feature-settings); line-height: calc(var(--line-height)); letter-spacing: calc(var(--letter-spacing)); + font-feature-settings: var(--font-feature-settings); } .trim > [class^=f-]:not([class$=f-]), .trim > [class*=" f-"]:not([class$=f-]), @@ -109,7 +111,6 @@ body { .f-sans, [class^=f-sans-]:not([class$=f-sans-]), [class*=" f-sans-"]:not([class$=f-sans-]) { --font-family: var(--font-family-sans); - --line-height: var(--line-height-sans); --letter-spacing: var(--letter-spacing-sans); --font-feature-settings: var(--font-feature-settings-sans); --dist-capline: 0em; @@ -120,7 +121,6 @@ body { .f-serif, [class^=f-serif-]:not([class$=f-serif-]), [class*=" f-serif-"]:not([class$=f-serif-]) { --font-family: var(--font-family-serif); - --line-height: var(--line-height-serif); --letter-spacing: var(--letter-spacing-serif); --font-feature-settings: var(--font-feature-settings-serif); --dist-capline: 0em; @@ -131,7 +131,6 @@ body { .f-modern, [class^=f-modern-]:not([class$=f-modern-]), [class*=" f-modern-"]:not([class$=f-modern-]) { --font-family: var(--font-family-modern); - --line-height: var(--line-height-modern); --letter-spacing: var(--letter-spacing-modern); --font-feature-settings: var(--font-feature-settings-modern); --dist-capline: 0em; diff --git a/tests/renders/output-typo.libsass.css b/tests/renders/output-typo.libsass.css index 476301a..e48ba26 100644 --- a/tests/renders/output-typo.libsass.css +++ b/tests/renders/output-typo.libsass.css @@ -1,32 +1,34 @@ -body { +html { + font-size: var(--font-size); font-family: var(--font-family); + line-height: var(--line-height); } :root { --font-family: var(--font-family-sans); - --font-feature-settings: var(--font-feature-settings-sans); --line-height: var(--line-height-sans); --letter-spacing: var(--letter-spacing-sans); + --font-feature-settings: var(--font-feature-settings-sans); --font-family-sans: MessinaSans; - --font-feature-settings-sans: (); --line-height-sans: 1.4em; --letter-spacing-sans: 0px; + --font-feature-settings-sans: (); --dist-capline-sans: 0em; --dist-baseline-sans: 0em; --trim-sides-sans: 0; --trim-adjacent-sans: 0.125em; --font-family-serif: MessinaSerif; - --font-feature-settings-serif: (); --line-height-serif: 1.4em; --letter-spacing-serif: 0px; + --font-feature-settings-serif: (); --dist-capline-serif: 0em; --dist-baseline-serif: 0em; --trim-sides-serif: 0; --trim-adjacent-serif: 0.125em; --font-family-modern: MessinaModern; - --font-feature-settings-modern: (); --line-height-modern: 1.4em; --letter-spacing-modern: 0px; + --font-feature-settings-modern: (); --dist-capline-modern: 0em; --dist-baseline-modern: 0em; --trim-sides-modern: 0; @@ -83,9 +85,9 @@ body { .plain > *, [class^="plain-"]:not([class$="plain-"]) > *, [class*=" plain-"]:not([class$="plain-"]) > * { font-size: var(--font-size); font-family: var(--font-family); - font-feature-settings: var(--font-feature-settings); line-height: calc(var(--line-height)); letter-spacing: calc(var(--letter-spacing)); + font-feature-settings: var(--font-feature-settings); } .trim > [class^="f-"]:not([class$="f-"]), .trim > [class*=" f-"]:not([class$="f-"]), @@ -111,7 +113,6 @@ body { .f-sans, [class^="f-sans-"]:not([class$="f-sans-"]), [class*=" f-sans-"]:not([class$="f-sans-"]) { --font-family: var(--font-family-sans); - --line-height: var(--line-height-sans); --letter-spacing: var(--letter-spacing-sans); --font-feature-settings: var(--font-feature-settings-sans); --dist-capline: 0em; @@ -122,7 +123,6 @@ body { .f-serif, [class^="f-serif-"]:not([class$="f-serif-"]), [class*=" f-serif-"]:not([class$="f-serif-"]) { --font-family: var(--font-family-serif); - --line-height: var(--line-height-serif); --letter-spacing: var(--letter-spacing-serif); --font-feature-settings: var(--font-feature-settings-serif); --dist-capline: 0em; @@ -133,7 +133,6 @@ body { .f-modern, [class^="f-modern-"]:not([class$="f-modern-"]), [class*=" f-modern-"]:not([class$="f-modern-"]) { --font-family: var(--font-family-modern); - --line-height: var(--line-height-modern); --letter-spacing: var(--letter-spacing-modern); --font-feature-settings: var(--font-feature-settings-modern); --dist-capline: 0em; diff --git a/tests/snapshots/output-core-root.scss.md b/tests/snapshots/output-core-root.scss.md index 817f652..e978ef1 100644 --- a/tests/snapshots/output-core-root.scss.md +++ b/tests/snapshots/output-core-root.scss.md @@ -97,10 +97,6 @@ Generated by [AVA](https://ava.li). }␊ }␊ ␊ - html {␊ - font-size: var(--font-size);␊ - }␊ - ␊ ` ## output-core-root[libsass] @@ -200,9 +196,5 @@ Generated by [AVA](https://ava.li). }␊ }␊ ␊ - html {␊ - font-size: var(--font-size);␊ - }␊ - ␊ ␊ ` diff --git a/tests/snapshots/output-core-root.scss.snap b/tests/snapshots/output-core-root.scss.snap index 33f42650528b6c37d11fabceb75e27cd41160d9a..80d3b168e7e1075adb844ccfd82fb4f1bfa4e3ed 100644 GIT binary patch literal 542 zcmV+(0^$8ZRzV10jCV_$-~V6px%6uQ02V;%ey^eIZw%^(g<71iMhlRMn5gDSQOo0f-= z3r)8IvyK_`atx^C#e6=G96nqoTB}>Uib=bseToby>y4n$H`}gDdIrSUA1^YV5TmG# zn0xd2xIsE4%$|K%^U2UsRJ-RWW8cRPEv1gCV;L5%w;Y!|S}yU(N<6;5r7TIAu}Oud z0WGs`WsglSJGAm}14^RCj|Y=s)YxJJM}1NiWvoU(Z5YrS2Hl4AU^x*=8zG2B=uBY1 zb_ZXli!7fYL;Za+!nIUcRJ7wZ+=PNo-bgI}Gg_uqnTep`?Tz2Y=)N~!e@dG%amK_M9RjA# gm^zz3TTGrYc{VS$m_B3rEX0KS0-(p51$Pqw04E~%761SM literal 556 zcmV+{0@M9LRzVJs*n*00000000B+ zmcLGeKpe-f8e=4JF!}(um=q0!KLsr=4nBbK0W_4JmIz!!uZkMuBe=UcxH&nvn7A27 z^${E#d;~WSXiF(qwL@c!#{&8N|H0?N*8%`cfYQxYQ`=tIytrMQ-FP{BFM;@am;vDR zZS(5s`Euv+V?o-Oy}mCc*7JD)Cc$(PRhj~G6Sp&h6=F=_i2$J_)k0+NH?bQK$+n=b zAb%~f<2FH|bm-PeBXxvbPhUpOf)!>);$USs7Bra|)M4nd-n)|IQ(@glb=QV1CqyWK zc2I|9-;UB83u;xlTCE~qOqR*kii_`J+OFjuBMYi#Gg|AI-5{VnBWmo7ml=3jq?X{UlYboUyB4y|OhQ%4OGf_+wshjs@t9PG9IfZo~x^{84tzO$vOD2oG=N-YaI zw&#=&?6BOkif{=kvLOxz(_!@7VqJ$ftco^JBVsm;*bSq&Av;(tgtA76vJp;)FyIE= zw-X~P7RbeP2F}?-|5c2njh6 uclW1699MB%#jzpaGLFl*@w3Hs9M^H6I}kR(9K6952ltpURT diff --git a/tests/snapshots/output-theme.scss.md b/tests/snapshots/output-theme.scss.md index 119fb9b..761fa84 100644 --- a/tests/snapshots/output-theme.scss.md +++ b/tests/snapshots/output-theme.scss.md @@ -56,8 +56,8 @@ Generated by [AVA](https://ava.li). }␊ ␊ body {␊ - background-color: rgb(var(--color-lite));␊ - color: rgb(var(--contrast-lite));␊ + color: rgb(var(--fg-default));␊ + background-color: rgb(var(--bg-default));␊ }␊ ␊ [class^=fg-]:not([class$=fg-]), [class*=" fg-"]:not([class$=fg-]), [class*=__fg-]:not([class*=" __fg-"]):not([class*="__fg- "]):not([class$=__fg-]):not([class^=__fg-]) {␊ @@ -5753,8 +5753,8 @@ Generated by [AVA](https://ava.li). }␊ ␊ body {␊ - background-color: rgb(var(--color-lite));␊ - color: rgb(var(--contrast-lite));␊ + color: rgb(var(--fg-default));␊ + background-color: rgb(var(--bg-default));␊ }␊ ␊ [class^="fg-"]:not([class$="fg-"]), [class*=" fg-"]:not([class$="fg-"]), [class*="__fg-"]:not([class*=" __fg-"]):not([class*="__fg- "]):not([class$="__fg-"]):not([class^="__fg-"]) {␊ diff --git a/tests/snapshots/output-theme.scss.snap b/tests/snapshots/output-theme.scss.snap index 9bb559f0bec26d4d9df5d69e6444947164576fda..f0599f3a367ff164b6810d5be435f179598d0013 100644 GIT binary patch delta 10374 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 delta 11161 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 diff --git a/tests/snapshots/output-typo.scss.md b/tests/snapshots/output-typo.scss.md index d0d802b..e670b5f 100644 --- a/tests/snapshots/output-typo.scss.md +++ b/tests/snapshots/output-typo.scss.md @@ -8,35 +8,37 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `body {␊ + `html {␊ + font-size: var(--font-size);␊ font-family: var(--font-family);␊ + line-height: var(--line-height);␊ }␊ ␊ :root {␊ --font-family: var(--font-family-sans);␊ - --font-feature-settings: var(--font-feature-settings-sans);␊ --line-height: var(--line-height-sans);␊ --letter-spacing: var(--letter-spacing-sans);␊ + --font-feature-settings: var(--font-feature-settings-sans);␊ --font-family-sans: MessinaSans;␊ - --font-feature-settings-sans: ();␊ --line-height-sans: 1.4em;␊ --letter-spacing-sans: 0px;␊ + --font-feature-settings-sans: ();␊ --dist-capline-sans: 0em;␊ --dist-baseline-sans: 0em;␊ --trim-sides-sans: 0;␊ --trim-adjacent-sans: 0.125em;␊ --font-family-serif: MessinaSerif;␊ - --font-feature-settings-serif: ();␊ --line-height-serif: 1.4em;␊ --letter-spacing-serif: 0px;␊ + --font-feature-settings-serif: ();␊ --dist-capline-serif: 0em;␊ --dist-baseline-serif: 0em;␊ --trim-sides-serif: 0;␊ --trim-adjacent-serif: 0.125em;␊ --font-family-modern: MessinaModern;␊ - --font-feature-settings-modern: ();␊ --line-height-modern: 1.4em;␊ --letter-spacing-modern: 0px;␊ + --font-feature-settings-modern: ();␊ --dist-capline-modern: 0em;␊ --dist-baseline-modern: 0em;␊ --trim-sides-modern: 0;␊ @@ -91,9 +93,9 @@ Generated by [AVA](https://ava.li). .plain > *, [class^=plain-]:not([class$=plain-]) > *, [class*=" plain-"]:not([class$=plain-]) > * {␊ font-size: var(--font-size);␊ font-family: var(--font-family);␊ - font-feature-settings: var(--font-feature-settings);␊ line-height: calc(var(--line-height));␊ letter-spacing: calc(var(--letter-spacing));␊ + font-feature-settings: var(--font-feature-settings);␊ }␊ ␊ .trim > [class^=f-]:not([class$=f-]), .trim > [class*=" f-"]:not([class$=f-]),␊ @@ -119,7 +121,6 @@ Generated by [AVA](https://ava.li). ␊ .f-sans, [class^=f-sans-]:not([class$=f-sans-]), [class*=" f-sans-"]:not([class$=f-sans-]) {␊ --font-family: var(--font-family-sans);␊ - --line-height: var(--line-height-sans);␊ --letter-spacing: var(--letter-spacing-sans);␊ --font-feature-settings: var(--font-feature-settings-sans);␊ --dist-capline: 0em;␊ @@ -130,7 +131,6 @@ Generated by [AVA](https://ava.li). ␊ .f-serif, [class^=f-serif-]:not([class$=f-serif-]), [class*=" f-serif-"]:not([class$=f-serif-]) {␊ --font-family: var(--font-family-serif);␊ - --line-height: var(--line-height-serif);␊ --letter-spacing: var(--letter-spacing-serif);␊ --font-feature-settings: var(--font-feature-settings-serif);␊ --dist-capline: 0em;␊ @@ -141,7 +141,6 @@ Generated by [AVA](https://ava.li). ␊ .f-modern, [class^=f-modern-]:not([class$=f-modern-]), [class*=" f-modern-"]:not([class$=f-modern-]) {␊ --font-family: var(--font-family-modern);␊ - --line-height: var(--line-height-modern);␊ --letter-spacing: var(--letter-spacing-modern);␊ --font-feature-settings: var(--font-feature-settings-modern);␊ --dist-capline: 0em;␊ @@ -241,35 +240,37 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `body {␊ + `html {␊ + font-size: var(--font-size);␊ font-family: var(--font-family);␊ + line-height: var(--line-height);␊ }␊ ␊ :root {␊ --font-family: var(--font-family-sans);␊ - --font-feature-settings: var(--font-feature-settings-sans);␊ --line-height: var(--line-height-sans);␊ --letter-spacing: var(--letter-spacing-sans);␊ + --font-feature-settings: var(--font-feature-settings-sans);␊ --font-family-sans: MessinaSans;␊ - --font-feature-settings-sans: ();␊ --line-height-sans: 1.4em;␊ --letter-spacing-sans: 0px;␊ + --font-feature-settings-sans: ();␊ --dist-capline-sans: 0em;␊ --dist-baseline-sans: 0em;␊ --trim-sides-sans: 0;␊ --trim-adjacent-sans: 0.125em;␊ --font-family-serif: MessinaSerif;␊ - --font-feature-settings-serif: ();␊ --line-height-serif: 1.4em;␊ --letter-spacing-serif: 0px;␊ + --font-feature-settings-serif: ();␊ --dist-capline-serif: 0em;␊ --dist-baseline-serif: 0em;␊ --trim-sides-serif: 0;␊ --trim-adjacent-serif: 0.125em;␊ --font-family-modern: MessinaModern;␊ - --font-feature-settings-modern: ();␊ --line-height-modern: 1.4em;␊ --letter-spacing-modern: 0px;␊ + --font-feature-settings-modern: ();␊ --dist-capline-modern: 0em;␊ --dist-baseline-modern: 0em;␊ --trim-sides-modern: 0;␊ @@ -326,9 +327,9 @@ Generated by [AVA](https://ava.li). .plain > *, [class^="plain-"]:not([class$="plain-"]) > *, [class*=" plain-"]:not([class$="plain-"]) > * {␊ font-size: var(--font-size);␊ font-family: var(--font-family);␊ - font-feature-settings: var(--font-feature-settings);␊ line-height: calc(var(--line-height));␊ letter-spacing: calc(var(--letter-spacing));␊ + font-feature-settings: var(--font-feature-settings);␊ }␊ ␊ .trim > [class^="f-"]:not([class$="f-"]), .trim > [class*=" f-"]:not([class$="f-"]),␊ @@ -354,7 +355,6 @@ Generated by [AVA](https://ava.li). ␊ .f-sans, [class^="f-sans-"]:not([class$="f-sans-"]), [class*=" f-sans-"]:not([class$="f-sans-"]) {␊ --font-family: var(--font-family-sans);␊ - --line-height: var(--line-height-sans);␊ --letter-spacing: var(--letter-spacing-sans);␊ --font-feature-settings: var(--font-feature-settings-sans);␊ --dist-capline: 0em;␊ @@ -365,7 +365,6 @@ Generated by [AVA](https://ava.li). ␊ .f-serif, [class^="f-serif-"]:not([class$="f-serif-"]), [class*=" f-serif-"]:not([class$="f-serif-"]) {␊ --font-family: var(--font-family-serif);␊ - --line-height: var(--line-height-serif);␊ --letter-spacing: var(--letter-spacing-serif);␊ --font-feature-settings: var(--font-feature-settings-serif);␊ --dist-capline: 0em;␊ @@ -376,7 +375,6 @@ Generated by [AVA](https://ava.li). ␊ .f-modern, [class^="f-modern-"]:not([class$="f-modern-"]), [class*=" f-modern-"]:not([class$="f-modern-"]) {␊ --font-family: var(--font-family-modern);␊ - --line-height: var(--line-height-modern);␊ --letter-spacing: var(--letter-spacing-modern);␊ --font-feature-settings: var(--font-feature-settings-modern);␊ --dist-capline: 0em;␊ diff --git a/tests/snapshots/output-typo.scss.snap b/tests/snapshots/output-typo.scss.snap index 377e7c5f1f2a5b7c7af235bf2f9193b0ab6b12b7..a663c643928e31e61fac4dc6d407ca153938bf04 100644 GIT binary patch literal 1653 zcmV-*28#JXRzVP900BO6UprEo=CnX!=CE3kIWKm8?sgH){B*aOx-q~H>`D3x25biEL1qBj+ zfd4?r|DdO$gN_0k?D?=~?6LjM=F1zLYIfdd-Y?I*elvb1hGA?QXMaYI|JeTF?CjUS z-dbY(>s%JTWg&xNBM2#Nab7o+Hn3zmouTia=b)$JP=%i)G9q!c+pe>h&gJ z5X8iuv|gdoijW@>y^8E0Lbl^CGO#o&;;BK5;`0z&Q36Zkk?c)DSYDmG zJ29W(C~|!CW%8rsI)fYzkFclmmdOuRmo>gI&@S^}=0ve&qZKj3)^qJdHboIu3FFZ5 zlBYYvT;qW-k7h5CjeYL%!SHbOgfEn0#-TIMgHC@bqNbpluqmJ^Zi-R|&NNg+UXY5R zGm$cOCaVhG3uZX6K_|`c-Qi;2r zlQc13*)EEr7pHUU>xm!4yY%aTBqltz2h)_H6`)Yr(Z_ZJ%%Vo_N!)n zGOSu*riUyj=wfq&Msr$98l6c2bXEUa{=oHs_B|2KoQnY&#AxbbI-EO;(BTrJ%cSgX{^5J*WZl@xle>2_P7)j(Na8roCv zA*@{tI(SNe#$l^pzoC6bJNMfrcR%gU=%)5$txRg6Q)G>u)bQ|&OV;zu$z6(A)yUmS zv1-uCLiHh&r2@mC`kyfF^uvVM7FS&gD{q6<*TB;KFUe|pOC+V0TpN{=MQ4kNC9~zs zGB7Z;DOxMH!h&^@D=fe5?9zKDF}>_2s+cl9T}UvSE@e1_!%|G)IyshBtdV4C{jKj| zdVwqELU~=rf$(pU33$KiGo@6REU0xI<51fk(6*;x+XLEmfwo-@+b+O1yE+G0XGoxZ zhE{q&3P-^Oum@TW!0khxJq7C6S3iA~eaQ2tKpp$)9U$A!zD_iIkU?QSWN?)itg;o| zfP10mgpLn@y}*%LJ}7rXg%5!Jz>!)$D0hVH1N~=lIodb*aGVd1^5K(wc$^Ja+34KO zhCx1@xetcxBEDaXH;mP-XZe=4gw5aOiYwNV2l?w<(e-omRrXkq@8k7e-ZE1+uwQ+1 zp8QL5_b>eNUe?>ScheeVhwsii1Bnp#Q%8vF2yq=Dt|P>05aK#UT*rue5WJ?264z1U zu1SgOmo9e6O#O#F22m2@`pT~-*({74C&T|I^tkFr0ieibkEBSFtI-M|%E_A{(WYcn zWU~X1VQpmq*DBc_Yx$<54R}J@_jOM1%(mBmU=?X!03DI;{)lvdve-ZlTceu699T=? zjg?3pA9XbXOJzIB40`3V-7!ELuT}lz3`c%BWnqiku1L$}HxFh6=guH$Q%TAbwkn%)$N6RbH^7>UwJ5d0l=1B`W za$ZNy>&ST>IjzH`oY#@_9v(UGe%W~~qvvf1Kkpt1dcFSu#cgsv?M?syKo&$1 literal 1666 zcmV-|27UQKRzV#qPXCG?{ki?q>FKY3 zzct^E-)w2=@9P~+d-mUZAAj`W@gL8A{P&+wD>=e?_5ZxRMUjL`y7f;S`NN6DfbX`}c&w9Uwl zW5-`a;+g`HU+p@+ZJycA;w)xsxG4ddthPflS|Tf9l7WTUvR=8m6aA?jMUIcYNgirc zr{LYPf|N2G9NL~tCrUq9UJ~leiDJ`2OU#1O*h);BqR5sJ2gTPWCUht51VI(@3On!u%I6H<-c1W;i(C01Bopz@|ulGJuet1{jTW_IXj z)<4CMb>_1LGW!{=dIK0jz5^Lmz6B*Rw+9(bwh0-L?ZQ>>3(uZ8NRO=0wtXG>Gkw=X zm*x-7EIym)qvOHx@v-e0_>kwvJ=>PZc};@Ryi5cAh?pZG*HgWTJ|0z4-HCqqnUtD3 zwIsO|i3BkilkJkRXynkupkP3mftNBERWm5qSZ3g+42CiW#H+R2z(eF_P((A2Miw<& zks~Vhf&ywbBS&Praa9ql##p0Ns5?nEf+=6^OL#x z-NX;#UGn@WeKz)W^0ar-*XL$m0_Y8vE^>VRiN43c&rk4FfgPPQcx1|!%=fFoc{P?A zD%45o1b+QA7HbTmQgz{FLb+uj*V--BTm}Iasx2NXkPK2g4$@asVqg9Ci>Nv`L@}~n zHuDo<)eJK}ctL>|oiiH6DKTkOCIygH{k8Og^8v*@CeEA-0}o;}b!{@7JBuWq$k_1~ zWDs4@!9`N91e7=rkw<~S^o4E36q}5kz$XtVEpW*2%tpysrb3d0&c-N=9V?LzKZ)(t z9h4i|r#}5Ri0jTcSkgQoNgBGT57W2ur}{|$gr*_B2;SH6OPi4x!?c(^k77bKxFUBN z#Bt!QAdi*R97_*{i)4>;{S!*EUerW@3ernxLKPN-{2$o7e&->sJ(nZW?8)-jUSbR| z<>k=z(_XV!Wk%PM{-AoP@dBm61l_{(2v3FW)*n_XwbBHf5=$wCoNE$p3$!$(`K6&e z1s}rN#h`;H1t=W0`t=)HXS6fkHo5v~_l|CAP1edyEmVrMuoDU%c5z8-o;kit;jQu62Dw4z_f2|V$AIuml7RQCl8lfUO{jDg;ZWHgP`0Na+XKpWfwEl% z*)Bjfy}JiUr$~jwRpoV@WC|*PHBeFjE+6810#uPN_r6R%#Qy}SB3~W>qWtXhNV5hR zR3%+jL;=lgMK$1Bs41bM10WU{Qb`ACG*svShzEvL(m@&#q7LNW>e*;tXTxzmJj{oW z^Wjl8TxO$lHyZ}|aOU2dN|k@V7Oyy~E86lkaS5Bh%O!WbB@Ob|x#VvLLtkZXJ-Un6 zdpTsLZeYFq{yh0lb^9;;axAMw?d_BX+2OnO%0TF+`>pGz>-y=se!2(LPuDfnbq#g* zqAjZHsOviF*6gV3mu`FUO#OF33X%5J^`#$QvRPPfod|y*-F4Nj0Cd=8E-Cid)o=y$ z*@?lBaFaG0eg0bL*7-Sy!C(qcnz z*$UYVroc)JuPsHY=%~sOm@3=Z3!#=S+ie51@M@(I*VC(4729e@w22AuSgx-Ngv-WO zD(#HJO|PHYy{nsB)wOb4*YD)(%Nz9aX+Sq02fjC7NpHEIuV2xm$IU}}`gnNP)wf1h zU%#qRk0*dS`-BBuZ(rBj*Y);wy?tG8U)S5$_4akWeGj|0?{1s>TGrjSA?