From adf7d7a67cfbd600e02b1990d63bda9dda8c8482 Mon Sep 17 00:00:00 2001 From: thepaperpilot Date: Fri, 11 Jun 2021 23:38:16 -0500 Subject: [PATCH] Added layer features --- package-lock.json | 805 +++++++----------- package.json | 6 +- src/App.vue | 56 +- src/components/common/notify.css | 20 + src/components/features/Achievement.vue | 61 ++ src/components/features/Achievements.vue | 37 + src/components/features/Bar.vue | 130 +++ src/components/features/Buyable.vue | 101 +++ src/components/features/Buyables.vue | 73 ++ src/components/features/Challenge.vue | 87 ++ src/components/features/Challenges.vue | 37 + src/components/features/Clickable.vue | 74 ++ src/components/features/Clickables.vue | 63 ++ .../features/DefaultChallengeDisplay.vue | 51 ++ .../features/DefaultPrestigeButtonDisplay.vue | 71 ++ .../features/DefaultUpgradeDisplay.vue | 53 ++ src/components/features/Grid.vue | 31 + src/components/features/Gridable.vue | 75 ++ src/components/features/Infobox.vue | 169 ++++ src/components/features/MainDisplay.vue | 17 +- src/components/features/MarkNode.vue | 66 ++ src/components/features/MasterButton.vue | 44 + src/components/features/Milestone.vue | 66 ++ src/components/features/Milestones.vue | 28 + src/components/features/PrestigeButton.vue | 56 ++ src/components/features/ResourceDisplay.vue | 55 ++ src/components/features/RespecButton.vue | 111 +++ src/components/features/Upgrade.vue | 61 ++ src/components/features/Upgrades.vue | 37 + src/components/features/features.css | 32 + src/components/features/table.css | 30 + src/components/fields/Select.vue | 6 +- src/components/fields/Slider.vue | 23 + src/components/fields/Text.vue | 24 + src/components/fields/Toggle.vue | 2 +- src/components/fields/fields.css | 2 +- src/components/index.js | 114 ++- src/components/system/Column.vue | 15 + src/components/system/DefaultLayerTab.vue | 27 +- src/components/system/Info.vue | 4 +- src/components/system/LayerProvider.vue | 16 +- src/components/system/LayerTab.vue | 119 ++- src/components/system/Microtab.vue | 29 + src/components/system/Modal.vue | 40 +- src/components/system/Nav.vue | 5 +- src/components/system/Options.vue | 29 +- src/components/system/Row.vue | 15 + src/components/system/Spacer.vue | 21 + src/components/system/Sticky.vue | 64 ++ src/components/system/Subtab.vue | 27 + src/components/system/TabButton.vue | 81 ++ src/components/system/Tabs.vue | 80 +- src/components/system/Tooltip.vue | 90 ++ src/components/system/VerticalRule.vue | 21 + src/components/tree/BranchLine.vue | 48 ++ src/components/tree/BranchNode.vue | 77 ++ src/components/tree/Branches.vue | 107 +++ src/components/tree/Tree.vue | 78 ++ src/components/tree/TreeNode.vue | 138 +++ src/data/layers/aca/a.js | 70 ++ src/data/layers/aca/c.js | 410 +++++++++ src/data/layers/aca/f.js | 106 +++ src/data/layers/demo-infinity.js | 10 +- src/data/layers/demo.js | 52 +- src/data/mod.js | 39 +- src/data/modInfo.json | 4 +- src/data/themes.js | 65 +- src/main.css | 49 ++ src/main.js | 23 +- src/store/layers.js | 423 ++++++++- src/store/proxies.js | 60 +- src/util/common.js | 10 + src/util/features.js | 32 +- src/util/layers.js | 50 +- src/util/load.js | 14 +- src/util/vue.js | 47 +- 76 files changed, 4568 insertions(+), 801 deletions(-) create mode 100644 src/components/common/notify.css create mode 100644 src/components/features/Achievement.vue create mode 100644 src/components/features/Achievements.vue create mode 100644 src/components/features/Bar.vue create mode 100644 src/components/features/Buyable.vue create mode 100644 src/components/features/Buyables.vue create mode 100644 src/components/features/Challenge.vue create mode 100644 src/components/features/Challenges.vue create mode 100644 src/components/features/Clickable.vue create mode 100644 src/components/features/Clickables.vue create mode 100644 src/components/features/DefaultChallengeDisplay.vue create mode 100644 src/components/features/DefaultPrestigeButtonDisplay.vue create mode 100644 src/components/features/DefaultUpgradeDisplay.vue create mode 100644 src/components/features/Grid.vue create mode 100644 src/components/features/Gridable.vue create mode 100644 src/components/features/Infobox.vue create mode 100644 src/components/features/MarkNode.vue create mode 100644 src/components/features/MasterButton.vue create mode 100644 src/components/features/Milestone.vue create mode 100644 src/components/features/Milestones.vue create mode 100644 src/components/features/PrestigeButton.vue create mode 100644 src/components/features/ResourceDisplay.vue create mode 100644 src/components/features/RespecButton.vue create mode 100644 src/components/features/Upgrade.vue create mode 100644 src/components/features/Upgrades.vue create mode 100644 src/components/features/features.css create mode 100644 src/components/features/table.css create mode 100644 src/components/fields/Slider.vue create mode 100644 src/components/fields/Text.vue create mode 100644 src/components/system/Column.vue create mode 100644 src/components/system/Microtab.vue create mode 100644 src/components/system/Row.vue create mode 100644 src/components/system/Spacer.vue create mode 100644 src/components/system/Sticky.vue create mode 100644 src/components/system/Subtab.vue create mode 100644 src/components/system/TabButton.vue create mode 100644 src/components/system/Tooltip.vue create mode 100644 src/components/system/VerticalRule.vue create mode 100644 src/components/tree/BranchLine.vue create mode 100644 src/components/tree/BranchNode.vue create mode 100644 src/components/tree/Branches.vue create mode 100644 src/components/tree/Tree.vue create mode 100644 src/components/tree/TreeNode.vue create mode 100644 src/data/layers/aca/a.js create mode 100644 src/data/layers/aca/c.js create mode 100644 src/data/layers/aca/f.js create mode 100644 src/main.css diff --git a/package-lock.json b/package-lock.json index a10d1b4..48c1066 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,12 @@ "dependencies": { "core-js": "^3.6.5", "vue": "^2.6.11", - "vue-fragment": "^1.5.2", + "vue-frag": "^1.1.5", + "vue-reactive-provide": "^0.3.0", "vue-select": "^3.11.2", + "vue-textarea-autosize": "^1.1.1", + "vue-transition-expand": "^0.1.0", + "vue2-perfect-scrollbar": "^1.5.0", "vuex": "^3.4.0" }, "devDependencies": { @@ -1582,8 +1586,7 @@ "node_modules/@types/q": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz", - "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==", - "dev": true + "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "node_modules/@types/qs": { "version": "6.9.6", @@ -2467,8 +2470,7 @@ "node_modules/alphanum-sort": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true + "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=" }, "node_modules/ansi-colors": { "version": "3.2.4", @@ -2519,7 +2521,6 @@ "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, "dependencies": { "color-convert": "^1.9.0" }, @@ -2576,7 +2577,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, "dependencies": { "sprintf-js": "~1.0.2" } @@ -3082,8 +3082,7 @@ "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "node_modules/brace-expansion": { "version": "1.1.11", @@ -3254,7 +3253,6 @@ "version": "4.16.6", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", - "dev": true, "dependencies": { "caniuse-lite": "^1.0.30001219", "colorette": "^1.2.2", @@ -3399,7 +3397,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -3418,7 +3415,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", - "dev": true, "dependencies": { "callsites": "^2.0.0" }, @@ -3430,7 +3426,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", - "dev": true, "dependencies": { "caller-callsite": "^2.0.0" }, @@ -3442,7 +3437,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", - "dev": true, "engines": { "node": ">=4" } @@ -3473,7 +3467,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", - "dev": true, "dependencies": { "browserslist": "^4.0.0", "caniuse-lite": "^1.0.0", @@ -3485,7 +3478,6 @@ "version": "1.0.30001228", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz", "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==", - "dev": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/browserslist" @@ -3510,7 +3502,6 @@ "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, "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -3972,7 +3963,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz", "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", - "dev": true, "dependencies": { "@types/q": "^1.5.1", "chalk": "^2.4.1", @@ -3999,7 +3989,6 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz", "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==", - "dev": true, "dependencies": { "color-convert": "^1.9.1", "color-string": "^1.5.4" @@ -4009,7 +3998,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "dependencies": { "color-name": "1.1.3" } @@ -4017,14 +4005,12 @@ "node_modules/color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "node_modules/color-string": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz", "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==", - "dev": true, "dependencies": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -4033,8 +4019,7 @@ "node_modules/colorette": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", - "dev": true + "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" }, "node_modules/combined-stream": { "version": "1.0.8", @@ -4464,7 +4449,6 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", - "dev": true, "dependencies": { "import-fresh": "^2.0.0", "is-directory": "^0.3.1", @@ -4569,7 +4553,6 @@ "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", - "dev": true, "engines": { "node": "*" } @@ -4578,7 +4561,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz", "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==", - "dev": true, "dependencies": { "postcss": "^7.0.1", "timsort": "^0.3.0" @@ -4631,7 +4613,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", - "dev": true, "dependencies": { "boolbase": "^1.0.0", "css-what": "^3.2.1", @@ -4642,14 +4623,12 @@ "node_modules/css-select-base-adapter": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz", - "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==", - "dev": true + "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==" }, "node_modules/css-tree": { "version": "1.0.0-alpha.37", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==", - "dev": true, "dependencies": { "mdn-data": "2.0.4", "source-map": "^0.6.1" @@ -4662,7 +4641,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4671,7 +4649,6 @@ "version": "3.4.2", "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==", - "dev": true, "engines": { "node": ">= 6" }, @@ -4683,7 +4660,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true, "bin": { "cssesc": "bin/cssesc" }, @@ -4695,7 +4671,6 @@ "version": "4.1.11", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz", "integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==", - "dev": true, "dependencies": { "cosmiconfig": "^5.0.0", "cssnano-preset-default": "^4.0.8", @@ -4710,7 +4685,6 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz", "integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==", - "dev": true, "dependencies": { "css-declaration-sorter": "^4.0.1", "cssnano-util-raw-cache": "^4.0.1", @@ -4751,7 +4725,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz", "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -4760,7 +4733,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz", "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -4769,7 +4741,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz", "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==", - "dev": true, "dependencies": { "postcss": "^7.0.0" }, @@ -4781,7 +4752,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz", "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -4790,7 +4760,6 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", - "dev": true, "dependencies": { "css-tree": "^1.1.2" }, @@ -4802,7 +4771,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", - "dev": true, "dependencies": { "mdn-data": "2.0.14", "source-map": "^0.6.1" @@ -4814,14 +4782,12 @@ "node_modules/csso/node_modules/mdn-data": { "version": "2.0.14", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", - "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", - "dev": true + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==" }, "node_modules/csso/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5067,7 +5033,6 @@ "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, "dependencies": { "object-keys": "^1.0.12" }, @@ -5250,7 +5215,6 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", - "dev": true, "dependencies": { "domelementtype": "^2.0.1", "entities": "^2.0.0" @@ -5260,7 +5224,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", - "dev": true, "funding": [ { "type": "github", @@ -5281,8 +5244,7 @@ "node_modules/domelementtype": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", - "dev": true + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" }, "node_modules/domhandler": { "version": "2.4.2", @@ -5297,7 +5259,6 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", - "dev": true, "dependencies": { "dom-serializer": "0", "domelementtype": "1" @@ -5307,7 +5268,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, "dependencies": { "is-obj": "^2.0.0" }, @@ -5386,8 +5346,7 @@ "node_modules/electron-to-chromium": { "version": "1.3.733", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.733.tgz", - "integrity": "sha512-6VUgcqRBo7FC+SG08arfFwr9qKVnBSmagXN332SWvvG2j/26Xy7AfQMqPsVq3vVW4fw20SrnmBedQzTD3slVEQ==", - "dev": true + "integrity": "sha512-6VUgcqRBo7FC+SG08arfFwr9qKVnBSmagXN332SWvvG2j/26Xy7AfQMqPsVq3vVW4fw20SrnmBedQzTD3slVEQ==" }, "node_modules/elliptic": { "version": "6.5.4", @@ -5474,7 +5433,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -5495,7 +5453,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, "dependencies": { "is-arrayish": "^0.2.1" } @@ -5513,7 +5470,6 @@ "version": "1.18.0", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", @@ -5543,7 +5499,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, "dependencies": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -5560,7 +5515,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, "engines": { "node": ">=6" } @@ -5575,7 +5529,6 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, "engines": { "node": ">=0.8.0" } @@ -5804,7 +5757,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -6636,8 +6588,7 @@ "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "node_modules/functional-red-black-tree": { "version": "1.0.1", @@ -6667,7 +6618,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "dev": true, "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -6835,7 +6785,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "dependencies": { "function-bind": "^1.1.1" }, @@ -6847,7 +6796,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -6856,7 +6804,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, "engines": { "node": ">=4" } @@ -6865,7 +6812,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -6988,8 +6934,7 @@ "node_modules/hex-color-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", - "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==", - "dev": true + "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==" }, "node_modules/highlight.js": { "version": "10.7.2", @@ -7041,14 +6986,12 @@ "node_modules/hsl-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz", - "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=", - "dev": true + "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=" }, "node_modules/hsla-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz", - "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=", - "dev": true + "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=" }, "node_modules/html-entities": { "version": "1.4.0", @@ -7408,7 +7351,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", - "dev": true, "dependencies": { "caller-path": "^2.0.0", "resolve-from": "^3.0.0" @@ -7515,8 +7457,7 @@ "node_modules/indexes-of": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true + "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=" }, "node_modules/infer-owner": { "version": "1.0.4", @@ -7732,7 +7673,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7767,14 +7707,12 @@ "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "node_modules/is-bigint": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz", "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7796,7 +7734,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz", "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==", - "dev": true, "dependencies": { "call-bind": "^1.0.2" }, @@ -7817,7 +7754,6 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -7841,7 +7777,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz", "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=", - "dev": true, "dependencies": { "css-color-names": "^0.0.4", "hex-color-regex": "^1.1.0", @@ -7855,7 +7790,6 @@ "version": "2.4.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz", "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==", - "dev": true, "dependencies": { "has": "^1.0.3" }, @@ -7879,7 +7813,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz", "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -7905,7 +7838,6 @@ "version": "0.3.1", "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7971,7 +7903,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -7995,7 +7926,6 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz", "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -8019,7 +7949,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true, "engines": { "node": ">=8" } @@ -8085,7 +8014,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-symbols": "^1.0.2" @@ -8100,8 +8028,7 @@ "node_modules/is-resolvable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==" }, "node_modules/is-stream": { "version": "1.1.0", @@ -8116,7 +8043,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz", "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -8128,7 +8054,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, "dependencies": { "has-symbols": "^1.0.2" }, @@ -8230,7 +8155,6 @@ "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -8260,8 +8184,7 @@ "node_modules/json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", @@ -8532,8 +8455,7 @@ "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true + "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" }, "node_modules/lodash.transform": { "version": "4.6.0", @@ -8544,8 +8466,7 @@ "node_modules/lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true + "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" }, "node_modules/log-symbols": { "version": "2.2.0", @@ -8637,8 +8558,7 @@ "node_modules/mdn-data": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", - "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==", - "dev": true + "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==" }, "node_modules/media-typer": { "version": "0.3.0", @@ -8851,8 +8771,7 @@ "node_modules/minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "node_modules/minipass": { "version": "3.1.3", @@ -8910,7 +8829,6 @@ "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, "dependencies": { "minimist": "^1.2.5" }, @@ -9102,8 +9020,7 @@ "node_modules/node-releases": { "version": "1.1.72", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz", - "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==", - "dev": true + "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==" }, "node_modules/normalize-package-data": { "version": "2.5.0", @@ -9175,7 +9092,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "dev": true, "dependencies": { "boolbase": "~1.0.0" } @@ -9302,7 +9218,6 @@ "version": "1.10.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -9327,7 +9242,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, "engines": { "node": ">= 0.4" } @@ -9348,7 +9262,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dev": true, "dependencies": { "call-bind": "^1.0.0", "define-properties": "^1.1.3", @@ -9366,7 +9279,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz", "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -9395,7 +9307,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz", "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -9745,7 +9656,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, "dependencies": { "error-ex": "^1.3.1", "json-parse-better-errors": "^1.0.1" @@ -9841,8 +9751,7 @@ "node_modules/path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "node_modules/path-to-regexp": { "version": "0.1.7", @@ -9887,6 +9796,11 @@ "node": ">=0.12" } }, + "node_modules/perfect-scrollbar": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.1.tgz", + "integrity": "sha512-MrSImINnIh3Tm1hdPT6bji6fmIeRorVEegQvyUnhqko2hDGTHhmjPefHXfxG/Jb8xVbfCwgmUIlIajERGXjVXQ==" + }, "node_modules/performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -9995,7 +9909,6 @@ "version": "7.0.35", "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", - "dev": true, "dependencies": { "chalk": "^2.4.2", "source-map": "^0.6.1", @@ -10013,7 +9926,6 @@ "version": "7.0.5", "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz", "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==", - "dev": true, "dependencies": { "postcss": "^7.0.27", "postcss-selector-parser": "^6.0.2", @@ -10024,7 +9936,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz", "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==", - "dev": true, "dependencies": { "browserslist": "^4.0.0", "color": "^3.0.0", @@ -10039,14 +9950,12 @@ "node_modules/postcss-colormin/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-convert-values": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz", "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==", - "dev": true, "dependencies": { "postcss": "^7.0.0", "postcss-value-parser": "^3.0.0" @@ -10058,14 +9967,12 @@ "node_modules/postcss-convert-values/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-discard-comments": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz", "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==", - "dev": true, "dependencies": { "postcss": "^7.0.0" }, @@ -10077,7 +9984,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz", "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==", - "dev": true, "dependencies": { "postcss": "^7.0.0" }, @@ -10089,7 +9995,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz", "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==", - "dev": true, "dependencies": { "postcss": "^7.0.0" }, @@ -10101,7 +10006,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz", "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==", - "dev": true, "dependencies": { "postcss": "^7.0.0" }, @@ -10109,6 +10013,25 @@ "node": ">=6.9.0" } }, + "node_modules/postcss-import": { + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz", + "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==", + "dependencies": { + "postcss": "^7.0.1", + "postcss-value-parser": "^3.2.3", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/postcss-import/node_modules/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==" + }, "node_modules/postcss-load-config": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz", @@ -10159,7 +10082,6 @@ "version": "4.0.11", "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz", "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==", - "dev": true, "dependencies": { "css-color-names": "0.0.4", "postcss": "^7.0.0", @@ -10173,14 +10095,12 @@ "node_modules/postcss-merge-longhand/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-merge-rules": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz", "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==", - "dev": true, "dependencies": { "browserslist": "^4.0.0", "caniuse-api": "^3.0.0", @@ -10197,7 +10117,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, "dependencies": { "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", @@ -10211,7 +10130,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz", "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==", - "dev": true, "dependencies": { "postcss": "^7.0.0", "postcss-value-parser": "^3.0.0" @@ -10223,14 +10141,12 @@ "node_modules/postcss-minify-font-values/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-minify-gradients": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz", "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==", - "dev": true, "dependencies": { "cssnano-util-get-arguments": "^4.0.0", "is-color-stop": "^1.0.0", @@ -10244,14 +10160,12 @@ "node_modules/postcss-minify-gradients/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-minify-params": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz", "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==", - "dev": true, "dependencies": { "alphanum-sort": "^1.0.0", "browserslist": "^4.0.0", @@ -10267,14 +10181,12 @@ "node_modules/postcss-minify-params/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-minify-selectors": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz", "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==", - "dev": true, "dependencies": { "alphanum-sort": "^1.0.0", "has": "^1.0.0", @@ -10289,7 +10201,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, "dependencies": { "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", @@ -10353,7 +10264,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz", "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==", - "dev": true, "dependencies": { "postcss": "^7.0.0" }, @@ -10365,7 +10275,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz", "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==", - "dev": true, "dependencies": { "cssnano-util-get-match": "^4.0.0", "postcss": "^7.0.0", @@ -10378,14 +10287,12 @@ "node_modules/postcss-normalize-display-values/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-normalize-positions": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz", "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==", - "dev": true, "dependencies": { "cssnano-util-get-arguments": "^4.0.0", "has": "^1.0.0", @@ -10399,14 +10306,12 @@ "node_modules/postcss-normalize-positions/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-normalize-repeat-style": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz", "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==", - "dev": true, "dependencies": { "cssnano-util-get-arguments": "^4.0.0", "cssnano-util-get-match": "^4.0.0", @@ -10420,14 +10325,12 @@ "node_modules/postcss-normalize-repeat-style/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-normalize-string": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz", "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==", - "dev": true, "dependencies": { "has": "^1.0.0", "postcss": "^7.0.0", @@ -10440,14 +10343,12 @@ "node_modules/postcss-normalize-string/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-normalize-timing-functions": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz", "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==", - "dev": true, "dependencies": { "cssnano-util-get-match": "^4.0.0", "postcss": "^7.0.0", @@ -10460,14 +10361,12 @@ "node_modules/postcss-normalize-timing-functions/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-normalize-unicode": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz", "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==", - "dev": true, "dependencies": { "browserslist": "^4.0.0", "postcss": "^7.0.0", @@ -10480,14 +10379,12 @@ "node_modules/postcss-normalize-unicode/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-normalize-url": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz", "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==", - "dev": true, "dependencies": { "is-absolute-url": "^2.0.0", "normalize-url": "^3.0.0", @@ -10502,7 +10399,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz", "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==", - "dev": true, "engines": { "node": ">=6" } @@ -10510,14 +10406,12 @@ "node_modules/postcss-normalize-url/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-normalize-whitespace": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz", "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==", - "dev": true, "dependencies": { "postcss": "^7.0.0", "postcss-value-parser": "^3.0.0" @@ -10529,14 +10423,12 @@ "node_modules/postcss-normalize-whitespace/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-ordered-values": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz", "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==", - "dev": true, "dependencies": { "cssnano-util-get-arguments": "^4.0.0", "postcss": "^7.0.0", @@ -10549,14 +10441,12 @@ "node_modules/postcss-ordered-values/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-reduce-initial": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz", "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==", - "dev": true, "dependencies": { "browserslist": "^4.0.0", "caniuse-api": "^3.0.0", @@ -10571,7 +10461,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz", "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==", - "dev": true, "dependencies": { "cssnano-util-get-match": "^4.0.0", "has": "^1.0.0", @@ -10585,14 +10474,12 @@ "node_modules/postcss-reduce-transforms/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-selector-parser": { "version": "6.0.6", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", - "dev": true, "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -10605,7 +10492,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz", "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==", - "dev": true, "dependencies": { "postcss": "^7.0.0", "postcss-value-parser": "^3.0.0", @@ -10618,14 +10504,12 @@ "node_modules/postcss-svgo/node_modules/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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "node_modules/postcss-unique-selectors": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz", "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==", - "dev": true, "dependencies": { "alphanum-sort": "^1.0.0", "postcss": "^7.0.0", @@ -10638,14 +10522,12 @@ "node_modules/postcss-value-parser": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", - "dev": true + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==" }, "node_modules/postcss/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -10654,7 +10536,6 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, "dependencies": { "has-flag": "^3.0.0" }, @@ -10828,7 +10709,6 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", - "dev": true, "engines": { "node": ">=0.6.0", "teleport": ">=0.2.0" @@ -10923,6 +10803,22 @@ "node": ">= 0.8" } }, + "node_modules/read-cache": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", + "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", + "dependencies": { + "pify": "^2.3.0" + } + }, + "node_modules/read-cache/node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -11232,7 +11128,6 @@ "version": "1.20.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", - "dev": true, "dependencies": { "is-core-module": "^2.2.0", "path-parse": "^1.0.6" @@ -11257,7 +11152,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true, "engines": { "node": ">=4" } @@ -11303,14 +11197,12 @@ "node_modules/rgb-regex": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz", - "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=", - "dev": true + "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=" }, "node_modules/rgba-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", - "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=", - "dev": true + "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=" }, "node_modules/rimraf": { "version": "2.7.1", @@ -11388,8 +11280,7 @@ "node_modules/sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "node_modules/schema-utils": { "version": "2.7.1", @@ -11678,7 +11569,6 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", - "dev": true, "dependencies": { "is-arrayish": "^0.3.1" } @@ -11686,8 +11576,7 @@ "node_modules/simple-swizzle/node_modules/is-arrayish": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "dev": true + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" }, "node_modules/slash": { "version": "2.0.0", @@ -12099,8 +11988,7 @@ "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "node_modules/sshpk": { "version": "1.16.1", @@ -12142,8 +12030,7 @@ "node_modules/stable": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", - "dev": true + "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" }, "node_modules/stackframe": { "version": "1.2.0", @@ -12351,7 +12238,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -12364,7 +12250,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -12428,7 +12313,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz", "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==", - "dev": true, "dependencies": { "browserslist": "^4.0.0", "postcss": "^7.0.0", @@ -12442,7 +12326,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, "dependencies": { "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", @@ -12456,7 +12339,6 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, "dependencies": { "has-flag": "^3.0.0" }, @@ -12474,7 +12356,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", - "dev": true, "dependencies": { "chalk": "^2.4.1", "coa": "^2.0.2", @@ -12803,8 +12684,7 @@ "node_modules/timsort": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", - "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", - "dev": true + "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" }, "node_modules/tmp": { "version": "0.0.33", @@ -13041,7 +12921,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==", - "dev": true, "dependencies": { "function-bind": "^1.1.1", "has-bigints": "^1.0.1", @@ -13119,14 +12998,12 @@ "node_modules/uniq": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true + "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=" }, "node_modules/uniqs": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", - "dev": true + "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=" }, "node_modules/unique-filename": { "version": "1.1.1", @@ -13167,8 +13044,7 @@ "node_modules/unquote": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", - "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=", - "dev": true + "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=" }, "node_modules/unset-value": { "version": "1.0.0", @@ -13320,14 +13196,12 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "node_modules/util.promisify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", - "dev": true, "dependencies": { "define-properties": "^1.1.2", "object.getownpropertydescriptors": "^2.0.3" @@ -13392,7 +13266,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz", "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==", - "dev": true, "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -13459,12 +13332,12 @@ "node": ">=8.0.0" } }, - "node_modules/vue-fragment": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.5.2.tgz", - "integrity": "sha512-KEW0gkeNOLJjtXN4jqJhTazez5jtrwimHkE5Few/VxblH4F9EcvJiEsahrV5kg5uKd5U8du4ORKS6QjGE0piYA==", - "peerDependencies": { - "vue": "^2.5.16" + "node_modules/vue-frag": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/vue-frag/-/vue-frag-1.1.5.tgz", + "integrity": "sha512-g+PP9pjW1gnrmPjy2Sa5jK/bfxYHK8Hgt1sVs/Y/7KT+srGJUwtGNwXNTUvWv/zJ2yGcvJVEH98eIrICyZX9Ng==", + "funding": { + "url": "https://github.com/privatenumber/vue-frag?sponsor=1" } }, "node_modules/vue-hot-reload-api": { @@ -13608,6 +13481,14 @@ "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=", "dev": true }, + "node_modules/vue-reactive-provide": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/vue-reactive-provide/-/vue-reactive-provide-0.3.0.tgz", + "integrity": "sha512-hx2JtRPRvne9NY4s1r7ASsCaO8CIby30qwC1kGQRxsrWApO3he+rziGOzTDSfvmr852zWMb11n6qAwHCz6C/vw==", + "peerDependencies": { + "vue": ">=2.6" + } + }, "node_modules/vue-select": { "version": "3.11.2", "resolved": "https://registry.npmjs.org/vue-select/-/vue-select-3.11.2.tgz", @@ -13648,6 +13529,39 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "node_modules/vue-textarea-autosize": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/vue-textarea-autosize/-/vue-textarea-autosize-1.1.1.tgz", + "integrity": "sha512-B33Mg5ZDEfj/whhoPBLg25qqAdGHGM2NjDT99Qi5MXRyeLmXb4C3s6EprAHqy3nU0cooWXFU+IekI5DpoEbnFg==", + "dependencies": { + "core-js": "^2.6.5" + } + }, + "node_modules/vue-textarea-autosize/node_modules/core-js": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", + "deprecated": "core-js@<3.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.", + "hasInstallScript": true + }, + "node_modules/vue-transition-expand": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/vue-transition-expand/-/vue-transition-expand-0.1.0.tgz", + "integrity": "sha512-4UKkK/ILk+Qh3WWJoupt7pXfzpjvb7vTQTaVUhnkr+FeXArndJVDyIn2eWIn7i37cVFXKu2jsDR47QELOCq/gQ==", + "dependencies": { + "vue": "^2.5.16" + } + }, + "node_modules/vue2-perfect-scrollbar": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/vue2-perfect-scrollbar/-/vue2-perfect-scrollbar-1.5.0.tgz", + "integrity": "sha512-hQAjhOX9MP3/ePa/AozKKtpiHSaV0dBlniyt2L7eqC/PsDx+pu7YBmTpM0KR5WlNq5GZwreK6215L8ZG1EHC7w==", + "dependencies": { + "cssnano": "^4.1.3", + "perfect-scrollbar": "^1.5.0", + "postcss-import": "^12.0.0" + } + }, "node_modules/vuex": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz", @@ -14439,7 +14353,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, "dependencies": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", @@ -16139,8 +16052,7 @@ "@types/q": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz", - "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==", - "dev": true + "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "@types/qs": { "version": "6.9.6", @@ -16891,8 +16803,7 @@ "alphanum-sort": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true + "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=" }, "ansi-colors": { "version": "3.2.4", @@ -16925,7 +16836,6 @@ "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" } @@ -16962,7 +16872,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, "requires": { "sprintf-js": "~1.0.2" } @@ -17377,8 +17286,7 @@ "boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "brace-expansion": { "version": "1.1.11", @@ -17527,7 +17435,6 @@ "version": "4.16.6", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", - "dev": true, "requires": { "caniuse-lite": "^1.0.30001219", "colorette": "^1.2.2", @@ -17652,7 +17559,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, "requires": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -17668,7 +17574,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", - "dev": true, "requires": { "callsites": "^2.0.0" } @@ -17677,7 +17582,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", - "dev": true, "requires": { "caller-callsite": "^2.0.0" } @@ -17685,8 +17589,7 @@ "callsites": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", - "dev": true + "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=" }, "camel-case": { "version": "3.0.0", @@ -17708,7 +17611,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", - "dev": true, "requires": { "browserslist": "^4.0.0", "caniuse-lite": "^1.0.0", @@ -17719,8 +17621,7 @@ "caniuse-lite": { "version": "1.0.30001228", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz", - "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==", - "dev": true + "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==" }, "case-sensitive-paths-webpack-plugin": { "version": "2.4.0", @@ -17738,7 +17639,6 @@ "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", @@ -18100,7 +18000,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz", "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", - "dev": true, "requires": { "@types/q": "^1.5.1", "chalk": "^2.4.1", @@ -18121,7 +18020,6 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz", "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==", - "dev": true, "requires": { "color-convert": "^1.9.1", "color-string": "^1.5.4" @@ -18131,7 +18029,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -18139,14 +18036,12 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "color-string": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz", "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==", - "dev": true, "requires": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -18155,8 +18050,7 @@ "colorette": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", - "dev": true + "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" }, "combined-stream": { "version": "1.0.8", @@ -18503,7 +18397,6 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", - "dev": true, "requires": { "import-fresh": "^2.0.0", "is-directory": "^0.3.1", @@ -18599,14 +18492,12 @@ "css-color-names": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", - "dev": true + "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=" }, "css-declaration-sorter": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz", "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==", - "dev": true, "requires": { "postcss": "^7.0.1", "timsort": "^0.3.0" @@ -18645,7 +18536,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", - "dev": true, "requires": { "boolbase": "^1.0.0", "css-what": "^3.2.1", @@ -18656,14 +18546,12 @@ "css-select-base-adapter": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz", - "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==", - "dev": true + "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==" }, "css-tree": { "version": "1.0.0-alpha.37", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==", - "dev": true, "requires": { "mdn-data": "2.0.4", "source-map": "^0.6.1" @@ -18672,28 +18560,24 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, "css-what": { "version": "3.4.2", "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", - "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==", - "dev": true + "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==" }, "cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" }, "cssnano": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz", "integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==", - "dev": true, "requires": { "cosmiconfig": "^5.0.0", "cssnano-preset-default": "^4.0.8", @@ -18705,7 +18589,6 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz", "integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==", - "dev": true, "requires": { "css-declaration-sorter": "^4.0.1", "cssnano-util-raw-cache": "^4.0.1", @@ -18742,20 +18625,17 @@ "cssnano-util-get-arguments": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz", - "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=", - "dev": true + "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=" }, "cssnano-util-get-match": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz", - "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=", - "dev": true + "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=" }, "cssnano-util-raw-cache": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz", "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==", - "dev": true, "requires": { "postcss": "^7.0.0" } @@ -18763,14 +18643,12 @@ "cssnano-util-same-parent": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz", - "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==", - "dev": true + "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==" }, "csso": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", - "dev": true, "requires": { "css-tree": "^1.1.2" }, @@ -18779,7 +18657,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", - "dev": true, "requires": { "mdn-data": "2.0.14", "source-map": "^0.6.1" @@ -18788,14 +18665,12 @@ "mdn-data": { "version": "2.0.14", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", - "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", - "dev": true + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==" }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, @@ -18980,7 +18855,6 @@ "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" } @@ -19142,7 +19016,6 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", - "dev": true, "requires": { "domelementtype": "^2.0.1", "entities": "^2.0.0" @@ -19151,8 +19024,7 @@ "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", - "dev": true + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" } } }, @@ -19165,8 +19037,7 @@ "domelementtype": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", - "dev": true + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" }, "domhandler": { "version": "2.4.2", @@ -19181,7 +19052,6 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", - "dev": true, "requires": { "dom-serializer": "0", "domelementtype": "1" @@ -19191,7 +19061,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, "requires": { "is-obj": "^2.0.0" } @@ -19257,8 +19126,7 @@ "electron-to-chromium": { "version": "1.3.733", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.733.tgz", - "integrity": "sha512-6VUgcqRBo7FC+SG08arfFwr9qKVnBSmagXN332SWvvG2j/26Xy7AfQMqPsVq3vVW4fw20SrnmBedQzTD3slVEQ==", - "dev": true + "integrity": "sha512-6VUgcqRBo7FC+SG08arfFwr9qKVnBSmagXN332SWvvG2j/26Xy7AfQMqPsVq3vVW4fw20SrnmBedQzTD3slVEQ==" }, "elliptic": { "version": "6.5.4", @@ -19336,8 +19204,7 @@ "entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" }, "errno": { "version": "0.1.8", @@ -19352,7 +19219,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, "requires": { "is-arrayish": "^0.2.1" } @@ -19370,7 +19236,6 @@ "version": "1.18.0", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", - "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", @@ -19394,7 +19259,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -19404,8 +19268,7 @@ "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "escape-html": { "version": "1.0.3", @@ -19416,8 +19279,7 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { "version": "6.8.0", @@ -19587,8 +19449,7 @@ "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esquery": { "version": "1.4.0", @@ -20250,8 +20111,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "functional-red-black-tree": { "version": "1.0.1", @@ -20275,7 +20135,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -20411,7 +20270,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -20419,20 +20277,17 @@ "has-bigints": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", - "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", - "dev": true + "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==" }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" }, "has-value": { "version": "1.0.0", @@ -20521,8 +20376,7 @@ "hex-color-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", - "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==", - "dev": true + "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==" }, "highlight.js": { "version": "10.7.2", @@ -20568,14 +20422,12 @@ "hsl-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz", - "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=", - "dev": true + "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=" }, "hsla-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz", - "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=", - "dev": true + "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=" }, "html-entities": { "version": "1.4.0", @@ -20858,7 +20710,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", - "dev": true, "requires": { "caller-path": "^2.0.0", "resolve-from": "^3.0.0" @@ -20937,8 +20788,7 @@ "indexes-of": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true + "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=" }, "infer-owner": { "version": "1.0.4", @@ -21109,8 +20959,7 @@ "is-absolute-url": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", - "dev": true + "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=" }, "is-accessor-descriptor": { "version": "1.0.0", @@ -21133,14 +20982,12 @@ "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-bigint": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz", - "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==", - "dev": true + "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==" }, "is-binary-path": { "version": "2.1.0", @@ -21156,7 +21003,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz", "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==", - "dev": true, "requires": { "call-bind": "^1.0.2" } @@ -21170,8 +21016,7 @@ "is-callable": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", - "dev": true + "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==" }, "is-ci": { "version": "1.2.1", @@ -21186,7 +21031,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz", "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=", - "dev": true, "requires": { "css-color-names": "^0.0.4", "hex-color-regex": "^1.1.0", @@ -21200,7 +21044,6 @@ "version": "2.4.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz", "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==", - "dev": true, "requires": { "has": "^1.0.3" } @@ -21217,8 +21060,7 @@ "is-date-object": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz", - "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==", - "dev": true + "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==" }, "is-descriptor": { "version": "1.0.2", @@ -21234,8 +21076,7 @@ "is-directory": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", - "dev": true + "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=" }, "is-docker": { "version": "2.2.1", @@ -21276,8 +21117,7 @@ "is-negative-zero": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", - "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", - "dev": true + "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==" }, "is-number": { "version": "3.0.0", @@ -21302,14 +21142,12 @@ "is-number-object": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz", - "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==", - "dev": true + "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==" }, "is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" }, "is-path-cwd": { "version": "2.2.0", @@ -21354,7 +21192,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", - "dev": true, "requires": { "call-bind": "^1.0.2", "has-symbols": "^1.0.2" @@ -21363,8 +21200,7 @@ "is-resolvable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==" }, "is-stream": { "version": "1.1.0", @@ -21375,14 +21211,12 @@ "is-string": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz", - "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==", - "dev": true + "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==" }, "is-symbol": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, "requires": { "has-symbols": "^1.0.2" } @@ -21463,7 +21297,6 @@ "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -21484,8 +21317,7 @@ "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" }, "json-parse-even-better-errors": { "version": "2.3.1", @@ -21721,8 +21553,7 @@ "lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true + "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" }, "lodash.transform": { "version": "4.6.0", @@ -21733,8 +21564,7 @@ "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true + "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" }, "log-symbols": { "version": "2.2.0", @@ -21804,8 +21634,7 @@ "mdn-data": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", - "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==", - "dev": true + "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==" }, "media-typer": { "version": "0.3.0", @@ -21979,8 +21808,7 @@ "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "minipass": { "version": "3.1.3", @@ -22031,7 +21859,6 @@ "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, "requires": { "minimist": "^1.2.5" } @@ -22207,8 +22034,7 @@ "node-releases": { "version": "1.1.72", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz", - "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==", - "dev": true + "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==" }, "normalize-package-data": { "version": "2.5.0", @@ -22267,7 +22093,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "dev": true, "requires": { "boolbase": "~1.0.0" } @@ -22367,8 +22192,7 @@ "object-inspect": { "version": "1.10.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", - "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==", - "dev": true + "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==" }, "object-is": { "version": "1.1.5", @@ -22383,8 +22207,7 @@ "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, "object-visit": { "version": "1.0.1", @@ -22399,7 +22222,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dev": true, "requires": { "call-bind": "^1.0.0", "define-properties": "^1.1.3", @@ -22411,7 +22233,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz", "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==", - "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -22431,7 +22252,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz", "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==", - "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -22708,7 +22528,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, "requires": { "error-ex": "^1.3.1", "json-parse-better-errors": "^1.0.1" @@ -22788,8 +22607,7 @@ "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-to-regexp": { "version": "0.1.7", @@ -22827,6 +22645,11 @@ "sha.js": "^2.4.8" } }, + "perfect-scrollbar": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.1.tgz", + "integrity": "sha512-MrSImINnIh3Tm1hdPT6bji6fmIeRorVEegQvyUnhqko2hDGTHhmjPefHXfxG/Jb8xVbfCwgmUIlIajERGXjVXQ==" + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -22910,7 +22733,6 @@ "version": "7.0.35", "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", - "dev": true, "requires": { "chalk": "^2.4.2", "source-map": "^0.6.1", @@ -22920,14 +22742,12 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, "requires": { "has-flag": "^3.0.0" } @@ -22938,7 +22758,6 @@ "version": "7.0.5", "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz", "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==", - "dev": true, "requires": { "postcss": "^7.0.27", "postcss-selector-parser": "^6.0.2", @@ -22949,7 +22768,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz", "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==", - "dev": true, "requires": { "browserslist": "^4.0.0", "color": "^3.0.0", @@ -22961,8 +22779,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -22970,7 +22787,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz", "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==", - "dev": true, "requires": { "postcss": "^7.0.0", "postcss-value-parser": "^3.0.0" @@ -22979,8 +22795,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -22988,7 +22803,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz", "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==", - "dev": true, "requires": { "postcss": "^7.0.0" } @@ -22997,7 +22811,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz", "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==", - "dev": true, "requires": { "postcss": "^7.0.0" } @@ -23006,7 +22819,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz", "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==", - "dev": true, "requires": { "postcss": "^7.0.0" } @@ -23015,11 +22827,28 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz", "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==", - "dev": true, "requires": { "postcss": "^7.0.0" } }, + "postcss-import": { + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz", + "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==", + "requires": { + "postcss": "^7.0.1", + "postcss-value-parser": "^3.2.3", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" + }, + "dependencies": { + "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==" + } + } + }, "postcss-load-config": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz", @@ -23059,7 +22888,6 @@ "version": "4.0.11", "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz", "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==", - "dev": true, "requires": { "css-color-names": "0.0.4", "postcss": "^7.0.0", @@ -23070,8 +22898,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23079,7 +22906,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz", "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==", - "dev": true, "requires": { "browserslist": "^4.0.0", "caniuse-api": "^3.0.0", @@ -23093,7 +22919,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, "requires": { "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", @@ -23106,7 +22931,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz", "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==", - "dev": true, "requires": { "postcss": "^7.0.0", "postcss-value-parser": "^3.0.0" @@ -23115,8 +22939,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23124,7 +22947,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz", "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==", - "dev": true, "requires": { "cssnano-util-get-arguments": "^4.0.0", "is-color-stop": "^1.0.0", @@ -23135,8 +22957,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23144,7 +22965,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz", "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==", - "dev": true, "requires": { "alphanum-sort": "^1.0.0", "browserslist": "^4.0.0", @@ -23157,8 +22977,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23166,7 +22985,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz", "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==", - "dev": true, "requires": { "alphanum-sort": "^1.0.0", "has": "^1.0.0", @@ -23178,7 +22996,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, "requires": { "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", @@ -23232,7 +23049,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz", "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==", - "dev": true, "requires": { "postcss": "^7.0.0" } @@ -23241,7 +23057,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz", "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==", - "dev": true, "requires": { "cssnano-util-get-match": "^4.0.0", "postcss": "^7.0.0", @@ -23251,8 +23066,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23260,7 +23074,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz", "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==", - "dev": true, "requires": { "cssnano-util-get-arguments": "^4.0.0", "has": "^1.0.0", @@ -23271,8 +23084,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23280,7 +23092,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz", "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==", - "dev": true, "requires": { "cssnano-util-get-arguments": "^4.0.0", "cssnano-util-get-match": "^4.0.0", @@ -23291,8 +23102,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23300,7 +23110,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz", "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==", - "dev": true, "requires": { "has": "^1.0.0", "postcss": "^7.0.0", @@ -23310,8 +23119,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23319,7 +23127,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz", "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==", - "dev": true, "requires": { "cssnano-util-get-match": "^4.0.0", "postcss": "^7.0.0", @@ -23329,8 +23136,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23338,7 +23144,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz", "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==", - "dev": true, "requires": { "browserslist": "^4.0.0", "postcss": "^7.0.0", @@ -23348,8 +23153,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23357,7 +23161,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz", "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==", - "dev": true, "requires": { "is-absolute-url": "^2.0.0", "normalize-url": "^3.0.0", @@ -23368,14 +23171,12 @@ "normalize-url": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz", - "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==", - "dev": true + "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==" }, "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23383,7 +23184,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz", "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==", - "dev": true, "requires": { "postcss": "^7.0.0", "postcss-value-parser": "^3.0.0" @@ -23392,8 +23192,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23401,7 +23200,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz", "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==", - "dev": true, "requires": { "cssnano-util-get-arguments": "^4.0.0", "postcss": "^7.0.0", @@ -23411,8 +23209,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23420,7 +23217,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz", "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==", - "dev": true, "requires": { "browserslist": "^4.0.0", "caniuse-api": "^3.0.0", @@ -23432,7 +23228,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz", "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==", - "dev": true, "requires": { "cssnano-util-get-match": "^4.0.0", "has": "^1.0.0", @@ -23443,8 +23238,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23452,7 +23246,6 @@ "version": "6.0.6", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", - "dev": true, "requires": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -23462,7 +23255,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz", "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==", - "dev": true, "requires": { "postcss": "^7.0.0", "postcss-value-parser": "^3.0.0", @@ -23472,8 +23264,7 @@ "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==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" } } }, @@ -23481,7 +23272,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz", "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==", - "dev": true, "requires": { "alphanum-sort": "^1.0.0", "postcss": "^7.0.0", @@ -23491,8 +23281,7 @@ "postcss-value-parser": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", - "dev": true + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==" }, "prelude-ls": { "version": "1.1.2", @@ -23639,8 +23428,7 @@ "q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", - "dev": true + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" }, "qs": { "version": "6.5.2", @@ -23713,6 +23501,21 @@ "unpipe": "1.0.0" } }, + "read-cache": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", + "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", + "requires": { + "pify": "^2.3.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + } + } + }, "read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -23967,7 +23770,6 @@ "version": "1.20.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", - "dev": true, "requires": { "is-core-module": "^2.2.0", "path-parse": "^1.0.6" @@ -23985,8 +23787,7 @@ "resolve-from": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" }, "resolve-url": { "version": "0.2.1", @@ -24019,14 +23820,12 @@ "rgb-regex": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz", - "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=", - "dev": true + "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=" }, "rgba-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", - "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=", - "dev": true + "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=" }, "rimraf": { "version": "2.7.1", @@ -24095,8 +23894,7 @@ "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "schema-utils": { "version": "2.7.1", @@ -24347,7 +24145,6 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", - "dev": true, "requires": { "is-arrayish": "^0.3.1" }, @@ -24355,8 +24152,7 @@ "is-arrayish": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "dev": true + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" } } }, @@ -24719,8 +24515,7 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sshpk": { "version": "1.16.1", @@ -24751,8 +24546,7 @@ "stable": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", - "dev": true + "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" }, "stackframe": { "version": "1.2.0", @@ -24929,7 +24723,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", - "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -24939,7 +24732,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", - "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -24982,7 +24774,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz", "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==", - "dev": true, "requires": { "browserslist": "^4.0.0", "postcss": "^7.0.0", @@ -24993,7 +24784,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, "requires": { "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", @@ -25006,7 +24796,6 @@ "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" } @@ -25021,7 +24810,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", - "dev": true, "requires": { "chalk": "^2.4.1", "coa": "^2.0.2", @@ -25281,8 +25069,7 @@ "timsort": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", - "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", - "dev": true + "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" }, "tmp": { "version": "0.0.33", @@ -25467,7 +25254,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==", - "dev": true, "requires": { "function-bind": "^1.1.1", "has-bigints": "^1.0.1", @@ -25526,14 +25312,12 @@ "uniq": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true + "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=" }, "uniqs": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", - "dev": true + "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=" }, "unique-filename": { "version": "1.1.1", @@ -25568,8 +25352,7 @@ "unquote": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", - "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=", - "dev": true + "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=" }, "unset-value": { "version": "1.0.0", @@ -25703,14 +25486,12 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "util.promisify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", - "dev": true, "requires": { "define-properties": "^1.1.2", "object.getownpropertydescriptors": "^2.0.3" @@ -25759,8 +25540,7 @@ "vendors": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz", - "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==", - "dev": true + "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==" }, "verror": { "version": "1.10.0", @@ -25810,11 +25590,10 @@ } } }, - "vue-fragment": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.5.2.tgz", - "integrity": "sha512-KEW0gkeNOLJjtXN4jqJhTazez5jtrwimHkE5Few/VxblH4F9EcvJiEsahrV5kg5uKd5U8du4ORKS6QjGE0piYA==", - "requires": {} + "vue-frag": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/vue-frag/-/vue-frag-1.1.5.tgz", + "integrity": "sha512-g+PP9pjW1gnrmPjy2Sa5jK/bfxYHK8Hgt1sVs/Y/7KT+srGJUwtGNwXNTUvWv/zJ2yGcvJVEH98eIrICyZX9Ng==" }, "vue-hot-reload-api": { "version": "2.3.4", @@ -25924,6 +25703,12 @@ } } }, + "vue-reactive-provide": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/vue-reactive-provide/-/vue-reactive-provide-0.3.0.tgz", + "integrity": "sha512-hx2JtRPRvne9NY4s1r7ASsCaO8CIby30qwC1kGQRxsrWApO3he+rziGOzTDSfvmr852zWMb11n6qAwHCz6C/vw==", + "requires": {} + }, "vue-select": { "version": "3.11.2", "resolved": "https://registry.npmjs.org/vue-select/-/vue-select-3.11.2.tgz", @@ -25964,6 +25749,39 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "vue-textarea-autosize": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/vue-textarea-autosize/-/vue-textarea-autosize-1.1.1.tgz", + "integrity": "sha512-B33Mg5ZDEfj/whhoPBLg25qqAdGHGM2NjDT99Qi5MXRyeLmXb4C3s6EprAHqy3nU0cooWXFU+IekI5DpoEbnFg==", + "requires": { + "core-js": "^2.6.5" + }, + "dependencies": { + "core-js": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" + } + } + }, + "vue-transition-expand": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/vue-transition-expand/-/vue-transition-expand-0.1.0.tgz", + "integrity": "sha512-4UKkK/ILk+Qh3WWJoupt7pXfzpjvb7vTQTaVUhnkr+FeXArndJVDyIn2eWIn7i37cVFXKu2jsDR47QELOCq/gQ==", + "requires": { + "vue": "^2.5.16" + } + }, + "vue2-perfect-scrollbar": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/vue2-perfect-scrollbar/-/vue2-perfect-scrollbar-1.5.0.tgz", + "integrity": "sha512-hQAjhOX9MP3/ePa/AozKKtpiHSaV0dBlniyt2L7eqC/PsDx+pu7YBmTpM0KR5WlNq5GZwreK6215L8ZG1EHC7w==", + "requires": { + "cssnano": "^4.1.3", + "perfect-scrollbar": "^1.5.0", + "postcss-import": "^12.0.0" + } + }, "vuex": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz", @@ -26597,7 +26415,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, "requires": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", diff --git a/package.json b/package.json index d75da71..5cbe496 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,12 @@ "dependencies": { "core-js": "^3.6.5", "vue": "^2.6.11", - "vue-fragment": "^1.5.2", + "vue-frag": "^1.1.5", + "vue-reactive-provide": "^0.3.0", "vue-select": "^3.11.2", + "vue-textarea-autosize": "^1.1.1", + "vue-transition-expand": "^0.1.0", + "vue2-perfect-scrollbar": "^1.5.0", "vuex": "^3.4.0" }, "devDependencies": { diff --git a/src/App.vue b/src/App.vue index 194c949..dce8b79 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,6 +12,8 @@ import Tabs from './components/system/Tabs'; import TPS from './components/system/TPS'; import themes from './data/themes'; import { mapState } from 'vuex'; +import { player } from './store/proxies'; +import './main.css'; export default { name: 'App', @@ -21,7 +23,7 @@ export default { computed: { ...mapState([ 'showTPS' ]), theme() { - return themes[this.$store.state.theme || "default"]; + return themes[player.theme].variables; } }, methods: { @@ -32,57 +34,7 @@ export default { }; - diff --git a/src/components/features/Achievements.vue b/src/components/features/Achievements.vue new file mode 100644 index 0000000..fd438cb --- /dev/null +++ b/src/components/features/Achievements.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/components/features/Bar.vue b/src/components/features/Bar.vue new file mode 100644 index 0000000..1bcba4f --- /dev/null +++ b/src/components/features/Bar.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/components/features/Buyable.vue b/src/components/features/Buyable.vue new file mode 100644 index 0000000..ccb6d5d --- /dev/null +++ b/src/components/features/Buyable.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/components/features/Buyables.vue b/src/components/features/Buyables.vue new file mode 100644 index 0000000..772e3df --- /dev/null +++ b/src/components/features/Buyables.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/src/components/features/Challenge.vue b/src/components/features/Challenge.vue new file mode 100644 index 0000000..dd6dcfa --- /dev/null +++ b/src/components/features/Challenge.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/src/components/features/Challenges.vue b/src/components/features/Challenges.vue new file mode 100644 index 0000000..e8b5d6e --- /dev/null +++ b/src/components/features/Challenges.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/components/features/Clickable.vue b/src/components/features/Clickable.vue new file mode 100644 index 0000000..178fd15 --- /dev/null +++ b/src/components/features/Clickable.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/src/components/features/Clickables.vue b/src/components/features/Clickables.vue new file mode 100644 index 0000000..5b9ea30 --- /dev/null +++ b/src/components/features/Clickables.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/components/features/DefaultChallengeDisplay.vue b/src/components/features/DefaultChallengeDisplay.vue new file mode 100644 index 0000000..e7b908b --- /dev/null +++ b/src/components/features/DefaultChallengeDisplay.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/components/features/DefaultPrestigeButtonDisplay.vue b/src/components/features/DefaultPrestigeButtonDisplay.vue new file mode 100644 index 0000000..a26a344 --- /dev/null +++ b/src/components/features/DefaultPrestigeButtonDisplay.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/components/features/DefaultUpgradeDisplay.vue b/src/components/features/DefaultUpgradeDisplay.vue new file mode 100644 index 0000000..c348770 --- /dev/null +++ b/src/components/features/DefaultUpgradeDisplay.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/src/components/features/Grid.vue b/src/components/features/Grid.vue new file mode 100644 index 0000000..f228196 --- /dev/null +++ b/src/components/features/Grid.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/components/features/Gridable.vue b/src/components/features/Gridable.vue new file mode 100644 index 0000000..b22cc68 --- /dev/null +++ b/src/components/features/Gridable.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/components/features/Infobox.vue b/src/components/features/Infobox.vue new file mode 100644 index 0000000..7a11196 --- /dev/null +++ b/src/components/features/Infobox.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/components/features/MainDisplay.vue b/src/components/features/MainDisplay.vue index a6d3988..49a7354 100644 --- a/src/components/features/MainDisplay.vue +++ b/src/components/features/MainDisplay.vue @@ -16,30 +16,31 @@ import { coerceComponent } from '../../util/vue'; export default { name: 'main-display', - inject: [ 'layer' ], + inject: [ 'tab' ], props: { + layer: String, precision: Number }, computed: { style() { - return layers[this.layer].componentStyles?.['main-display']; + return layers[this.layer || this.tab.layer].componentStyles?.['main-display']; }, resource() { - return layers[this.layer].resource; + return layers[this.layer || this.tab.layer].resource; }, effectDescription() { - return coerceComponent(layers[this.layer].effectDescription); + return coerceComponent(layers[this.layer || this.tab.layer].effectDescription); }, showPrefix() { - return player[this.layer].points.lt('1e1000'); + return player[this.layer || this.tab.layer].points.lt('1e1000'); }, color() { - return layers[this.layer].color; + return layers[this.layer || this.tab.layer].color; }, amount() { return this.precision == undefined ? - formatWhole(player[this.layer].points) : - format(player[this.layer].points, this.precision); + formatWhole(player[this.layer || this.tab.layer].points) : + format(player[this.layer || this.tab.layer].points, this.precision); } } }; diff --git a/src/components/features/MarkNode.vue b/src/components/features/MarkNode.vue new file mode 100644 index 0000000..f0cf56b --- /dev/null +++ b/src/components/features/MarkNode.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/components/features/MasterButton.vue b/src/components/features/MasterButton.vue new file mode 100644 index 0000000..e94e394 --- /dev/null +++ b/src/components/features/MasterButton.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/components/features/Milestone.vue b/src/components/features/Milestone.vue new file mode 100644 index 0000000..b9e6fee --- /dev/null +++ b/src/components/features/Milestone.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/components/features/Milestones.vue b/src/components/features/Milestones.vue new file mode 100644 index 0000000..bfd4bd6 --- /dev/null +++ b/src/components/features/Milestones.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/components/features/PrestigeButton.vue b/src/components/features/PrestigeButton.vue new file mode 100644 index 0000000..5313097 --- /dev/null +++ b/src/components/features/PrestigeButton.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/src/components/features/ResourceDisplay.vue b/src/components/features/ResourceDisplay.vue new file mode 100644 index 0000000..504f689 --- /dev/null +++ b/src/components/features/ResourceDisplay.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/src/components/features/RespecButton.vue b/src/components/features/RespecButton.vue new file mode 100644 index 0000000..54336ab --- /dev/null +++ b/src/components/features/RespecButton.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/src/components/features/Upgrade.vue b/src/components/features/Upgrade.vue new file mode 100644 index 0000000..6424450 --- /dev/null +++ b/src/components/features/Upgrade.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/components/features/Upgrades.vue b/src/components/features/Upgrades.vue new file mode 100644 index 0000000..3928018 --- /dev/null +++ b/src/components/features/Upgrades.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/components/features/features.css b/src/components/features/features.css new file mode 100644 index 0000000..052c9d9 --- /dev/null +++ b/src/components/features/features.css @@ -0,0 +1,32 @@ +.feature, +.feature button { + position: relative; + padding-top: 5px; + border-radius: var(--border-radius); + border: 2px solid rgba(0, 0, 0, 0.125); + margin: var(--feature-margin); + box-sizing: border-box; +} + +.can, +.can button { + cursor: pointer; +} + +.can:hover, +.can:hover button { + transform: scale(1.15, 1.15); + box-shadow: 0 0 20px var(--points); +} + +.locked, +.locked button { + background-color: var(--locked); + cursor: not-allowed; +} + +.bought, +.bought button { + background-color: var(--bought); + cursor: default; +} diff --git a/src/components/features/table.css b/src/components/features/table.css new file mode 100644 index 0000000..6058e90 --- /dev/null +++ b/src/components/features/table.css @@ -0,0 +1,30 @@ +.table { + display: flex; + flex-flow: column wrap; + justify-content: center; + align-items: center; + max-width: 100%; + margin: 0 auto; +} + +.table + .table { + margin-top: 10px; +} + +.row { + display: flex; + flex-flow: row wrap; + justify-content: center; + align-items: center; + max-width: 100%; + margin: 0 10px; +} + +.col { + display: flex; + flex-flow: column wrap; + justify-content: center; + align-items: center; + height: 100%; + margin: 10px 0; +} diff --git a/src/components/fields/Select.vue b/src/components/fields/Select.vue index c1d035b..a62d77e 100644 --- a/src/components/fields/Select.vue +++ b/src/components/fields/Select.vue @@ -1,6 +1,6 @@ @@ -15,8 +15,8 @@ export default { props: { title: String, options: Array, // https://vue-select.org/guide/options.html#options-prop - value: String, - default: String + value: [ String, Object ], + default: [ String, Object ] }, components: { vSelect diff --git a/src/components/fields/Slider.vue b/src/components/fields/Slider.vue new file mode 100644 index 0000000..b8b8cbe --- /dev/null +++ b/src/components/fields/Slider.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/src/components/fields/Text.vue b/src/components/fields/Text.vue new file mode 100644 index 0000000..72443b3 --- /dev/null +++ b/src/components/fields/Text.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/components/fields/Toggle.vue b/src/components/fields/Toggle.vue index 194e676..401d411 100644 --- a/src/components/fields/Toggle.vue +++ b/src/components/fields/Toggle.vue @@ -17,7 +17,7 @@ export default { }, methods: { handleInput(e) { - this.$emit('change', e.target.value); + this.$emit('change', e.target.checked); } } }; diff --git a/src/components/fields/fields.css b/src/components/fields/fields.css index 3a00431..7eab1fa 100644 --- a/src/components/fields/fields.css +++ b/src/components/fields/fields.css @@ -1,7 +1,7 @@ .field { display: flex; position: relative; - height: 2em; + min-height: 2em; margin: 10px 0; user-select: none; justify-content: space-between; diff --git a/src/components/index.js b/src/components/index.js index 6cea9e4..deafa8f 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -3,40 +3,130 @@ import Vue from 'vue'; +/* features */ +import Achievement from './features/Achievement'; +import Achievements from './features/Achievements'; +import Bar from './features/Bar'; +import Buyable from './features/Buyable'; +import Buyables from './features/Buyables'; +import Challenge from './features/Challenge'; +import Challenges from './features/Challenges'; +import Clickable from './features/Clickable'; +import Clickables from './features/Clickables'; +import DefaultChallengeDisplay from './features/DefaultChallengeDisplay'; +import DefaultPrestigeButtonDisplay from './features/DefaultPrestigeButtonDisplay'; +import DefaultUpgradeDisplay from './features/DefaultUpgradeDisplay'; +import Grid from './features/Grid'; +import Gridable from './features/Gridable'; +import Infobox from './features/Infobox'; +import MainDisplay from './features/MainDisplay'; +import MarkNode from './features/MarkNode'; +import MasterButton from './features/MasterButton'; +import Milestone from './features/Milestone'; +import Milestones from './features/Milestones'; +import PrestigeButton from './features/PrestigeButton'; +import ResourceDisplay from './features/ResourceDisplay'; +import RespecButton from './features/RespecButton'; +import Upgrade from './features/Upgrade'; +import Upgrades from './features/Upgrades'; +/* fields */ +import Select from './fields/Select'; +import Slider from './fields/Slider'; +import Text from './fields/Text'; +import Toggle from './fields/Toggle'; /* system */ +import Column from './system/Column'; import DefaultLayerTab from './system/DefaultLayerTab'; import Info from './system/Info'; import LayerProvider from './system/LayerProvider'; import LayerTab from './system/LayerTab'; +import Microtab from './system/Microtab'; import Modal from './system/Modal'; import Nav from './system/Nav'; import Options from './system/Options'; import Resource from './system/Resource'; +import Row from './system/Row'; +import Spacer from './system/Spacer'; +import Sticky from './system/Sticky'; +import Subtab from './system/Subtab'; +import TabButton from './system/TabButton'; import Tabs from './system/Tabs'; +import Tooltip from './system/Tooltip'; import TPS from './system/TPS'; -/* fields */ -import Select from './fields/Select'; -import Toggle from './fields/Toggle'; -/* features */ -import MainDisplay from './features/MainDisplay'; +import VerticalRule from './system/VerticalRule'; +/* tree */ +import Branches from './tree/Branches'; +import BranchLine from './tree/BranchLine'; +import BranchNode from './tree/BranchNode'; +import Tree from './tree/Tree'; +import TreeNode from './tree/TreeNode'; /* misc */ -import { Fragment } from 'vue-fragment'; +import frag from 'vue-frag'; +import TransitionExpand from 'vue-transition-expand'; +import 'vue-transition-expand/dist/vue-transition-expand.css'; +import PerfectScrollbar from 'vue2-perfect-scrollbar'; +import 'vue2-perfect-scrollbar/dist/vue2-perfect-scrollbar.css'; +import VueTextareaAutosize from 'vue-textarea-autosize'; +/* features */ +Vue.component(Achievement.name, Achievement); +Vue.component(Achievements.name, Achievements); +Vue.component(Bar.name, Bar); +Vue.component(Buyable.name, Buyable); +Vue.component(Buyables.name, Buyables); +Vue.component(Challenge.name, Challenge); +Vue.component(Challenges.name, Challenges); +Vue.component(Clickable.name, Clickable); +Vue.component(Clickables.name, Clickables); +Vue.component(DefaultChallengeDisplay.name, DefaultChallengeDisplay); +Vue.component(DefaultPrestigeButtonDisplay.name, DefaultPrestigeButtonDisplay); +Vue.component(DefaultUpgradeDisplay.name, DefaultUpgradeDisplay); +Vue.component(Grid.name, Grid); +Vue.component(Gridable.name, Gridable); +Vue.component(Infobox.name, Infobox); +Vue.component(MainDisplay.name, MainDisplay); +Vue.component(MarkNode.name, MarkNode); +Vue.component(MasterButton.name, MasterButton); +Vue.component(Milestone.name, Milestone); +Vue.component(Milestones.name, Milestones); +Vue.component(PrestigeButton.name, PrestigeButton); +Vue.component(ResourceDisplay.name, ResourceDisplay); +Vue.component(RespecButton.name, RespecButton); +Vue.component(Upgrade.name, Upgrade); +Vue.component(Upgrades.name, Upgrades); +/* fields */ +Vue.component(Select.name, Select); +Vue.component(Slider.name, Slider); +Vue.component(Text.name, Text); +Vue.component(Toggle.name, Toggle); /* system */ +Vue.component(Column.name, Column); Vue.component(DefaultLayerTab.name, DefaultLayerTab); Vue.component(Info.name, Info); Vue.component(LayerProvider.name, LayerProvider); Vue.component(LayerTab.name, LayerTab); +Vue.component(Microtab.name, Microtab); Vue.component(Modal.name, Modal); Vue.component(Nav.name, Nav); Vue.component(Options.name, Options); Vue.component(Resource.name, Resource); +Vue.component(Row.name, Row); +Vue.component(Spacer.name, Spacer); +Vue.component(Sticky.name, Sticky); +Vue.component(Subtab.name, Subtab); +Vue.component(TabButton.name, TabButton); Vue.component(Tabs.name, Tabs); +Vue.component(Tooltip.name, Tooltip); Vue.component(TPS.name, TPS); -/* fields */ -Vue.component(Select.name, Select); -Vue.component(Toggle.name, Toggle); -/* features */ -Vue.component(MainDisplay.name, MainDisplay); +Vue.component(VerticalRule.name, VerticalRule); +/* tree */ +Vue.component(Branches.name, Branches); +Vue.component(BranchLine.name, BranchLine); +Vue.component(BranchNode.name, BranchNode); +Vue.component(Tree.name, Tree); +Vue.component(TreeNode.name, TreeNode); /* misc */ -Vue.component(Fragment.name, Fragment); +Vue.directive('frag', frag); +Vue.use(TransitionExpand); +Vue.use(PerfectScrollbar); +Vue.use(VueTextareaAutosize); diff --git a/src/components/system/Column.vue b/src/components/system/Column.vue new file mode 100644 index 0000000..20c3999 --- /dev/null +++ b/src/components/system/Column.vue @@ -0,0 +1,15 @@ + + + diff --git a/src/components/system/DefaultLayerTab.vue b/src/components/system/DefaultLayerTab.vue index 7a78c87..da2c101 100644 --- a/src/components/system/DefaultLayerTab.vue +++ b/src/components/system/DefaultLayerTab.vue @@ -1,8 +1,8 @@ diff --git a/src/components/system/Info.vue b/src/components/system/Info.vue index ec98dd8..c5c8d81 100644 --- a/src/components/system/Info.vue +++ b/src/components/system/Info.vue @@ -44,6 +44,7 @@
Time Played: {{ timePlayed }}
+

Hotkeys

{{ key.key }}: {{ key.description }} @@ -56,6 +57,7 @@ diff --git a/src/components/system/LayerTab.vue b/src/components/system/LayerTab.vue index bf9275a..a7f0498 100644 --- a/src/components/system/LayerTab.vue +++ b/src/components/system/LayerTab.vue @@ -1,11 +1,14 @@ @@ -13,46 +16,126 @@ diff --git a/src/components/system/Microtab.vue b/src/components/system/Microtab.vue new file mode 100644 index 0000000..701de51 --- /dev/null +++ b/src/components/system/Microtab.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/components/system/Modal.vue b/src/components/system/Modal.vue index e60bec1..b77a633 100644 --- a/src/components/system/Modal.vue +++ b/src/components/system/Modal.vue @@ -3,24 +3,23 @@
-
default header
- -
- - default body - -
- + + + + default body + + +
-
@@ -61,18 +60,31 @@ export default { } .modal-container { - width: 400px; - max-width: calc(95vw - 40px); + width: 640px; + max-width: 95vw; + max-height: 95vh; background-color: var(--background); padding: 20px; border-radius: 5px; transition: all 0.3s ease; text-align: left; border: var(--modal-border); + box-sizing: border-box; + display: flex; + flex-direction: column; +} + +.modal-header { + width: 100%; } .modal-body { margin: 20px 0; + width: 100%; +} + +.modal-footer { + width: 100%; } .modal-default-footer { @@ -97,3 +109,9 @@ export default { transform: scale(1.1); } + + diff --git a/src/components/system/Nav.vue b/src/components/system/Nav.vue index cbb71b1..736c6f1 100644 --- a/src/components/system/Nav.vue +++ b/src/components/system/Nav.vue @@ -1,5 +1,5 @@ @@ -31,10 +33,20 @@ export default { }, data() { return { - themes: Object.keys(themes).map(theme => ({ label: camelToTitle(theme), value: theme })) + themes: Object.keys(themes).map(theme => ({ label: camelToTitle(theme), value: theme })), + msDisplayOptions: [ "all", "last", "configurable", "incomplete", "none" ] + .map(option => ({ label: camelToTitle(option), value: option })) + } + }, + computed: { + ...mapState([ "autosave", "offlineProd", "showTPS", "hideChallenges" ]), + theme() { + return { label: camelToTitle(player.theme), value: player.theme }; + }, + msDisplay() { + return { label: camelToTitle(player.msDisplay), value: player.msDisplay }; } }, - computed: mapState([ "autosave", "offlineProd", "showTPS", "theme" ]), methods: { toggleOption(option) { player[option] = !player[option]; @@ -42,6 +54,9 @@ export default { setTheme(theme) { player.theme = theme; }, + setMSDisplay(msDisplay) { + player.msDisplay = msDisplay; + }, save() { console.warn("Not yet implemented!"); }, diff --git a/src/components/system/Row.vue b/src/components/system/Row.vue new file mode 100644 index 0000000..f566d31 --- /dev/null +++ b/src/components/system/Row.vue @@ -0,0 +1,15 @@ + + + diff --git a/src/components/system/Spacer.vue b/src/components/system/Spacer.vue new file mode 100644 index 0000000..2832ebb --- /dev/null +++ b/src/components/system/Spacer.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/components/system/Sticky.vue b/src/components/system/Sticky.vue new file mode 100644 index 0000000..7caf0b5 --- /dev/null +++ b/src/components/system/Sticky.vue @@ -0,0 +1,64 @@ + + + + + \ No newline at end of file diff --git a/src/components/system/Subtab.vue b/src/components/system/Subtab.vue new file mode 100644 index 0000000..a8268b6 --- /dev/null +++ b/src/components/system/Subtab.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/components/system/TabButton.vue b/src/components/system/TabButton.vue new file mode 100644 index 0000000..e32c0d7 --- /dev/null +++ b/src/components/system/TabButton.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/components/system/Tabs.vue b/src/components/system/Tabs.vue index 9b51041..bad33e0 100644 --- a/src/components/system/Tabs.vue +++ b/src/components/system/Tabs.vue @@ -1,15 +1,21 @@ + + diff --git a/src/components/system/Tooltip.vue b/src/components/system/Tooltip.vue new file mode 100644 index 0000000..87c2311 --- /dev/null +++ b/src/components/system/Tooltip.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/components/system/VerticalRule.vue b/src/components/system/VerticalRule.vue new file mode 100644 index 0000000..c2b732d --- /dev/null +++ b/src/components/system/VerticalRule.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/src/components/tree/BranchLine.vue b/src/components/tree/BranchLine.vue new file mode 100644 index 0000000..9ceac3c --- /dev/null +++ b/src/components/tree/BranchLine.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/components/tree/BranchNode.vue b/src/components/tree/BranchNode.vue new file mode 100644 index 0000000..f7c4a48 --- /dev/null +++ b/src/components/tree/BranchNode.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/components/tree/Branches.vue b/src/components/tree/Branches.vue new file mode 100644 index 0000000..9247c72 --- /dev/null +++ b/src/components/tree/Branches.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/components/tree/Tree.vue b/src/components/tree/Tree.vue new file mode 100644 index 0000000..88b088b --- /dev/null +++ b/src/components/tree/Tree.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/components/tree/TreeNode.vue b/src/components/tree/TreeNode.vue new file mode 100644 index 0000000..4d95a97 --- /dev/null +++ b/src/components/tree/TreeNode.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/data/layers/aca/a.js b/src/data/layers/aca/a.js new file mode 100644 index 0000000..0f3c70c --- /dev/null +++ b/src/data/layers/aca/a.js @@ -0,0 +1,70 @@ +import Decimal from '../../../util/bignum'; +import { player } from '../../../store/proxies'; + +export default { + id: "a", + startData() { return { + unlocked: true, + points: new Decimal(0), + }}, + color: "yellow", + modal: true, + name: "Achievements", + resource: "achievement power", + row: "side", + tooltip() { // Optional, tooltip displays when the layer is locked + return ("Achievements") + }, + achievementPopups: true, + achievements: { + 11: { + image: "https://unsoftcapped2.github.io/The-Modding-Tree-2/discord.png", + name: "Get me!", + done() {return true}, // This one is a freebie + goalTooltip: "How did this happen?", // Shows when achievement is not completed + doneTooltip: "You did it!", // Showed when the achievement is completed + }, + 12: { + name: "Impossible!", + done() {return false}, + goalTooltip: "Mwahahaha!", // Shows when achievement is not completed + doneTooltip: "HOW????", // Showed when the achievement is completed + style: {'color': '#04e050'}, + }, + 13: { + name: "EIEIO", + done() {return player.f.points.gte(1)}, + tooltip: "Get a farm point.\n\nReward: The dinosaur is now your friend (you can max Farm Points).", // Showed when the achievement is completed + onComplete() {console.log("Bork bork bork!")} + }, + }, + midsection: "", + grids: { + test: { + maxRows: 3, + rows: 2, + cols: 2, + getStartData(cell) { + return cell + }, + getUnlocked() { // Default + return true + }, + getCanClick() { + return player.points.eq(10) + }, + getStyle(cell, data) { + return {'background-color': '#'+ (data*1234%999999)} + }, + onClick() { // Don't forget onHold + this.data++ + }, + getTitle(cell) { + return "Gridable #" + cell + }, + getDisplay(cell, data) { + return data + }, + } + }, +} diff --git a/src/data/layers/aca/c.js b/src/data/layers/aca/c.js new file mode 100644 index 0000000..ebad8ae --- /dev/null +++ b/src/data/layers/aca/c.js @@ -0,0 +1,410 @@ +import Decimal, { format, formatWhole } from '../../../util/bignum'; +import { player, tmp } from '../../../store/proxies'; +import { layers } from '../../../store/layers'; +import { hasUpgrade, hasMilestone, getBuyableAmount, setBuyableAmount, upgradeEffect, buyableEffect, challengeCompletions } from '../../../util/features'; +import { resetLayer, resetLayerData } from '../../../util/layers'; +import { UP, RIGHT } from '../../../util/vue'; + +export default { + id: "c", // This is assigned automatically, both to the layer and all upgrades, etc. Shown here so you know about it + name: "Candies", // This is optional, only used in a few places, If absent it just uses the layer id. + symbol: "C", // This appears on the layer's node. Default is the id with the first letter capitalized + position: 0, // Horizontal position within a row. By default it uses the layer id and sorts in alphabetical order + startData() { return { + unlocked: true, + points: new Decimal(0), + best: new Decimal(0), + total: new Decimal(0), + beep: false, + thingy: "pointy", + otherThingy: 10, + spentOnBuyables: new Decimal(0) + }}, + color: "#4BDC13", + requires: new Decimal(10), // Can be a function that takes requirement increases into account + resource: "lollipops", // Name of prestige currency + baseResource: "points", // Name of resource prestige is based on + baseAmount() {return player.points}, // Get the current amount of baseResource + type: "normal", // normal: cost to gain currency depends on amount gained. static: cost depends on how much you already have + exponent: 0.5, // Prestige currency exponent + base: 5, // Only needed for static layers, base of the formula (b^(x^exp)) + roundUpCost: false, // True if the cost needs to be rounded up (use when baseResource is static?) + + // For normal layers, gain beyond [softcap] points is put to the [softcapPower]th power + softcap: new Decimal(1e100), + softcapPower: new Decimal(0.5), + canBuyMax() {}, // Only needed for static layers with buy max + gainMult() { // Calculate the multiplier for main currency from bonuses + let mult = new Decimal(1) + if (hasUpgrade(this.layer, 166)) mult = mult.times(2) // These upgrades don't exist + if (hasUpgrade(this.layer, 120)) mult = mult.times(upgradeEffect(this.layer, 120)) + return mult + }, + gainExp() { // Calculate the exponent on main currency from bonuses + return new Decimal(1) + }, + row: 0, // Row the layer is in on the tree (0 is the first row) + effect() { + return { // Formulas for any boosts inherent to resources in the layer. Can return a single value instead of an object if there is just one effect + waffleBoost: Decimal.pow(player[this.layer].points, 0.2), + icecreamCap: (player[this.layer].points * 10) + }}, + effectDescription() { // Optional text to describe the effects + let eff = this.effect; + const waffleBoost = eff.waffleBoost.times(buyableEffect(this.layer, 11).first) + return "which are boosting waffles by "+format(waffleBoost)+" and increasing the Ice Cream cap by "+format(eff.icecreamCap) + }, + infoboxes:{ + coolInfo: { + title: "Lore", + titleStyle: {'color': '#FE0000'}, + body: "DEEP LORE!", + bodyStyle: {'background-color': "#0000EE"} + } + }, + milestones: { + 0: {requirementDisplay: "3 Lollipops", + done() {return player[this.layer].best.gte(3)}, // Used to determine when to give the milestone + effectDisplay: "Unlock the next milestone", + }, + 1: {requirementDisplay: "4 Lollipops", + unlocked() {return hasMilestone(this.layer, 0)}, + done() {return player[this.layer].best.gte(4)}, + effectDisplay: "You can toggle beep and boop (which do nothing)", + optionsDisplay: ` +
+ + +
+ `, + style() { + if(hasMilestone(this.layer, this.id)) return { + 'background-color': '#1111DD' + }}, + + }, + }, + challenges: { + + 11: { + name: "Fun", + completionLimit: 3, + challengeDescription() {return "Makes the game 0% harder
"+challengeCompletions(this.layer, this.id) + "/" + this.completionLimit + " completions"}, + unlocked() { return player[this.layer].best.gt(0) }, + goalDescription: 'Have 20 points I guess', + canComplete() { + return player.points.gte(20) + }, + rewardEffect() { + let ret = player[this.layer].points.add(1).tetrate(0.02) + return ret; + }, + rewardDisplay() { return format(this.rewardEffect)+"x" }, + countsAs: [12, 21], // Use this for if a challenge includes the effects of other challenges. Being in this challenge "counts as" being in these. + rewardDescription: "Says hi", + onComplete() {console.log("hiii")}, // Called when you successfully complete the challenge + onEnter() {console.log("So challenging")}, + onExit() {console.log("Sweet freedom!")}, + + }, + }, + upgrades: { + + 11: { + title: "Generator of Genericness", + description: "Gain 1 Point every second.", + cost: new Decimal(1), + unlocked() { return player[this.layer].unlocked }, // The upgrade is only visible when this is true + }, + 12: { + description: "Point generation is faster based on your unspent Lollipops.", + cost: new Decimal(1), + unlocked() { return (hasUpgrade(this.layer, 11))}, + effect() { // Calculate bonuses from the upgrade. Can return a single value or an object with multiple values + let ret = player[this.layer].points.add(1).pow(player[this.layer].upgrades.includes(24)?1.1:(player[this.layer].upgrades.includes(14)?0.75:0.5)) + if (ret.gte("1e20000000")) ret = ret.sqrt().times("1e10000000") + return ret; + }, + effectDisplay() { return format(this.effect)+"x" }, // Add formatting to the effect + }, + 13: { + unlocked() { return (hasUpgrade(this.layer, 12))}, + onPurchase() { // This function triggers when the upgrade is purchased + player[this.layer].unlockOrder = 0 + }, + style() { + if (hasUpgrade(this.layer, this.id)) return { + 'background-color': '#1111dd' + } + else if (!this.canAfford) { + return { + 'background-color': '#dd1111' + } + } // Otherwise use the default + }, + canAfford(){return player.points.lte(7)}, + pay(){player.points = player.points.add(7)}, + fullDisplay: "Only buyable with less than 7 points, and gives you 7 more. Unlocks a secret subtab." + }, + 22: { + title: "This upgrade doesn't exist", + description: "Or does it?.", + currencyLocation() {return player[this.layer].buyables}, // The object in player data that the currency is contained in + currencyDisplayName: "exhancers", // Use if using a nonstandard currency + currencyInternalName: 11, // Use if using a nonstandard currency + + cost: new Decimal(3), + unlocked() { return player[this.layer].unlocked }, // The upgrade is only visible when this is true + }, + }, + buyables: { + showRespec: true, + respec() { // Optional, reset things and give back your currency. Having this function makes a respec button appear + player[this.layer].points = player[this.layer].points.add(player[this.layer].spentOnBuyables) // A built-in thing to keep track of this but only keeps a single value + this.reset; + resetLayer(this.layer, true) // Force a reset + }, + respecText: "Respec Thingies", // Text on Respec button, optional + respecMessage: "Are you sure? Respeccing these doesn't accomplish much.", + 11: { + title: "Exhancers", // Optional, displayed at the top in a larger font + cost(x) { // cost for buying xth buyable, can be an object if there are multiple currencies + if (x.gte(25)) x = x.pow(2).div(25) + let cost = Decimal.pow(2, x.pow(1.5)) + return cost.floor() + }, + effect(x) { // Effects of owning x of the items, x is a decimal + let eff = {} + if (x.gte(0)) eff.first = Decimal.pow(25, x.pow(1.1)) + else eff.first = Decimal.pow(1/25, x.times(-1).pow(1.1)) + + if (x.gte(0)) eff.second = x.pow(0.8) + else eff.second = x.times(-1).pow(0.8).times(-1) + return eff; + }, + display() { // Everything else displayed in the buyable button after the title + let data = tmp[this.layer].buyables[this.id] + return "Cost: " + format(data.cost) + " lollipops\n\ + Amount: " + player[this.layer].buyables[this.id] + "/4\n\ + Adds + " + format(data.effect.first) + " things and multiplies stuff by " + format(data.effect.second) + }, + unlocked() { return player[this.layer].unlocked }, + canAfford() { + return player[this.layer].points.gte(tmp[this.layer].buyables[this.id].cost)}, + buy() { + let cost = tmp[this.layer].buyables[this.id].cost + player[this.layer].points = player[this.layer].points.sub(cost) + player[this.layer].buyables[this.id] = player[this.layer].buyables[this.id].add(1) + player[this.layer].spentOnBuyables = player[this.layer].spentOnBuyables.add(cost) // This is a built-in system that you can use for respeccing but it only works with a single Decimal value + }, + buyMax() {}, // You'll have to handle this yourself if you want + style: {'height':'222px'}, + purchaseLimit: new Decimal(4), + sellOne() { + let amount = getBuyableAmount(this.layer, this.id) + if (amount.lte(0)) return // Only sell one if there is at least one + setBuyableAmount(this.layer, this.id, amount.sub(1)) + player[this.layer].points = player[this.layer].points.add(this.cost) + }, + }, + }, + doReset(resettingLayer){ // Triggers when this layer is being reset, along with the layer doing the resetting. Not triggered by lower layers resetting, but is by layers on the same row. + if(layers[resettingLayer].row > this.row) resetLayerData(this.layer, ["points"]) // This is actually the default behavior + }, + layerShown() {return true}, // Condition for when layer appears on the tree + automate() { + }, // Do any automation inherent to this layer if appropriate + resetsNothing() {return false}, + onPrestige() { + return + }, // Useful for if you gain secondary resources or have other interesting things happen to this layer when you reset it. You gain the currency after this function ends. + + hotkeys: [ + {key: "c", description: "reset for lollipops or whatever", onPress(){if (layers[this.layer].canReset) resetLayer(this.layer)}}, + {key: "ctrl+c", description: "respec things", onPress(){layers[this.layer].buyables.respec()}, unlocked() {return hasUpgrade('c', '22')}} , + ], + increaseUnlockOrder: [], // Array of layer names to have their order increased when this one is first unlocked + + microtabs: { + stuff: { + first: { + content: ["upgrades", ["display-text", function() {return "confirmed"}]] + }, + second: { + embedLayer: "f", + + content: [["upgrade", 11], + ["row", [["upgrade", 11], "blank", "blank", ["upgrade", 11],]], + + ["display-text", function() {return "double confirmed"}]] + }, + }, + otherStuff: { + // There could be another set of microtabs here + } + }, + + bars: { + longBoi: { + fillStyle: {'background-color' : "#FFFFFF"}, + baseStyle: {'background-color' : "#696969"}, + textStyle: {'color': '#04e050'}, + + borderStyle() {return {}}, + direction: RIGHT, + width: 300, + height: 30, + progress() { + return (player.points.add(1).log(10).div(10)).toNumber() + }, + display() { + return format(player.points) + " / 1e10 points" + }, + unlocked: true, + + }, + tallBoi: { + fillStyle: {'background-color' : "#4BEC13"}, + baseStyle: {'background-color' : "#000000"}, + textStyle: {'text-shadow': '0px 0px 2px #000000'}, + + borderStyle() {return {'border-width': "7px"}}, + direction: UP, + width: 50, + height: 200, + progress() { + return player.points.div(100) + }, + display() { + return formatWhole((player.points.div(1)).min(100)) + "%" + }, + unlocked: true, + + }, + flatBoi: { + fillStyle: {'background-color' : "#FE0102"}, + baseStyle: {'background-color' : "#222222"}, + textStyle: {'text-shadow': '0px 0px 2px #000000'}, + + borderStyle() {return {}}, + direction: UP, + width: 100, + height: 30, + progress() { + return player.c.points.div(50) + }, + unlocked: true, + + }, + }, + + // Optional, lets you format the tab yourself by listing components. You can create your own components in v.js. + subtabs: { + "main tab": { + buttonStyle() {return {'color': 'orange'}}, + notify: true, + display: ` +
+ + + + + +
Name your points!
+ + I have {{ format(player.points) }} {{ player.c.thingy }} points! +
+ + + + +
+ `, + glowColor: "blue", + + }, + thingies: { + resetNotify: true, + style() {return {'background-color': '#222222', '--background': '#222222'}}, + buttonStyle() {return {'border-color': 'orange'}}, + display: ` +
+ + + + + +
Beep
+ + + + + + + + + +
+ ` + }, + jail: { + display: ` +
+ + + + + +
Sugar level:
+ + + +
idk
+ + + + + +
It's jail because "bars"! So funny! Ha ha!
+ +
+ ` + }, + illuminati: { + unlocked() {return (hasUpgrade("c", 13))}, + display: ` +
+

C O N F I R M E D

+ + +
Adjust how many points H gives you!
+ +
+ ` + } + + }, + style() {return { + //'background-color': '#3325CC' + }}, + nodeStyle() {return { // Style on the layer node + 'color': '#3325CC', + 'text-decoration': 'underline' + }}, + glowColor: "orange", // If the node is highlighted, it will be this color (default is red) + componentStyles: { + "challenge"() {return {'height': '200px'}}, + "prestige-button"() {return {'color': '#AA66AA'}}, + }, + tooltip() { // Optional, tooltip displays when the layer is unlocked + let tooltip = formatWhole(player[this.layer].points) + " " + this.resource + if (player[this.layer].buyables[11].gt(0)) tooltip += "



" + formatWhole(player[this.layer].buyables[11]) + " Exhancers" + return tooltip + }, + shouldNotify() { // Optional, layer will be highlighted on the tree if true. + // Layer will automatically highlight if an upgrade is purchasable. + return (player.c.buyables[11] == 1) + }, + mark: "https://unsoftcapped2.github.io/The-Modding-Tree-2/discord.png", + resetDescription: "Melt your points into ", +}; diff --git a/src/data/layers/aca/f.js b/src/data/layers/aca/f.js new file mode 100644 index 0000000..c863239 --- /dev/null +++ b/src/data/layers/aca/f.js @@ -0,0 +1,106 @@ +import Decimal, { formatWhole } from '../../../util/bignum'; +import { player, tmp } from '../../../store/proxies'; +import { getClickableState } from '../../../util/features'; + +export default { + id: "f", + infoboxes:{ + coolInfo: { + title: "Lore", + titleStyle: {'color': '#FE0000'}, + body: "DEEP LORE!", + bodyStyle: {'background-color': "#0000EE"} + } + }, + + startData() { return { + unlocked: false, + points: new Decimal(0), + boop: false, + clickables: {[11]: "Start"}, // Optional default Clickable state + }}, + color: "#FE0102", + requires() {return new Decimal(10)}, + resource: "farm points", + baseResource: "points", + baseAmount() {return player.points}, + type: "static", + exponent: 0.5, + base: 3, + roundUpCost: true, + canBuyMax() {return false}, + //directMult() {return new Decimal(player.c.otherThingy)}, + + row: 1, + layerShown() {return true}, + branches: [{ target: "c", 'stroke-width': '25px', 'stroke': 'blue', style: 'filter: blur(5px)' }], // When this layer appears, a branch will appear from this layer to any layers here. Each entry can be a pair consisting of a layer id and a color. + + tooltipLocked() { // Optional, tooltip displays when the layer is locked + return ("This weird farmer dinosaur will only see you if you have at least " + this.requires + " points. You only have " + formatWhole(player.points)) + }, + midsection: '

Bork Bork!
', + // The following are only currently used for "custom" Prestige type: + prestigeButtonDisplay() { //Is secretly HTML + if (!this.canBuyMax) return "Hi! I'm a weird dinosaur and I'll give you a Farm Point in exchange for all of your points and lollipops! (At least " + formatWhole(tmp[this.layer].nextAt) + " points)" + if (this.canBuyMax) return "Hi! I'm a weird dinosaur and I'll give you " + formatWhole(tmp[this.layer].resetGain) + " Farm Points in exchange for all of your points and lollipops! (You'll get another one at " + formatWhole(tmp[this.layer].nextAtDisp) + " points)" + }, + canReset() { + return tmp[this.layer].baseAmount.gte(tmp[this.layer].nextAt) + }, + // This is also non minimal, a Clickable! + clickables: { + + masterButtonPress() { + if (getClickableState(this.layer, 11) == "Borkened...") + player[this.layer].clickables[11] = "Start" + }, + masterButtonText() {return (getClickableState(this.layer, 11) == "Borkened...") ? "Fix the clickable!" : "Does nothing"}, // Text on Respec button, optional + 11: { + title: "Clicky clicky!", // Optional, displayed at the top in a larger font + display() { // Everything else displayed in the buyable button after the title + let data = getClickableState(this.layer, this.id) + return "Current state:
" + data + }, + unlocked() { return player[this.layer].unlocked }, + canClick() { + return getClickableState(this.layer, this.id) !== "Borkened..."}, + onClick() { + switch(getClickableState(this.layer, this.id)){ + case "Start": + player[this.layer].clickables[this.id] = "A new state!" + break; + case "A new state!": + player[this.layer].clickables[this.id] = "Keep going!" + break; + case "Keep going!": + player[this.layer].clickables[this.id] = "Maybe that's a bit too far..." + break; + case "Maybe that's a bit too far...": + //makeParticles(coolParticle, 4) + player[this.layer].clickables[this.id] = "Borkened..." + break; + default: + player[this.layer].clickables[this.id] = "Start" + break; + } + }, + onHold(){ + console.log("Clickkkkk...") + }, + style() { + switch(getClickableState(this.layer, this.id)){ + case "Start": + return {'background-color': 'green'} + case "A new state!": + return {'background-color': 'yellow'} + case "Keep going!": + return {'background-color': 'orange'} + case "Maybe that's a bit too far...": + return {'background-color': 'red'} + default: + return {} + }}, + }, + }, + +} diff --git a/src/data/layers/demo-infinity.js b/src/data/layers/demo-infinity.js index 9ab81d1..ea1b571 100644 --- a/src/data/layers/demo-infinity.js +++ b/src/data/layers/demo-infinity.js @@ -2,7 +2,7 @@ import Decimal, { format } from '../../util/bignum'; import { player } from '../../store/proxies'; import { layers } from '../../store/layers'; import { hasUpgrade, hasMilestone, getBuyableAmount, setBuyableAmount, hasChallenge } from '../../util/features'; -import { canReset, doReset } from '../../util/layers'; +import { resetLayer } from '../../util/layers'; export default { id: "i", @@ -26,13 +26,13 @@ export default { getResetGain(){ if (hasMilestone("p",12)){return getBuyableAmount("p",21).div(2).floor().times(2).times(5).sub(30).sub(player.i.points)} - return (player.p.buyables[21].gte(layers.i.requires())?1:0)}, // Prestige currency exponent + return (player.p.buyables[21].gte(layers.i.requires)?1:0)}, // Prestige currency exponent getNextAt(){return new Decimal(100)}, - canReset(){return player.p.buyables[21].gte(layers.i.requires())}, - prestigeButtonText(){return "Reset everything for +"+format(layers.i.getResetGain())+" Infinity.
You need "+format(layers.i.requires())+" pointy points to reset."}, + canReset(){return player.p.buyables[21].gte(layers.i.requires)}, + prestigeButtonText(){return "Reset everything for +"+format(layers.i.getResetGain)+" Infinity.
You need "+format(layers.i.requires())+" pointy points to reset."}, row: 1, // Row the layer is in on the tree (0 is the first row) hotkeys: [ - {key: "i", description: "I: Infinity", onPress(){if (canReset(this.layer)) doReset(this.layer)}}, + {key: "i", description: "I: Infinity", onPress(){if (layers.i.canReset) resetLayer(this.layer)}}, ], layerShown(){return player[this.layer].unlocked||new Decimal(player.p.buyables[21]).gte(8)}, milestones: { diff --git a/src/data/layers/demo.js b/src/data/layers/demo.js index 5f6a206..75a1eb7 100644 --- a/src/data/layers/demo.js +++ b/src/data/layers/demo.js @@ -2,7 +2,7 @@ import Decimal, { format } from '../../util/bignum'; import { player } from '../../store/proxies'; import { layers } from '../../store/layers'; import { hasUpgrade, hasMilestone, getBuyableAmount, setBuyableAmount, hasChallenge } from '../../util/features'; -import { canReset, doReset } from '../../util/layers'; +import { resetLayer } from '../../util/layers'; export default { id: "p", @@ -47,7 +47,7 @@ export default { }, row: 0, // Row the layer is in on the tree (0 is the first row) hotkeys: [ - {key: "p", description: "P: Reset for prestige points", onPress(){if (canReset(this.layer)) doReset(this.layer)}}, + {key: "p", description: "P: Reset for prestige points", onPress(){if (layers.p.canReset) resetLayer(this.layer)}}, ], layerShown(){return true}, upgrades:{ @@ -375,7 +375,7 @@ export default { cost(){return new Decimal(1)}, canAfford(){return getBuyableAmount(this.layer,22).gte(this.cost())}, pay(){setBuyableAmount(this.layer,22,getBuyableAmount(this.layer,22).sub(this.cost()))}, - unlocked(){return (hasMilestone("i",5)&&player.subtabs.p.mainTabs!="Upgrades")}, + unlocked(){return (hasMilestone("i",5)&&layers.p.activeSubtab!="Upgrades")}, }, 212:{ title: "Pointy", @@ -383,7 +383,7 @@ export default { cost(){return new Decimal(2)}, canAfford(){return getBuyableAmount(this.layer,22).gte(this.cost())}, pay(){setBuyableAmount(this.layer,22,getBuyableAmount(this.layer,22).sub(this.cost()))}, - unlocked(){return (hasMilestone("i",5)&&player.subtabs.p.mainTabs!="Upgrades"&&hasUpgrade(this.layer,211))}, + unlocked(){return (hasMilestone("i",5)&&layers.p.activeSubtab!="Upgrades"&&hasUpgrade(this.layer,211))}, }, 213:{ title: "Time", @@ -391,7 +391,7 @@ export default { cost(){return new Decimal(6)}, canAfford(){return getBuyableAmount(this.layer,22).gte(this.cost())}, pay(){setBuyableAmount(this.layer,22,getBuyableAmount(this.layer,22).sub(this.cost()))}, - unlocked(){return (hasMilestone("i",5)&&player.subtabs.p.mainTabs!="Upgrades"&&hasUpgrade(this.layer,212))}, + unlocked(){return (hasMilestone("i",5)&&layers.p.activeSubtab!="Upgrades"&&hasUpgrade(this.layer,212))}, }, 214:{ title: "^0", @@ -399,7 +399,7 @@ export default { cost(){return new Decimal(11)}, canAfford(){return getBuyableAmount(this.layer,22).gte(this.cost())}, pay(){setBuyableAmount(this.layer,22,getBuyableAmount(this.layer,22).sub(this.cost()))}, - unlocked(){return (hasMilestone("i",5)&&player.subtabs.p.mainTabs!="Upgrades"&&hasUpgrade(this.layer,213))}, + unlocked(){return (hasMilestone("i",5)&&layers.p.activeSubtab!="Upgrades"&&hasUpgrade(this.layer,213))}, }, 215:{ title: "bulk", @@ -407,7 +407,7 @@ export default { cost(){return new Decimal(27)}, canAfford(){return getBuyableAmount(this.layer,22).gte(this.cost())}, pay(){setBuyableAmount(this.layer,22,getBuyableAmount(this.layer,22).sub(this.cost()))}, - unlocked(){return (hasMilestone("i",5)&&player.subtabs.p.mainTabs!="Upgrades"&&hasUpgrade(this.layer,214))}, + unlocked(){return (hasMilestone("i",5)&&layers.p.activeSubtab!="Upgrades"&&hasUpgrade(this.layer,214))}, }, 221:{ title: "^-1", @@ -415,7 +415,7 @@ export default { cost(){return new Decimal(28)}, canAfford(){return getBuyableAmount(this.layer,22).gte(this.cost())}, pay(){setBuyableAmount(this.layer,22,getBuyableAmount(this.layer,22).sub(this.cost()))}, - unlocked(){return (hasMilestone("i",5)&&player.subtabs.p.mainTabs!="Upgrades"&&hasUpgrade(this.layer,215))}, + unlocked(){return (hasMilestone("i",5)&&layers.p.activeSubtab!="Upgrades"&&hasUpgrade(this.layer,215))}, }, 222:{ title: "???", @@ -423,7 +423,7 @@ export default { cost(){return new Decimal(90)}, canAfford(){return getBuyableAmount(this.layer,22).gte(this.cost())}, pay(){setBuyableAmount(this.layer,22,getBuyableAmount(this.layer,22).sub(this.cost()))}, - unlocked(){return (hasMilestone("i",5)&&player.subtabs.p.mainTabs!="Upgrades"&&hasUpgrade(this.layer,221))}, + unlocked(){return (hasMilestone("i",5)&&layers.p.activeSubtab!="Upgrades"&&hasUpgrade(this.layer,221))}, }, 223:{ title: "more automation", @@ -431,7 +431,7 @@ export default { cost(){return new Decimal(96)}, canAfford(){return getBuyableAmount(this.layer,22).gte(this.cost())}, pay(){setBuyableAmount(this.layer,22,getBuyableAmount(this.layer,22).sub(this.cost()))}, - unlocked(){return (hasMilestone("i",5)&&player.subtabs.p.mainTabs!="Upgrades"&&hasUpgrade(this.layer,222))}, + unlocked(){return (hasMilestone("i",5)&&layers.p.activeSubtab!="Upgrades"&&hasUpgrade(this.layer,222))}, }, 224:{ title: "Generation", @@ -439,7 +439,7 @@ export default { cost(){return new Decimal(100)}, canAfford(){return getBuyableAmount(this.layer,22).gte(this.cost())}, pay(){setBuyableAmount(this.layer,22,getBuyableAmount(this.layer,22).sub(this.cost()))}, - unlocked(){return (hasMilestone("i",5)&&player.subtabs.p.mainTabs!="Upgrades"&&hasUpgrade(this.layer,223))}, + unlocked(){return (hasMilestone("i",5)&&layers.p.activeSubtab!="Upgrades"&&hasUpgrade(this.layer,223))}, }, 225:{ title: "Boosters", @@ -447,7 +447,7 @@ export default { cost(){return new Decimal(135)}, canAfford(){return getBuyableAmount(this.layer,22).gte(this.cost())}, pay(){setBuyableAmount(this.layer,22,getBuyableAmount(this.layer,22).sub(this.cost()))}, - unlocked(){return (hasMilestone("i",5)&&player.subtabs.p.mainTabs!="Upgrades"&&hasUpgrade(this.layer,224))}, + unlocked(){return (hasMilestone("i",5)&&layers.p.activeSubtab!="Upgrades"&&hasUpgrade(this.layer,224))}, }, 231:{ title: "Blue", @@ -455,7 +455,7 @@ export default { cost(){return new Decimal(4)}, canAfford(){return getBuyableAmount(this.layer,23).gte(this.cost())}, pay(){setBuyableAmount(this.layer,23,getBuyableAmount(this.layer,23).sub(this.cost()))}, - unlocked(){return (player.subtabs.p.mainTabs!="Upgrades"&&hasMilestone(this.layer,11))}, + unlocked(){return (layers.p.activeSubtab!="Upgrades"&&hasMilestone(this.layer,11))}, currencyDisplayName: "pointy boosters" }, 232:{ @@ -464,7 +464,7 @@ export default { cost(){return new Decimal(5)}, canAfford(){return getBuyableAmount(this.layer,23).gte(this.cost())}, pay(){setBuyableAmount(this.layer,23,getBuyableAmount(this.layer,23).sub(this.cost()))}, - unlocked(){return (player.subtabs.p.mainTabs!="Upgrades"&&hasMilestone(this.layer,12))}, + unlocked(){return (layers.p.activeSubtab!="Upgrades"&&hasMilestone(this.layer,12))}, currencyDisplayName: "pointy boosters" }, 233:{ @@ -473,7 +473,7 @@ export default { cost(){return new Decimal(5)}, canAfford(){return getBuyableAmount(this.layer,23).gte(this.cost())}, pay(){setBuyableAmount(this.layer,23,getBuyableAmount(this.layer,23).sub(this.cost()))}, - unlocked(){return (player.subtabs.p.mainTabs!="Upgrades"&&hasMilestone(this.layer,12))}, + unlocked(){return (layers.p.activeSubtab!="Upgrades"&&hasMilestone(this.layer,12))}, currencyDisplayName: "pointy boosters" }, 234:{ @@ -482,7 +482,7 @@ export default { cost(){return new Decimal(6)}, canAfford(){return getBuyableAmount(this.layer,23).gte(this.cost())}, pay(){setBuyableAmount(this.layer,23,getBuyableAmount(this.layer,23).sub(this.cost()))}, - unlocked(){return (player.subtabs.p.mainTabs!="Upgrades"&&hasMilestone(this.layer,12))}, + unlocked(){return (layers.p.activeSubtab!="Upgrades"&&hasMilestone(this.layer,12))}, currencyDisplayName: "pointy boosters" }, 235:{ @@ -491,7 +491,7 @@ export default { cost(){return new Decimal(8)}, canAfford(){return getBuyableAmount(this.layer,23).gte(this.cost())}, pay(){setBuyableAmount(this.layer,23,getBuyableAmount(this.layer,23).sub(this.cost()))}, - unlocked(){return (player.subtabs.p.mainTabs!="Upgrades"&&hasMilestone(this.layer,12))}, + unlocked(){return (layers.p.activeSubtab!="Upgrades"&&hasMilestone(this.layer,12))}, currencyDisplayName: "pointy boosters" }, }, @@ -754,55 +754,55 @@ challenges:{ requirementDescription: "1 reset", effectDescription: "Add 0.01 to base point gain and prestige requirement, and 1 doesn't reset upgrades", done() { return getBuyableAmount("p",11).gte(1) }, - unlocked(){return player.subtabs.p.mainTabs!="Pointy points"} + unlocked(){return layers.p.activeSubtab!="Pointy points"} }, 1: { requirementDescription: "2 resets", effectDescription: "2 and 3 don't reset upgrades, and start with the first 8 upgrades on reset", done() { return getBuyableAmount("p",11).gte(2) }, - unlocked(){return hasMilestone(this.layer,this.id-1)&&player.subtabs.p.mainTabs!="Pointy points"} + unlocked(){return hasMilestone(this.layer,this.id-1)&&layers.p.activeSubtab!="Pointy points"} }, 2: { requirementDescription: "3 resets", effectDescription: "4 doesn't reset upgrades, and permanently fix the bug where you can't buy upgrades when you have 1 prestige point", done() { return getBuyableAmount("p",11).gte(3) }, - unlocked(){return hasMilestone(this.layer,this.id-1)&&player.subtabs.p.mainTabs!="Pointy points"} + unlocked(){return hasMilestone(this.layer,this.id-1)&&layers.p.activeSubtab!="Pointy points"} }, 3: { requirementDescription: "4 resets", effectDescription: "Don't reset challenges, add 1 to Point maximum completions, and start with 24 upgrades", done() { return getBuyableAmount("p",11).gte(4) }, - unlocked(){return hasMilestone(this.layer,this.id-1)&&player.subtabs.p.mainTabs!="Pointy points"} + unlocked(){return hasMilestone(this.layer,this.id-1)&&layers.p.activeSubtab!="Pointy points"} }, 4: { requirementDescription: "5 resets", effectDescription: "Each useless upgrade adds 0.1 to base point gain", done() { return getBuyableAmount("p",11).gte(5) }, - unlocked(){return hasMilestone(this.layer,this.id-1)&&player.subtabs.p.mainTabs!="Pointy points"} + unlocked(){return hasMilestone(this.layer,this.id-1)&&layers.p.activeSubtab!="Pointy points"} }, 5: { requirementDescription: "6 resets", effectDescription: "Unlock something", done() { return getBuyableAmount("p",11).gte(6) }, - unlocked(){return hasMilestone(this.layer,this.id-1)&&player.subtabs.p.mainTabs!="Pointy points"} + unlocked(){return hasMilestone(this.layer,this.id-1)&&layers.p.activeSubtab!="Pointy points"} }, 6: { requirementDescription: "1 pointy point", effectDescription: "Unlock the upgrade tree", done() { return getBuyableAmount("p",21).gte(1) }, - unlocked(){return hasMilestone(this.layer,this.id-1)&&(hasUpgrade(this.layer,104)||player.i.unlocked)&&player.subtabs.p.mainTabs!="Pointy points"} + unlocked(){return hasMilestone(this.layer,this.id-1)&&(hasUpgrade(this.layer,104)||player.i.unlocked)&&layers.p.activeSubtab!="Pointy points"} }, 7: { requirementDescription: "7 pointy points", effectDescription: "You can now buy both first and second row upgrade tree upgrades", done() { return getBuyableAmount("p",21).gte(7) }, - unlocked(){return hasMilestone(this.layer,this.id-1)&&(hasUpgrade(this.layer,111)||player.i.unlocked)&&player.subtabs.p.mainTabs!="Pointy points"} + unlocked(){return hasMilestone(this.layer,this.id-1)&&(hasUpgrade(this.layer,111)||player.i.unlocked)&&layers.p.activeSubtab!="Pointy points"} }, 8: { requirementDescription: "8 pointy points", effectDescription: "Unlock another layer", done() { return getBuyableAmount("p",21).gte(8) }, - unlocked(){return hasMilestone(this.layer,this.id-1)&&(hasUpgrade(this.layer,141)||hasUpgrade(this.layer,143)||hasUpgrade(this.layer,142)||player.i.unlocked)&&player.subtabs.p.mainTabs!="Pointy points"} + unlocked(){return hasMilestone(this.layer,this.id-1)&&(hasUpgrade(this.layer,141)||hasUpgrade(this.layer,143)||hasUpgrade(this.layer,142)||player.i.unlocked)&&layers.p.activeSubtab!="Pointy points"} }, 11: { requirementDescription: "3 boosters", diff --git a/src/data/mod.js b/src/data/mod.js index 0d9e33c..4dd9bdb 100644 --- a/src/data/mod.js +++ b/src/data/mod.js @@ -5,10 +5,43 @@ import Decimal from '../util/bignum'; import modInfo from './modInfo'; // Import initial layers -import demo from './layers/demo.js'; -import demoInfinity from './layers/demo-infinity.js'; +import f from './layers/aca/f.js'; +import c from './layers/aca/c.js'; +import a from './layers/aca/a.js'; +const g = { + id: "g", + symbol: "TH", + branches: ["c"], + color: '#6d3678', + layerShown: true, + canClick() {return player.points.gte(10)}, + tooltip: "Thanos your points", + onClick() { + player.points = player.points.div(2); + console.log(this.layer); + } +}; +const h = { + id: "h", + branches: ["g", { target: 'flatBoi', featureType: 'bar', endOffset: { x: () => -50 + 100 * layers.c.bars.flatBoi.progress.toNumber() } }], + layerShown: true, + tooltip() {return "Restore your points to " + player.c.otherThingy}, + row: "side", + canClick() {return player.points.lt(player.c.otherThingy)}, + onClick() {player.points = new Decimal(player.c.otherThingy)} +}; +const spook = { + id: "spook", + row: 1, + layerShown: "ghost", +}; -export const initialLayers = [ demo, demoInfinity ]; +const main = { + id: 'main', + display: '' +} + +export const initialLayers = [ main, f, c, a, g, h, spook ]; export function update(delta) { let gain = new Decimal(3.19) diff --git a/src/data/modInfo.json b/src/data/modInfo.json index 1b97937..feef8d0 100644 --- a/src/data/modInfo.json +++ b/src/data/modInfo.json @@ -10,10 +10,10 @@ "allowSmall": false, "defaultDecimalsShown": 2, - "useHeader": false, + "useHeader": true, "banner": null, "logo": null, - "initialTabs": ["tree-tab", "p", "i"], + "initialTabs": [ "main", "c" ], "maxTickLength": 3600 } diff --git a/src/data/themes.js b/src/data/themes.js index fa331e2..d8fbffd 100644 --- a/src/data/themes.js +++ b/src/data/themes.js @@ -1,35 +1,52 @@ const defaultTheme = { - "--background": "#0f0f0f", - "--background-tooltip": "rgba(0, 0, 0, 0.75)", - "--secondary-background": "#0f0f0f", - "--color": "#dfdfdf", - "--points": "#ffffff", - "--locked": "#bf8f8f", - "--link": "#02f2f2", - "--separator": "#dfdfdf", - "--border-radius": "25%", - "--danger": "rgb(220, 53, 69)", - "--modal-border": "solid 2px var(--color)" + variables: { + "--background": "#0f0f0f", + "--background-tooltip": "rgba(0, 0, 0, 0.75)", + "--secondary-background": "#0f0f0f", + "--color": "#dfdfdf", + "--points": "#ffffff", + "--locked": "#bf8f8f", + "--bought": "#77bf5f", + "--link": "#02f2f2", + "--separator": "#dfdfdf", + "--border-radius": "25%", + "--danger": "rgb(220, 53, 69)", + "--modal-border": "solid 2px var(--color)", + "--feature-margin": "0px", + }, + stackedInfoboxes: false, + floatingTabs: true }; export default { - default: defaultTheme, + classic: defaultTheme, paper: { ...defaultTheme, - "--background": "#2a323d", - "--secondary-background": "#333c4a", - "--separator": "#333c4a", - "--border-radius": "4px", - "--modal-border": "" + variables: { + ...defaultTheme.variables, + "--background": "#2a323d", + "--secondary-background": "#333c4a", + "--locked": "#3a3e45", + "--bought": "#5C8A58", + "--separator": "#333c4a", + "--border-radius": "4px", + "--modal-border": "", + "--feature-margin": "5px", + }, + stackedInfoboxes: true, + floatingTabs: false }, aqua: { ...defaultTheme, - "--background": "#001f3f", - "--background-tooltip": "rgba(0, 15, 31, 0.75)", - "--secondary-background": "#001f3f", - "--color": "#bfdfff", - "--points": "#dfefff", - "--locked": "#c4a7b3", - "--separator": "#bfdfff" + variables: { + ...defaultTheme.variables, + "--background": "#001f3f", + "--background-tooltip": "rgba(0, 15, 31, 0.75)", + "--secondary-background": "#001f3f", + "--color": "#bfdfff", + "--points": "#dfefff", + "--locked": "#c4a7b3", + "--separator": "#bfdfff" + } } }; diff --git a/src/main.css b/src/main.css new file mode 100644 index 0000000..31b6f87 --- /dev/null +++ b/src/main.css @@ -0,0 +1,49 @@ +* { + transition-duration: 0.5s; + font-family: "Roboto Mono", monospace; + font-weight: bold; + margin: auto; + text-size-adjust: none; +} + +*:focus { + outline: none; +} + +body { + overflow: hidden; + min-width: 640px; + transition: none; + text-align: center; +} + +html, body, #app { + min-height: 100%; + height: 100%; +} + +h1, h2, h3, b, input { + display: inline; +} + +a, +.button, +.link { + display: block; + color: var(--link); + background: none; + border: none; + cursor: pointer; + text-decoration: none; +} + +a:hover, +.button:hover, +.link:hover { + text-shadow: 5px 0 10px var(--link), + -3px 0 12px var(--link); +} + +ul { + list-style-type: none; +} diff --git a/src/main.js b/src/main.js index 3771553..7fca680 100644 --- a/src/main.js +++ b/src/main.js @@ -1,20 +1,25 @@ import Vue from 'vue'; import App from './App'; import store from './store'; -import { layers, hotkeys } from './store/layers'; +import { addLayer} from './store/layers'; import { setVue } from './util/vue'; import './components/index'; // Setup Vue.config.productionTip = false; -// Create Vue -const vue = window.vue = new Vue({ - store, - render: h => h(App), - data: { layers, hotkeys } -}).$mount('#app'); +requestAnimationFrame(async () => { + // Add layers on second frame so dependencies can resolve + const { initialLayers } = await import('./data/mod'); + initialLayers.forEach(addLayer); -setVue(vue); + // Create Vue + const vue = window.vue = new Vue({ + store, + render: h => h(App) + }); + setVue(vue); + vue.$mount('#app'); -// Start game loop + // Start game loop +}); diff --git a/src/store/layers.js b/src/store/layers.js index 5e0bfcb..b98a177 100644 --- a/src/store/layers.js +++ b/src/store/layers.js @@ -1,37 +1,49 @@ -import { isPlainObject } from '../util/common'; +import { isFunction, isPlainObject } from '../util/common'; import { createProxy, createGridProxy, player } from './proxies'; import Decimal from '../util/bignum'; import store from './index'; - -// Add layers on second frame so dependencies can resolve -requestAnimationFrame(async () => { - const { initialLayers } = await import('../data/mod'); - initialLayers.forEach(addLayer); -}); +import { resetLayer, noCache, getStartingBuyables, getStartingClickables, getStartingChallenges } from '../util/layers'; export const layers = {}; export const hotkeys = []; +window.layers = layers; export function addLayer(layer) { // Check for required properties - if (requiredProperties.some(prop => !(prop in layer))) { - console.error(`Cannot add layer without a ${requiredProperties.find(prop => !(prop in layer))} property!`, layer); + if (!('id' in layer)) { + console.error(`Cannot add layer without a "id" property!`, layer); return; } + if (layer.type === "static" || layer.type === "normal") { + const missingProperty = [ 'baseAmount', 'requires' ].find(prop => !(prop in layer)); + if (missingProperty) { + console.error(`Cannot add layer without a "${missingProperty}" property!`, layer); + return; + } + } + if (layer.type === "static" && (layer.base == undefined || Decimal.lte(layer.base, 1))) { + layer.base = 2; + } // Set default property values layer = Object.assign({}, defaultLayerProperties, layer); layer.layer = layer.id; + if (layer.shown == undefined) { + layer.shown = true; + } + if (layer.onClick != undefined) { + layer.onClick.forceCached = false; + } const getters = {}; // Process each feature - for (let property in gridProperties) { + for (let property of gridProperties) { if (layer[property]) { setRowCol(layer[property]); } } - for (let property in featureProperties) { + for (let property of featureProperties) { if (layer[property]) { setupFeature(layer.id, layer[property]); } @@ -45,6 +57,69 @@ export function addLayer(layer) { layer.upgrades[id].bought = function() { return !this.deactivated && player[layer.id].upgrades.some(upgrade => upgrade == id); } + if (layer.upgrades[id].canAfford == undefined) { + layer.upgrades[id].canAfford = function() { + if (this.currencyInternalName) { + let name = this.currencyInternalName; + if (this.currencyLocation) { + return !(this.currencyLocation[name].lt(this.cost)); + } else if (this.currencyLayer) { + let lr = this.currencyLayer; + return !(player[lr][name].lt(this.cost)); + } else { + return !(player[name].lt(this.cost)); + } + } else { + return !(player[this.layer].points.lt(this.cost)) + } + } + } + if (layer.upgrades[id].pay == undefined) { + layer.upgrades[id].pay = noCache(function() { + if (this.bought || !this.canAfford) { + return; + } + if (this.currencyInternalName) { + let name = this.currencyInternalName + if (this.currencyLocation) { + if (this.currencyLocation[name].lt(this.cost)) { + return; + } + this.currencyLocation[name] = this.currencyLocation[name].sub(this.cost); + } else if (this.currencyLayer) { + let lr = this.currencyLayer; + if (player[lr][name].lt(this.cost)) { + return; + } + player[lr][name] = player[lr][name].sub(this.cost); + } else { + if (player[name].lt(this.cost)) { + return; + } + player[name] = player[name].sub(this.cost); + } + } else { + if (player[this.layer].points.lt(this.cost)) { + return; + } + player[this.layer].points = player[this.layer].points.sub(this.cost); + } + }); + } else { + layer.upgrades[id].pay.forceCached = false; + } + if (layer.upgrades[id].buy == undefined) { + layer.upgrades[id].buy = noCache(function() { + if (this.bought || !this.canAfford) { + return; + } + this.pay(); + player[this.layer].upgrades.push(this.id); + this.onPurchase?.(); + }); + } else { + layer.upgrades[id].buy.forceCached = false; + } } } } @@ -62,7 +137,7 @@ export function addLayer(layer) { } if (layer.challenges) { if (player[layer.id].challenges == undefined) { - player[layer.id].challenges = {}; + player[layer.id].challenges = getStartingChallenges(layer); } for (let id in layer.challenges) { if (isPlainObject(layer.challenges[id])) { @@ -75,21 +150,73 @@ export function addLayer(layer) { layer.challenges[id].maxed = function() { return !this.deactivated && Decimal.gte(player[layer.id].challenges[id], this.completionLimit); } - if (layer.challenges[id].marked == undefined) { - layer.challenges[id].marked = function() { + if (layer.challenges[id].mark == undefined) { + layer.challenges[id].mark = function() { return this.maxed; } } layer.challenges[id].active = function() { - // TODO search for other rows that "count as" this challenge as well - return !this.deactivated && (player[layer.id].activeChallenge === id || layers[layer.id].challenges[player[layer.id].activeChallenge]?.countsAs?.includes(id)); + return !this.deactivated && player[layer.id].activeChallenge === id; + } + if (layer.challenges[id].canComplete == undefined) { + layer.challenges[id].canComplete = function() { + if (this.active) { + return false; + } + + if (this.currencyInternalName) { + let name = this.currencyInternalName; + if (this.currencyLocation) { + return !(this.currencyLocation[name].lt(this.goal)); + } else if (this.currencyLayer) { + let lr = this.currencyLayer; + return !(player[lr][name].lt(this.goal)); + } else { + return !(player[name].lt(this.goal)); + } + } else { + return !(player.points.lt(this.goal)); + } + } + } + if (layer.challenges[id].completionLimit == undefined) { + layer.challenges[id].completionLimit = new Decimal(1); + } + layer.challenges[id].toggle = function() { + let exiting = player[layer.id].activeChallenge === id; + if (exiting) { + if (this.canComplete && !this.maxed) { + let completions = this.canComplete; + if (completions === true) { + completions = 1; + } + player[layer.id].challenges[id] = + Decimal.min(player[layer.id].challenges[id].add(completions), this.completionLimit); + this.onComplete?.(); + } + player[layer.id].activeChallenge = null; + this.onExit?.(); + resetLayer(layer.id, true); + } else if (!exiting && this.canStart) { + resetLayer(layer.id, true); + player[layer.id].activeChallenge = id; + this.onEnter?.(); + } + } + if (layer.challenges[id].canStart == undefined) { + layer.challenges[id].canStart = true; } } } } if (layer.buyables) { if (player[layer.id].buyables == undefined) { - player[layer.id].buyables = {}; + player[layer.id].buyables = getStartingBuyables(layer); + } + if (layer.buyables.reset == undefined) { + layer.buyables.reset = noCache(function() { + player[this.layer].buyables = getStartingBuyables(layer); + }); } for (let id in layer.buyables) { if (isPlainObject(layer.buyables[id])) { @@ -100,17 +227,32 @@ export function addLayer(layer) { player[layer.id].buyables[id] = amount; } layer.buyables[id].canBuy = function() { - return !this.deactivated && this.unlocked !== false && this.canAfford !== false && Decimal.lt(player[layer.id].buyables[id], this.purchaseLimit); + return !this.deactivated && this.unlocked !== false && this.canAfford !== false && + Decimal.lt(player[layer.id].buyables[id], this.purchaseLimit); } if (layer.buyables[id].purchaseLimit == undefined) { layer.buyables[id].purchaseLimit = new Decimal(Infinity); } + if (layer.buyables[id].cost != undefined && layer.buyables[id].buy == undefined) { + layer.buyables[id].buy = noCache(function() { + player[this.layer].points = player[this.layer].points.sub(this.cost()); + this.amount = this.amount.add(1); + }); + } else { + layer.buyables[id].buy.forceCached = false; + } + if (layer.buyables[id].sellOne != undefined) { + layer.buyables[id].sellOne.forceCached = false; + } + if (layer.buyables[id].sellAll != undefined) { + layer.buyables[id].sellAll.forceCached = false; + } } } } if (layer.clickables) { if (player[layer.id].clickables == undefined) { - player[layer.id].clickables = {}; + player[layer.id].clickables = getStartingClickables(layer); } for (let id in layer.clickables) { if (isPlainObject(layer.clickables[id])) { @@ -129,6 +271,26 @@ export function addLayer(layer) { } for (let id in layer.milestones) { if (isPlainObject(layer.milestones[id])) { + layer.milestones[id].shown = function() { + if (!this.unlocked) { + return false; + } + + switch (player.msDisplay) { + default: + case "all": + return true; + case "last": + return this.optionsDisplay || !this.earned || + player[this.layer].milestones[player[this.layer].milestones.length - 1] === this.id; + case "configurable": + return this.optionsDisplay || !this.earned; + case "incomplete": + return !this.earned; + case "none": + return false; + } + } layer.milestones[id].earned = function() { return !this.deactivated && player[layer.id].milestones.some(milestone => milestone == id); } @@ -150,23 +312,62 @@ export function addLayer(layer) { if (layer.grids[id].getCanClick == undefined) { layer.grids[id].getCanClick = true; } + if (layer.grids[id].getStartData == undefined) { + layer.grids[id].getStartData = ""; + } layer.grids[id].data = function(cell) { - return player[layer.id].grids[id][cell]; + if (player[layer.id].grids[id][cell] != undefined) { + return player[layer.id].grids[id][cell]; + } + if (isFunction(this.getStartData)) { + return this.getStartData(cell); + } + return this.getStartData; } layer.grids[id].dataSet = function(cell, data) { player[layer.id].grids[id][cell] = data; } - createGridProxy(layer.grids[id], getters, `${layer.id}/grids-${id}-`); + layer.grids[id] = createGridProxy(layer.grids[id], getters, `${layer.id}/grids-${id}-`); } } } if (layer.subtabs) { + for (let id in layer.subtabs) { + if (isPlainObject(layer.subtabs[id])) { + layer.subtabs[id].active = function() { + return player.subtabs[this.layer]?.mainTabs === this.id; + } + } + } layer.activeSubtab = function() { if (this.subtabs != undefined) { - if (player.subtabs[layer.id] in this.subtabs && this.subtabs[player.subtabs[layer.id]].unlocked !== false) { - return player.subtabs[layer.id]; + if (this.subtabs[player.subtabs[layer.id]?.mainTabs] && + this.subtabs[player.subtabs[layer.id].mainTabs].unlocked !== false) { + return this.subtabs[player.subtabs[layer.id].mainTabs]; } - return Object.keys(this.subtabs).find(subtab => this.subtabs[subtab].unlocked !== false); + // Default to first unlocked tab + return Object.values(this.subtabs).find(subtab => subtab.unlocked !== false); + } + } + } + if (layer.microtabs) { + for (let family in layer.microtabs) { + for (let id in layer.microtabs[family]) { + if (isPlainObject(layer.microtabs[family][id])) { + layer.microtabs[family][id].layer = layer.id; + layer.microtabs[family][id].family = family; + layer.microtabs[family][id].id = id; + layer.microtabs[family][id].active = function() { + return player.subtabs[this.layer]?.[this.family] === this.id; + } + } + } + layer.microtabs[family].activeMicrotab = function() { + if (this[player.subtabs[layer.id][family]]?.unlocked !== false) { + return this[player.subtabs[layer.id][family]]; + } + // Default to first unlocked tab + return Object.values(this).find(microtab => microtab.unlocked !== false); } } } @@ -205,14 +406,176 @@ export function reloadLayer(layer) { addLayer(layer); } -const requiredProperties = [ 'id' ]; -const defaultLayerProperties = { +export const defaultLayerProperties = { type: "none", layerShown: true, - glowColor: "red" + glowColor: "red", + displayRow() { + return this.row; + }, + symbol() { + return this.id; + }, + unlocked() { + if (player[this.id].unlocked) { + return true; + } + if (this.type !== "none" && this.canReset && this.layerShown) { + return true; + } + return false; + }, + trueGlowColor() { + if (this.subtabs) { + for (let subtab of Object.values(this.subtabs)) { + if (subtab.notify) { + return subtab.glowColor || "red"; + } + } + } + if (this.microtabs) { + for (let microtab of Object.values(this.microtabs)) { + if (microtab.notify) { + return microtab.glowColor || "red"; + } + } + } + return this.glowColor || "red"; + }, + resetGain() { + if (this.type === "none" || this.type === "custom") { + return new Decimal(0); + } + if (this.gainExp?.eq(0)) { + return new Decimal(0); + } + if (this.baseAmount.lt(this.requires)) { + return new Decimal(0); + } + if (this.type === "static") { + if (!this.canBuyMax) { + return new Decimal(1); + } + let gain = this.baseAmount.div(this.requires).div(this.gainMult || 1).max(1).log(this.base) + .times(this.gainExp || 1).pow(Decimal.pow(this.exponent || 1, -1)); + gain = gain.times(this.directMult || 1); + return gain.floor().sub(player[this.layer].points).add(1).max(1); + } + if (this.type === "normal") { + let gain = this.baseAmount.div(this.requires).pow(this.exponent || 1).times(this.gainMult || 1) + .pow(this.gainExp || 1); + if (this.softcap && gain.gte(this.softcap)) { + gain = gain.pow(this.softcapPower).times(this.softcap.pow(Decimal.sub(1, this.softcapPower))); + } + gain = gain.times(this.directMult || 1); + return gain.floor().max(0); + } + // Unknown prestige type + return new Decimal(0); + }, + nextAt() { + if (this.type === "none" || this.type === "custom") { + return new Decimal(Infinity); + } + if (this.gainMult?.lte(0) || this.gainExp?.lte(0)) { + return new Decimal(Infinity); + } + if (this.type === "static") { + const amount = player[this.layer].points.div(this.directMult || 1); + const extraCost = Decimal.pow(this.base, amount.pow(this.exponent || 1).div(this.gainExp || 1)) + .times(this.gainMult || 1); + let cost = extraCost.times(this.requires).max(this.requires); + if (this.roundUpCost) { + cost = cost.ceil(); + } + return cost; + } + if (this.type === "normal") { + let next = this.resetGain.div(this.directMult || 1); + if (this.softcap && next.gte(this.softcap)) { + next = next.div(this.softcap.pow(Decimal.sub(1, this.softcapPower))) + .pow(Decimal.div(1, this.softcapPower)); + } + next = next.root(this.gainExp || 1).div(this.gainMult || 1).root(this.exponent || 1) + .times(this.requires).max(this.requires); + if (this.roundUpCost) { + next = next.ceil(); + } + return next; + } + // Unknown prestige type + return new Decimal(0); + }, + nextAtMax() { + if (!this.canBuyMax || this.type !== "static") { + return this.nextAt; + } + const amount = player[this.layer].points.plus(this.resetGain).div(this.directMult || 1); + const extraCost = Decimal.pow(this.base, amount.pow(this.exponent || 1).div(this.gainExp || 1)) + .times(this.gainMult || 1); + let cost = extraCost.times(this.requires).max(this.requires); + if (this.roundUpCost) { + cost = cost.ceil(); + } + return cost; + }, + canReset() { + if (this.type === "normal") { + return this.baseAmount.gte(this.requires); + } + if (this.type === "static") { + return this.baseAmount.gte(this.nextAt); + } + return false; + }, + notify() { + if (this.upgrades) { + if (Object.values(this.upgrades).some(upgrade => upgrade.canAfford && !upgrade.bought && upgrade.unlocked)) { + return true; + } + } + if (player[this.layer].activeChallenge && this.challenges[player[this.layer].activeChallenge].canComplete) { + return true; + } + if (this.subtabs) { + if (Object.values(this.subtabs).some(subtab => subtab.notify)) { + return true; + } + } + if (this.microtabs) { + if (Object.values(this.microtabs).some(subtab => subtab.notify)) { + return true; + } + } + + return false; + }, + resetNotify() { + if (this.subtabs) { + if (Object.values(this.subtabs).some(subtab => subtab.prestigeNotify)) { + return true; + } + } + if (this.microtabs) { + if (Object.values(this.microtabs).some(microtab => microtab.prestigeNotify)) { + return true; + } + } + if (this.autoPrestige || this.passiveGeneration) { + return false; + } + if (this.type === "static") { + return this.canReset; + } + if (this.type === "normal") { + return this.canReset && this.resetGain.gte(player[this.layer].points.div(10)); + } + return false; + } }; const gridProperties = [ 'upgrades', 'achievements', 'challenges', 'buyables', 'clickables' ]; -const featureProperties = [ 'upgrades', 'achievements', 'challenges', 'buyables', 'clickables', 'milestones', 'bars', 'infoboxes', 'grids', 'hotkeys', 'subtabs' ]; +const featureProperties = [ 'upgrades', 'achievements', 'challenges', 'buyables', 'clickables', 'milestones', 'bars', + 'infoboxes', 'grids', 'hotkeys', 'subtabs' ]; function setRowCol(features) { if (features.rows && features.cols) { @@ -235,11 +598,15 @@ function setRowCol(features) { } function setupFeature(layer, features) { + features.layer = layer; for (let id in features) { const feature = features[id]; if (isPlainObject(feature)) { feature.id = id; feature.layer = layer; + if (feature.unlocked == undefined) { + feature.unlocked = true; + } } } } diff --git a/src/store/proxies.js b/src/store/proxies.js index 893fb1b..5436fb9 100644 --- a/src/store/proxies.js +++ b/src/store/proxies.js @@ -24,7 +24,7 @@ const playerHandler = { return; } - if (!target[key].isProxy && !(target[key] instanceof Decimal) && isPlainObject(target[key])) { + if (!target[key].isProxy && !(target[key] instanceof Decimal) && (isPlainObject(target[key]) || Array.isArray(target[key]))) { // Note that player isn't pre-created since it (shouldn't) have functions or getters // so creating proxies as they're requested is A-OK target[key] = new Proxy(target[key], playerHandler); @@ -41,6 +41,9 @@ const playerHandler = { export const player = window.player = new Proxy(store.state, playerHandler); export function createProxy(object, getters, prefix) { + if (object.isProxy) { + console.warn("Creating a proxy out of a proxy! This may cause unintentional function calls and stack overflows."); + } const objectProxy = new Proxy(object, getHandler(prefix)); travel(createProxy, object, objectProxy, getters, prefix); return objectProxy; @@ -48,6 +51,9 @@ export function createProxy(object, getters, prefix) { // TODO cache grid values? Currently they'll be calculated every render they're visible export function createGridProxy(object, getters, prefix) { + if (object.isProxy) { + console.warn("Creating a proxy out of a proxy! This may cause unintentional function calls and stack overflows."); + } const objectProxy = new Proxy(object, getGridHandler(prefix)); travel(createGridProxy, object, objectProxy, getters, prefix); return objectProxy; @@ -59,14 +65,13 @@ function travel(callback, object, objectProxy, getters, prefix) { continue; } if (isFunction(object[key])) { - // Skip any functions that require a parameter, since they can't be cached through vuex - if (object[key].length !== 0) { + if ((object[key].length !== 0 && object[key].forceCached !== true) || object[key].forceCached === false) { continue; } getters[`${prefix}${key}`] = () => { return object[key].call(objectProxy); } - } else if (isPlainObject(object[key])) { + } else if ((isPlainObject(object[key]) || Array.isArray(object[key])) && !(object[key] instanceof Decimal)) { object[key] = callback(object[key], getters, `${prefix}${key}-`); } } @@ -83,9 +88,9 @@ function getHandler(prefix) { return; } - if (target[key].isProxy) { + if (target[key].isProxy || target[key] instanceof Decimal) { return target[key]; - } else if (isPlainObject(target[key])) { + } else if ((isPlainObject(target[key]) || Array.isArray(target[key])) && key.slice(0, 2) !== '__') { console.warn("Creating proxy outside `createProxy`. This may cause issues when calling proxied functions.", target, key); target[key] = new Proxy(target[key], getHandler(`${prefix}${key}-`)); @@ -103,6 +108,7 @@ function getHandler(prefix) { set(target, key, value, receiver) { if (`${key}Set` in target && isFunction(target[`${key}Set`]) && target[`${key}Set`].length < 2) { target[`${key}Set`].call(receiver, value); + return true; } else { console.warn(`No setter for "${key}".`, target); } @@ -117,9 +123,9 @@ function getGridHandler(prefix) { return true; } - if (target[key].isProxy) { + if (target[key] && (target[key].isProxy || target[key] instanceof Decimal)) { return target[key]; - } else if (isPlainObject(target[key])) { + } else if (isPlainObject(target[key]) || Array.isArray(target[key])) { console.warn("Creating proxy outside `createProxy`. This may cause issues when calling proxied functions.", target, key); target[key] = new Proxy(target[key], getHandler(`${prefix}${key}-`)); @@ -132,7 +138,7 @@ function getGridHandler(prefix) { return target[key].bind(receiver); } } - if (!isNaN(key) && parseInt(key) > 100) { + if (!isNaN(key)) { target[key] = new Proxy(target, getCellHandler(key)); } return target[key]; @@ -140,6 +146,7 @@ function getGridHandler(prefix) { set(target, key, value, receiver) { if (`${key}Set` in target && isFunction(target[`${key}Set`]) && target[`${key}Set`].length < 2) { target[`${key}Set`].call(receiver, value); + return true; } else { console.warn(`No setter for "${key}".`, target); } @@ -156,31 +163,36 @@ function getCellHandler(id) { let prop = target[key]; if (isFunction(prop)) { - // TODO explicitly list functions that don't receive cell data? - if (prop.length < 2) { - return prop.call(receiver, id); - } else { - return prop.call(receiver, receiver.data, id); - } + return prop.call(receiver, id, target.data(id)); } else if (prop != undefined) { return prop; } - prop = target[`get${key.slice(0, 1).toUpperCase() + key.slice(1)}`]; - if (isFunction(prop)) { - // TODO explicitly list functions that don't receive cell data? - if (prop.length < 2) { - return prop.call(receiver, id); - } else { - return prop.call(receiver, receiver.data, id); - } - } else { + if (key.slice == undefined) { return prop; } + + key = key.slice(0, 1).toUpperCase() + key.slice(1); + prop = target[`get${key}`]; + if (isFunction(prop)) { + return prop.call(receiver, id, target.data(id)); + } else if (prop != undefined) { + return prop; + } + + prop = target[`on${key}`]; + if (isFunction(prop)) { + return () => prop.call(receiver, id, target.data(id)); + } else if (prop != undefined) { + return prop; + } + + return target[key]; }, set(target, key, value, receiver) { if (`${key}Set` in target && isFunction(target[`${key}Set`]) && target[`${key}Set`].length < 3) { target[`${key}Set`].call(receiver, id, value); + return true; } else { console.warn(`No setter for "${key}".`, target); } diff --git a/src/util/common.js b/src/util/common.js index cd8201a..d36f05e 100644 --- a/src/util/common.js +++ b/src/util/common.js @@ -1,3 +1,5 @@ +import Decimal from './bignum'; + // Reference: https://stackoverflow.com/questions/7225407/convert-camelcasetext-to-sentence-case-text export function camelToTitle(camel) { let title = camel.replace(/([A-Z])/g, " $1"); @@ -12,3 +14,11 @@ export function isPlainObject(object) { export function isFunction(func) { return typeof func === 'function'; } + +export function softcap(value, cap, power = 0.5) { + if (value.lte(cap)) { + return value; + } else { + return value.pow(power).times(cap.pow(Decimal.sub(1, power))); + } +} diff --git a/src/util/features.js b/src/util/features.js index 012df8b..de262fa 100644 --- a/src/util/features.js +++ b/src/util/features.js @@ -1,35 +1,35 @@ import { layers } from '../store/layers'; export function hasUpgrade(layer, id) { - return layers[layer].upgrades[id].bought; + return layers[layer]?.upgrades?.[id]?.bought; } export function hasMilestone(layer, id) { - return layers[layer].milestones[id].earned; + return layers[layer]?.milestones?.[id]?.earned; } export function hasAchievement(layer, id) { - return layers[layer].achievements[id].earned; + return layers[layer]?.achievements?.[id]?.earned; } export function hasChallenge(layer, id) { - return layers[layer].challenges[id].completed; + return layers[layer]?.challenges?.[id]?.completed; } export function maxedChallenge(layer, id) { - return layers[layer].challenges[id].maxed; + return layers[layer]?.challenges?.[id]?.maxed; } export function challengeCompletions(layer, id) { - return layers[layer].challenges[id].completions; + return layers[layer]?.challenges?.[id]?.completions; } export function inChallenge(layer, id) { - return layers[layer].challenges[id].active; + return layers[layer]?.challenges?.[id]?.active; } export function getBuyableAmount(layer, id) { - return layers[layer].buyables[id].amount; + return layers[layer]?.buyables?.[id]?.amount; } export function setBuyableAmount(layer, id, amt) { @@ -37,7 +37,7 @@ export function setBuyableAmount(layer, id, amt) { } export function getClickableState(layer, id) { - return layers[layer].clickables[id].state; + return layers[layer]?.clickables?.[id]?.state; } export function setClickableState(layer, id, state) { @@ -45,7 +45,7 @@ export function setClickableState(layer, id, state) { } export function getGridData(layer, id, cell) { - return layers[layer].grids[id][cell]; + return layers[layer]?.grids?.[id]?.[cell]; } export function setGridData(layer, id, cell, data) { @@ -53,25 +53,25 @@ export function setGridData(layer, id, cell, data) { } export function upgradeEffect(layer, id) { - return layers[layer].upgrades[id].effect; + return layers[layer]?.upgrades?.[id]?.effect; } export function challengeEffect(layer, id) { - return layers[layer].challenges[id].rewardEffect; + return layers[layer]?.challenges?.[id]?.rewardEffect; } export function buyableEffect(layer, id) { - return layers[layer].buyables[id].effect; + return layers[layer]?.buyables?.[id]?.effect; } export function clickableEffect(layer, id) { - return layers[layer].clickables[id].effect; + return layers[layer]?.clickables?.[id]?.effect; } export function achievementEffect(layer, id) { - return layers[layer].achievements[id].effect; + return layers[layer]?.achievements?.[id]?.effect; } export function gridEffect(layer, id, cell) { - return layers[layer].grids[id][cell].effect; + return layers[layer]?.grids?.[id]?.[cell]?.effect; } diff --git a/src/util/layers.js b/src/util/layers.js index 6f5971f..91b48d1 100644 --- a/src/util/layers.js +++ b/src/util/layers.js @@ -1,11 +1,49 @@ -export function canReset(layer) { - console.warn("Not yet implemented!", layer); +import Decimal from './bignum'; +import { isPlainObject } from './common'; + +// TODO make layer.reset(force = false) +export function resetLayer(layer, force = false) { + console.warn("Not yet implemented!", layer, force); } -export function doReset(layer) { - console.warn("Not yet implemented!", layer); +// TODO make layer.resetData(keep = []) +export function resetLayerData(layer, keep = []) { + console.warn("Not yet implemented!", layer, keep); } -export function layerDataReset(layer) { - console.warn("Not yet implemented!", layer); +export function cache(func) { + func.forceCached = true; + return func; +} + +export function noCache(func) { + func.forceCached = false; + return func; +} + +export function getStartingBuyables(layer) { + return layer.buyables && Object.keys(layer.buyables).reduce((acc, curr) => { + if (isPlainObject(layer.buyables[curr])) { + acc[curr] = new Decimal(0); + } + return acc; + }, {}); +} + +export function getStartingClickables(layer) { + return layer.clickables && Object.keys(layer.clickables).reduce((acc, curr) => { + if (isPlainObject(layer.clickables[curr])) { + acc[curr] = ""; + } + return acc; + }, {}); +} + +export function getStartingChallenges(layer) { + return layer.challenges && Object.keys(layer.challenges).reduce((acc, curr) => { + if (isPlainObject(layer.challenges[curr])) { + acc[curr] = new Decimal(0); + } + return acc; + }, {}); } diff --git a/src/util/load.js b/src/util/load.js index b50edfd..258f6c2 100644 --- a/src/util/load.js +++ b/src/util/load.js @@ -1,5 +1,6 @@ import modInfo from '../data/modInfo'; import { getStartingData, initialLayers } from '../data/mod'; +import { getStartingBuyables, getStartingClickables, getStartingChallenges } from './layers'; export function getInitialStore() { return { @@ -12,11 +13,22 @@ export function getInitialStore() { hasNaN: false, lastTenTicks: [], showTPS: true, + msDisplay: "all", + hideChallenges: false, theme: "paper", subtabs: {}, ...getStartingData(), ...initialLayers.reduce((acc, layer) => { - acc[layer.id] = layer.startData(); + acc[layer.id] = { + upgrades: [], + achievements: [], + milestones: [], + infoboxes: {}, + buyables: getStartingBuyables(layer), + clickables: getStartingClickables(layer), + challenges: getStartingChallenges(layer), + ...layer.startData?.() + }; return acc; }, {}) } diff --git a/src/util/vue.js b/src/util/vue.js index 88d463d..71a09b9 100644 --- a/src/util/vue.js +++ b/src/util/vue.js @@ -8,25 +8,44 @@ export function setVue(vm) { } // Pass in various data that the template could potentially use -const defaultComputed = { +const computed = { player() { return player; }, layers() { return layers; } }; -const defaultData = function() { +const data = function() { return { Decimal, ...numberUtils }; } -export function coerceComponent(component) { - if (typeof component === 'string' && !(component in vue.$options.components)) { - let computed = defaultComputed; - let data = defaultData; - if (component.charAt(0) !== '<') { - // Not a template string, so make it one and remove the data - component = `${component}`; - computed = null; - data = null; - } +export function coerceComponent(component, defaultWrapper = 'span') { + if (typeof component === 'number') { + component = "" + component; + } + if (typeof component === 'string') { + component = component.trim(); + if (!(component in vue.$options.components)) { + if (component.charAt(0) !== '<') { + component = `<${defaultWrapper}>${component}`; + } - return { template: component, computed, data }; + return { template: component, computed, data, inject: [ 'tab' ] }; + } } return component; -} \ No newline at end of file +} + +export function getFiltered(objects, filter = null) { + if (filter) { + return Object.keys(objects) + .filter(key => key in filter) + .reduce((acc, curr) => { + acc[curr] = objects[curr]; + return acc; + }, {}); + } + return objects; +} + +export const UP = 'UP'; +export const DOWN = 'DOWN'; +export const LEFT = 'LEFT'; +export const RIGHT = 'RIGHT'; +export const DEFAULT = 'DEFAULT';