From cb434bfecd7588c83fc3eb4878e07f7567dcc5d1 Mon Sep 17 00:00:00 2001 From: evilebottnawi Date: Thu, 21 Nov 2019 17:05:28 +0300 Subject: [PATCH 1/6] refactor: code --- package-lock.json | 3499 +++++++++-------- package.json | 52 +- src/index.js | 15 +- .../__snapshots__/modules-option.test.js.snap | 4 +- .../validate-options.test.js.snap | 14 +- 5 files changed, 1819 insertions(+), 1765 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5df23e9e..c2512a59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,19 +5,18 @@ "requires": true, "dependencies": { "@babel/cli": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.5.5.tgz", - "integrity": "sha512-UHI+7pHv/tk9g6WXQKYz+kmXTI77YtuY3vqC59KIqcoWEjsJJSG6rAxKaLsgj3LDyadsPrCB929gVOKM6Hui0w==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.7.0.tgz", + "integrity": "sha512-jECEqAq6Ngf3pOhLSg7od9WKyrIacyh1oNNYtRXNn+ummSHCTXBamGywOAtiae34Vk7zKuQNnLvo2BKTMCoV4A==", "dev": true, "requires": { - "chokidar": "^2.0.4", + "chokidar": "^2.1.8", "commander": "^2.8.1", "convert-source-map": "^1.1.0", "fs-readdir-recursive": "^1.1.0", "glob": "^7.0.0", "lodash": "^4.17.13", - "mkdirp": "^0.5.1", - "output-file-sync": "^2.0.0", + "make-dir": "^2.1.0", "slash": "^2.0.0", "source-map": "^0.5.0" }, @@ -40,19 +39,19 @@ } }, "@babel/core": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz", - "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz", + "integrity": "sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==", "dev": true, "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.5.5", - "@babel/helpers": "^7.5.5", - "@babel/parser": "^7.5.5", - "@babel/template": "^7.4.4", - "@babel/traverse": "^7.5.5", - "@babel/types": "^7.5.5", - "convert-source-map": "^1.1.0", + "@babel/generator": "^7.7.2", + "@babel/helpers": "^7.7.0", + "@babel/parser": "^7.7.2", + "@babel/template": "^7.7.0", + "@babel/traverse": "^7.7.2", + "@babel/types": "^7.7.2", + "convert-source-map": "^1.7.0", "debug": "^4.1.0", "json5": "^2.1.0", "lodash": "^4.17.13", @@ -71,9 +70,9 @@ } }, "json5": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz", - "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz", + "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==", "dev": true, "requires": { "minimist": "^1.2.0" @@ -94,16 +93,15 @@ } }, "@babel/generator": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz", - "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz", + "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==", "dev": true, "requires": { - "@babel/types": "^7.5.5", + "@babel/types": "^7.7.2", "jsesc": "^2.5.1", "lodash": "^4.17.13", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" + "source-map": "^0.5.0" }, "dependencies": { "source-map": { @@ -115,124 +113,134 @@ } }, "@babel/helper-annotate-as-pure": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz", - "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz", + "integrity": "sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.7.0" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz", - "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.0.tgz", + "integrity": "sha512-Cd8r8zs4RKDwMG/92lpZcnn5WPQ3LAMQbCw42oqUh4s7vsSN5ANUZjMel0OOnxDLq57hoDDbai+ryygYfCTOsw==", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/helper-explode-assignable-expression": "^7.7.0", + "@babel/types": "^7.7.0" } }, "@babel/helper-call-delegate": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz", - "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.0.tgz", + "integrity": "sha512-Su0Mdq7uSSWGZayGMMQ+z6lnL00mMCnGAbO/R0ZO9odIdB/WNU/VfQKqMQU0fdIsxQYbRjDM4BixIa93SQIpvw==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.4.4", - "@babel/traverse": "^7.4.4", - "@babel/types": "^7.4.4" + "@babel/helper-hoist-variables": "^7.7.0", + "@babel/traverse": "^7.7.0", + "@babel/types": "^7.7.0" + } + }, + "@babel/helper-create-regexp-features-plugin": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz", + "integrity": "sha512-pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ==", + "dev": true, + "requires": { + "@babel/helper-regex": "^7.4.4", + "regexpu-core": "^4.6.0" } }, "@babel/helper-define-map": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz", - "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz", + "integrity": "sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.1.0", - "@babel/types": "^7.5.5", + "@babel/helper-function-name": "^7.7.0", + "@babel/types": "^7.7.0", "lodash": "^4.17.13" } }, "@babel/helper-explode-assignable-expression": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz", - "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.0.tgz", + "integrity": "sha512-CDs26w2shdD1urNUAji2RJXyBFCaR+iBEGnFz3l7maizMkQe3saVw9WtjG1tz8CwbjvlFnaSLVhgnu1SWaherg==", "dev": true, "requires": { - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/traverse": "^7.7.0", + "@babel/types": "^7.7.0" } }, "@babel/helper-function-name": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz", - "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", + "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.0.0", - "@babel/template": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/helper-get-function-arity": "^7.7.0", + "@babel/template": "^7.7.0", + "@babel/types": "^7.7.0" } }, "@babel/helper-get-function-arity": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz", - "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", + "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.7.0" } }, "@babel/helper-hoist-variables": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz", - "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz", + "integrity": "sha512-LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ==", "dev": true, "requires": { - "@babel/types": "^7.4.4" + "@babel/types": "^7.7.0" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz", - "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz", + "integrity": "sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA==", "dev": true, "requires": { - "@babel/types": "^7.5.5" + "@babel/types": "^7.7.0" } }, "@babel/helper-module-imports": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz", - "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz", + "integrity": "sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.7.0" } }, "@babel/helper-module-transforms": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz", - "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz", + "integrity": "sha512-rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.0.0", - "@babel/helper-simple-access": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/template": "^7.4.4", - "@babel/types": "^7.5.5", + "@babel/helper-module-imports": "^7.7.0", + "@babel/helper-simple-access": "^7.7.0", + "@babel/helper-split-export-declaration": "^7.7.0", + "@babel/template": "^7.7.0", + "@babel/types": "^7.7.0", "lodash": "^4.17.13" } }, "@babel/helper-optimise-call-expression": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz", - "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz", + "integrity": "sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.7.0" } }, "@babel/helper-plugin-utils": { @@ -251,70 +259,70 @@ } }, "@babel/helper-remap-async-to-generator": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz", - "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz", + "integrity": "sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-wrap-function": "^7.1.0", - "@babel/template": "^7.1.0", - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/helper-annotate-as-pure": "^7.7.0", + "@babel/helper-wrap-function": "^7.7.0", + "@babel/template": "^7.7.0", + "@babel/traverse": "^7.7.0", + "@babel/types": "^7.7.0" } }, "@babel/helper-replace-supers": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz", - "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz", + "integrity": "sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.5.5", - "@babel/helper-optimise-call-expression": "^7.0.0", - "@babel/traverse": "^7.5.5", - "@babel/types": "^7.5.5" + "@babel/helper-member-expression-to-functions": "^7.7.0", + "@babel/helper-optimise-call-expression": "^7.7.0", + "@babel/traverse": "^7.7.0", + "@babel/types": "^7.7.0" } }, "@babel/helper-simple-access": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz", - "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz", + "integrity": "sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g==", "dev": true, "requires": { - "@babel/template": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/template": "^7.7.0", + "@babel/types": "^7.7.0" } }, "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz", + "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==", "dev": true, "requires": { - "@babel/types": "^7.4.4" + "@babel/types": "^7.7.0" } }, "@babel/helper-wrap-function": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz", - "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz", + "integrity": "sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.1.0", - "@babel/template": "^7.1.0", - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.2.0" + "@babel/helper-function-name": "^7.7.0", + "@babel/template": "^7.7.0", + "@babel/traverse": "^7.7.0", + "@babel/types": "^7.7.0" } }, "@babel/helpers": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz", - "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.0.tgz", + "integrity": "sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g==", "dev": true, "requires": { - "@babel/template": "^7.4.4", - "@babel/traverse": "^7.5.5", - "@babel/types": "^7.5.5" + "@babel/template": "^7.7.0", + "@babel/traverse": "^7.7.0", + "@babel/types": "^7.7.0" } }, "@babel/highlight": { @@ -329,26 +337,26 @@ } }, "@babel/parser": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", - "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", + "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==", "dev": true }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz", - "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz", + "integrity": "sha512-ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.1.0", + "@babel/helper-remap-async-to-generator": "^7.7.0", "@babel/plugin-syntax-async-generators": "^7.2.0" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz", - "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz", + "integrity": "sha512-7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -366,9 +374,9 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz", - "integrity": "sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz", + "integrity": "sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -386,14 +394,13 @@ } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz", - "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz", + "integrity": "sha512-mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.4.4", - "regexpu-core": "^4.5.4" + "@babel/helper-create-regexp-features-plugin": "^7.7.0", + "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-async-generators": { @@ -441,6 +448,15 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.0.tgz", + "integrity": "sha512-hi8FUNiFIY1fnUI2n1ViB1DR0R4QeK4iHcTlW6aJkrPoTdb8Rf1EMQ6GT3f67DDkYyWgew9DFoOZ6gOoEsdzTA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, "@babel/plugin-transform-arrow-functions": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz", @@ -451,14 +467,14 @@ } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz", - "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz", + "integrity": "sha512-vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.0.0", + "@babel/helper-module-imports": "^7.7.0", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.1.0" + "@babel/helper-remap-async-to-generator": "^7.7.0" } }, "@babel/plugin-transform-block-scoped-functions": { @@ -471,9 +487,9 @@ } }, "@babel/plugin-transform-block-scoping": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz", - "integrity": "sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz", + "integrity": "sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -481,18 +497,18 @@ } }, "@babel/plugin-transform-classes": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz", - "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz", + "integrity": "sha512-/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-define-map": "^7.5.5", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-optimise-call-expression": "^7.0.0", + "@babel/helper-annotate-as-pure": "^7.7.0", + "@babel/helper-define-map": "^7.7.0", + "@babel/helper-function-name": "^7.7.0", + "@babel/helper-optimise-call-expression": "^7.7.0", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.5.5", - "@babel/helper-split-export-declaration": "^7.4.4", + "@babel/helper-replace-supers": "^7.7.0", + "@babel/helper-split-export-declaration": "^7.7.0", "globals": "^11.1.0" } }, @@ -506,23 +522,22 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz", - "integrity": "sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz", + "integrity": "sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz", - "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz", + "integrity": "sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.4.4", - "regexpu-core": "^4.5.4" + "@babel/helper-create-regexp-features-plugin": "^7.7.0", + "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-duplicate-keys": { @@ -554,12 +569,12 @@ } }, "@babel/plugin-transform-function-name": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz", - "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz", + "integrity": "sha512-P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.1.0", + "@babel/helper-function-name": "^7.7.0", "@babel/helper-plugin-utils": "^7.0.0" } }, @@ -593,45 +608,45 @@ } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz", - "integrity": "sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz", + "integrity": "sha512-KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.4.4", + "@babel/helper-module-transforms": "^7.7.0", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-simple-access": "^7.1.0", + "@babel/helper-simple-access": "^7.7.0", "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz", - "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz", + "integrity": "sha512-ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.4.4", + "@babel/helper-hoist-variables": "^7.7.0", "@babel/helper-plugin-utils": "^7.0.0", "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz", - "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz", + "integrity": "sha512-u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.1.0", + "@babel/helper-module-transforms": "^7.7.0", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz", - "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz", + "integrity": "sha512-+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg==", "dev": true, "requires": { - "regexp-tree": "^0.1.6" + "@babel/helper-create-regexp-features-plugin": "^7.7.0" } }, "@babel/plugin-transform-new-target": { @@ -674,9 +689,9 @@ } }, "@babel/plugin-transform-regenerator": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz", - "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz", + "integrity": "sha512-AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg==", "dev": true, "requires": { "regenerator-transform": "^0.14.0" @@ -701,9 +716,9 @@ } }, "@babel/plugin-transform-spread": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz", - "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz", + "integrity": "sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" @@ -739,67 +754,67 @@ } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz", - "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz", + "integrity": "sha512-RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.4.4", - "regexpu-core": "^4.5.4" + "@babel/helper-create-regexp-features-plugin": "^7.7.0", + "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/preset-env": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz", - "integrity": "sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.1.tgz", + "integrity": "sha512-/93SWhi3PxcVTDpSqC+Dp4YxUu3qZ4m7I76k0w73wYfn7bGVuRIO4QUz95aJksbS+AD1/mT1Ie7rbkT0wSplaA==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.0.0", + "@babel/helper-module-imports": "^7.7.0", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-async-generator-functions": "^7.2.0", - "@babel/plugin-proposal-dynamic-import": "^7.5.0", + "@babel/plugin-proposal-async-generator-functions": "^7.7.0", + "@babel/plugin-proposal-dynamic-import": "^7.7.0", "@babel/plugin-proposal-json-strings": "^7.2.0", - "@babel/plugin-proposal-object-rest-spread": "^7.5.5", + "@babel/plugin-proposal-object-rest-spread": "^7.6.2", "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", + "@babel/plugin-proposal-unicode-property-regex": "^7.7.0", "@babel/plugin-syntax-async-generators": "^7.2.0", "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/plugin-syntax-json-strings": "^7.2.0", "@babel/plugin-syntax-object-rest-spread": "^7.2.0", "@babel/plugin-syntax-optional-catch-binding": "^7.2.0", + "@babel/plugin-syntax-top-level-await": "^7.7.0", "@babel/plugin-transform-arrow-functions": "^7.2.0", - "@babel/plugin-transform-async-to-generator": "^7.5.0", + "@babel/plugin-transform-async-to-generator": "^7.7.0", "@babel/plugin-transform-block-scoped-functions": "^7.2.0", - "@babel/plugin-transform-block-scoping": "^7.5.5", - "@babel/plugin-transform-classes": "^7.5.5", + "@babel/plugin-transform-block-scoping": "^7.6.3", + "@babel/plugin-transform-classes": "^7.7.0", "@babel/plugin-transform-computed-properties": "^7.2.0", - "@babel/plugin-transform-destructuring": "^7.5.0", - "@babel/plugin-transform-dotall-regex": "^7.4.4", + "@babel/plugin-transform-destructuring": "^7.6.0", + "@babel/plugin-transform-dotall-regex": "^7.7.0", "@babel/plugin-transform-duplicate-keys": "^7.5.0", "@babel/plugin-transform-exponentiation-operator": "^7.2.0", "@babel/plugin-transform-for-of": "^7.4.4", - "@babel/plugin-transform-function-name": "^7.4.4", + "@babel/plugin-transform-function-name": "^7.7.0", "@babel/plugin-transform-literals": "^7.2.0", "@babel/plugin-transform-member-expression-literals": "^7.2.0", "@babel/plugin-transform-modules-amd": "^7.5.0", - "@babel/plugin-transform-modules-commonjs": "^7.5.0", - "@babel/plugin-transform-modules-systemjs": "^7.5.0", - "@babel/plugin-transform-modules-umd": "^7.2.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5", + "@babel/plugin-transform-modules-commonjs": "^7.7.0", + "@babel/plugin-transform-modules-systemjs": "^7.7.0", + "@babel/plugin-transform-modules-umd": "^7.7.0", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.7.0", "@babel/plugin-transform-new-target": "^7.4.4", "@babel/plugin-transform-object-super": "^7.5.5", "@babel/plugin-transform-parameters": "^7.4.4", "@babel/plugin-transform-property-literals": "^7.2.0", - "@babel/plugin-transform-regenerator": "^7.4.5", + "@babel/plugin-transform-regenerator": "^7.7.0", "@babel/plugin-transform-reserved-words": "^7.2.0", "@babel/plugin-transform-shorthand-properties": "^7.2.0", - "@babel/plugin-transform-spread": "^7.2.0", + "@babel/plugin-transform-spread": "^7.6.2", "@babel/plugin-transform-sticky-regex": "^7.2.0", "@babel/plugin-transform-template-literals": "^7.4.4", "@babel/plugin-transform-typeof-symbol": "^7.2.0", - "@babel/plugin-transform-unicode-regex": "^7.4.4", - "@babel/types": "^7.5.5", + "@babel/plugin-transform-unicode-regex": "^7.7.0", + "@babel/types": "^7.7.1", "browserslist": "^4.6.0", "core-js-compat": "^3.1.1", "invariant": "^2.2.2", @@ -808,28 +823,28 @@ } }, "@babel/template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", - "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", + "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4" + "@babel/parser": "^7.7.0", + "@babel/types": "^7.7.0" } }, "@babel/traverse": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz", - "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz", + "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==", "dev": true, "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.5.5", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.5.5", - "@babel/types": "^7.5.5", + "@babel/generator": "^7.7.2", + "@babel/helper-function-name": "^7.7.0", + "@babel/helper-split-export-declaration": "^7.7.0", + "@babel/parser": "^7.7.2", + "@babel/types": "^7.7.2", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" @@ -853,9 +868,9 @@ } }, "@babel/types": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", - "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", + "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -874,17 +889,17 @@ } }, "@commitlint/cli": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-8.1.0.tgz", - "integrity": "sha512-83K5C2nIAgoZlzMegf0/MEBjX+ampUyc/u79RxgX9ZYjzos+RQtNyO7I43dztVxPXSwAnX9XRgoOfkGWA4nbig==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-8.2.0.tgz", + "integrity": "sha512-8fJ5pmytc38yw2QWbTTJmXLfSiWPwMkHH4govo9zJ/+ERPBF2jvlxD/dQvk24ezcizjKc6LFka2edYC4OQ+Dgw==", "dev": true, "requires": { - "@commitlint/format": "^8.1.0", - "@commitlint/lint": "^8.1.0", - "@commitlint/load": "^8.1.0", - "@commitlint/read": "^8.1.0", + "@commitlint/format": "^8.2.0", + "@commitlint/lint": "^8.2.0", + "@commitlint/load": "^8.2.0", + "@commitlint/read": "^8.2.0", "babel-polyfill": "6.26.0", - "chalk": "2.3.1", + "chalk": "2.4.2", "get-stdin": "7.0.0", "lodash": "4.17.14", "meow": "5.0.0", @@ -892,44 +907,24 @@ "resolve-global": "1.0.0" }, "dependencies": { - "chalk": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz", - "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.2.0" - } - }, "lodash": { "version": "4.17.14", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, "@commitlint/config-conventional": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-8.1.0.tgz", - "integrity": "sha512-/JY+FNBnrT91qzDVIoV1Buiigvj7Le7ezFw+oRqu0nYREX03k7xnaG/7t7rUSvm7hM6dnLSOlaUsevjgMI9AEw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-8.2.0.tgz", + "integrity": "sha512-HuwlHQ3DyVhpK9GHgTMhJXD8Zp8PGIQVpQGYh/iTrEU6TVxdRC61BxIDZvfWatCaiG617Z/U8maRAFrqFM4TqA==", "dev": true }, "@commitlint/ensure": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-8.1.0.tgz", - "integrity": "sha512-dBU4CcjN0vJSDNOeSpaHNgQ1ra444u4USvI6PTaHVAS4aeDpZ5Cds1rxkZNsocu48WNycUu0jP84+zjcw2pPLQ==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-8.2.0.tgz", + "integrity": "sha512-XZZih/kcRrqK7lEORbSYCfqQw6byfsFbLygRGVdJMlCPGu9E2MjpwCtoj5z7y/lKfUB3MJaBhzn2muJqS1gC6A==", "dev": true, "requires": { "lodash": "4.17.14" @@ -944,47 +939,47 @@ } }, "@commitlint/execute-rule": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-8.1.0.tgz", - "integrity": "sha512-+vpH3RFuO6ypuCqhP2rSqTjFTQ7ClzXtUvXphpROv9v9+7zH4L+Ex+wZLVkL8Xj2cxefSLn/5Kcqa9XyJTn3kg==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-8.2.0.tgz", + "integrity": "sha512-9MBRthHaulbWTa8ReG2Oii2qc117NuvzhZdnkuKuYLhker7sUXGFcVhLanuWUKGyfyI2o9zVr/NHsNbCCsTzAA==", "dev": true }, "@commitlint/format": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-8.1.0.tgz", - "integrity": "sha512-D0cmabUTQIKdABgt08d9JAvO9+lMRAmkcsZx8TMScY502R67HCw77JhzRDcw1RmqX5rN8JO6ZjDHO92Pbwlt+Q==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-8.2.0.tgz", + "integrity": "sha512-sA77agkDEMsEMrlGhrLtAg8vRexkOofEEv/CZX+4xlANyAz2kNwJvMg33lcL65CBhqKEnRRJRxfZ1ZqcujdKcQ==", "dev": true, "requires": { "chalk": "^2.0.1" } }, "@commitlint/is-ignored": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-8.1.0.tgz", - "integrity": "sha512-HUSxx6kuLbqrQ8jb5QRzo+yR+CIXgA9HNcIcZ1qWrb+O9GOixt3mlW8li1IcfIgfODlaWoxIz0jYCxR08IoQLg==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-8.2.0.tgz", + "integrity": "sha512-ADaGnKfbfV6KD1pETp0Qf7XAyc75xTy3WJlbvPbwZ4oPdBMsXF0oXEEGMis6qABfU2IXan5/KAJgAFX3vdd0jA==", "dev": true, "requires": { "@types/semver": "^6.0.1", - "semver": "6.1.1" + "semver": "6.2.0" }, "dependencies": { "semver": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz", - "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz", + "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==", "dev": true } } }, "@commitlint/lint": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-8.1.0.tgz", - "integrity": "sha512-WYjbUgtqvnlVH3S3XPZMAa+N7KO0yQ+GuUG20Qra+EtER6SRYawykmEs4wAyrmY8VcFXUnKgSlIQUsqmGKwNZQ==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-8.2.0.tgz", + "integrity": "sha512-ch9JN8aR37ufdjoWv50jLfvFz9rWMgLW5HEkMGLsM/51gjekmQYS5NJg8S2+6F5+jmralAO7VkUMI6FukXKX0A==", "dev": true, "requires": { - "@commitlint/is-ignored": "^8.1.0", - "@commitlint/parse": "^8.1.0", - "@commitlint/rules": "^8.1.0", + "@commitlint/is-ignored": "^8.2.0", + "@commitlint/parse": "^8.2.0", + "@commitlint/rules": "^8.2.0", "babel-runtime": "^6.23.0", "lodash": "4.17.14" }, @@ -998,13 +993,13 @@ } }, "@commitlint/load": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-8.1.0.tgz", - "integrity": "sha512-ra02Dvmd7Gp1+uFLzTY3yGOpHjPzl5T9wYg/xrtPJNiOWXvQ0Mw7THw+ucd1M5iLUWjvdavv2N87YDRc428wHg==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-8.2.0.tgz", + "integrity": "sha512-EV6PfAY/p83QynNd1llHxJiNxKmp43g8+7dZbyfHFbsGOdokrCnoelAVZ+WGgktXwLN/uXyfkcIAxwac015UYw==", "dev": true, "requires": { - "@commitlint/execute-rule": "^8.1.0", - "@commitlint/resolve-extends": "^8.1.0", + "@commitlint/execute-rule": "^8.2.0", + "@commitlint/resolve-extends": "^8.2.0", "babel-runtime": "^6.23.0", "chalk": "2.4.2", "cosmiconfig": "^5.2.0", @@ -1021,15 +1016,15 @@ } }, "@commitlint/message": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-8.1.0.tgz", - "integrity": "sha512-AjHq022G8jQQ/3YrBOjwVBD4xF75hvC3vcvFoBIb7cC8vad1QWq+1w+aks0KlEK5IW+/+7ORZXIH+oyW7h3+8A==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-8.2.0.tgz", + "integrity": "sha512-LNsSwDLIFgE3nb/Sb1PIluYNy4Q8igdf4tpJCdv5JJDf7CZCZt3ZTglj0YutZZorpRRuHJsVIB2+dI4bVH3bFw==", "dev": true }, "@commitlint/parse": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-8.1.0.tgz", - "integrity": "sha512-n4fEbZ5kdK5HChvne7Mj8rGGkKMfA4H11IuWiWmmMzgmZTNb/B04LPrzdUm4lm3f10XzM2JMM7PLXqofQJOGvA==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-8.2.0.tgz", + "integrity": "sha512-vzouqroTXG6QXApkrps0gbeSYW6w5drpUk7QAeZIcaCSPsQXDM8eqqt98ZzlzLJHo5oPNXPX1AAVSTrssvHemA==", "dev": true, "requires": { "conventional-changelog-angular": "^1.3.3", @@ -1038,21 +1033,21 @@ } }, "@commitlint/read": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-8.1.0.tgz", - "integrity": "sha512-PKsGMQFEr2sX/+orI71b82iyi8xFqb7F4cTvsLxzB5x6/QutxPVM3rg+tEVdi6rBKIDuqRIp2puDZQuREZs3vg==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-8.2.0.tgz", + "integrity": "sha512-1tBai1VuSQmsOTsvJr3Fi/GZqX3zdxRqYe/yN4i3cLA5S2Y4QGJ5I3l6nGZlKgm/sSelTCVKHltrfWU8s5H7SA==", "dev": true, "requires": { - "@commitlint/top-level": "^8.1.0", + "@commitlint/top-level": "^8.2.0", "@marionebl/sander": "^0.6.0", "babel-runtime": "^6.23.0", "git-raw-commits": "^1.3.0" } }, "@commitlint/resolve-extends": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-8.1.0.tgz", - "integrity": "sha512-r/y+CeKW72Oa9BUctS1+I/MFCDiI3lfhwfQ65Tpfn6eZ4CuBYKzrCRi++GTHeAFKE3y8q1epJq5Rl/1GBejtBw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-8.2.0.tgz", + "integrity": "sha512-cwi0HUsDcD502HBP8huXfTkVuWmeo1Fiz3GKxNwMBBsJV4+bKa7QrtxbNpXhVuarX7QjWfNTvmW6KmFS7YK9uw==", "dev": true, "requires": { "@types/node": "^12.0.2", @@ -1071,27 +1066,27 @@ } }, "@commitlint/rules": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-8.1.0.tgz", - "integrity": "sha512-hlM8VfNjsOkbvMteFyqn0c3akiUjqG09Iid28MBLrXl/d+8BR3eTzwJ4wMta4oz/iqGyrIywvg1FpHrV977MPA==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-8.2.0.tgz", + "integrity": "sha512-FlqSBBP2Gxt5Ibw+bxdYpzqYR6HI8NIBpaTBhAjSEAduQtdWFMOhF0zsgkwH7lHN7opaLcnY2fXxAhbzTmJQQA==", "dev": true, "requires": { - "@commitlint/ensure": "^8.1.0", - "@commitlint/message": "^8.1.0", - "@commitlint/to-lines": "^8.1.0", + "@commitlint/ensure": "^8.2.0", + "@commitlint/message": "^8.2.0", + "@commitlint/to-lines": "^8.2.0", "babel-runtime": "^6.23.0" } }, "@commitlint/to-lines": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-8.1.0.tgz", - "integrity": "sha512-Lh4OH1bInI8GME/7FggS0/XkIMEJdTObMbXRyPRGaPcWH5S7zpB6y+b4qjzBHXAbEv2O46QAAMjZ+ywPQCpmYQ==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-8.2.0.tgz", + "integrity": "sha512-LXTYG3sMenlN5qwyTZ6czOULVcx46uMy+MEVqpvCgptqr/MZcV/C2J+S2o1DGwj1gOEFMpqrZaE3/1R2Q+N8ng==", "dev": true }, "@commitlint/top-level": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-8.1.0.tgz", - "integrity": "sha512-EvQuofuA/+0l1w9pkG/PRyIwACmZdIh9qxyax7w7mR8qqmSHscqf2jARIylh1TOx0uI9egO8MuPLiwC1RwyREA==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-8.2.0.tgz", + "integrity": "sha512-Yaw4KmYNy31/HhRUuZ+fupFcDalnfpdu4JGBgGAqS9aBHdMSSWdWqtAaDaxdtWjTZeN3O0sA2gOhXwvKwiDwvw==", "dev": true, "requires": { "find-up": "^4.0.0" @@ -1117,9 +1112,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -1155,48 +1150,49 @@ "dev": true }, "@jest/console": { - "version": "24.7.1", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz", - "integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", + "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", "dev": true, "requires": { - "@jest/source-map": "^24.3.0", + "@jest/source-map": "^24.9.0", "chalk": "^2.0.1", "slash": "^2.0.0" } }, "@jest/core": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.8.0.tgz", - "integrity": "sha512-R9rhAJwCBQzaRnrRgAdVfnglUuATXdwTRsYqs6NMdVcAl5euG8LtWDe+fVkN27YfKVBW61IojVsXKaOmSnqd/A==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz", + "integrity": "sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==", "dev": true, "requires": { "@jest/console": "^24.7.1", - "@jest/reporters": "^24.8.0", - "@jest/test-result": "^24.8.0", - "@jest/transform": "^24.8.0", - "@jest/types": "^24.8.0", + "@jest/reporters": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/transform": "^24.9.0", + "@jest/types": "^24.9.0", "ansi-escapes": "^3.0.0", "chalk": "^2.0.1", "exit": "^0.1.2", "graceful-fs": "^4.1.15", - "jest-changed-files": "^24.8.0", - "jest-config": "^24.8.0", - "jest-haste-map": "^24.8.0", - "jest-message-util": "^24.8.0", + "jest-changed-files": "^24.9.0", + "jest-config": "^24.9.0", + "jest-haste-map": "^24.9.0", + "jest-message-util": "^24.9.0", "jest-regex-util": "^24.3.0", - "jest-resolve-dependencies": "^24.8.0", - "jest-runner": "^24.8.0", - "jest-runtime": "^24.8.0", - "jest-snapshot": "^24.8.0", - "jest-util": "^24.8.0", - "jest-validate": "^24.8.0", - "jest-watcher": "^24.8.0", + "jest-resolve": "^24.9.0", + "jest-resolve-dependencies": "^24.9.0", + "jest-runner": "^24.9.0", + "jest-runtime": "^24.9.0", + "jest-snapshot": "^24.9.0", + "jest-util": "^24.9.0", + "jest-validate": "^24.9.0", + "jest-watcher": "^24.9.0", "micromatch": "^3.1.10", "p-each-series": "^1.0.0", - "pirates": "^4.0.1", "realpath-native": "^1.1.0", "rimraf": "^2.5.4", + "slash": "^2.0.0", "strip-ansi": "^5.0.0" }, "dependencies": { @@ -1205,42 +1201,57 @@ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", "dev": true + }, + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } } } }, "@jest/environment": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.8.0.tgz", - "integrity": "sha512-vlGt2HLg7qM+vtBrSkjDxk9K0YtRBi7HfRFaDxoRtyi+DyVChzhF20duvpdAnKVBV6W5tym8jm0U9EfXbDk1tw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz", + "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==", "dev": true, "requires": { - "@jest/fake-timers": "^24.8.0", - "@jest/transform": "^24.8.0", - "@jest/types": "^24.8.0", - "jest-mock": "^24.8.0" + "@jest/fake-timers": "^24.9.0", + "@jest/transform": "^24.9.0", + "@jest/types": "^24.9.0", + "jest-mock": "^24.9.0" } }, "@jest/fake-timers": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.8.0.tgz", - "integrity": "sha512-2M4d5MufVXwi6VzZhJ9f5S/wU4ud2ck0kxPof1Iz3zWx6Y+V2eJrES9jEktB6O3o/oEyk+il/uNu9PvASjWXQw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz", + "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==", "dev": true, "requires": { - "@jest/types": "^24.8.0", - "jest-message-util": "^24.8.0", - "jest-mock": "^24.8.0" + "@jest/types": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-mock": "^24.9.0" } }, "@jest/reporters": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.8.0.tgz", - "integrity": "sha512-eZ9TyUYpyIIXfYCrw0UHUWUvE35vx5I92HGMgS93Pv7du+GHIzl+/vh8Qj9MCWFK/4TqyttVBPakWMOfZRIfxw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz", + "integrity": "sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==", "dev": true, "requires": { - "@jest/environment": "^24.8.0", - "@jest/test-result": "^24.8.0", - "@jest/transform": "^24.8.0", - "@jest/types": "^24.8.0", + "@jest/environment": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/transform": "^24.9.0", + "@jest/types": "^24.9.0", "chalk": "^2.0.1", "exit": "^0.1.2", "glob": "^7.1.2", @@ -1248,22 +1259,22 @@ "istanbul-lib-instrument": "^3.0.1", "istanbul-lib-report": "^2.0.4", "istanbul-lib-source-maps": "^3.0.1", - "istanbul-reports": "^2.1.1", - "jest-haste-map": "^24.8.0", - "jest-resolve": "^24.8.0", - "jest-runtime": "^24.8.0", - "jest-util": "^24.8.0", + "istanbul-reports": "^2.2.6", + "jest-haste-map": "^24.9.0", + "jest-resolve": "^24.9.0", + "jest-runtime": "^24.9.0", + "jest-util": "^24.9.0", "jest-worker": "^24.6.0", - "node-notifier": "^5.2.1", + "node-notifier": "^5.4.2", "slash": "^2.0.0", "source-map": "^0.6.0", "string-length": "^2.0.0" } }, "@jest/source-map": { - "version": "24.3.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.3.0.tgz", - "integrity": "sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", + "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", "dev": true, "requires": { "callsites": "^3.0.0", @@ -1272,45 +1283,46 @@ } }, "@jest/test-result": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.8.0.tgz", - "integrity": "sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz", + "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==", "dev": true, "requires": { - "@jest/console": "^24.7.1", - "@jest/types": "^24.8.0", + "@jest/console": "^24.9.0", + "@jest/types": "^24.9.0", "@types/istanbul-lib-coverage": "^2.0.0" } }, "@jest/test-sequencer": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz", - "integrity": "sha512-OzL/2yHyPdCHXEzhoBuq37CE99nkme15eHkAzXRVqthreWZamEMA0WoetwstsQBCXABhczpK03JNbc4L01vvLg==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz", + "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==", "dev": true, "requires": { - "@jest/test-result": "^24.8.0", - "jest-haste-map": "^24.8.0", - "jest-runner": "^24.8.0", - "jest-runtime": "^24.8.0" + "@jest/test-result": "^24.9.0", + "jest-haste-map": "^24.9.0", + "jest-runner": "^24.9.0", + "jest-runtime": "^24.9.0" } }, "@jest/transform": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.8.0.tgz", - "integrity": "sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz", + "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/types": "^24.8.0", + "@jest/types": "^24.9.0", "babel-plugin-istanbul": "^5.1.0", "chalk": "^2.0.1", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", "graceful-fs": "^4.1.15", - "jest-haste-map": "^24.8.0", - "jest-regex-util": "^24.3.0", - "jest-util": "^24.8.0", + "jest-haste-map": "^24.9.0", + "jest-regex-util": "^24.9.0", + "jest-util": "^24.9.0", "micromatch": "^3.1.10", + "pirates": "^4.0.1", "realpath-native": "^1.1.0", "slash": "^2.0.0", "source-map": "^0.6.1", @@ -1318,14 +1330,14 @@ } }, "@jest/types": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.8.0.tgz", - "integrity": "sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", + "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^12.0.9" + "@types/yargs": "^13.0.0" } }, "@marionebl/sander": { @@ -1340,28 +1352,28 @@ } }, "@nodelib/fs.scandir": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.1.tgz", - "integrity": "sha512-NT/skIZjgotDSiXs0WqYhgcuBKhUMgfekCmCGtkUAiLqZdOnrdjmZr9wRl3ll64J9NF79uZ4fk16Dx0yMc/Xbg==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", + "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", "dev": true, "requires": { - "@nodelib/fs.stat": "2.0.1", + "@nodelib/fs.stat": "2.0.3", "run-parallel": "^1.1.9" } }, "@nodelib/fs.stat": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.1.tgz", - "integrity": "sha512-+RqhBlLn6YRBGOIoVYthsG0J9dfpO79eJyN7BYBkZJtfqrBwf2KK+rD/M/yjZR6WBmIhAgOV7S60eCgaSWtbFw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", "dev": true }, "@nodelib/fs.walk": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.2.tgz", - "integrity": "sha512-J/DR3+W12uCzAJkw7niXDcqcKBg6+5G5Q/ZpThpGNzAUz70eOR6RV4XnnSN01qHZiVl0eavoxJsBypQoKsV2QQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", + "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", "dev": true, "requires": { - "@nodelib/fs.scandir": "2.1.1", + "@nodelib/fs.scandir": "2.1.3", "fastq": "^1.6.0" } }, @@ -1375,9 +1387,9 @@ } }, "@types/babel__core": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.2.tgz", - "integrity": "sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz", + "integrity": "sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==", "dev": true, "requires": { "@babel/parser": "^7.1.0", @@ -1388,9 +1400,9 @@ } }, "@types/babel__generator": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.0.2.tgz", - "integrity": "sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.0.tgz", + "integrity": "sha512-c1mZUu4up5cp9KROs/QAw0gTeHrw/x7m52LcnvMxxOZ03DmLwPV0MlGmlgzV3cnSdjhJOZsj7E7FHeioai+egw==", "dev": true, "requires": { "@babel/types": "^7.0.0" @@ -1407,9 +1419,9 @@ } }, "@types/babel__traverse": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz", - "integrity": "sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==", + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.8.tgz", + "integrity": "sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw==", "dev": true, "requires": { "@babel/types": "^7.3.0" @@ -1464,9 +1476,9 @@ "dev": true }, "@types/node": { - "version": "12.6.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.9.tgz", - "integrity": "sha512-+YB9FtyxXGyD54p8rXwWaN1EWEyar5L58GlGWgtH2I9rGmLGBQcw63+0jw+ujqVavNuO47S1ByAjm9zdHMnskw==", + "version": "12.12.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.11.tgz", + "integrity": "sha512-O+x6uIpa6oMNTkPuHDa9MhMMehlxLAd5QcOvKRjAFsBVpeFWTOPnXbDvILvFgFFZfQ1xh1EZi1FbXxUix+zpsQ==", "dev": true }, "@types/normalize-package-data": { @@ -1476,9 +1488,9 @@ "dev": true }, "@types/semver": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.0.1.tgz", - "integrity": "sha512-ffCdcrEE5h8DqVxinQjo+2d1q+FV5z7iNtPofw3JsrltSoSVlOGaW0rY8XxtO9XukdTn8TaCGWmk2VFGhI70mg==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.2.0.tgz", + "integrity": "sha512-1OzrNb4RuAzIT7wHSsgZRlMBlNsJl+do6UblR7JMW4oB7bbR+uBEYtUh7gEc/jM84GGilh68lSOokyM/zNUlBA==", "dev": true }, "@types/stack-utils": { @@ -1488,9 +1500,18 @@ "dev": true }, "@types/yargs": { - "version": "12.0.12", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.12.tgz", - "integrity": "sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==", + "version": "13.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz", + "integrity": "sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz", + "integrity": "sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==", "dev": true }, "@webassemblyjs/ast": { @@ -1670,9 +1691,9 @@ } }, "@webpack-contrib/defaults": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@webpack-contrib/defaults/-/defaults-5.0.2.tgz", - "integrity": "sha512-S1eSkPza/9e/8OuENfjOfDYWn+ZxYr8dsMlz4gMzI82eKMOyxuHi+SBW8zUsC8I/qWjIqx9CDhsahirxL+ZSaA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@webpack-contrib/defaults/-/defaults-5.1.1.tgz", + "integrity": "sha512-UvWJSpCBVzDpCASLhBuiSw/S5i57Z3FqO5X2cRqkvDR6TlhaPp0cXLr7R83xyRs2+eZ5pyl9UnP8HtSJx1s7Fw==", "dev": true, "requires": { "chalk": "^2.3.0", @@ -1732,21 +1753,21 @@ } }, "abab": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz", - "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz", + "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==", "dev": true }, "acorn": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz", - "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", + "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", "dev": true }, "acorn-globals": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz", - "integrity": "sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", + "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==", "dev": true, "requires": { "acorn": "^6.0.1", @@ -1754,9 +1775,9 @@ } }, "acorn-jsx": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz", - "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz", + "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==", "dev": true }, "acorn-walk": { @@ -1765,6 +1786,24 @@ "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==", "dev": true }, + "aggregate-error": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", + "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "dev": true, + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "dependencies": { + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true + } + } + }, "ajv": { "version": "6.10.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", @@ -1889,12 +1928,6 @@ "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", "dev": true }, - "array-filter": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz", - "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=", - "dev": true - }, "array-find-index": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", @@ -1917,30 +1950,12 @@ "es-abstract": "^1.7.0" } }, - "array-map": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz", - "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=", - "dev": true - }, - "array-reduce": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz", - "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=", - "dev": true - }, "array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, "array-unique": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", @@ -2049,18 +2064,18 @@ "dev": true }, "autoprefixer": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz", - "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==", + "version": "9.7.2", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.2.tgz", + "integrity": "sha512-LCAfcdej1182uVvPOZnytbq61AhnOZ/4JelDaJGDeNwewyU1AMaNthcHsyz1NRjTmd2FkurMckLWfkHg3Z//KA==", "dev": true, "requires": { - "browserslist": "^4.6.3", - "caniuse-lite": "^1.0.30000980", + "browserslist": "^4.7.3", + "caniuse-lite": "^1.0.30001010", "chalk": "^2.4.2", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.17", - "postcss-value-parser": "^4.0.0" + "postcss": "^7.0.23", + "postcss-value-parser": "^4.0.2" } }, "aws-sign2": { @@ -2129,16 +2144,16 @@ } }, "babel-jest": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.8.0.tgz", - "integrity": "sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz", + "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==", "dev": true, "requires": { - "@jest/transform": "^24.8.0", - "@jest/types": "^24.8.0", + "@jest/transform": "^24.9.0", + "@jest/types": "^24.9.0", "@types/babel__core": "^7.1.0", "babel-plugin-istanbul": "^5.1.0", - "babel-preset-jest": "^24.6.0", + "babel-preset-jest": "^24.9.0", "chalk": "^2.4.2", "slash": "^2.0.0" } @@ -2184,9 +2199,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -2210,9 +2225,9 @@ } }, "babel-plugin-jest-hoist": { - "version": "24.6.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz", - "integrity": "sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz", + "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==", "dev": true, "requires": { "@types/babel__traverse": "^7.0.6" @@ -2238,13 +2253,13 @@ } }, "babel-preset-jest": { - "version": "24.6.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz", - "integrity": "sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz", + "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==", "dev": true, "requires": { "@babel/plugin-syntax-object-rest-spread": "^7.0.0", - "babel-plugin-jest-hoist": "^24.6.0" + "babel-plugin-jest-hoist": "^24.9.0" } }, "babel-runtime": { @@ -2345,9 +2360,9 @@ "dev": true }, "bluebird": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", - "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz", + "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==", "dev": true }, "bn.js": { @@ -2496,29 +2511,29 @@ } }, "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.3.tgz", + "integrity": "sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "caniuse-lite": "^1.0.30001010", + "electron-to-chromium": "^1.3.306", + "node-releases": "^1.1.40" } }, "bser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz", - "integrity": "sha512-8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", "dev": true, "requires": { "node-int64": "^0.4.0" } }, "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", + "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", "dev": true, "requires": { "base64-js": "^1.0.2", @@ -2545,9 +2560,9 @@ "dev": true }, "cacache": { - "version": "12.0.2", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz", - "integrity": "sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==", + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", + "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", "dev": true, "requires": { "bluebird": "^3.5.5", @@ -2565,6 +2580,23 @@ "ssri": "^6.0.1", "unique-filename": "^1.1.1", "y18n": "^4.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + } } }, "cache-base": { @@ -2641,24 +2673,22 @@ } }, "caniuse-lite": { - "version": "1.0.30000989", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz", - "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==", + "version": "1.0.30001011", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001011.tgz", + "integrity": "sha512-h+Eqyn/YA6o6ZTqpS86PyRmNWOs1r54EBDcd2NTwwfsXQ8re1B38SnB+p2RKF8OUsyEIjeDU8XGec1RGO/wYCg==", "dev": true }, "caporal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/caporal/-/caporal-1.1.0.tgz", - "integrity": "sha512-R5qo2QGoqBM6RvzHonGhUuEJSeqEa4lD1r+cPUEY2+YsXhpQVTS2TvScfIbi6ydFdhzFCNeNUB1v0YrRBvsbdg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/caporal/-/caporal-1.3.0.tgz", + "integrity": "sha512-4bj21UXbEu5cF+1gVjhwwRqMhY3lR7CUTlBr6YX3uzftL4l/sbu8EoHfOLZWHr+HeiosW9fTWkQCS2UZMAk5lw==", "dev": true, "requires": { "bluebird": "^3.4.7", "cli-table3": "^0.5.0", - "colorette": "1.0.1", + "colorette": "^1.0.1", "fast-levenshtein": "^2.0.6", - "lodash.camelcase": "^4.3.0", - "lodash.kebabcase": "^4.1.1", - "lodash.merge": "^4.6.0", + "lodash": "^4.17.14", "micromist": "1.1.0", "prettyjson": "^1.2.1", "tabtab": "^2.2.2", @@ -2707,9 +2737,9 @@ "dev": true }, "chokidar": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", - "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "dev": true, "requires": { "anymatch": "^2.0.0", @@ -2727,9 +2757,9 @@ } }, "chownr": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz", - "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz", + "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==", "dev": true }, "chrome-trace-event": { @@ -2780,6 +2810,12 @@ } } }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true + }, "cli-cursor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", @@ -2854,43 +2890,59 @@ "dev": true }, "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" }, "dependencies": { "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^4.1.0" } } } }, "clone-deep": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", - "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, "requires": { - "for-own": "^1.0.0", "is-plain-object": "^2.0.4", - "kind-of": "^6.0.0", - "shallow-clone": "^1.0.0" + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" } }, "co": { @@ -2929,15 +2981,15 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "colorette": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.0.1.tgz", - "integrity": "sha512-40MnlppkzHhFjRhtXunbpqKUT+eJn0gyVGi8aQlNSG8T2CCy31NdD7yktcS0aizH1VP2OhhQCyGMeTp0a/fvaw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.1.0.tgz", + "integrity": "sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg==", "dev": true }, "colors": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz", - "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", "dev": true }, "combined-stream": { @@ -2950,9 +3002,9 @@ } }, "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, "comment-json": { @@ -3014,13 +3066,10 @@ } }, "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "dev": true, - "requires": { - "date-now": "^0.1.4" - } + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true }, "constants-browserify": { "version": "1.0.0", @@ -3035,28 +3084,28 @@ "dev": true }, "conventional-changelog": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.9.tgz", - "integrity": "sha512-JbNVm1iGZ3aXxcFZjqKNDNfdgchQjSltWc8rvSniMrkHLsub9Wn20/JLdJNTBM74dt1IA2M+v/mzServ6N37YA==", - "dev": true, - "requires": { - "conventional-changelog-angular": "^5.0.3", - "conventional-changelog-atom": "^2.0.1", - "conventional-changelog-codemirror": "^2.0.1", - "conventional-changelog-conventionalcommits": "^4.0.0", - "conventional-changelog-core": "^3.2.3", - "conventional-changelog-ember": "^2.0.2", - "conventional-changelog-eslint": "^3.0.2", + "version": "3.1.12", + "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.12.tgz", + "integrity": "sha512-zyGKwii8Z5zOq1nGFm5jn9Ou1jQ6UBoRT0+nqBIU8fEzh64+AcVxrY97tVuK77Ati0xwpBiFHpDXAW7pkq1jEw==", + "dev": true, + "requires": { + "conventional-changelog-angular": "^5.0.5", + "conventional-changelog-atom": "^2.0.3", + "conventional-changelog-codemirror": "^2.0.3", + "conventional-changelog-conventionalcommits": "^4.2.1", + "conventional-changelog-core": "^4.0.2", + "conventional-changelog-ember": "^2.0.4", + "conventional-changelog-eslint": "^3.0.4", "conventional-changelog-express": "^2.0.1", - "conventional-changelog-jquery": "^3.0.4", - "conventional-changelog-jshint": "^2.0.1", - "conventional-changelog-preset-loader": "^2.1.1" + "conventional-changelog-jquery": "^3.0.6", + "conventional-changelog-jshint": "^2.0.3", + "conventional-changelog-preset-loader": "^2.2.0" }, "dependencies": { "conventional-changelog-angular": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz", - "integrity": "sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz", + "integrity": "sha512-QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA==", "dev": true, "requires": { "compare-func": "^1.3.1", @@ -3076,53 +3125,54 @@ } }, "conventional-changelog-atom": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.1.tgz", - "integrity": "sha512-9BniJa4gLwL20Sm7HWSNXd0gd9c5qo49gCi8nylLFpqAHhkFTj7NQfROq3f1VpffRtzfTQp4VKU5nxbe2v+eZQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.3.tgz", + "integrity": "sha512-szZe2ut97qNO6vCCMkm1I/tWu6ol4Rr8a9Lx0y/VlpDnpY0PNp+oGpFgU55lplhx+I3Lro9Iv4/gRj0knfgjzg==", "dev": true, "requires": { "q": "^1.5.1" } }, "conventional-changelog-codemirror": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.1.tgz", - "integrity": "sha512-23kT5IZWa+oNoUaDUzVXMYn60MCdOygTA2I+UjnOMiYVhZgmVwNd6ri/yDlmQGXHqbKhNR5NoXdBzSOSGxsgIQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.3.tgz", + "integrity": "sha512-t2afackdgFV2yBdHhWPqrKbpaQeVnz2hSJKdWqjasPo5EpIB6TBL0er3cOP1mnGQmuzk9JSvimNSuqjWGDtU5Q==", "dev": true, "requires": { "q": "^1.5.1" } }, "conventional-changelog-config-spec": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.0.0.tgz", - "integrity": "sha512-zQmcBP/pR8tN5MSv+nXG9hOmy+Z6rgEquBerpoEbOKTFPLoxBy/adeUUpshrMpqdZ/ycqbT2AgdTtiIu/9IHGg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz", + "integrity": "sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==", "dev": true }, "conventional-changelog-conventionalcommits": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.1.0.tgz", - "integrity": "sha512-J3xolGrH8PTxpCqueHOuZtv3Cp73SQOWiBQzlsaugZAZ+hZgcJBonmC+1bQbfGs2neC2S18p2L1Gx+nTEglJTQ==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.2.3.tgz", + "integrity": "sha512-atGa+R4vvEhb8N/8v3IoW59gCBJeeFiX6uIbPu876ENAmkMwsenyn0R21kdDHJFLQdy6zW4J6b4xN8KI3b9oww==", "dev": true, "requires": { "compare-func": "^1.3.1", + "lodash": "^4.17.15", "q": "^1.5.1" } }, "conventional-changelog-core": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.2.3.tgz", - "integrity": "sha512-LMMX1JlxPIq/Ez5aYAYS5CpuwbOk6QFp8O4HLAcZxe3vxoCtABkhfjetk8IYdRB9CDQGwJFLR3Dr55Za6XKgUQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.1.1.tgz", + "integrity": "sha512-fBre5P6U9n914Da6Cj82vIfRU2DhTLGr1eDPXWA7AamxTpd4cd0jgdS7Aieas5Vn5WXOJNFRDNl6PrYLEonImg==", "dev": true, "requires": { - "conventional-changelog-writer": "^4.0.6", - "conventional-commits-parser": "^3.0.3", + "conventional-changelog-writer": "^4.0.11", + "conventional-commits-parser": "^3.0.8", "dateformat": "^3.0.0", "get-pkg-repo": "^1.0.0", "git-raw-commits": "2.0.0", "git-remote-origin-url": "^2.0.0", - "git-semver-tags": "^2.0.3", - "lodash": "^4.2.1", + "git-semver-tags": "^3.0.1", + "lodash": "^4.17.15", "normalize-package-data": "^2.3.5", "q": "^1.5.1", "read-pkg": "^3.0.0", @@ -3131,15 +3181,15 @@ }, "dependencies": { "conventional-commits-parser": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz", - "integrity": "sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz", + "integrity": "sha512-YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ==", "dev": true, "requires": { "JSONStream": "^1.0.4", - "is-text-path": "^2.0.0", - "lodash": "^4.2.1", - "meow": "^4.0.0", + "is-text-path": "^1.0.1", + "lodash": "^4.17.15", + "meow": "^5.0.0", "split2": "^2.0.0", "through2": "^3.0.0", "trim-off-newlines": "^1.0.0" @@ -3158,6 +3208,23 @@ "through2": "^2.0.0" }, "dependencies": { + "meow": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz", + "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==", + "dev": true, + "requires": { + "camelcase-keys": "^4.0.0", + "decamelize-keys": "^1.0.0", + "loud-rejection": "^1.0.0", + "minimist": "^1.1.3", + "minimist-options": "^3.0.1", + "normalize-package-data": "^2.3.4", + "read-pkg-up": "^3.0.0", + "redent": "^2.0.0", + "trim-newlines": "^2.0.0" + } + }, "through2": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", @@ -3171,53 +3238,21 @@ } }, "git-semver-tags": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.3.tgz", - "integrity": "sha512-tj4FD4ww2RX2ae//jSrXZzrocla9db5h0V7ikPl1P/WwoZar9epdUhwR7XHXSgc+ZkNq72BEEerqQuicoEQfzA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-3.0.1.tgz", + "integrity": "sha512-Hzd1MOHXouITfCasrpVJbRDg9uvW7LfABk3GQmXYZByerBDrfrEMP9HXpNT7RxAbieiocP6u+xq20DkvjwxnCA==", "dev": true, "requires": { - "meow": "^4.0.0", + "meow": "^5.0.0", "semver": "^6.0.0" } }, - "is-text-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz", - "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==", - "dev": true, - "requires": { - "text-extensions": "^2.0.0" - } - }, - "meow": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz", - "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==", - "dev": true, - "requires": { - "camelcase-keys": "^4.0.0", - "decamelize-keys": "^1.0.0", - "loud-rejection": "^1.0.0", - "minimist": "^1.1.3", - "minimist-options": "^3.0.1", - "normalize-package-data": "^2.3.4", - "read-pkg-up": "^3.0.0", - "redent": "^2.0.0", - "trim-newlines": "^2.0.0" - } - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true }, - "text-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.0.0.tgz", - "integrity": "sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==", - "dev": true - }, "through2": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", @@ -3230,18 +3265,18 @@ } }, "conventional-changelog-ember": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.2.tgz", - "integrity": "sha512-qtZbA3XefO/n6DDmkYywDYi6wDKNNc98MMl2F9PKSaheJ25Trpi3336W8fDlBhq0X+EJRuseceAdKLEMmuX2tg==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.4.tgz", + "integrity": "sha512-q1u73sO9uCnxN4TSw8xu6MRU8Y1h9kpwtcdJuNRwu/LSKI1IE/iuNSH5eQ6aLlQ3HTyrIpTfUuVybW4W0F17rA==", "dev": true, "requires": { "q": "^1.5.1" } }, "conventional-changelog-eslint": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.2.tgz", - "integrity": "sha512-Yi7tOnxjZLXlCYBHArbIAm8vZ68QUSygFS7PgumPRiEk+9NPUeucy5Wg9AAyKoBprSV3o6P7Oghh4IZSLtKCvQ==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.4.tgz", + "integrity": "sha512-CPwTUENzhLGl3auunrJxiIEWncAGaby7gOFCdj2gslIuOFJ0KPJVOUhRz4Da/I53sdo/7UncUJkiLg94jEsjxg==", "dev": true, "requires": { "q": "^1.5.1" @@ -3257,18 +3292,18 @@ } }, "conventional-changelog-jquery": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.4.tgz", - "integrity": "sha512-IVJGI3MseYoY6eybknnTf9WzeQIKZv7aNTm2KQsiFVJH21bfP2q7XVjfoMibdCg95GmgeFlaygMdeoDDa+ZbEQ==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.6.tgz", + "integrity": "sha512-gHAABCXUNA/HjnZEm+vxAfFPJkgtrZvCDIlCKfdPVXtCIo/Q0lN5VKpx8aR5p8KdVRQFF3OuTlvv5kv6iPuRqA==", "dev": true, "requires": { "q": "^1.5.1" } }, "conventional-changelog-jshint": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.1.tgz", - "integrity": "sha512-kRFJsCOZzPFm2tzRHULWP4tauGMvccOlXYf3zGeuSW4U0mZhk5NsjnRZ7xFWrTFPlCLV+PNmHMuXp5atdoZmEg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.3.tgz", + "integrity": "sha512-Pc2PnMPcez634ckzr4EOWviwRSpZcURaK7bjyD9oK6N5fsC/a+3G7LW5m/JpcHPhA9ZxsfIbm7uqZ3ZDGsQ/sw==", "dev": true, "requires": { "compare-func": "^1.3.1", @@ -3276,46 +3311,29 @@ } }, "conventional-changelog-preset-loader": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.2.0.tgz", - "integrity": "sha512-zXB+5vF7D5Y3Cb/rJfSyCCvFphCVmF8mFqOdncX3BmjZwAtGAPfYrBcT225udilCKvBbHgyzgxqz2GWDB5xShQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.0.tgz", + "integrity": "sha512-/rHb32J2EJnEXeK4NpDgMaAVTFZS3o1ExmjKMtYVgIC4MQn0vkNSbYpdGRotkfGGRWiqk3Ri3FBkiZGbAfIfOQ==", "dev": true }, "conventional-changelog-writer": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.7.tgz", - "integrity": "sha512-p/wzs9eYaxhFbrmX/mCJNwJuvvHR+j4Fd0SQa2xyAhYed6KBiZ780LvoqUUvsayP4R1DtC27czalGUhKV2oabw==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz", + "integrity": "sha512-g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw==", "dev": true, "requires": { "compare-func": "^1.3.1", "conventional-commits-filter": "^2.0.2", "dateformat": "^3.0.0", - "handlebars": "^4.1.2", + "handlebars": "^4.4.0", "json-stringify-safe": "^5.0.1", - "lodash": "^4.2.1", - "meow": "^4.0.0", + "lodash": "^4.17.15", + "meow": "^5.0.0", "semver": "^6.0.0", "split": "^1.0.0", "through2": "^3.0.0" }, "dependencies": { - "meow": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz", - "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==", - "dev": true, - "requires": { - "camelcase-keys": "^4.0.0", - "decamelize-keys": "^1.0.0", - "loud-rejection": "^1.0.0", - "minimist": "^1.1.3", - "minimist-options": "^3.0.1", - "normalize-package-data": "^2.3.4", - "read-pkg-up": "^3.0.0", - "redent": "^2.0.0", - "trim-newlines": "^2.0.0" - } - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -3378,15 +3396,15 @@ } }, "conventional-recommended-bump": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.0.0.tgz", - "integrity": "sha512-iIHkDOuWCC49J/E4WXvXBCCrO2NoGqwjfhm2iUOHPPEik8TVHxczt/hFaWY+4MXeZ/nC53BNfjmlr8+EXOrlvA==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.0.2.tgz", + "integrity": "sha512-9qWhAweJbT6CAHcCprBYzUb3tySsaRrUx0ckpMprHbtWOBfl3gxakUCBNd/4T3m2Iv9Cb8Y4P2Px3cR5ysXPDw==", "dev": true, "requires": { "concat-stream": "^2.0.0", "conventional-changelog-preset-loader": "^2.2.0", "conventional-commits-filter": "^2.0.2", - "conventional-commits-parser": "^3.0.3", + "conventional-commits-parser": "^3.0.5", "git-raw-commits": "2.0.0", "git-semver-tags": "^3.0.0", "meow": "^4.0.0", @@ -3406,18 +3424,37 @@ } }, "conventional-commits-parser": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz", - "integrity": "sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz", + "integrity": "sha512-YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ==", "dev": true, "requires": { "JSONStream": "^1.0.4", - "is-text-path": "^2.0.0", - "lodash": "^4.2.1", - "meow": "^4.0.0", + "is-text-path": "^1.0.1", + "lodash": "^4.17.15", + "meow": "^5.0.0", "split2": "^2.0.0", "through2": "^3.0.0", "trim-off-newlines": "^1.0.0" + }, + "dependencies": { + "meow": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz", + "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==", + "dev": true, + "requires": { + "camelcase-keys": "^4.0.0", + "decamelize-keys": "^1.0.0", + "loud-rejection": "^1.0.0", + "minimist-options": "^3.0.1", + "normalize-package-data": "^2.3.4", + "read-pkg-up": "^3.0.0", + "redent": "^2.0.0", + "trim-newlines": "^2.0.0", + "yargs-parser": "^10.0.0" + } + } } }, "git-raw-commits": { @@ -3460,15 +3497,6 @@ } } }, - "is-text-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz", - "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==", - "dev": true, - "requires": { - "text-extensions": "^2.0.0" - } - }, "meow": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz", @@ -3497,12 +3525,6 @@ "util-deprecate": "^1.0.1" } }, - "text-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.0.0.tgz", - "integrity": "sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==", - "dev": true - }, "through2": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", @@ -3515,9 +3537,9 @@ } }, "convert-source-map": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", - "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", "dev": true, "requires": { "safe-buffer": "~5.1.1" @@ -3544,20 +3566,19 @@ "dev": true }, "core-js": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", - "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==", + "version": "2.6.10", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz", + "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==", "dev": true }, "core-js-compat": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.4.tgz", - "integrity": "sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.4.1.tgz", + "integrity": "sha512-YdeJI26gLc0CQJ9asLE5obEgBz2I0+CIgnoTbS2T0d5IPQw/OCgCIFR527RmpduxjrB3gSEHoGOCTq9sigOyfw==", "dev": true, "requires": { - "browserslist": "^4.6.2", - "core-js-pure": "3.1.4", - "semver": "^6.1.1" + "browserslist": "^4.7.2", + "semver": "^6.3.0" }, "dependencies": { "semver": { @@ -3568,12 +3589,6 @@ } } }, - "core-js-pure": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.4.tgz", - "integrity": "sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==", - "dev": true - }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -3648,13 +3663,55 @@ } }, "cross-env": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", - "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz", + "integrity": "sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==", "dev": true, "requires": { - "cross-spawn": "^6.0.5", - "is-windows": "^1.0.0" + "cross-spawn": "^7.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", + "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "path-key": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz", + "integrity": "sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } } }, "cross-spawn": { @@ -3778,9 +3835,9 @@ "dev": true }, "cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", + "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=", "dev": true }, "dargs": { @@ -3813,9 +3870,9 @@ }, "dependencies": { "whatwg-url": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz", - "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", "dev": true, "requires": { "lodash.sortby": "^4.7.0", @@ -3831,12 +3888,6 @@ "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==", "dev": true }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", - "dev": true - }, "dateformat": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", @@ -3951,81 +4002,48 @@ } }, "del": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-5.0.0.tgz", - "integrity": "sha512-TfU3nUY0WDIhN18eq+pgpbLY9AfL5RfiE9czKaTSolc6aK7qASXfDErvYgjV1UqCR4sNXDoxO0/idPmhDUt2Sg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz", + "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==", "dev": true, "requires": { - "globby": "^10.0.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "rimraf": "^2.6.3" - } - }, - "del-cli": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/del-cli/-/del-cli-2.0.0.tgz", - "integrity": "sha512-IREsO6mjSTxxvWLKMMUi1G0izhqEBx7qeDkOJ6H3+TJl8gQl6x5C5hK4Sm1GJ51KodUMR6O7HuIhnF24Edua3g==", - "dev": true, - "requires": { - "del": "^4.1.1", - "meow": "^5.0.0" + "globby": "^10.0.1", + "graceful-fs": "^4.2.2", + "is-glob": "^4.0.1", + "is-path-cwd": "^2.2.0", + "is-path-inside": "^3.0.1", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "slash": "^3.0.0" }, "dependencies": { - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "del": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", - "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", - "dev": true, - "requires": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" - } - }, - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "rimraf": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz", + "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==", "dev": true, "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } + "glob": "^7.1.3" } }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true } } }, + "del-cli": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/del-cli/-/del-cli-3.0.0.tgz", + "integrity": "sha512-J4HDC2mpcN5aopya4VdkyiFXZaqAoo7ua9VpKbciX3DDUSbtJbPMc3ivggJsAAgS6EqonmbenIiMhBGtJPW9FA==", + "dev": true, + "requires": { + "del": "^5.1.0", + "meow": "^5.0.0" + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -4039,9 +4057,9 @@ "dev": true }, "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", + "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", "dev": true, "requires": { "inherits": "^2.0.1", @@ -4061,9 +4079,9 @@ "dev": true }, "diff-sequences": { - "version": "24.3.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.3.0.tgz", - "integrity": "sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", + "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", "dev": true }, "diffie-hellman": { @@ -4157,9 +4175,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -4214,30 +4232,12 @@ "lru-cache": "^4.1.5", "semver": "^5.6.0", "sigmund": "^1.0.1" - }, - "dependencies": { - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - } } }, "electron-to-chromium": { - "version": "1.3.215", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.215.tgz", - "integrity": "sha512-ZV3OnwF0FlIygwxAG2H92yt7WGjWBpawyFAFu8e9k7xJatY+BPowID0D0Bs3PMACYAJATEejw/I9cawO27ZvTg==", + "version": "1.3.309", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.309.tgz", + "integrity": "sha512-NZd91XD15v2UPLjYXoN/gLnkwIUQjdH4SQLpRCCQiYJH6BBkfgp5pWemBJPr1rZ2dl8Ee3o91O9Sa1QuAfZmog==", "dev": true }, "elegant-spinner": { @@ -4247,9 +4247,9 @@ "dev": true }, "elliptic": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz", - "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz", + "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==", "dev": true, "requires": { "bn.js": "^4.4.0", @@ -4262,9 +4262,9 @@ } }, "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "emojis-list": { @@ -4273,22 +4273,22 @@ "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" }, "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, "requires": { "once": "^1.4.0" } }, "enhanced-resolve": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", - "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz", + "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==", "dev": true, "requires": { "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", + "memory-fs": "^0.5.0", "tapable": "^1.0.0" } }, @@ -4311,34 +4311,38 @@ } }, "es-abstract": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", - "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz", + "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==", "dev": true, "requires": { "es-to-primitive": "^1.2.0", "function-bind": "^1.1.1", "has": "^1.0.3", + "has-symbols": "^1.0.0", "is-callable": "^1.1.4", "is-regex": "^1.0.4", - "object-keys": "^1.0.12" + "object-inspect": "^1.6.0", + "object-keys": "^1.1.1", + "string.prototype.trimleft": "^2.1.0", + "string.prototype.trimright": "^2.1.0" } }, "es-check": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/es-check/-/es-check-5.0.0.tgz", - "integrity": "sha512-30n+EZt5KjazXEvyYr2DXJCOJJWfdT1unRp5+Szlcja6uGAB3Sh3QPjRsxd2xgN9SFj4S5P8pdBISwGcDdS45Q==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/es-check/-/es-check-5.1.0.tgz", + "integrity": "sha512-QlRhlUmEpdnleBFYWRFROm8u9cNPOWdE1iXQPWiQXnwmlJZ0hSxWpLOXwpFLyRrwnTmt5xqYM/5OR8Ao0MYa8w==", "dev": true, "requires": { - "acorn": "6.0.4", - "caporal": "1.1.0", + "acorn": "6.1.1", + "caporal": "1.3.0", "glob": "^7.1.2" } }, "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", + "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", @@ -4352,9 +4356,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz", - "integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz", + "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==", "dev": true, "requires": { "esprima": "^3.1.3", @@ -4373,9 +4377,9 @@ } }, "eslint": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz", - "integrity": "sha512-QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.6.0.tgz", + "integrity": "sha512-PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -4385,9 +4389,9 @@ "debug": "^4.0.1", "doctrine": "^3.0.0", "eslint-scope": "^5.0.0", - "eslint-utils": "^1.3.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^6.0.0", + "eslint-utils": "^1.4.3", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.1.2", "esquery": "^1.0.1", "esutils": "^2.0.2", "file-entry-cache": "^5.0.1", @@ -4397,7 +4401,7 @@ "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", - "inquirer": "^6.4.1", + "inquirer": "^7.0.0", "is-glob": "^4.0.0", "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", @@ -4418,18 +4422,27 @@ }, "dependencies": { "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz", + "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true }, "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, "requires": { - "restore-cursor": "^2.0.0" + "restore-cursor": "^3.1.0" } }, "debug": { @@ -4453,18 +4466,18 @@ } }, "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", + "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==", "dev": true, "requires": { "escape-string-regexp": "^1.0.5" } }, "glob-parent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", - "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -4477,26 +4490,32 @@ "dev": true }, "inquirer": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz", - "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz", + "integrity": "sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==", "dev": true, "requires": { - "ansi-escapes": "^3.2.0", + "ansi-escapes": "^4.2.1", "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", + "cli-cursor": "^3.1.0", "cli-width": "^2.0.0", "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", "run-async": "^2.2.0", "rxjs": "^6.4.0", - "string-width": "^2.1.0", + "string-width": "^4.1.0", "strip-ansi": "^5.1.0", "through": "^2.3.6" } }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -4504,36 +4523,75 @@ "dev": true }, "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "^2.1.0" } }, "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + } } }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, "strip-json-comments": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", @@ -4552,9 +4610,9 @@ } }, "eslint-config-prettier": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz", - "integrity": "sha512-vDrcCFE3+2ixNT5H83g28bO/uYAwibJxerXPj+E7op4qzBCsAV36QfvdAyVOoNxKAH2Os/e01T/2x++V0LPukA==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.7.0.tgz", + "integrity": "sha512-FamQVKM3jjUVwhG4hEMnbtsq7xOIDm+SY5iBPfR8gKsJoAB2IQnNF+bk1+8Fy44Nq7PPJaLvkRxILYdJWoguKQ==", "dev": true, "requires": { "get-stdin": "^6.0.0" @@ -4687,35 +4745,35 @@ } }, "eslint-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz", - "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.0.0" + "eslint-visitor-keys": "^1.1.0" } }, "eslint-visitor-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", + "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", "dev": true }, "espree": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.0.0.tgz", - "integrity": "sha512-lJvCS6YbCn3ImT3yKkPe0+tJ+mH6ljhGNjHQH9mRtiO6gjhVAOhVXW1yjnwqGwTkK3bGbye+hb00nFNmu0l/1Q==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz", + "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==", "dev": true, "requires": { - "acorn": "^6.0.7", - "acorn-jsx": "^5.0.0", - "eslint-visitor-keys": "^1.0.0" + "acorn": "^7.1.0", + "acorn-jsx": "^5.1.0", + "eslint-visitor-keys": "^1.1.0" }, "dependencies": { "acorn": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz", - "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", + "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", "dev": true } } @@ -4745,9 +4803,9 @@ } }, "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true }, "esutils": { @@ -4773,9 +4831,9 @@ } }, "exec-sh": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz", - "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz", + "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==", "dev": true }, "execa": { @@ -4841,17 +4899,17 @@ } }, "expect": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-24.8.0.tgz", - "integrity": "sha512-/zYvP8iMDrzaaxHVa724eJBCKqSHmO0FA7EDkBiRHxg6OipmMn1fN+C8T9L9K8yr7UONkOifu6+LLH+z76CnaA==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz", + "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==", "dev": true, "requires": { - "@jest/types": "^24.8.0", + "@jest/types": "^24.9.0", "ansi-styles": "^3.2.0", - "jest-get-type": "^24.8.0", - "jest-matcher-utils": "^24.8.0", - "jest-message-util": "^24.8.0", - "jest-regex-util": "^24.3.0" + "jest-get-type": "^24.9.0", + "jest-matcher-utils": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-regex-util": "^24.9.0" } }, "extend": { @@ -4975,16 +5033,15 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" }, "fast-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz", - "integrity": "sha512-wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.0.tgz", + "integrity": "sha512-TrUz3THiq2Vy3bjfQUB2wNyPdGBeGmdjbzzBLhfHN4YFurYptCKwGq/TfiRavbGywFRzY6U2CdmQ1zmsY5yYaw==", "dev": true, "requires": { - "@nodelib/fs.stat": "^2.0.1", - "@nodelib/fs.walk": "^1.2.1", - "glob-parent": "^5.0.0", - "is-glob": "^4.0.1", - "merge2": "^1.2.3", + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", "micromatch": "^4.0.2" }, "dependencies": { @@ -5007,9 +5064,9 @@ } }, "glob-parent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", - "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -5097,9 +5154,9 @@ } }, "file-loader": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.1.0.tgz", - "integrity": "sha512-ajDk1nlByoalZAGR4b0H6oD+EGlWnyW1qbSxzaUc7RFiqmn+RbXQQRbTc72jsiUIlVusJ4Et58ltds8ZwTfnAw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.2.0.tgz", + "integrity": "sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==", "dev": true, "requires": { "loader-utils": "^1.2.3", @@ -5160,9 +5217,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -5212,6 +5269,17 @@ "flatted": "^2.0.0", "rimraf": "2.6.3", "write": "1.0.3" + }, + "dependencies": { + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } } }, "flatted": { @@ -5221,9 +5289,9 @@ "dev": true }, "flatten": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", - "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz", + "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==", "dev": true }, "flush-write-stream": { @@ -5242,15 +5310,6 @@ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -5911,15 +5970,15 @@ } }, "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, "get-own-enumerable-property-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz", - "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.1.tgz", + "integrity": "sha512-09/VS4iek66Dh2bctjRkowueRJbY1JDGR1L/zRxO1Qk8Uxs6PnqaNSqalpizPT+CDjre3hnEsuzvhgomz9qYrA==", "dev": true }, "get-pkg-repo": { @@ -6262,9 +6321,9 @@ } }, "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -6336,9 +6395,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", "dev": true }, "growly": { @@ -6348,9 +6407,9 @@ "dev": true }, "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz", + "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", "dev": true, "requires": { "neo-async": "^2.6.0", @@ -6399,9 +6458,9 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "has-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true }, "has-unicode": { @@ -6483,13 +6542,10 @@ } }, "hosted-git-info": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz", - "integrity": "sha512-CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==", - "dev": true, - "requires": { - "lru-cache": "^5.1.1" - } + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", + "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==", + "dev": true }, "html-encoding-sniffer": { "version": "1.0.2", @@ -6518,20 +6574,20 @@ "dev": true }, "husky": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/husky/-/husky-3.0.2.tgz", - "integrity": "sha512-WXCtaME2x0o4PJlKY4ap8BzLA+D0zlvefqAvLCPriOOu+x0dpO5uc5tlB7CY6/0SE2EESmoZsj4jW5D09KrJoA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/husky/-/husky-3.1.0.tgz", + "integrity": "sha512-FJkPoHHB+6s4a+jwPqBudBDvYZsoQW5/HBuMSehC8qDiCe50kpcxeqFoDSlow+9I6wg47YxBoT3WxaURlrDIIQ==", "dev": true, "requires": { "chalk": "^2.4.2", + "ci-info": "^2.0.0", "cosmiconfig": "^5.2.1", "execa": "^1.0.0", "get-stdin": "^7.0.0", - "is-ci": "^2.0.0", "opencollective-postinstall": "^2.0.2", "pkg-dir": "^4.2.0", - "please-upgrade-node": "^3.1.1", - "read-pkg": "^5.1.1", + "please-upgrade-node": "^3.2.0", + "read-pkg": "^5.2.0", "run-node": "^1.0.0", "slash": "^3.0.0" }, @@ -6556,9 +6612,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -6623,6 +6679,12 @@ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true + }, + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true } } }, @@ -6656,9 +6718,9 @@ "dev": true }, "ignore": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.2.tgz", - "integrity": "sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", + "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==", "dev": true }, "import-cwd": { @@ -6671,9 +6733,9 @@ } }, "import-fresh": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz", - "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", "dev": true, "requires": { "parent-module": "^1.0.0", @@ -6735,9 +6797,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -6901,12 +6963,6 @@ "loose-envify": "^1.0.0" } }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true - }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -7097,23 +7153,11 @@ "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", "dev": true }, - "is-path-in-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", - "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", - "dev": true, - "requires": { - "is-path-inside": "^2.1.0" - } - }, "is-path-inside": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", - "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", - "dev": true, - "requires": { - "path-is-inside": "^1.0.2" - } + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", + "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==", + "dev": true }, "is-plain-obj": { "version": "1.1.0", @@ -7158,12 +7202,12 @@ "dev": true }, "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "dev": true, "requires": { - "has-symbols": "^1.0.0" + "has-symbols": "^1.0.1" } }, "is-text-path": { @@ -7303,244 +7347,246 @@ } }, "jest": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-24.8.0.tgz", - "integrity": "sha512-o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz", + "integrity": "sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==", "dev": true, "requires": { "import-local": "^2.0.0", - "jest-cli": "^24.8.0" + "jest-cli": "^24.9.0" }, "dependencies": { "jest-cli": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.8.0.tgz", - "integrity": "sha512-+p6J00jSMPQ116ZLlHJJvdf8wbjNbZdeSX9ptfHX06/MSNaXmKihQzx5vQcw0q2G6JsdVkUIdWbOWtSnaYs3yA==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz", + "integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==", "dev": true, "requires": { - "@jest/core": "^24.8.0", - "@jest/test-result": "^24.8.0", - "@jest/types": "^24.8.0", + "@jest/core": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", "chalk": "^2.0.1", "exit": "^0.1.2", "import-local": "^2.0.0", "is-ci": "^2.0.0", - "jest-config": "^24.8.0", - "jest-util": "^24.8.0", - "jest-validate": "^24.8.0", + "jest-config": "^24.9.0", + "jest-util": "^24.9.0", + "jest-validate": "^24.9.0", "prompts": "^2.0.1", "realpath-native": "^1.1.0", - "yargs": "^12.0.2" + "yargs": "^13.3.0" } } } }, "jest-changed-files": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.8.0.tgz", - "integrity": "sha512-qgANC1Yrivsq+UrLXsvJefBKVoCsKB0Hv+mBb6NMjjZ90wwxCDmU3hsCXBya30cH+LnPYjwgcU65i6yJ5Nfuug==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz", + "integrity": "sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==", "dev": true, "requires": { - "@jest/types": "^24.8.0", + "@jest/types": "^24.9.0", "execa": "^1.0.0", "throat": "^4.0.0" } }, "jest-config": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.8.0.tgz", - "integrity": "sha512-Czl3Nn2uEzVGsOeaewGWoDPD8GStxCpAe0zOYs2x2l0fZAgPbCr3uwUkgNKV3LwE13VXythM946cd5rdGkkBZw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz", + "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^24.8.0", - "@jest/types": "^24.8.0", - "babel-jest": "^24.8.0", + "@jest/test-sequencer": "^24.9.0", + "@jest/types": "^24.9.0", + "babel-jest": "^24.9.0", "chalk": "^2.0.1", "glob": "^7.1.1", - "jest-environment-jsdom": "^24.8.0", - "jest-environment-node": "^24.8.0", - "jest-get-type": "^24.8.0", - "jest-jasmine2": "^24.8.0", + "jest-environment-jsdom": "^24.9.0", + "jest-environment-node": "^24.9.0", + "jest-get-type": "^24.9.0", + "jest-jasmine2": "^24.9.0", "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.8.0", - "jest-util": "^24.8.0", - "jest-validate": "^24.8.0", + "jest-resolve": "^24.9.0", + "jest-util": "^24.9.0", + "jest-validate": "^24.9.0", "micromatch": "^3.1.10", - "pretty-format": "^24.8.0", + "pretty-format": "^24.9.0", "realpath-native": "^1.1.0" } }, "jest-diff": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.8.0.tgz", - "integrity": "sha512-wxetCEl49zUpJ/bvUmIFjd/o52J+yWcoc5ZyPq4/W1LUKGEhRYDIbP1KcF6t+PvqNrGAFk4/JhtxDq/Nnzs66g==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", + "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", "dev": true, "requires": { "chalk": "^2.0.1", - "diff-sequences": "^24.3.0", - "jest-get-type": "^24.8.0", - "pretty-format": "^24.8.0" + "diff-sequences": "^24.9.0", + "jest-get-type": "^24.9.0", + "pretty-format": "^24.9.0" } }, "jest-docblock": { - "version": "24.3.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.3.0.tgz", - "integrity": "sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz", + "integrity": "sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==", "dev": true, "requires": { "detect-newline": "^2.1.0" } }, "jest-each": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.8.0.tgz", - "integrity": "sha512-NrwK9gaL5+XgrgoCsd9svsoWdVkK4gnvyhcpzd6m487tXHqIdYeykgq3MKI1u4I+5Zf0tofr70at9dWJDeb+BA==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz", + "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==", "dev": true, "requires": { - "@jest/types": "^24.8.0", + "@jest/types": "^24.9.0", "chalk": "^2.0.1", - "jest-get-type": "^24.8.0", - "jest-util": "^24.8.0", - "pretty-format": "^24.8.0" + "jest-get-type": "^24.9.0", + "jest-util": "^24.9.0", + "pretty-format": "^24.9.0" } }, "jest-environment-jsdom": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz", - "integrity": "sha512-qbvgLmR7PpwjoFjM/sbuqHJt/NCkviuq9vus9NBn/76hhSidO+Z6Bn9tU8friecegbJL8gzZQEMZBQlFWDCwAQ==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz", + "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==", "dev": true, "requires": { - "@jest/environment": "^24.8.0", - "@jest/fake-timers": "^24.8.0", - "@jest/types": "^24.8.0", - "jest-mock": "^24.8.0", - "jest-util": "^24.8.0", + "@jest/environment": "^24.9.0", + "@jest/fake-timers": "^24.9.0", + "@jest/types": "^24.9.0", + "jest-mock": "^24.9.0", + "jest-util": "^24.9.0", "jsdom": "^11.5.1" } }, "jest-environment-node": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.8.0.tgz", - "integrity": "sha512-vIGUEScd1cdDgR6sqn2M08sJTRLQp6Dk/eIkCeO4PFHxZMOgy+uYLPMC4ix3PEfM5Au/x3uQ/5Tl0DpXXZsJ/Q==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz", + "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==", "dev": true, "requires": { - "@jest/environment": "^24.8.0", - "@jest/fake-timers": "^24.8.0", - "@jest/types": "^24.8.0", - "jest-mock": "^24.8.0", - "jest-util": "^24.8.0" + "@jest/environment": "^24.9.0", + "@jest/fake-timers": "^24.9.0", + "@jest/types": "^24.9.0", + "jest-mock": "^24.9.0", + "jest-util": "^24.9.0" } }, "jest-get-type": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.8.0.tgz", - "integrity": "sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", + "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", "dev": true }, "jest-haste-map": { - "version": "24.8.1", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.8.1.tgz", - "integrity": "sha512-SwaxMGVdAZk3ernAx2Uv2sorA7jm3Kx+lR0grp6rMmnY06Kn/urtKx1LPN2mGTea4fCT38impYT28FfcLUhX0g==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz", + "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==", "dev": true, "requires": { - "@jest/types": "^24.8.0", + "@jest/types": "^24.9.0", "anymatch": "^2.0.0", "fb-watchman": "^2.0.0", "fsevents": "^1.2.7", "graceful-fs": "^4.1.15", "invariant": "^2.2.4", - "jest-serializer": "^24.4.0", - "jest-util": "^24.8.0", - "jest-worker": "^24.6.0", + "jest-serializer": "^24.9.0", + "jest-util": "^24.9.0", + "jest-worker": "^24.9.0", "micromatch": "^3.1.10", "sane": "^4.0.3", "walker": "^1.0.7" } }, "jest-jasmine2": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz", - "integrity": "sha512-cEky88npEE5LKd5jPpTdDCLvKkdyklnaRycBXL6GNmpxe41F0WN44+i7lpQKa/hcbXaQ+rc9RMaM4dsebrYong==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz", + "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==", "dev": true, "requires": { "@babel/traverse": "^7.1.0", - "@jest/environment": "^24.8.0", - "@jest/test-result": "^24.8.0", - "@jest/types": "^24.8.0", + "@jest/environment": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", "chalk": "^2.0.1", "co": "^4.6.0", - "expect": "^24.8.0", + "expect": "^24.9.0", "is-generator-fn": "^2.0.0", - "jest-each": "^24.8.0", - "jest-matcher-utils": "^24.8.0", - "jest-message-util": "^24.8.0", - "jest-runtime": "^24.8.0", - "jest-snapshot": "^24.8.0", - "jest-util": "^24.8.0", - "pretty-format": "^24.8.0", + "jest-each": "^24.9.0", + "jest-matcher-utils": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-runtime": "^24.9.0", + "jest-snapshot": "^24.9.0", + "jest-util": "^24.9.0", + "pretty-format": "^24.9.0", "throat": "^4.0.0" } }, "jest-junit": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-7.0.0.tgz", - "integrity": "sha512-ljUdO0hLyu0A92xk7R2Wet3kj99fmazTo+ZFYQP6b7AGOBxJUj8ZkJWzJ632ajpXko2Y5oNoGR2kvOwiDdu6hg==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-9.0.0.tgz", + "integrity": "sha512-jnABGjL5pd2lhE1w3RIslZSufFbWQZGx8O3eluDES7qKxQuonXMtsPIi+4AKl4rtjb4DvMAjwLi4eHukc2FP/Q==", "dev": true, "requires": { - "jest-validate": "^24.0.0", + "jest-validate": "^24.9.0", "mkdirp": "^0.5.1", - "strip-ansi": "^4.0.0", + "strip-ansi": "^5.2.0", + "uuid": "^3.3.3", "xml": "^1.0.1" }, "dependencies": { "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^4.1.0" } } } }, "jest-leak-detector": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz", - "integrity": "sha512-cG0yRSK8A831LN8lIHxI3AblB40uhv0z+SsQdW3GoMMVcK+sJwrIIyax5tu3eHHNJ8Fu6IMDpnLda2jhn2pD/g==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz", + "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==", "dev": true, "requires": { - "pretty-format": "^24.8.0" + "jest-get-type": "^24.9.0", + "pretty-format": "^24.9.0" } }, "jest-matcher-utils": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz", - "integrity": "sha512-lex1yASY51FvUuHgm0GOVj7DCYEouWSlIYmCW7APSqB9v8mXmKSn5+sWVF0MhuASG0bnYY106/49JU1FZNl5hw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz", + "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==", "dev": true, "requires": { "chalk": "^2.0.1", - "jest-diff": "^24.8.0", - "jest-get-type": "^24.8.0", - "pretty-format": "^24.8.0" + "jest-diff": "^24.9.0", + "jest-get-type": "^24.9.0", + "pretty-format": "^24.9.0" } }, "jest-message-util": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.8.0.tgz", - "integrity": "sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz", + "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/test-result": "^24.8.0", - "@jest/types": "^24.8.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", "@types/stack-utils": "^1.0.1", "chalk": "^2.0.1", "micromatch": "^3.1.10", @@ -7549,12 +7595,12 @@ } }, "jest-mock": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.8.0.tgz", - "integrity": "sha512-6kWugwjGjJw+ZkK4mDa0Df3sDlUTsV47MSrT0nGQ0RBWJbpODDQ8MHDVtGtUYBne3IwZUhtB7elxHspU79WH3A==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz", + "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==", "dev": true, "requires": { - "@jest/types": "^24.8.0" + "@jest/types": "^24.9.0" } }, "jest-pnp-resolver": { @@ -7564,18 +7610,18 @@ "dev": true }, "jest-regex-util": { - "version": "24.3.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.3.0.tgz", - "integrity": "sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", + "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", "dev": true }, "jest-resolve": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz", - "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz", + "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==", "dev": true, "requires": { - "@jest/types": "^24.8.0", + "@jest/types": "^24.9.0", "browser-resolve": "^1.11.3", "chalk": "^2.0.1", "jest-pnp-resolver": "^1.2.1", @@ -7583,111 +7629,120 @@ } }, "jest-resolve-dependencies": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz", - "integrity": "sha512-hyK1qfIf/krV+fSNyhyJeq3elVMhK9Eijlwy+j5jqmZ9QsxwKBiP6qukQxaHtK8k6zql/KYWwCTQ+fDGTIJauw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz", + "integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==", "dev": true, "requires": { - "@jest/types": "^24.8.0", + "@jest/types": "^24.9.0", "jest-regex-util": "^24.3.0", - "jest-snapshot": "^24.8.0" + "jest-snapshot": "^24.9.0" } }, "jest-runner": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.8.0.tgz", - "integrity": "sha512-utFqC5BaA3JmznbissSs95X1ZF+d+4WuOWwpM9+Ak356YtMhHE/GXUondZdcyAAOTBEsRGAgH/0TwLzfI9h7ow==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz", + "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==", "dev": true, "requires": { "@jest/console": "^24.7.1", - "@jest/environment": "^24.8.0", - "@jest/test-result": "^24.8.0", - "@jest/types": "^24.8.0", + "@jest/environment": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", "chalk": "^2.4.2", "exit": "^0.1.2", "graceful-fs": "^4.1.15", - "jest-config": "^24.8.0", + "jest-config": "^24.9.0", "jest-docblock": "^24.3.0", - "jest-haste-map": "^24.8.0", - "jest-jasmine2": "^24.8.0", - "jest-leak-detector": "^24.8.0", - "jest-message-util": "^24.8.0", - "jest-resolve": "^24.8.0", - "jest-runtime": "^24.8.0", - "jest-util": "^24.8.0", + "jest-haste-map": "^24.9.0", + "jest-jasmine2": "^24.9.0", + "jest-leak-detector": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-resolve": "^24.9.0", + "jest-runtime": "^24.9.0", + "jest-util": "^24.9.0", "jest-worker": "^24.6.0", "source-map-support": "^0.5.6", "throat": "^4.0.0" } }, "jest-runtime": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.8.0.tgz", - "integrity": "sha512-Mq0aIXhvO/3bX44ccT+czU1/57IgOMyy80oM0XR/nyD5zgBcesF84BPabZi39pJVA6UXw+fY2Q1N+4BiVUBWOA==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz", + "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==", "dev": true, "requires": { "@jest/console": "^24.7.1", - "@jest/environment": "^24.8.0", + "@jest/environment": "^24.9.0", "@jest/source-map": "^24.3.0", - "@jest/transform": "^24.8.0", - "@jest/types": "^24.8.0", - "@types/yargs": "^12.0.2", + "@jest/transform": "^24.9.0", + "@jest/types": "^24.9.0", + "@types/yargs": "^13.0.0", "chalk": "^2.0.1", "exit": "^0.1.2", "glob": "^7.1.3", "graceful-fs": "^4.1.15", - "jest-config": "^24.8.0", - "jest-haste-map": "^24.8.0", - "jest-message-util": "^24.8.0", - "jest-mock": "^24.8.0", + "jest-config": "^24.9.0", + "jest-haste-map": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-mock": "^24.9.0", "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.8.0", - "jest-snapshot": "^24.8.0", - "jest-util": "^24.8.0", - "jest-validate": "^24.8.0", + "jest-resolve": "^24.9.0", + "jest-snapshot": "^24.9.0", + "jest-util": "^24.9.0", + "jest-validate": "^24.9.0", "realpath-native": "^1.1.0", "slash": "^2.0.0", "strip-bom": "^3.0.0", - "yargs": "^12.0.2" + "yargs": "^13.3.0" } }, "jest-serializer": { - "version": "24.4.0", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.4.0.tgz", - "integrity": "sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz", + "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==", "dev": true }, "jest-snapshot": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.8.0.tgz", - "integrity": "sha512-5ehtWoc8oU9/cAPe6fez6QofVJLBKyqkY2+TlKTOf0VllBB/mqUNdARdcjlZrs9F1Cv+/HKoCS/BknT0+tmfPg==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz", + "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==", "dev": true, "requires": { "@babel/types": "^7.0.0", - "@jest/types": "^24.8.0", + "@jest/types": "^24.9.0", "chalk": "^2.0.1", - "expect": "^24.8.0", - "jest-diff": "^24.8.0", - "jest-matcher-utils": "^24.8.0", - "jest-message-util": "^24.8.0", - "jest-resolve": "^24.8.0", + "expect": "^24.9.0", + "jest-diff": "^24.9.0", + "jest-get-type": "^24.9.0", + "jest-matcher-utils": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-resolve": "^24.9.0", "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", - "pretty-format": "^24.8.0", - "semver": "^5.5.0" + "pretty-format": "^24.9.0", + "semver": "^6.2.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, "jest-util": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.8.0.tgz", - "integrity": "sha512-DYZeE+XyAnbNt0BG1OQqKy/4GVLPtzwGx5tsnDrFcax36rVE3lTA5fbvgmbVPUZf9w77AJ8otqR4VBbfFJkUZA==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz", + "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==", "dev": true, "requires": { - "@jest/console": "^24.7.1", - "@jest/fake-timers": "^24.8.0", - "@jest/source-map": "^24.3.0", - "@jest/test-result": "^24.8.0", - "@jest/types": "^24.8.0", + "@jest/console": "^24.9.0", + "@jest/fake-timers": "^24.9.0", + "@jest/source-map": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", "callsites": "^3.0.0", "chalk": "^2.0.1", "graceful-fs": "^4.1.15", @@ -7698,31 +7753,31 @@ } }, "jest-validate": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.8.0.tgz", - "integrity": "sha512-+/N7VOEMW1Vzsrk3UWBDYTExTPwf68tavEPKDnJzrC6UlHtUDU/fuEdXqFoHzv9XnQ+zW6X3qMZhJ3YexfeLDA==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz", + "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==", "dev": true, "requires": { - "@jest/types": "^24.8.0", - "camelcase": "^5.0.0", + "@jest/types": "^24.9.0", + "camelcase": "^5.3.1", "chalk": "^2.0.1", - "jest-get-type": "^24.8.0", - "leven": "^2.1.0", - "pretty-format": "^24.8.0" + "jest-get-type": "^24.9.0", + "leven": "^3.1.0", + "pretty-format": "^24.9.0" } }, "jest-watcher": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.8.0.tgz", - "integrity": "sha512-SBjwHt5NedQoVu54M5GEx7cl7IGEFFznvd/HNT8ier7cCAx/Qgu9ZMlaTQkvK22G1YOpcWBLQPFSImmxdn3DAw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz", + "integrity": "sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==", "dev": true, "requires": { - "@jest/test-result": "^24.8.0", - "@jest/types": "^24.8.0", - "@types/yargs": "^12.0.9", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", + "@types/yargs": "^13.0.0", "ansi-escapes": "^3.0.0", "chalk": "^2.0.1", - "jest-util": "^24.8.0", + "jest-util": "^24.9.0", "string-length": "^2.0.0" }, "dependencies": { @@ -7735,12 +7790,12 @@ } }, "jest-worker": { - "version": "24.6.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.6.0.tgz", - "integrity": "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", + "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==", "dev": true, "requires": { - "merge-stream": "^1.0.1", + "merge-stream": "^2.0.0", "supports-color": "^6.1.0" } }, @@ -7883,12 +7938,6 @@ "graceful-fs": "^4.1.6" } }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true - }, "jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -7919,15 +7968,6 @@ "integrity": "sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==", "dev": true }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, - "requires": { - "invert-kv": "^2.0.0" - } - }, "left-pad": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", @@ -7935,9 +7975,9 @@ "dev": true }, "leven": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", - "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", "dev": true }, "levn": { @@ -7957,9 +7997,9 @@ "dev": true }, "lint-staged": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-9.2.1.tgz", - "integrity": "sha512-3lGgJfBddCy/WndKdNko+uJbwyYjBD1k+V+SA+phBYWzH265S95KQya/Wln/UL+hOjc7NcjtFYVCUWuAcqYHhg==", + "version": "9.4.3", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-9.4.3.tgz", + "integrity": "sha512-PejnI+rwOAmKAIO+5UuAZU9gxdej/ovSEOAY34yMfC3OS4Ac82vCBPzAWLReR9zCPOMqeVwQRaZ3bUBpAsaL2Q==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -7972,6 +8012,7 @@ "listr": "^0.14.3", "log-symbols": "^3.0.0", "micromatch": "^4.0.2", + "normalize-path": "^3.0.0", "please-upgrade-node": "^3.1.1", "string-argv": "^0.3.0", "stringify-object": "^3.3.0" @@ -7986,6 +8027,17 @@ "fill-range": "^7.0.1" } }, + "cross-spawn": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", + "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -7996,12 +8048,12 @@ } }, "execa": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/execa/-/execa-2.0.3.tgz", - "integrity": "sha512-iM124nlyGSrXmuyZF1EMe83ESY2chIYVyDRZKgmcDynid2Q2v/+GuE7gNMl6Sy9Niwf4MC0DDxagOxeMPjuLsw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz", + "integrity": "sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==", "dev": true, "requires": { - "cross-spawn": "^6.0.5", + "cross-spawn": "^7.0.0", "get-stream": "^5.0.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", @@ -8042,12 +8094,6 @@ "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", "dev": true }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, "micromatch": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", @@ -8058,12 +8104,6 @@ "picomatch": "^2.0.5" } }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -8100,6 +8140,21 @@ "integrity": "sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==", "dev": true }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -8108,6 +8163,15 @@ "requires": { "is-number": "^7.0.0" } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } } } }, @@ -8132,6 +8196,14 @@ "listr-verbose-renderer": "^0.5.0", "p-map": "^2.0.0", "rxjs": "^6.3.3" + }, + "dependencies": { + "p-map": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", + "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", + "dev": true + } } }, "listr-silent-renderer": { @@ -8231,6 +8303,12 @@ "escape-string-regexp": "^1.0.5" } }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true + }, "onetime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", @@ -8262,6 +8340,14 @@ "parse-json": "^4.0.0", "pify": "^3.0.0", "strip-bom": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } } }, "loader-runner": { @@ -8320,18 +8406,6 @@ "integrity": "sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=", "dev": true }, - "lodash.kebabcase": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", - "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=", - "dev": true - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, "lodash.pad": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz", @@ -8356,12 +8430,6 @@ "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", "dev": true }, - "lodash.tail": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", - "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", - "dev": true - }, "lodash.template": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", @@ -8428,6 +8496,12 @@ "restore-cursor": "^2.0.0" } }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true + }, "onetime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", @@ -8488,12 +8562,13 @@ } }, "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, "requires": { - "yallist": "^3.0.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "make-dir": { @@ -8504,14 +8579,6 @@ "requires": { "pify": "^4.0.1", "semver": "^5.6.0" - }, - "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - } } }, "makeerror": { @@ -8529,15 +8596,6 @@ "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==", "dev": true }, - "map-age-cleaner": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", - "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "dev": true, - "requires": { - "p-defer": "^1.0.0" - } - }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -8570,29 +8628,10 @@ "safe-buffer": "^5.1.2" } }, - "mem": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", - "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", - "dev": true, - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" - }, - "dependencies": { - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - } - } - }, "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", + "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", "dev": true, "requires": { "errno": "^0.1.3", @@ -8623,18 +8662,15 @@ } }, "merge-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", - "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", - "dev": true, - "requires": { - "readable-stream": "^2.0.1" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true }, "merge2": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz", - "integrity": "sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz", + "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==", "dev": true }, "micromatch": { @@ -8678,24 +8714,24 @@ } }, "mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", + "version": "1.42.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz", + "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==", "dev": true }, "mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "version": "2.1.25", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz", + "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==", "dev": true, "requires": { - "mime-db": "1.40.0" + "mime-db": "1.42.0" } }, "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true }, "minimalistic-assert": { @@ -8773,24 +8809,6 @@ } } }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "dev": true, - "requires": { - "for-in": "^0.1.3", - "is-extendable": "^0.1.1" - }, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", - "dev": true - } - } - }, "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", @@ -8829,9 +8847,9 @@ } }, "mrm-core": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/mrm-core/-/mrm-core-3.3.2.tgz", - "integrity": "sha512-0SOw8U9s0gvcXQQHM736kLSo0XFB6O1Zs2UwNBcURjfMeev/qgP7d0RQRrzN7E+hLem+OPsL0eNrQSDoBIcaFA==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/mrm-core/-/mrm-core-3.3.4.tgz", + "integrity": "sha512-vTywqjBrQIDlRuoww+xspvm/be272c2M54VY2GWY4NCZtSSG3uY6zyEuQekKANM5HEKc8WVn+jQGHmdETQCtww==", "dev": true, "requires": { "babel-code-frame": "^6.26.0", @@ -8874,9 +8892,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -9007,9 +9025,9 @@ "dev": true }, "node-notifier": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.1.tgz", - "integrity": "sha512-p52B+onAEHKW1OF9MGO/S7k/ahGEHfhP5/tvwYzog/5XLYOd8ZuD6vdNZdUuWMONRnKPneXV43v3s6Snx1wsCQ==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz", + "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==", "dev": true, "requires": { "growly": "^1.3.0", @@ -9020,12 +9038,20 @@ } }, "node-releases": { - "version": "1.1.26", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.26.tgz", - "integrity": "sha512-fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ==", + "version": "1.1.40", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.40.tgz", + "integrity": "sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ==", "dev": true, "requires": { - "semver": "^5.3.0" + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, "normalize-package-data": { @@ -9107,9 +9133,9 @@ "dev": true }, "nwsapi": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz", - "integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", "dev": true }, "oauth-sign": { @@ -9155,6 +9181,12 @@ } } }, + "object-inspect": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", + "dev": true + }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -9249,45 +9281,28 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true - }, - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true } } }, "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", "dev": true, "requires": { "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", + "fast-levenshtein": "~2.0.6", "levn": "~0.3.0", "prelude-ls": "~1.1.2", "type-check": "~0.3.2", - "wordwrap": "~1.0.0" + "word-wrap": "~1.2.3" } }, "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", - "dev": true - }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", + "dev": true }, "os-shim": { "version": "0.1.3", @@ -9301,23 +9316,6 @@ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, - "output-file-sync": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz", - "integrity": "sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "is-plain-obj": "^1.1.0", - "mkdirp": "^0.5.1" - } - }, - "p-defer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", - "dev": true - }, "p-each-series": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz", @@ -9333,12 +9331,6 @@ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, - "p-is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", - "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==", - "dev": true - }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -9358,10 +9350,13 @@ } }, "p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", - "dev": true + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "dev": true, + "requires": { + "aggregate-error": "^3.0.0" + } }, "p-reduce": { "version": "1.0.0", @@ -9382,12 +9377,12 @@ "dev": true }, "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz", + "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "dev": true, "requires": { - "cyclist": "~0.2.2", + "cyclist": "^1.0.1", "inherits": "^2.0.3", "readable-stream": "^2.1.5" } @@ -9402,9 +9397,9 @@ } }, "parse-asn1": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz", - "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz", + "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==", "dev": true, "requires": { "asn1.js": "^4.0.0", @@ -9502,12 +9497,6 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, "path-key": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", @@ -9527,6 +9516,14 @@ "dev": true, "requires": { "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } } }, "pbkdf2": { @@ -9549,9 +9546,9 @@ "dev": true }, "picomatch": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz", - "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.1.1.tgz", + "integrity": "sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==", "dev": true }, "pidtree": { @@ -9561,9 +9558,9 @@ "dev": true }, "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true }, "pinkie": { @@ -9600,9 +9597,9 @@ } }, "please-upgrade-node": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz", - "integrity": "sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", + "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==", "dev": true, "requires": { "semver-compare": "^1.0.0" @@ -9621,9 +9618,9 @@ "dev": true }, "postcss": { - "version": "7.0.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz", - "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==", + "version": "7.0.23", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.23.tgz", + "integrity": "sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ==", "requires": { "chalk": "^2.4.2", "source-map": "^0.6.1", @@ -9855,9 +9852,9 @@ } }, "postcss-initial": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.1.tgz", - "integrity": "sha512-I2Sz83ZSHybMNh02xQDK609lZ1/QOyYeuizCjzEhlMgeV/HcDJapQiH4yTqLjZss0X6/6VvKFXUeObaHpJoINw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.2.tgz", + "integrity": "sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA==", "dev": true, "requires": { "lodash.template": "^4.5.0", @@ -10116,9 +10113,9 @@ } }, "postcss-value-parser": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.1.tgz", - "integrity": "sha512-3Jk+/CVH0HBfgSSFWALKm9Hyzf4kumPjZfUxkRYZNcqFztELb2APKxv0nlX8HCdc1/ymePmT/nFf1ST6fjWH2A==" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz", + "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==" }, "postcss-values-parser": { "version": "2.0.1", @@ -10138,18 +10135,18 @@ "dev": true }, "prettier": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz", - "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true }, "pretty-format": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.8.0.tgz", - "integrity": "sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", + "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", "dev": true, "requires": { - "@jest/types": "^24.8.0", + "@jest/types": "^24.9.0", "ansi-regex": "^4.0.0", "ansi-styles": "^3.2.0", "react-is": "^16.8.4" @@ -10204,9 +10201,9 @@ "dev": true }, "prompts": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz", - "integrity": "sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz", + "integrity": "sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==", "dev": true, "requires": { "kleur": "^3.0.3", @@ -10243,9 +10240,9 @@ "dev": true }, "psl": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz", - "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz", + "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==", "dev": true }, "public-encrypt": { @@ -10362,9 +10359,9 @@ } }, "react-is": { - "version": "16.8.6", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", - "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==", + "version": "16.12.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", + "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==", "dev": true }, "read-pkg": { @@ -10482,12 +10479,6 @@ "safe-regex": "^1.1.0" } }, - "regexp-tree": { - "version": "0.1.11", - "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz", - "integrity": "sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==", - "dev": true - }, "regexpp": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", @@ -10495,13 +10486,13 @@ "dev": true }, "regexpu-core": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz", - "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz", + "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==", "dev": true, "requires": { "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.0.2", + "regenerate-unicode-properties": "^8.1.0", "regjsgen": "^0.5.0", "regjsparser": "^0.6.0", "unicode-match-property-ecmascript": "^1.0.4", @@ -10509,9 +10500,9 @@ } }, "regjsgen": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz", - "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz", + "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==", "dev": true }, "regjsparser": { @@ -10614,21 +10605,21 @@ } }, "request-promise-core": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz", - "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", + "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", "dev": true, "requires": { - "lodash": "^4.17.11" + "lodash": "^4.17.15" } }, "request-promise-native": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz", - "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz", + "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==", "dev": true, "requires": { - "request-promise-core": "1.1.2", + "request-promise-core": "1.1.3", "stealthy-require": "^1.1.1", "tough-cookie": "^2.3.3" } @@ -10715,9 +10706,9 @@ "dev": true }, "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { "glob": "^7.1.3" @@ -10776,9 +10767,9 @@ "dev": true }, "rxjs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", - "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz", + "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -10823,26 +10814,33 @@ } }, "sass": { - "version": "1.22.9", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.9.tgz", - "integrity": "sha512-FzU1X2V8DlnqabrL4u7OBwD2vcOzNMongEJEx3xMEhWY/v26FFR3aG0hyeu2T965sfR0E9ufJwmG+Qjz78vFPQ==", + "version": "1.23.7", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.23.7.tgz", + "integrity": "sha512-cYgc0fanwIpi0rXisGxl+/wadVQ/HX3RhpdRcjLdj2o2ye/sxUTpAxIhbmJy3PLQgRFbf6Pn8Jsrta2vdXcoOQ==", "dev": true, "requires": { "chokidar": ">=2.0.0 <4.0.0" } }, "sass-loader": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz", - "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz", + "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==", "dev": true, "requires": { - "clone-deep": "^2.0.1", + "clone-deep": "^4.0.1", "loader-utils": "^1.0.1", - "lodash.tail": "^4.1.1", "neo-async": "^2.5.0", - "pify": "^3.0.0", - "semver": "^5.5.0" + "pify": "^4.0.1", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, "sax": { @@ -10852,18 +10850,18 @@ "dev": true }, "schema-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.0.1.tgz", - "integrity": "sha512-HJFKJ4JixDpRur06QHwi8uu2kZbng318ahWEKgBjc0ZklcE4FDvmm2wghb448q0IRaABxIESt8vqPFvwgMB80A==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz", + "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==", "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1" } }, "semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true }, "semver-compare": { @@ -10873,9 +10871,9 @@ "dev": true }, "serialize-javascript": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz", - "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz", + "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==", "dev": true }, "set-blocking": { @@ -10924,22 +10922,12 @@ } }, "shallow-clone": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", - "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, "requires": { - "is-extendable": "^0.1.1", - "kind-of": "^5.0.0", - "mixin-object": "^2.0.1" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } + "kind-of": "^6.0.2" } }, "shebang-command": { @@ -10958,16 +10946,10 @@ "dev": true }, "shell-quote": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", - "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", - "dev": true, - "requires": { - "array-filter": "~0.0.0", - "array-map": "~0.0.0", - "array-reduce": "~0.0.0", - "jsonify": "~0.0.0" - } + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz", + "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==", + "dev": true }, "shellwords": { "version": "0.1.1", @@ -10988,9 +10970,9 @@ "dev": true }, "sisteransi": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz", - "integrity": "sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz", + "integrity": "sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==", "dev": true }, "slash": { @@ -11157,9 +11139,9 @@ } }, "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz", + "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -11292,15 +11274,15 @@ "dev": true }, "standard-version": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-7.0.0.tgz", - "integrity": "sha512-pbFXM9vutnxTkSGkqSWQeYCMYqWmFBaLUNdEc/sJDQnMgwB0Csw3CZeeDhi62VoVS3P8mQiYbvXGZWyOBWxUbw==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-7.0.1.tgz", + "integrity": "sha512-3GR9dPlNpC/osTwb9YsU2KQelGvSORMPUFN7zOUE3HN4yjCTsT57IJAFsyPXPP512QDMSxwwjhxa8Em5vF5F5Q==", "dev": true, "requires": { "chalk": "2.4.2", - "conventional-changelog": "3.1.9", - "conventional-changelog-config-spec": "2.0.0", - "conventional-recommended-bump": "6.0.0", + "conventional-changelog": "3.1.12", + "conventional-changelog-config-spec": "2.1.0", + "conventional-recommended-bump": "6.0.2", "detect-indent": "6.0.0", "detect-newline": "3.0.0", "dotgitignore": "2.1.0", @@ -11309,20 +11291,15 @@ "fs-access": "1.0.1", "git-semver-tags": "3.0.0", "semver": "6.3.0", - "stringify-package": "1.0.0", - "yargs": "13.3.0" + "stringify-package": "1.0.1", + "yargs": "14.2.0" }, "dependencies": { - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true }, "detect-indent": { "version": "6.0.0", @@ -11336,6 +11313,12 @@ "integrity": "sha512-JAP22dVPAqvhdRFFxK1G5GViIokyUn0UWXRNW0ztK96fsqi9cuM8w8ESbSk+T2w5OVorcMcL6m7yUg1RrX+2CA==", "dev": true }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, "figures": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz", @@ -11355,12 +11338,6 @@ "path-exists": "^4.0.0" } }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -11371,9 +11348,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -11415,26 +11392,27 @@ "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" - } - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } } }, "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.0.tgz", + "integrity": "sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg==", "dev": true, "requires": { "cliui": "^5.0.0", + "decamelize": "^1.2.0", "find-up": "^3.0.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", @@ -11443,7 +11421,7 @@ "string-width": "^3.0.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" + "yargs-parser": "^15.0.0" }, "dependencies": { "find-up": { @@ -11483,9 +11461,9 @@ } }, "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.0.tgz", + "integrity": "sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -11561,9 +11539,9 @@ "dev": true }, "string-argv": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.0.tgz", - "integrity": "sha512-NGZHq3nkSXVtGZXTBjFru3MNfoZyIzN25T7BmvdgnSC0LCJczAGLLMQLyjywSIaAoqSemgLzBRHOsnrHbt60+Q==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", + "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", "dev": true }, "string-length": { @@ -11631,6 +11609,26 @@ "function-bind": "^1.0.2" } }, + "string.prototype.trimleft": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz", + "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, + "string.prototype.trimright": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz", + "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -11652,24 +11650,24 @@ } }, "stringify-package": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.0.tgz", - "integrity": "sha512-JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz", + "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==", "dev": true }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true } } @@ -11725,9 +11723,9 @@ "dev": true }, "table": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/table/-/table-5.4.5.tgz", - "integrity": "sha512-oGa2Hl7CQjfoaogtrOHEJroOcYILTx7BZWLGsJIlzoWmB2zmguhNfPJZsWPKYek/MgCxfco54gEi31d1uN2hFA==", + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", "dev": true, "requires": { "ajv": "^6.10.2", @@ -11736,6 +11734,18 @@ "string-width": "^3.0.0" }, "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", @@ -11745,6 +11755,17 @@ "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" + }, + "dependencies": { + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } } } } @@ -11772,9 +11793,9 @@ "dev": true }, "terser": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.3.tgz", - "integrity": "sha512-on13d+cnpn5bMouZu+J8tPYQecsdRJCJuxFJ+FVoPBoLJgk5bCBkp+Uen2hWyi0KIUm6eDarnlAlH+KgIx/PuQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.0.tgz", + "integrity": "sha512-oDG16n2WKm27JO8h4y/w3iqBGAOSCtq7k8dRmrn4Wf9NouL0b2WpMHGChFGZq4nFAQy1FsNJrVQHfurXOSTmOA==", "dev": true, "requires": { "commander": "^2.20.0", @@ -11844,9 +11865,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -11914,9 +11935,9 @@ } }, "timers-browserify": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", - "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", + "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", "dev": true, "requires": { "setimmediate": "^1.0.4" @@ -12022,12 +12043,6 @@ "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=", "dev": true }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true - }, "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", @@ -12065,9 +12080,9 @@ } }, "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", "dev": true }, "typedarray": { @@ -12077,13 +12092,13 @@ "dev": true }, "uglify-js": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", - "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", + "version": "3.6.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz", + "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==", "dev": true, "optional": true, "requires": { - "commander": "~2.20.0", + "commander": "~2.20.3", "source-map": "~0.6.1" } }, @@ -12197,9 +12212,9 @@ } }, "upath": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", - "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", "dev": true }, "uri-js": { @@ -12283,9 +12298,9 @@ } }, "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", + "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==", "dev": true }, "v8-compile-cache": { @@ -12316,9 +12331,9 @@ } }, "vm-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz", - "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", "dev": true }, "w3c-hr-time": { @@ -12357,9 +12372,9 @@ "dev": true }, "webpack": { - "version": "4.39.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz", - "integrity": "sha512-/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==", + "version": "4.41.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz", + "integrity": "sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==", "dev": true, "requires": { "@webassemblyjs/ast": "1.8.5", @@ -12388,9 +12403,9 @@ }, "dependencies": { "acorn": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz", - "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", + "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", "dev": true }, "eslint-scope": { @@ -12403,6 +12418,16 @@ "estraverse": "^4.1.1" } }, + "memory-fs": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "dev": true, + "requires": { + "errno": "^0.1.3", + "readable-stream": "^2.0.1" + } + }, "schema-utils": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", @@ -12417,12 +12442,12 @@ } }, "webpack-merge": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", - "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", + "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", "dev": true, "requires": { - "lodash": "^4.17.5" + "lodash": "^4.17.15" } }, "webpack-sources": { @@ -12498,10 +12523,16 @@ } } }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true + }, "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", "dev": true }, "worker-farm": { @@ -12514,42 +12545,46 @@ } }, "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" }, "dependencies": { - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true }, "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } }, "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "^4.1.0" } } } @@ -12614,31 +12649,41 @@ "dev": true }, "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true }, "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", + "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", + "cliui": "^5.0.0", "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", + "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", + "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^2.0.0", + "string-width": "^3.0.0", "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" + "y18n": "^4.0.0", + "yargs-parser": "^13.1.1" }, "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, "find-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", @@ -12659,9 +12704,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -12682,16 +12727,32 @@ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "dependencies": { + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } }, "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", + "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", "dev": true, "requires": { "camelcase": "^5.0.0", diff --git a/package.json b/package.json index 1fd6d91b..fba7070b 100644 --- a/package.json +++ b/package.json @@ -46,46 +46,46 @@ "icss-utils": "^4.1.1", "loader-utils": "^1.2.3", "normalize-path": "^3.0.0", - "postcss": "^7.0.17", + "postcss": "^7.0.23", "postcss-modules-extract-imports": "^2.0.0", "postcss-modules-local-by-default": "^3.0.2", "postcss-modules-scope": "^2.1.0", "postcss-modules-values": "^3.0.0", - "postcss-value-parser": "^4.0.0", - "schema-utils": "^2.0.0" + "postcss-value-parser": "^4.0.2", + "schema-utils": "^2.5.0" }, "devDependencies": { - "@babel/cli": "^7.5.0", - "@babel/core": "^7.5.4", - "@babel/preset-env": "^7.5.4", - "@commitlint/cli": "^8.1.0", - "@commitlint/config-conventional": "^8.1.0", + "@babel/cli": "^7.7.0", + "@babel/core": "^7.7.2", + "@babel/preset-env": "^7.7.1", + "@commitlint/cli": "^8.2.0", + "@commitlint/config-conventional": "^8.2.0", "@webpack-contrib/defaults": "^5.0.2", "@webpack-contrib/eslint-config-webpack": "^3.0.0", - "babel-jest": "^24.8.0", + "babel-jest": "^24.9.0", "commitlint-azure-pipelines-cli": "^1.0.2", - "cross-env": "^5.2.0", - "del": "^5.0.0", - "del-cli": "^2.0.0", - "es-check": "^5.0.0", - "eslint": "^6.1.0", - "eslint-config-prettier": "^6.0.0", - "eslint-plugin-import": "^2.18.0", + "cross-env": "^6.0.3", + "del": "^5.1.0", + "del-cli": "^3.0.0", + "es-check": "^5.1.0", + "eslint": "^6.6.0", + "eslint-config-prettier": "^6.7.0", + "eslint-plugin-import": "^2.18.2", "file-loader": "^4.0.0", - "husky": "^3.0.0", - "jest": "^24.8.0", - "jest-junit": "^7.0.0", - "lint-staged": "^9.2.0", - "memory-fs": "^0.4.1", + "husky": "^3.1.0", + "jest": "^24.9.0", + "jest-junit": "^9.0.0", + "lint-staged": "^9.4.3", + "memory-fs": "^0.5.0", "npm-run-all": "^4.1.5", "postcss-loader": "^3.0.0", "postcss-preset-env": "^6.7.0", - "prettier": "^1.18.2", - "sass": "^1.22.5", + "prettier": "^1.19.1", + "sass": "^1.23.7", "sass-loader": "^7.1.0", - "standard-version": "^7.0.0", - "strip-ansi": "^5.2.0", - "webpack": "^4.35.0" + "standard-version": "^7.0.1", + "strip-ansi": "^6.0.0", + "webpack": "^4.41.2" }, "keywords": [ "webpack", diff --git a/src/index.js b/src/index.js index 234739ee..47ea7e1d 100644 --- a/src/index.js +++ b/src/index.js @@ -6,12 +6,7 @@ import validateOptions from 'schema-utils'; import postcss from 'postcss'; import postcssPkg from 'postcss/package.json'; -import { - getOptions, - isUrlRequest, - getRemainingRequest, - getCurrentRequest, -} from 'loader-utils'; +import { getOptions, isUrlRequest } from 'loader-utils'; import schema from './options.json'; import { importParser, icssParser, urlParser } from './plugins'; @@ -94,12 +89,8 @@ export default function loader(content, map, meta) { postcss(plugins) .process(content, { - from: getRemainingRequest(this) - .split('!') - .pop(), - to: getCurrentRequest(this) - .split('!') - .pop(), + from: this.remainingRequest.split('!').pop(), + to: this.currentRequest.split('!').pop(), map: options.sourceMap ? { prev: map, diff --git a/test/__snapshots__/modules-option.test.js.snap b/test/__snapshots__/modules-option.test.js.snap index 2070086f..472323cc 100644 --- a/test/__snapshots__/modules-option.test.js.snap +++ b/test/__snapshots__/modules-option.test.js.snap @@ -6287,12 +6287,12 @@ Array [ exports[`modules issue #636: module 1`] = ` "exports = module.exports = require(\\"../../../../src/runtime/api.js\\")(false); // Imports -exports.i(require(\\"-!../../../../src/index.js??ref--4-0!../../../../node_modules/sass-loader/lib/loader.js??ref--4-1!./foo.scss\\"), \\"\\"); +exports.i(require(\\"-!../../../../src/index.js??ref--4-0!../../../../node_modules/sass-loader/dist/cjs.js??ref--4-1!./foo.scss\\"), \\"\\"); // Module exports.push([module.id, \\".prefix-bar {\\\\n}\\", \\"\\"]); // Exports exports.locals = { - \\"bar\\": \\"prefix-bar \\" + require(\\"-!../../../../src/index.js??ref--4-0!../../../../node_modules/sass-loader/lib/loader.js??ref--4-1!./foo.scss\\").locals[\\"foo\\"] + \\"\\" + \\"bar\\": \\"prefix-bar \\" + require(\\"-!../../../../src/index.js??ref--4-0!../../../../node_modules/sass-loader/dist/cjs.js??ref--4-1!./foo.scss\\").locals[\\"foo\\"] + \\"\\" };" `; diff --git a/test/__snapshots__/validate-options.test.js.snap b/test/__snapshots__/validate-options.test.js.snap index 4390ddad..c4d62681 100644 --- a/test/__snapshots__/validate-options.test.js.snap +++ b/test/__snapshots__/validate-options.test.js.snap @@ -104,10 +104,11 @@ exports[`validate options 13`] = ` boolean | \\"local\\" | \\"global\\" | object { mode?, localIdentName?, localIdentRegExp?, context?, hashPrefix?, getLocalIdent? } -> Enables/Disables CSS Modules and their configuration (https://github.com/webpack-contrib/css-loader#modules). Details: - * options.modules.getLocalIdent should be a boolean. - * options.modules.getLocalIdent should be an instance of function. * options.modules.getLocalIdent should be one of these: - boolean | function" + boolean | function + Details: + * options.modules.getLocalIdent should be a boolean. + * options.modules.getLocalIdent should be an instance of function." `; exports[`validate options 14`] = ` @@ -116,10 +117,11 @@ exports[`validate options 14`] = ` boolean | \\"local\\" | \\"global\\" | object { mode?, localIdentName?, localIdentRegExp?, context?, hashPrefix?, getLocalIdent? } -> Enables/Disables CSS Modules and their configuration (https://github.com/webpack-contrib/css-loader#modules). Details: - * options.modules.localIdentRegExp should be a string. - * options.modules.localIdentRegExp should be an instance of RegExp. * options.modules.localIdentRegExp should be one of these: - string | RegExp" + string | RegExp + Details: + * options.modules.localIdentRegExp should be a string. + * options.modules.localIdentRegExp should be an instance of RegExp." `; exports[`validate options 15`] = ` From 94378b7d99bbf28d776e8e9bda7feb5bf0c43825 Mon Sep 17 00:00:00 2001 From: Evilebot Tnawi Date: Thu, 21 Nov 2019 20:22:59 +0300 Subject: [PATCH 2/6] test: module concatenation plugin (#996) --- package-lock.json | 97 +++-- package.json | 5 +- test/__snapshots__/loader.test.js.snap | 554 +++++++++++++++++++++++++ test/helpers.js | 25 +- test/loader.test.js | 61 +++ 5 files changed, 686 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index c2512a59..5fb34a66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5154,13 +5154,13 @@ } }, "file-loader": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.2.0.tgz", - "integrity": "sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz", + "integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==", "dev": true, "requires": { "loader-utils": "^1.2.3", - "schema-utils": "^2.0.0" + "schema-utils": "^2.5.0" } }, "fill-range": { @@ -8713,6 +8713,12 @@ "brorand": "^1.0.1" } }, + "mime": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", + "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "dev": true + }, "mime-db": { "version": "1.42.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz", @@ -10823,15 +10829,15 @@ } }, "sass-loader": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz", - "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz", + "integrity": "sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==", "dev": true, "requires": { "clone-deep": "^4.0.1", - "loader-utils": "^1.0.1", - "neo-async": "^2.5.0", - "pify": "^4.0.1", + "loader-utils": "^1.2.3", + "neo-async": "^2.6.1", + "schema-utils": "^2.1.0", "semver": "^6.3.0" }, "dependencies": { @@ -11392,17 +11398,15 @@ "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" - }, - "dependencies": { - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" } }, "yargs": { @@ -11755,17 +11759,15 @@ "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" - }, - "dependencies": { - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" } } } @@ -12249,6 +12251,17 @@ } } }, + "url-loader": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz", + "integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==", + "dev": true, + "requires": { + "loader-utils": "^1.2.3", + "mime": "^2.4.4", + "schema-utils": "^2.5.0" + } + }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -12736,17 +12749,15 @@ "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" - }, - "dependencies": { - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" } }, "yargs-parser": { diff --git a/package.json b/package.json index fba7070b..91bacb0e 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "eslint": "^6.6.0", "eslint-config-prettier": "^6.7.0", "eslint-plugin-import": "^2.18.2", - "file-loader": "^4.0.0", + "file-loader": "^4.3.0", "husky": "^3.1.0", "jest": "^24.9.0", "jest-junit": "^9.0.0", @@ -82,9 +82,10 @@ "postcss-preset-env": "^6.7.0", "prettier": "^1.19.1", "sass": "^1.23.7", - "sass-loader": "^7.1.0", + "sass-loader": "^8.0.0", "standard-version": "^7.0.1", "strip-ansi": "^6.0.0", + "url-loader": "^2.3.0", "webpack": "^4.41.2" }, "keywords": [ diff --git a/test/__snapshots__/loader.test.js.snap b/test/__snapshots__/loader.test.js.snap index 9c865cf1..68f488ce 100644 --- a/test/__snapshots__/loader.test.js.snap +++ b/test/__snapshots__/loader.test.js.snap @@ -1266,6 +1266,536 @@ You may need an appropriate loader to handle this file type, currently no loader exports[`loader should throws error when no loader for assets: warnings 1`] = `Array []`; +exports[`loader should work with ModuleConcatenationPlugin (file-loader): assets 1`] = ` +"/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); +/******/ } +/******/ }; +/******/ +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { +/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); +/******/ } +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ +/******/ // create a fake namespace object +/******/ // mode & 1: value is a module id, require it +/******/ // mode & 2: merge all properties of value into the ns +/******/ // mode & 4: return value when already ns object +/******/ // mode & 8|1: behave like require +/******/ __webpack_require__.t = function(value, mode) { +/******/ if(mode & 1) value = __webpack_require__(value); +/******/ if(mode & 8) return value; +/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; +/******/ var ns = Object.create(null); +/******/ __webpack_require__.r(ns); +/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); +/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); +/******/ return ns; +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = \\"\\"; +/******/ +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 1); +/******/ }) +/************************************************************************/ +/******/ ([ +/* 0 */ +/***/ (function(module, exports) { + +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +// css base code, injected by the css-loader +// eslint-disable-next-line func-names +module.exports = function(useSourceMap) { + const list = []; + + // return the list of modules as css string + list.toString = function toString() { + return this.map((item) => { + const content = cssWithMappingToString(item, useSourceMap); + + if (item[2]) { + return \`@media \${item[2]}{\${content}}\`; + } + + return content; + }).join(''); + }; + + // import a list of modules into the list + // eslint-disable-next-line func-names + list.i = function(modules, mediaQuery) { + if (typeof modules === 'string') { + // eslint-disable-next-line no-param-reassign + modules = [[null, modules, '']]; + } + + const alreadyImportedModules = {}; + + for (let i = 0; i < this.length; i++) { + // eslint-disable-next-line prefer-destructuring + const id = this[i][0]; + + if (id != null) { + alreadyImportedModules[id] = true; + } + } + + for (let i = 0; i < modules.length; i++) { + const item = modules[i]; + + // skip already imported module + // this implementation is not 100% perfect for weird media query combinations + // when a module is imported multiple times with different media queries. + // I hope this will never occur (Hey this way we have smaller bundles) + if (item[0] == null || !alreadyImportedModules[item[0]]) { + if (mediaQuery && !item[2]) { + item[2] = mediaQuery; + } else if (mediaQuery) { + item[2] = \`(\${item[2]}) and (\${mediaQuery})\`; + } + + list.push(item); + } + } + }; + + return list; +}; + +function cssWithMappingToString(item, useSourceMap) { + const content = item[1] || ''; + // eslint-disable-next-line prefer-destructuring + const cssMapping = item[3]; + + if (!cssMapping) { + return content; + } + + if (useSourceMap && typeof btoa === 'function') { + const sourceMapping = toComment(cssMapping); + const sourceURLs = cssMapping.sources.map( + (source) => \`/*# sourceURL=\${cssMapping.sourceRoot}\${source} */\` + ); + + return [content] + .concat(sourceURLs) + .concat([sourceMapping]) + .join('\\\\n'); + } + + return [content].join('\\\\n'); +} + +// Adapted from convert-source-map (MIT) +function toComment(sourceMap) { + // eslint-disable-next-line no-undef + const base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap)))); + const data = \`sourceMappingURL=data:application/json;charset=utf-8;base64,\${base64}\`; + + return \`/*# \${data} */\`; +} + + +/***/ }), +/* 1 */ +/***/ (function(module, exports, __webpack_require__) { + +/* eslint-disable */ +const styles = __webpack_require__(2); + +console.log(styles); + + +/***/ }), +/* 2 */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(0)(false); +// Imports +exports.i(__webpack_require__(3), \\"\\"); +var getUrl = __webpack_require__(4); +var ___CSS_LOADER_URL___0___ = getUrl(__webpack_require__(5)); +// Module +exports.push([module.i, \\"@charset \\\\\\"UTF-8\\\\\\";\\\\n\\\\n/* Comment */\\\\n\\\\n.class {\\\\n color: red;\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class-duplicate-url {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n:root {\\\\n --foo: 1px;\\\\n --bar: 2px;\\\\n}\\\\n\\\\n.class { a: b c d; }\\\\n\\\\n.two {}\\\\n\\\\n.u-m\\\\\\\\+ { a: b c d; }\\\\n\\\\n.class { content: \\\\\\"\\\\\\\\F10C\\\\\\" }\\\\n\\\\n@media only screen and (max-width: 600px) {\\\\n body {\\\\n background-color: lightblue;\\\\n }\\\\n}\\\\n\\\\n.class {\\\\n content: \\\\\\"\\\\\\\\2193\\\\\\";\\\\n content: \\\\\\"\\\\\\\\2193\\\\\\\\2193\\\\\\";\\\\n content: \\\\\\"\\\\\\\\2193 \\\\\\\\2193\\\\\\";\\\\n content: \\\\\\"\\\\\\\\2193\\\\\\\\2193\\\\\\\\2193\\\\\\";\\\\n content: \\\\\\"\\\\\\\\2193 \\\\\\\\2193 \\\\\\\\2193\\\\\\";\\\\n}\\\\n\\\\n.-top {}\\\\n.\\\\\\\\-top {}\\\\n\\\\n#\\\\\\\\#test {}\\\\n\\\\n.grid {\\\\n display: flex;\\\\n flex-wrap: wrap;\\\\n}\\\\n.grid.\\\\\\\\-top {\\\\n align-items: flex-start;\\\\n}\\\\n.grid.-top {\\\\n align-items: flex-start;\\\\n}\\\\n.grid.\\\\\\\\-middle {\\\\n align-items: center;\\\\n}\\\\n.grid.\\\\\\\\-bottom {\\\\n align-items: flex-end;\\\\n}\\\\n\\\\n.u-m\\\\\\\\00002b {}\\\\n\\\\n.u-m00002b {}\\\\n\\\\n#u-m\\\\\\\\+ {}\\\\n\\\\nbody {\\\\n font-family: '微软雅黑'; /* some chinese font name */\\\\n}\\\\n\\\\n.myStyle {\\\\n content: '\\\\\\\\e901';\\\\n}\\\\n\\\\n.myStyle {\\\\n content: '\\\\\\\\E901';\\\\n}\\\\n\\\\n.♫ {}\\\\n\\\\n.\\\\\\\\3A \\\\\\\\\`\\\\\\\\( {} /* matches elements with class=\\\\\\":\`(\\\\\\" */\\\\n.\\\\\\\\31 a2b3c {} /* matches elements with class=\\\\\\"1a2b3c\\\\\\" */\\\\n#\\\\\\\\#fake-id {} /* matches the element with id=\\\\\\"#fake-id\\\\\\" */\\\\n#-a-b-c- {} /* matches the element with id=\\\\\\"-a-b-c-\\\\\\" */\\\\n#© {} /* matches the element with id=\\\\\\"©\\\\\\" */\\\\n\\\\n:root {\\\\n --title-align: center;\\\\n --sr-only: {\\\\n position: absolute;\\\\n width: 1px;\\\\n height: 1px;\\\\n padding: 0;\\\\n overflow: hidden;\\\\n clip: rect(0,0,0,0);\\\\n white-space: nowrap;\\\\n clip-path: inset(50%);\\\\n border: 0;\\\\n };\\\\n}\\\\n\\\\n.test {\\\\n content: \\\\\\"\\\\\\\\2014\\\\\\\\A0\\\\\\";\\\\n content: \\\\\\"\\\\\\\\2014 \\\\\\\\A0\\\\\\";\\\\n content: \\\\\\"\\\\\\\\A0 \\\\\\\\2014\\\\\\";\\\\n content: \\\\\\"\\\\\\\\A0\\\\\\\\2014\\\\\\";\\\\n margin-top: 1px\\\\\\\\9;\\\\n background-color: #000\\\\\\\\9;\\\\n}\\\\n\\\\n.light.on .bulb:before{\\\\n content: '💡';\\\\n}\\\\n\\\\n.base64 {\\\\n background: url(data:img/jpg;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAhxJREFUSA3tk71rU1EYxnMTEoJUkowWwdJ2akEHBfGjCiIF6ZylVUKSm2TqZLGI+A/oIu2UXm8C4lAyF4SWji0tdFLo1Eo7VN0SaBEhH7e/Nz0nPTfGOjiaCyfPc5734zlfCQT6X/8E/vUErL81KBaL9y3LSnued5PcITjUOwR3gsFg2bbtjYt6/NGgXC4P1et1l2aPLmpAbD0SidjpdPqgV15PA9d17zQajU8UxHQRK/4G35Q5pveAK8LlI1ZjPMnlcltnyvnvbwaO41xvtVqy7YHztMACq5xnlb9EY3dRdvcGo1kj5wR+t1AofDG0gM+A875E8DNjRCexsrV8Pj9ZqVQitVrtqejxePxjMpmss5hVTB4buXvMb2DyU2tBTRS+BjvNlVYUpPl7iuVO3Gq1uoQx1FtSOW1gPgp5ZWrdBtNmUDgv5asgxQ8F1af5vhY0YjyjuWC3wTszKJz7GBOkcFlQfW2ONq4FjWi+Hj6DRCKxQOK2TlY4x92EuYd5dvMAbYIzfikau3pu5tJ8KxaLLfo0cyKci7tK4TZjUMcoXAmHwzle0Q/RaC5P1GFMyVx9R9Fo9HYqlTrSgqDvFelAqVQa5hmuMR/WGtjAaBdjwBoDQ0ZsnwVMZjKZ9n0Zem8DSeDPdrnZbL6F2l3NOvUYNZk4oVDoRTabPe4EDNJzB0ZcjAYxeoZ2i3FNxQ7BHYw/cB/fldaH//UETgHHO8S44KbfXgAAAABJRU5ErkJggg==);\\\\n}\\\\n\\\\na[href=''] {\\\\n color: red;\\\\n}\\\\n\\\\na[href='' i] {\\\\n color: red;\\\\n}\\\\n\\\\na[href=\\\\\\"\\\\\\"] {\\\\n color: blue;\\\\n}\\\\n\\\\na[href=\\\\\\"\\\\\\" i] {\\\\n color: blue;\\\\n}\\\\n\\", \\"\\"]); + + +/***/ }), +/* 3 */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(0)(false); +// Module +exports.push([module.i, \\".foo {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]); + + +/***/ }), +/* 4 */ +/***/ (function(module, exports) { + +module.exports = (url, needQuotes) => { + // eslint-disable-next-line no-underscore-dangle, no-param-reassign + url = url.__esModule ? url.default : url; + + if (typeof url !== 'string') { + return url; + } + + // If url is already wrapped in quotes, remove them + if (/^['\\"].*['\\"]$/.test(url)) { + // eslint-disable-next-line no-param-reassign + url = url.slice(1, -1); + } + + // Should url be wrapped? + // See https://drafts.csswg.org/css-values-3/#urls + if (/[\\"'() \\\\t\\\\n]/.test(url) || needQuotes) { + return \`\\"\${url.replace(/\\"/g, '\\\\\\\\\\"').replace(/\\\\n/g, '\\\\\\\\n')}\\"\`; + } + + return url; +}; + + +/***/ }), +/* 5 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +\\"use strict\\"; +__webpack_require__.r(__webpack_exports__); +/* harmony default export */ __webpack_exports__[\\"default\\"] = (__webpack_require__.p + \\"img.png\\"); + +/***/ }) +/******/ ]); +//# sourceMappingURL=main.bundle.js.map" +`; + +exports[`loader should work with ModuleConcatenationPlugin (file-loader): errors 1`] = `Array []`; + +exports[`loader should work with ModuleConcatenationPlugin (file-loader): warnings 1`] = `Array []`; + +exports[`loader should work with ModuleConcatenationPlugin (url-loader): assets 1`] = ` +"/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); +/******/ } +/******/ }; +/******/ +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { +/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); +/******/ } +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ +/******/ // create a fake namespace object +/******/ // mode & 1: value is a module id, require it +/******/ // mode & 2: merge all properties of value into the ns +/******/ // mode & 4: return value when already ns object +/******/ // mode & 8|1: behave like require +/******/ __webpack_require__.t = function(value, mode) { +/******/ if(mode & 1) value = __webpack_require__(value); +/******/ if(mode & 8) return value; +/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; +/******/ var ns = Object.create(null); +/******/ __webpack_require__.r(ns); +/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); +/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); +/******/ return ns; +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = \\"\\"; +/******/ +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 1); +/******/ }) +/************************************************************************/ +/******/ ([ +/* 0 */ +/***/ (function(module, exports) { + +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +// css base code, injected by the css-loader +// eslint-disable-next-line func-names +module.exports = function(useSourceMap) { + const list = []; + + // return the list of modules as css string + list.toString = function toString() { + return this.map((item) => { + const content = cssWithMappingToString(item, useSourceMap); + + if (item[2]) { + return \`@media \${item[2]}{\${content}}\`; + } + + return content; + }).join(''); + }; + + // import a list of modules into the list + // eslint-disable-next-line func-names + list.i = function(modules, mediaQuery) { + if (typeof modules === 'string') { + // eslint-disable-next-line no-param-reassign + modules = [[null, modules, '']]; + } + + const alreadyImportedModules = {}; + + for (let i = 0; i < this.length; i++) { + // eslint-disable-next-line prefer-destructuring + const id = this[i][0]; + + if (id != null) { + alreadyImportedModules[id] = true; + } + } + + for (let i = 0; i < modules.length; i++) { + const item = modules[i]; + + // skip already imported module + // this implementation is not 100% perfect for weird media query combinations + // when a module is imported multiple times with different media queries. + // I hope this will never occur (Hey this way we have smaller bundles) + if (item[0] == null || !alreadyImportedModules[item[0]]) { + if (mediaQuery && !item[2]) { + item[2] = mediaQuery; + } else if (mediaQuery) { + item[2] = \`(\${item[2]}) and (\${mediaQuery})\`; + } + + list.push(item); + } + } + }; + + return list; +}; + +function cssWithMappingToString(item, useSourceMap) { + const content = item[1] || ''; + // eslint-disable-next-line prefer-destructuring + const cssMapping = item[3]; + + if (!cssMapping) { + return content; + } + + if (useSourceMap && typeof btoa === 'function') { + const sourceMapping = toComment(cssMapping); + const sourceURLs = cssMapping.sources.map( + (source) => \`/*# sourceURL=\${cssMapping.sourceRoot}\${source} */\` + ); + + return [content] + .concat(sourceURLs) + .concat([sourceMapping]) + .join('\\\\n'); + } + + return [content].join('\\\\n'); +} + +// Adapted from convert-source-map (MIT) +function toComment(sourceMap) { + // eslint-disable-next-line no-undef + const base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap)))); + const data = \`sourceMappingURL=data:application/json;charset=utf-8;base64,\${base64}\`; + + return \`/*# \${data} */\`; +} + + +/***/ }), +/* 1 */ +/***/ (function(module, exports, __webpack_require__) { + +/* eslint-disable */ +const styles = __webpack_require__(2); + +console.log(styles); + + +/***/ }), +/* 2 */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(0)(false); +// Imports +exports.i(__webpack_require__(3), \\"\\"); +var getUrl = __webpack_require__(4); +var ___CSS_LOADER_URL___0___ = getUrl(__webpack_require__(5)); +// Module +exports.push([module.i, \\"@charset \\\\\\"UTF-8\\\\\\";\\\\n\\\\n/* Comment */\\\\n\\\\n.class {\\\\n color: red;\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class-duplicate-url {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n:root {\\\\n --foo: 1px;\\\\n --bar: 2px;\\\\n}\\\\n\\\\n.class { a: b c d; }\\\\n\\\\n.two {}\\\\n\\\\n.u-m\\\\\\\\+ { a: b c d; }\\\\n\\\\n.class { content: \\\\\\"\\\\\\\\F10C\\\\\\" }\\\\n\\\\n@media only screen and (max-width: 600px) {\\\\n body {\\\\n background-color: lightblue;\\\\n }\\\\n}\\\\n\\\\n.class {\\\\n content: \\\\\\"\\\\\\\\2193\\\\\\";\\\\n content: \\\\\\"\\\\\\\\2193\\\\\\\\2193\\\\\\";\\\\n content: \\\\\\"\\\\\\\\2193 \\\\\\\\2193\\\\\\";\\\\n content: \\\\\\"\\\\\\\\2193\\\\\\\\2193\\\\\\\\2193\\\\\\";\\\\n content: \\\\\\"\\\\\\\\2193 \\\\\\\\2193 \\\\\\\\2193\\\\\\";\\\\n}\\\\n\\\\n.-top {}\\\\n.\\\\\\\\-top {}\\\\n\\\\n#\\\\\\\\#test {}\\\\n\\\\n.grid {\\\\n display: flex;\\\\n flex-wrap: wrap;\\\\n}\\\\n.grid.\\\\\\\\-top {\\\\n align-items: flex-start;\\\\n}\\\\n.grid.-top {\\\\n align-items: flex-start;\\\\n}\\\\n.grid.\\\\\\\\-middle {\\\\n align-items: center;\\\\n}\\\\n.grid.\\\\\\\\-bottom {\\\\n align-items: flex-end;\\\\n}\\\\n\\\\n.u-m\\\\\\\\00002b {}\\\\n\\\\n.u-m00002b {}\\\\n\\\\n#u-m\\\\\\\\+ {}\\\\n\\\\nbody {\\\\n font-family: '微软雅黑'; /* some chinese font name */\\\\n}\\\\n\\\\n.myStyle {\\\\n content: '\\\\\\\\e901';\\\\n}\\\\n\\\\n.myStyle {\\\\n content: '\\\\\\\\E901';\\\\n}\\\\n\\\\n.♫ {}\\\\n\\\\n.\\\\\\\\3A \\\\\\\\\`\\\\\\\\( {} /* matches elements with class=\\\\\\":\`(\\\\\\" */\\\\n.\\\\\\\\31 a2b3c {} /* matches elements with class=\\\\\\"1a2b3c\\\\\\" */\\\\n#\\\\\\\\#fake-id {} /* matches the element with id=\\\\\\"#fake-id\\\\\\" */\\\\n#-a-b-c- {} /* matches the element with id=\\\\\\"-a-b-c-\\\\\\" */\\\\n#© {} /* matches the element with id=\\\\\\"©\\\\\\" */\\\\n\\\\n:root {\\\\n --title-align: center;\\\\n --sr-only: {\\\\n position: absolute;\\\\n width: 1px;\\\\n height: 1px;\\\\n padding: 0;\\\\n overflow: hidden;\\\\n clip: rect(0,0,0,0);\\\\n white-space: nowrap;\\\\n clip-path: inset(50%);\\\\n border: 0;\\\\n };\\\\n}\\\\n\\\\n.test {\\\\n content: \\\\\\"\\\\\\\\2014\\\\\\\\A0\\\\\\";\\\\n content: \\\\\\"\\\\\\\\2014 \\\\\\\\A0\\\\\\";\\\\n content: \\\\\\"\\\\\\\\A0 \\\\\\\\2014\\\\\\";\\\\n content: \\\\\\"\\\\\\\\A0\\\\\\\\2014\\\\\\";\\\\n margin-top: 1px\\\\\\\\9;\\\\n background-color: #000\\\\\\\\9;\\\\n}\\\\n\\\\n.light.on .bulb:before{\\\\n content: '💡';\\\\n}\\\\n\\\\n.base64 {\\\\n background: url(data:img/jpg;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAhxJREFUSA3tk71rU1EYxnMTEoJUkowWwdJ2akEHBfGjCiIF6ZylVUKSm2TqZLGI+A/oIu2UXm8C4lAyF4SWji0tdFLo1Eo7VN0SaBEhH7e/Nz0nPTfGOjiaCyfPc5734zlfCQT6X/8E/vUErL81KBaL9y3LSnued5PcITjUOwR3gsFg2bbtjYt6/NGgXC4P1et1l2aPLmpAbD0SidjpdPqgV15PA9d17zQajU8UxHQRK/4G35Q5pveAK8LlI1ZjPMnlcltnyvnvbwaO41xvtVqy7YHztMACq5xnlb9EY3dRdvcGo1kj5wR+t1AofDG0gM+A875E8DNjRCexsrV8Pj9ZqVQitVrtqejxePxjMpmss5hVTB4buXvMb2DyU2tBTRS+BjvNlVYUpPl7iuVO3Gq1uoQx1FtSOW1gPgp5ZWrdBtNmUDgv5asgxQ8F1af5vhY0YjyjuWC3wTszKJz7GBOkcFlQfW2ONq4FjWi+Hj6DRCKxQOK2TlY4x92EuYd5dvMAbYIzfikau3pu5tJ8KxaLLfo0cyKci7tK4TZjUMcoXAmHwzle0Q/RaC5P1GFMyVx9R9Fo9HYqlTrSgqDvFelAqVQa5hmuMR/WGtjAaBdjwBoDQ0ZsnwVMZjKZ9n0Zem8DSeDPdrnZbL6F2l3NOvUYNZk4oVDoRTabPe4EDNJzB0ZcjAYxeoZ2i3FNxQ7BHYw/cB/fldaH//UETgHHO8S44KbfXgAAAABJRU5ErkJggg==);\\\\n}\\\\n\\\\na[href=''] {\\\\n color: red;\\\\n}\\\\n\\\\na[href='' i] {\\\\n color: red;\\\\n}\\\\n\\\\na[href=\\\\\\"\\\\\\"] {\\\\n color: blue;\\\\n}\\\\n\\\\na[href=\\\\\\"\\\\\\" i] {\\\\n color: blue;\\\\n}\\\\n\\", \\"\\"]); + + +/***/ }), +/* 3 */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(0)(false); +// Module +exports.push([module.i, \\".foo {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]); + + +/***/ }), +/* 4 */ +/***/ (function(module, exports) { + +module.exports = (url, needQuotes) => { + // eslint-disable-next-line no-underscore-dangle, no-param-reassign + url = url.__esModule ? url.default : url; + + if (typeof url !== 'string') { + return url; + } + + // If url is already wrapped in quotes, remove them + if (/^['\\"].*['\\"]$/.test(url)) { + // eslint-disable-next-line no-param-reassign + url = url.slice(1, -1); + } + + // Should url be wrapped? + // See https://drafts.csswg.org/css-values-3/#urls + if (/[\\"'() \\\\t\\\\n]/.test(url) || needQuotes) { + return \`\\"\${url.replace(/\\"/g, '\\\\\\\\\\"').replace(/\\\\n/g, '\\\\\\\\n')}\\"\`; + } + + return url; +}; + + +/***/ }), +/* 5 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +\\"use strict\\"; +__webpack_require__.r(__webpack_exports__); +/* harmony default export */ __webpack_exports__[\\"default\\"] = (\\"data:image/png;base64,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\\"); + +/***/ }) +/******/ ]); +//# sourceMappingURL=main.bundle.js.map" +`; + +exports[`loader should work with ModuleConcatenationPlugin (url-loader): errors 1`] = `Array []`; + +exports[`loader should work with ModuleConcatenationPlugin (url-loader): warnings 1`] = `Array []`; + exports[`loader using together with "postcss-loader" and reuse \`ast\`: errors 1`] = `Array []`; exports[`loader using together with "postcss-loader" and reuse \`ast\`: module (evaluated) 1`] = ` @@ -1350,6 +1880,8 @@ exports[`loader using together with "postcss-loader" and reuse \`ast\`: warnings exports[`loader using together with "sass-loader": errors 1`] = `Array []`; +exports[`loader using together with "sass-loader": errors 2`] = `Array []`; + exports[`loader using together with "sass-loader": module (evaluated) 1`] = ` Array [ Array [ @@ -1363,6 +1895,19 @@ Array [ ] `; +exports[`loader using together with "sass-loader": module (evaluated) 2`] = ` +Array [ + Array [ + 1, + "body { + font: 100% Helvetica, sans-serif; + color: #333; +}", + "", + ], +] +`; + exports[`loader using together with "sass-loader": module 1`] = ` "exports = module.exports = require(\\"../../../src/runtime/api.js\\")(false); // Module @@ -1370,4 +1915,13 @@ exports.push([module.id, \\"body {\\\\n font: 100% Helvetica, sans-serif;\\\\n " `; +exports[`loader using together with "sass-loader": module 2`] = ` +"exports = module.exports = require(\\"../../../src/runtime/api.js\\")(false); +// Module +exports.push([module.id, \\"body {\\\\n font: 100% Helvetica, sans-serif;\\\\n color: #333;\\\\n}\\", \\"\\"]); +" +`; + exports[`loader using together with "sass-loader": warnings 1`] = `Array []`; + +exports[`loader using together with "sass-loader": warnings 2`] = `Array []`; diff --git a/test/helpers.js b/test/helpers.js index 8b355946..b9f9a9f1 100644 --- a/test/helpers.js +++ b/test/helpers.js @@ -142,16 +142,18 @@ const moduleConfig = (config) => { : [] ), }, - config.additionalLoader ? config.additionalLoader : {}, - { - test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/, - use: { - loader: 'file-loader', - options: { - name: '[name].[ext]', + config.disableFileLoader + ? {} + : { + test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/, + use: { + loader: 'file-loader', + options: config.fileLoaderOptions || { + name: '[name].[ext]', + }, + }, }, - }, - }, + config.additionalLoader ? config.additionalLoader : {}, ], }; }; @@ -170,7 +172,7 @@ function compile(fixture, config = {}, options = {}) { // webpack Config // eslint-disable-next-line no-param-reassign config = { - mode: 'development', + mode: config.mode || 'development', devtool: config.devtool || 'sourcemap', context: path.resolve(__dirname, 'fixtures'), entry: path.resolve(__dirname, 'fixtures', fixture), @@ -178,7 +180,8 @@ function compile(fixture, config = {}, options = {}) { module: moduleConfig(config), plugins: pluginsConfig(config), optimization: { - runtimeChunk: true, + minimize: false, + runtimeChunk: false, }, resolve: { alias: { diff --git a/test/loader.test.js b/test/loader.test.js index 4fea2209..88e19386 100644 --- a/test/loader.test.js +++ b/test/loader.test.js @@ -164,4 +164,65 @@ describe('loader', () => { expect(stats.compilation.warnings).toMatchSnapshot('warnings'); expect(stats.compilation.errors).toMatchSnapshot('errors'); }); + + it('using together with "sass-loader"', async () => { + const config = { + loader: { test: /\.s[ca]ss$/i }, + sassLoader: true, + sassLoaderOptions: { + // eslint-disable-next-line global-require + implementation: require('sass'), + }, + }; + const testId = './scss/source.scss'; + const stats = await webpack(testId, config); + const { modules } = stats.toJson(); + const module = modules.find((m) => m.id === testId); + + expect(module.source).toMatchSnapshot('module'); + expect(evaluated(module.source, modules)).toMatchSnapshot( + 'module (evaluated)' + ); + expect(stats.compilation.warnings).toMatchSnapshot('warnings'); + expect(stats.compilation.errors).toMatchSnapshot('errors'); + }); + + it('should work with ModuleConcatenationPlugin (file-loader)', async () => { + const stats = await webpack('basic.js', { + mode: 'production', + fileLoaderOptions: { + name: '[name].[ext]', + esModules: true, + }, + }); + + expect(stats.compilation.assets['main.bundle.js'].source()).toMatchSnapshot( + 'assets' + ); + expect(stats.compilation.warnings).toMatchSnapshot('warnings'); + expect(stats.compilation.errors).toMatchSnapshot('errors'); + }); + + it('should work with ModuleConcatenationPlugin (url-loader)', async () => { + const stats = await webpack('basic.js', { + mode: 'production', + disableFileLoader: true, + additionalLoader: { + test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/, + use: { + loader: 'url-loader', + options: { + name: '[name].[ext]', + esModules: true, + }, + }, + }, + }); + + expect(stats.compilation.assets['main.bundle.js'].source()).toMatchSnapshot( + 'assets' + ); + expect(stats.compilation.warnings).toMatchSnapshot('warnings'); + expect(stats.compilation.errors).toMatchSnapshot('errors'); + }); }); From 0961304020832fc9ca70cc708f4366e1f868e765 Mon Sep 17 00:00:00 2001 From: Evilebot Tnawi Date: Thu, 28 Nov 2019 13:29:56 +0300 Subject: [PATCH 3/6] fix: add an additional space after the escape sequence (#998) --- package-lock.json | 854 +++++++++--------- package.json | 18 +- .../__snapshots__/modules-option.test.js.snap | 119 +++ test/fixtures/modules/issue-995.css | 93 ++ .../modules/tests-cases/issue-589/source.css | 2 +- test/helpers.js | 1 + test/modules-option.test.js | 24 + 7 files changed, 694 insertions(+), 417 deletions(-) create mode 100644 test/fixtures/modules/issue-995.css diff --git a/package-lock.json b/package-lock.json index 5fb34a66..1aae4e87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,13 +5,13 @@ "requires": true, "dependencies": { "@babel/cli": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.7.0.tgz", - "integrity": "sha512-jECEqAq6Ngf3pOhLSg7od9WKyrIacyh1oNNYtRXNn+ummSHCTXBamGywOAtiae34Vk7zKuQNnLvo2BKTMCoV4A==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.7.4.tgz", + "integrity": "sha512-O7mmzaWdm+VabWQmxuM8hqNrWGGihN83KfhPUzp2lAW4kzIMwBxujXkZbD4fMwKMYY9FXTbDvXsJqU+5XHXi4A==", "dev": true, "requires": { "chokidar": "^2.1.8", - "commander": "^2.8.1", + "commander": "^4.0.1", "convert-source-map": "^1.1.0", "fs-readdir-recursive": "^1.1.0", "glob": "^7.0.0", @@ -39,18 +39,18 @@ } }, "@babel/core": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz", - "integrity": "sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.4.tgz", + "integrity": "sha512-+bYbx56j4nYBmpsWtnPUsKW3NdnYxbqyfrP2w9wILBuHzdfIKz9prieZK0DFPyIzkjYVUe4QkusGL07r5pXznQ==", "dev": true, "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.2", - "@babel/helpers": "^7.7.0", - "@babel/parser": "^7.7.2", - "@babel/template": "^7.7.0", - "@babel/traverse": "^7.7.2", - "@babel/types": "^7.7.2", + "@babel/generator": "^7.7.4", + "@babel/helpers": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "json5": "^2.1.0", @@ -93,12 +93,12 @@ } }, "@babel/generator": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz", - "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", + "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", "dev": true, "requires": { - "@babel/types": "^7.7.2", + "@babel/types": "^7.7.4", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -113,39 +113,39 @@ } }, "@babel/helper-annotate-as-pure": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz", - "integrity": "sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz", + "integrity": "sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==", "dev": true, "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.0.tgz", - "integrity": "sha512-Cd8r8zs4RKDwMG/92lpZcnn5WPQ3LAMQbCw42oqUh4s7vsSN5ANUZjMel0OOnxDLq57hoDDbai+ryygYfCTOsw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz", + "integrity": "sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-explode-assignable-expression": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-call-delegate": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.0.tgz", - "integrity": "sha512-Su0Mdq7uSSWGZayGMMQ+z6lnL00mMCnGAbO/R0ZO9odIdB/WNU/VfQKqMQU0fdIsxQYbRjDM4BixIa93SQIpvw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz", + "integrity": "sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-hoist-variables": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz", - "integrity": "sha512-pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz", + "integrity": "sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==", "dev": true, "requires": { "@babel/helper-regex": "^7.4.4", @@ -153,94 +153,94 @@ } }, "@babel/helper-define-map": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz", - "integrity": "sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz", + "integrity": "sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.7.0", - "@babel/types": "^7.7.0", + "@babel/helper-function-name": "^7.7.4", + "@babel/types": "^7.7.4", "lodash": "^4.17.13" } }, "@babel/helper-explode-assignable-expression": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.0.tgz", - "integrity": "sha512-CDs26w2shdD1urNUAji2RJXyBFCaR+iBEGnFz3l7maizMkQe3saVw9WtjG1tz8CwbjvlFnaSLVhgnu1SWaherg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz", + "integrity": "sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==", "dev": true, "requires": { - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-function-name": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", - "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-get-function-arity": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", - "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", "dev": true, "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-hoist-variables": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz", - "integrity": "sha512-LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz", + "integrity": "sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==", "dev": true, "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz", - "integrity": "sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz", + "integrity": "sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==", "dev": true, "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-module-imports": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz", - "integrity": "sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz", + "integrity": "sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==", "dev": true, "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-module-transforms": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz", - "integrity": "sha512-rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.4.tgz", + "integrity": "sha512-ehGBu4mXrhs0FxAqN8tWkzF8GSIGAiEumu4ONZ/hD9M88uHcD+Yu2ttKfOCgwzoesJOJrtQh7trI5YPbRtMmnA==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.7.0", - "@babel/helper-simple-access": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0", + "@babel/helper-module-imports": "^7.7.4", + "@babel/helper-simple-access": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4", "lodash": "^4.17.13" } }, "@babel/helper-optimise-call-expression": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz", - "integrity": "sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz", + "integrity": "sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==", "dev": true, "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-plugin-utils": { @@ -259,70 +259,70 @@ } }, "@babel/helper-remap-async-to-generator": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz", - "integrity": "sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz", + "integrity": "sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.7.0", - "@babel/helper-wrap-function": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-annotate-as-pure": "^7.7.4", + "@babel/helper-wrap-function": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-replace-supers": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz", - "integrity": "sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz", + "integrity": "sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.7.0", - "@babel/helper-optimise-call-expression": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-member-expression-to-functions": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-simple-access": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz", - "integrity": "sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz", + "integrity": "sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==", "dev": true, "requires": { - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz", - "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", "dev": true, "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-wrap-function": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz", - "integrity": "sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz", + "integrity": "sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-function-name": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helpers": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.0.tgz", - "integrity": "sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.4.tgz", + "integrity": "sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==", "dev": true, "requires": { - "@babel/template": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/highlight": { @@ -337,159 +337,159 @@ } }, "@babel/parser": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", - "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==", "dev": true }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz", - "integrity": "sha512-ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz", + "integrity": "sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.7.0", - "@babel/plugin-syntax-async-generators": "^7.2.0" + "@babel/helper-remap-async-to-generator": "^7.7.4", + "@babel/plugin-syntax-async-generators": "^7.7.4" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz", - "integrity": "sha512-7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz", + "integrity": "sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-dynamic-import": "^7.2.0" + "@babel/plugin-syntax-dynamic-import": "^7.7.4" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz", - "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz", + "integrity": "sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-json-strings": "^7.2.0" + "@babel/plugin-syntax-json-strings": "^7.7.4" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz", - "integrity": "sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz", + "integrity": "sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-object-rest-spread": "^7.2.0" + "@babel/plugin-syntax-object-rest-spread": "^7.7.4" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz", - "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz", + "integrity": "sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.2.0" + "@babel/plugin-syntax-optional-catch-binding": "^7.7.4" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz", - "integrity": "sha512-mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz", + "integrity": "sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.7.0", + "@babel/helper-create-regexp-features-plugin": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-async-generators": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz", - "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz", + "integrity": "sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-dynamic-import": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz", - "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz", + "integrity": "sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-json-strings": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz", - "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz", + "integrity": "sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-object-rest-spread": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz", - "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz", + "integrity": "sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz", - "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz", + "integrity": "sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-top-level-await": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.0.tgz", - "integrity": "sha512-hi8FUNiFIY1fnUI2n1ViB1DR0R4QeK4iHcTlW6aJkrPoTdb8Rf1EMQ6GT3f67DDkYyWgew9DFoOZ6gOoEsdzTA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz", + "integrity": "sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz", - "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz", + "integrity": "sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz", - "integrity": "sha512-vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz", + "integrity": "sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.7.0", + "@babel/helper-module-imports": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.7.0" + "@babel/helper-remap-async-to-generator": "^7.7.4" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz", - "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz", + "integrity": "sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz", - "integrity": "sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz", + "integrity": "sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -497,237 +497,237 @@ } }, "@babel/plugin-transform-classes": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz", - "integrity": "sha512-/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz", + "integrity": "sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.7.0", - "@babel/helper-define-map": "^7.7.0", - "@babel/helper-function-name": "^7.7.0", - "@babel/helper-optimise-call-expression": "^7.7.0", + "@babel/helper-annotate-as-pure": "^7.7.4", + "@babel/helper-define-map": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0", + "@babel/helper-replace-supers": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz", - "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz", + "integrity": "sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-destructuring": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz", - "integrity": "sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz", + "integrity": "sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz", - "integrity": "sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz", + "integrity": "sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.7.0", + "@babel/helper-create-regexp-features-plugin": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz", - "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz", + "integrity": "sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz", - "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz", + "integrity": "sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0", + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-for-of": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz", - "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz", + "integrity": "sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-function-name": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz", - "integrity": "sha512-P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz", + "integrity": "sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.7.0", + "@babel/helper-function-name": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz", - "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz", + "integrity": "sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz", - "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz", + "integrity": "sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz", - "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.4.tgz", + "integrity": "sha512-/542/5LNA18YDtg1F+QHvvUSlxdvjZoD/aldQwkq+E3WCkbEjNSN9zdrOXaSlfg3IfGi22ijzecklF/A7kVZFQ==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.1.0", + "@babel/helper-module-transforms": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz", - "integrity": "sha512-KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.4.tgz", + "integrity": "sha512-k8iVS7Jhc367IcNF53KCwIXtKAH7czev866ThsTgy8CwlXjnKZna2VHwChglzLleYrcHz1eQEIJlGRQxB53nqA==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.7.0", + "@babel/helper-module-transforms": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-simple-access": "^7.7.0", + "@babel/helper-simple-access": "^7.7.4", "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz", - "integrity": "sha512-ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz", + "integrity": "sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.7.0", + "@babel/helper-hoist-variables": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz", - "integrity": "sha512-u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz", + "integrity": "sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.7.0", + "@babel/helper-module-transforms": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz", - "integrity": "sha512-+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz", + "integrity": "sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.7.0" + "@babel/helper-create-regexp-features-plugin": "^7.7.4" } }, "@babel/plugin-transform-new-target": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz", - "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz", + "integrity": "sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-object-super": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz", - "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz", + "integrity": "sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.5.5" + "@babel/helper-replace-supers": "^7.7.4" } }, "@babel/plugin-transform-parameters": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz", - "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz", + "integrity": "sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==", "dev": true, "requires": { - "@babel/helper-call-delegate": "^7.4.4", - "@babel/helper-get-function-arity": "^7.0.0", + "@babel/helper-call-delegate": "^7.7.4", + "@babel/helper-get-function-arity": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-property-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz", - "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz", + "integrity": "sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-regenerator": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz", - "integrity": "sha512-AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.4.tgz", + "integrity": "sha512-e7MWl5UJvmPEwFJTwkBlPmqixCtr9yAASBqff4ggXTNicZiwbF8Eefzm6NVgfiBp7JdAGItecnctKTgH44q2Jw==", "dev": true, "requires": { "regenerator-transform": "^0.14.0" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz", - "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz", + "integrity": "sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz", - "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz", + "integrity": "sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-spread": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz", - "integrity": "sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz", + "integrity": "sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz", - "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz", + "integrity": "sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -735,86 +735,86 @@ } }, "@babel/plugin-transform-template-literals": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz", - "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz", + "integrity": "sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.0.0", + "@babel/helper-annotate-as-pure": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz", - "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz", + "integrity": "sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz", - "integrity": "sha512-RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz", + "integrity": "sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.7.0", + "@babel/helper-create-regexp-features-plugin": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/preset-env": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.1.tgz", - "integrity": "sha512-/93SWhi3PxcVTDpSqC+Dp4YxUu3qZ4m7I76k0w73wYfn7bGVuRIO4QUz95aJksbS+AD1/mT1Ie7rbkT0wSplaA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.4.tgz", + "integrity": "sha512-Dg+ciGJjwvC1NIe/DGblMbcGq1HOtKbw8RLl4nIjlfcILKEOkWT/vRqPpumswABEBVudii6dnVwrBtzD7ibm4g==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.7.0", + "@babel/helper-module-imports": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-async-generator-functions": "^7.7.0", - "@babel/plugin-proposal-dynamic-import": "^7.7.0", - "@babel/plugin-proposal-json-strings": "^7.2.0", - "@babel/plugin-proposal-object-rest-spread": "^7.6.2", - "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.7.0", - "@babel/plugin-syntax-async-generators": "^7.2.0", - "@babel/plugin-syntax-dynamic-import": "^7.2.0", - "@babel/plugin-syntax-json-strings": "^7.2.0", - "@babel/plugin-syntax-object-rest-spread": "^7.2.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.2.0", - "@babel/plugin-syntax-top-level-await": "^7.7.0", - "@babel/plugin-transform-arrow-functions": "^7.2.0", - "@babel/plugin-transform-async-to-generator": "^7.7.0", - "@babel/plugin-transform-block-scoped-functions": "^7.2.0", - "@babel/plugin-transform-block-scoping": "^7.6.3", - "@babel/plugin-transform-classes": "^7.7.0", - "@babel/plugin-transform-computed-properties": "^7.2.0", - "@babel/plugin-transform-destructuring": "^7.6.0", - "@babel/plugin-transform-dotall-regex": "^7.7.0", - "@babel/plugin-transform-duplicate-keys": "^7.5.0", - "@babel/plugin-transform-exponentiation-operator": "^7.2.0", - "@babel/plugin-transform-for-of": "^7.4.4", - "@babel/plugin-transform-function-name": "^7.7.0", - "@babel/plugin-transform-literals": "^7.2.0", - "@babel/plugin-transform-member-expression-literals": "^7.2.0", - "@babel/plugin-transform-modules-amd": "^7.5.0", - "@babel/plugin-transform-modules-commonjs": "^7.7.0", - "@babel/plugin-transform-modules-systemjs": "^7.7.0", - "@babel/plugin-transform-modules-umd": "^7.7.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.7.0", - "@babel/plugin-transform-new-target": "^7.4.4", - "@babel/plugin-transform-object-super": "^7.5.5", - "@babel/plugin-transform-parameters": "^7.4.4", - "@babel/plugin-transform-property-literals": "^7.2.0", - "@babel/plugin-transform-regenerator": "^7.7.0", - "@babel/plugin-transform-reserved-words": "^7.2.0", - "@babel/plugin-transform-shorthand-properties": "^7.2.0", - "@babel/plugin-transform-spread": "^7.6.2", - "@babel/plugin-transform-sticky-regex": "^7.2.0", - "@babel/plugin-transform-template-literals": "^7.4.4", - "@babel/plugin-transform-typeof-symbol": "^7.2.0", - "@babel/plugin-transform-unicode-regex": "^7.7.0", - "@babel/types": "^7.7.1", + "@babel/plugin-proposal-async-generator-functions": "^7.7.4", + "@babel/plugin-proposal-dynamic-import": "^7.7.4", + "@babel/plugin-proposal-json-strings": "^7.7.4", + "@babel/plugin-proposal-object-rest-spread": "^7.7.4", + "@babel/plugin-proposal-optional-catch-binding": "^7.7.4", + "@babel/plugin-proposal-unicode-property-regex": "^7.7.4", + "@babel/plugin-syntax-async-generators": "^7.7.4", + "@babel/plugin-syntax-dynamic-import": "^7.7.4", + "@babel/plugin-syntax-json-strings": "^7.7.4", + "@babel/plugin-syntax-object-rest-spread": "^7.7.4", + "@babel/plugin-syntax-optional-catch-binding": "^7.7.4", + "@babel/plugin-syntax-top-level-await": "^7.7.4", + "@babel/plugin-transform-arrow-functions": "^7.7.4", + "@babel/plugin-transform-async-to-generator": "^7.7.4", + "@babel/plugin-transform-block-scoped-functions": "^7.7.4", + "@babel/plugin-transform-block-scoping": "^7.7.4", + "@babel/plugin-transform-classes": "^7.7.4", + "@babel/plugin-transform-computed-properties": "^7.7.4", + "@babel/plugin-transform-destructuring": "^7.7.4", + "@babel/plugin-transform-dotall-regex": "^7.7.4", + "@babel/plugin-transform-duplicate-keys": "^7.7.4", + "@babel/plugin-transform-exponentiation-operator": "^7.7.4", + "@babel/plugin-transform-for-of": "^7.7.4", + "@babel/plugin-transform-function-name": "^7.7.4", + "@babel/plugin-transform-literals": "^7.7.4", + "@babel/plugin-transform-member-expression-literals": "^7.7.4", + "@babel/plugin-transform-modules-amd": "^7.7.4", + "@babel/plugin-transform-modules-commonjs": "^7.7.4", + "@babel/plugin-transform-modules-systemjs": "^7.7.4", + "@babel/plugin-transform-modules-umd": "^7.7.4", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.7.4", + "@babel/plugin-transform-new-target": "^7.7.4", + "@babel/plugin-transform-object-super": "^7.7.4", + "@babel/plugin-transform-parameters": "^7.7.4", + "@babel/plugin-transform-property-literals": "^7.7.4", + "@babel/plugin-transform-regenerator": "^7.7.4", + "@babel/plugin-transform-reserved-words": "^7.7.4", + "@babel/plugin-transform-shorthand-properties": "^7.7.4", + "@babel/plugin-transform-spread": "^7.7.4", + "@babel/plugin-transform-sticky-regex": "^7.7.4", + "@babel/plugin-transform-template-literals": "^7.7.4", + "@babel/plugin-transform-typeof-symbol": "^7.7.4", + "@babel/plugin-transform-unicode-regex": "^7.7.4", + "@babel/types": "^7.7.4", "browserslist": "^4.6.0", "core-js-compat": "^3.1.1", "invariant": "^2.2.2", @@ -823,28 +823,28 @@ } }, "@babel/template": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", - "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/traverse": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz", - "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", "dev": true, "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.2", - "@babel/helper-function-name": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0", - "@babel/parser": "^7.7.2", - "@babel/types": "^7.7.2", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" @@ -868,9 +868,9 @@ } }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -1476,9 +1476,9 @@ "dev": true }, "@types/node": { - "version": "12.12.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.11.tgz", - "integrity": "sha512-O+x6uIpa6oMNTkPuHDa9MhMMehlxLAd5QcOvKRjAFsBVpeFWTOPnXbDvILvFgFFZfQ1xh1EZi1FbXxUix+zpsQ==", + "version": "12.12.14", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.14.tgz", + "integrity": "sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==", "dev": true }, "@types/normalize-package-data": { @@ -2085,9 +2085,9 @@ "dev": true }, "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz", + "integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==", "dev": true }, "babel-code-frame": { @@ -2673,9 +2673,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001011", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001011.tgz", - "integrity": "sha512-h+Eqyn/YA6o6ZTqpS86PyRmNWOs1r54EBDcd2NTwwfsXQ8re1B38SnB+p2RKF8OUsyEIjeDU8XGec1RGO/wYCg==", + "version": "1.0.30001012", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001012.tgz", + "integrity": "sha512-7RR4Uh04t9K1uYRWzOJmzplgEOAXbfK72oVNokCdMzA67trrhPzy93ahKk1AWHiA0c58tD2P+NHqxrA8FZ+Trg==", "dev": true }, "caporal": { @@ -3002,9 +3002,9 @@ } }, "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.0.1.tgz", + "integrity": "sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==", "dev": true }, "comment-json": { @@ -3572,12 +3572,12 @@ "dev": true }, "core-js-compat": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.4.1.tgz", - "integrity": "sha512-YdeJI26gLc0CQJ9asLE5obEgBz2I0+CIgnoTbS2T0d5IPQw/OCgCIFR527RmpduxjrB3gSEHoGOCTq9sigOyfw==", + "version": "3.4.5", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.4.5.tgz", + "integrity": "sha512-rYVvzvKJDKoefdAC+q6VP63vp5hMmeVONCi9pVUbU1qRrtVrmAk/nPhnRg+i+XFd775m1hpG2Yd5RY3X45ccuw==", "dev": true, "requires": { - "browserslist": "^4.7.2", + "browserslist": "^4.7.3", "semver": "^6.3.0" }, "dependencies": { @@ -3683,9 +3683,9 @@ } }, "path-key": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz", - "integrity": "sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true }, "shebang-command": { @@ -4232,12 +4232,20 @@ "lru-cache": "^4.1.5", "semver": "^5.6.0", "sigmund": "^1.0.1" + }, + "dependencies": { + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + } } }, "electron-to-chromium": { - "version": "1.3.309", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.309.tgz", - "integrity": "sha512-NZd91XD15v2UPLjYXoN/gLnkwIUQjdH4SQLpRCCQiYJH6BBkfgp5pWemBJPr1rZ2dl8Ee3o91O9Sa1QuAfZmog==", + "version": "1.3.314", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.314.tgz", + "integrity": "sha512-IKDR/xCxKFhPts7h+VaSXS02Z1mznP3fli1BbXWXeN89i2gCzKraU8qLpEid8YzKcmZdZD3Mly3cn5/lY9xsBQ==", "dev": true }, "elegant-spinner": { @@ -4247,9 +4255,9 @@ "dev": true }, "elliptic": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz", - "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz", + "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==", "dev": true, "requires": { "bn.js": "^4.4.0", @@ -4311,18 +4319,18 @@ } }, "es-abstract": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz", - "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.2.tgz", + "integrity": "sha512-jYo/J8XU2emLXl3OLwfwtuFfuF2w6DYPs+xy9ZfVyPkDcrauu6LYrw/q2TyCtrbc/KUdCiC5e9UajRhgNkVopA==", "dev": true, "requires": { - "es-to-primitive": "^1.2.0", + "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.0", + "has-symbols": "^1.0.1", "is-callable": "^1.1.4", "is-regex": "^1.0.4", - "object-inspect": "^1.6.0", + "object-inspect": "^1.7.0", "object-keys": "^1.1.1", "string.prototype.trimleft": "^2.1.0", "string.prototype.trimright": "^2.1.0" @@ -4377,9 +4385,9 @@ } }, "eslint": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.6.0.tgz", - "integrity": "sha512-PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.7.1.tgz", + "integrity": "sha512-UWzBS79pNcsDSxgxbdjkmzn/B6BhsXMfUaOHnNwyE8nD+Q6pyT96ow2MccVayUTV4yMid4qLhMiQaywctRkBLA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -4397,7 +4405,7 @@ "file-entry-cache": "^5.0.1", "functional-red-black-tree": "^1.0.1", "glob-parent": "^5.0.0", - "globals": "^11.7.0", + "globals": "^12.1.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", @@ -4410,7 +4418,7 @@ "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", - "optionator": "^0.8.2", + "optionator": "^0.8.3", "progress": "^2.0.0", "regexpp": "^2.0.1", "semver": "^6.1.2", @@ -4483,6 +4491,15 @@ "is-glob": "^4.0.1" } }, + "globals": { + "version": "12.3.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz", + "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, "ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", @@ -5154,9 +5171,9 @@ } }, "file-loader": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz", - "integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-5.0.2.tgz", + "integrity": "sha512-QMiQ+WBkGLejKe81HU8SZ9PovsU/5uaLo0JdTCEXOYv7i7jfAjHZi1tcwp9tSASJPOmmHZtbdCervFmXMH/Dcg==", "dev": true, "requires": { "loader-utils": "^1.2.3", @@ -7997,9 +8014,9 @@ "dev": true }, "lint-staged": { - "version": "9.4.3", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-9.4.3.tgz", - "integrity": "sha512-PejnI+rwOAmKAIO+5UuAZU9gxdej/ovSEOAY34yMfC3OS4Ac82vCBPzAWLReR9zCPOMqeVwQRaZ3bUBpAsaL2Q==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-9.5.0.tgz", + "integrity": "sha512-nawMob9cb/G1J98nb8v3VC/E8rcX1rryUYXVZ69aT9kde6YWX+uvNOEHY5yf2gcWcTJGiD0kqXmCnS3oD75GIA==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -8027,6 +8044,12 @@ "fill-range": "^7.0.1" } }, + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, "cross-spawn": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", @@ -8135,9 +8158,9 @@ "dev": true }, "path-key": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz", - "integrity": "sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true }, "shebang-command": { @@ -9044,9 +9067,9 @@ } }, "node-releases": { - "version": "1.1.40", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.40.tgz", - "integrity": "sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ==", + "version": "1.1.41", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.41.tgz", + "integrity": "sha512-+IctMa7wIs8Cfsa8iYzeaLTFwv5Y4r5jZud+4AnfymzeEXKBCavFX0KBgzVaPVqf0ywa6PrO8/b+bPqdwjGBSg==", "dev": true, "requires": { "semver": "^6.3.0" @@ -9951,9 +9974,9 @@ } }, "postcss-modules-scope": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz", - "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz", + "integrity": "sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ==", "requires": { "postcss": "^7.0.6", "postcss-selector-parser": "^6.0.0" @@ -10643,9 +10666,9 @@ "dev": true }, "resolve": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", - "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.13.1.tgz", + "integrity": "sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -10856,9 +10879,9 @@ "dev": true }, "schema-utils": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz", - "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.0.tgz", + "integrity": "sha512-UlPB1ME4i/71cih/Rv92gK8043CrJTc2mjkyxDp4pdJ7ZfzY0g0hdGjjDB23jX3X+NXSneCdQbScGhn6K2tbpQ==", "requires": { "ajv": "^6.10.2", "ajv-keywords": "^3.4.1" @@ -11803,6 +11826,14 @@ "commander": "^2.20.0", "source-map": "~0.6.1", "source-map-support": "~0.5.12" + }, + "dependencies": { + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + } } }, "terser-webpack-plugin": { @@ -12094,14 +12125,23 @@ "dev": true }, "uglify-js": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz", - "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.0.tgz", + "integrity": "sha512-PC/ee458NEMITe1OufAjal65i6lB58R1HWMRcxwvdz1UopW0DYqlRL3xdu3IcTvTXsB02CRHykidkTRL+A3hQA==", "dev": true, "optional": true, "requires": { "commander": "~2.20.3", "source-map": "~0.6.1" + }, + "dependencies": { + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true, + "optional": true + } } }, "unicode-canonical-property-names-ecmascript": { @@ -12252,9 +12292,9 @@ } }, "url-loader": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz", - "integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-3.0.0.tgz", + "integrity": "sha512-a84JJbIA5xTFTWyjjcPdnsu+41o/SNE8SpXMdUvXs6Q+LuhCD9E2+0VCiuDWqgo3GGXVlFHzArDmBpj9PgWn4A==", "dev": true, "requires": { "loader-utils": "^1.2.3", @@ -12416,9 +12456,9 @@ }, "dependencies": { "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", + "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==", "dev": true }, "eslint-scope": { diff --git a/package.json b/package.json index 91bacb0e..a449b412 100644 --- a/package.json +++ b/package.json @@ -49,15 +49,15 @@ "postcss": "^7.0.23", "postcss-modules-extract-imports": "^2.0.0", "postcss-modules-local-by-default": "^3.0.2", - "postcss-modules-scope": "^2.1.0", + "postcss-modules-scope": "^2.1.1", "postcss-modules-values": "^3.0.0", "postcss-value-parser": "^4.0.2", - "schema-utils": "^2.5.0" + "schema-utils": "^2.6.0" }, "devDependencies": { - "@babel/cli": "^7.7.0", - "@babel/core": "^7.7.2", - "@babel/preset-env": "^7.7.1", + "@babel/cli": "^7.7.4", + "@babel/core": "^7.7.4", + "@babel/preset-env": "^7.7.4", "@commitlint/cli": "^8.2.0", "@commitlint/config-conventional": "^8.2.0", "@webpack-contrib/defaults": "^5.0.2", @@ -68,14 +68,14 @@ "del": "^5.1.0", "del-cli": "^3.0.0", "es-check": "^5.1.0", - "eslint": "^6.6.0", + "eslint": "^6.7.1", "eslint-config-prettier": "^6.7.0", "eslint-plugin-import": "^2.18.2", - "file-loader": "^4.3.0", + "file-loader": "^5.0.2", "husky": "^3.1.0", "jest": "^24.9.0", "jest-junit": "^9.0.0", - "lint-staged": "^9.4.3", + "lint-staged": "^9.5.0", "memory-fs": "^0.5.0", "npm-run-all": "^4.1.5", "postcss-loader": "^3.0.0", @@ -85,7 +85,7 @@ "sass-loader": "^8.0.0", "standard-version": "^7.0.1", "strip-ansi": "^6.0.0", - "url-loader": "^2.3.0", + "url-loader": "^3.0.0", "webpack": "^4.41.2" }, "keywords": [ diff --git a/test/__snapshots__/modules-option.test.js.snap b/test/__snapshots__/modules-option.test.js.snap index 472323cc..0a4f5700 100644 --- a/test/__snapshots__/modules-option.test.js.snap +++ b/test/__snapshots__/modules-option.test.js.snap @@ -6446,6 +6446,125 @@ exports.locals = { exports[`modules issue #980: warnings 1`] = `Array []`; +exports[`modules issue #995: errors 1`] = `Array []`; + +exports[`modules issue #995: module (evaluated) 1`] = ` +Array [ + Array [ + 1, + "/* class=\\"😀\\" */ +.a { + color: red; +} + +/* class=\\"😀 😓\\" */ +.a.b { + color: red; +} + +/* class=\\"😀\\" > class=\\"😓\\" */ +.a .b { + color: red; +} + +/* class=\\"😀\\" */ +.😀 { + color: red; +} + +/* class=\\"😀 😓\\" */ +.😀.😓 { + color: red; +} + +/* class=\\"😀\\" > class=\\"😓\\" */ +.😀 .😓 { + color: red; +} + +/* class=\\"😀\\" */ +.\\\\1F600 { + color: red; +} + +/* class=\\"😀 😓\\" */ +.\\\\1F600.\\\\1F613 { + color: red; +} + +/* class=\\"😀\\" > class=\\"😓\\" */ +.\\\\1F600 .\\\\1F613 { + color: red; +} + +/* Local */ + +/* class=\\"😀\\" */ +.\\\\1F600 { + color: red; +} + +/* class=\\"😀 😓\\" */ +.\\\\1F600.\\\\1F600 { + color: red; +} + +/* class=\\"😀\\" > class=\\"😓\\" */ +.\\\\1F600 .\\\\1F600 { + color: red; +} + +.\\\\1F600 .a .\\\\1F600 { + color: red; +} + +.\\\\1F600 .\\\\1F600 .\\\\1F600 { + color: red; +} + +div:not(.\\\\1F600) { + color: red; +} + +.\\\\1F600 .b { + color: red; +} + +.b .\\\\1F600 { + color: red; +} + +.\\\\1F613 .\\\\1F600 { + color: red; +} + +.\\\\1F613 .\\\\1F600 { + color: red; +} + +.\\\\1F600 > .\\\\1F600 > .\\\\1F600 { + color: red; +} +", + "", + ], +] +`; + +exports[`modules issue #995: module 1`] = ` +"exports = module.exports = require(\\"../../../src/runtime/api.js\\")(false); +// Module +exports.push([module.id, \\"/* class=\\\\\\"😀\\\\\\" */\\\\n.a {\\\\n color: red;\\\\n}\\\\n\\\\n/* class=\\\\\\"😀 😓\\\\\\" */\\\\n.a.b {\\\\n color: red;\\\\n}\\\\n\\\\n/* class=\\\\\\"😀\\\\\\" > class=\\\\\\"😓\\\\\\" */\\\\n.a .b {\\\\n color: red;\\\\n}\\\\n\\\\n/* class=\\\\\\"😀\\\\\\" */\\\\n.😀 {\\\\n color: red;\\\\n}\\\\n\\\\n/* class=\\\\\\"😀 😓\\\\\\" */\\\\n.😀.😓 {\\\\n color: red;\\\\n}\\\\n\\\\n/* class=\\\\\\"😀\\\\\\" > class=\\\\\\"😓\\\\\\" */\\\\n.😀 .😓 {\\\\n color: red;\\\\n}\\\\n\\\\n/* class=\\\\\\"😀\\\\\\" */\\\\n.\\\\\\\\1F600 {\\\\n color: red;\\\\n}\\\\n\\\\n/* class=\\\\\\"😀 😓\\\\\\" */\\\\n.\\\\\\\\1F600.\\\\\\\\1F613 {\\\\n color: red;\\\\n}\\\\n\\\\n/* class=\\\\\\"😀\\\\\\" > class=\\\\\\"😓\\\\\\" */\\\\n.\\\\\\\\1F600 .\\\\\\\\1F613 {\\\\n color: red;\\\\n}\\\\n\\\\n/* Local */\\\\n\\\\n/* class=\\\\\\"😀\\\\\\" */\\\\n.\\\\\\\\1F600 {\\\\n color: red;\\\\n}\\\\n\\\\n/* class=\\\\\\"😀 😓\\\\\\" */\\\\n.\\\\\\\\1F600.\\\\\\\\1F600 {\\\\n color: red;\\\\n}\\\\n\\\\n/* class=\\\\\\"😀\\\\\\" > class=\\\\\\"😓\\\\\\" */\\\\n.\\\\\\\\1F600 .\\\\\\\\1F600 {\\\\n color: red;\\\\n}\\\\n\\\\n.\\\\\\\\1F600 .a .\\\\\\\\1F600 {\\\\n color: red;\\\\n}\\\\n\\\\n.\\\\\\\\1F600 .\\\\\\\\1F600 .\\\\\\\\1F600 {\\\\n color: red;\\\\n}\\\\n\\\\ndiv:not(.\\\\\\\\1F600) {\\\\n color: red;\\\\n}\\\\n\\\\n.\\\\\\\\1F600 .b {\\\\n color: red;\\\\n}\\\\n\\\\n.b .\\\\\\\\1F600 {\\\\n color: red;\\\\n}\\\\n\\\\n.\\\\\\\\1F613 .\\\\\\\\1F600 {\\\\n color: red;\\\\n}\\\\n\\\\n.\\\\\\\\1F613 .\\\\\\\\1F600 {\\\\n color: red;\\\\n}\\\\n\\\\n.\\\\\\\\1F600 > .\\\\\\\\1F600 > .\\\\\\\\1F600 {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]); +// Exports +exports.locals = { + \\"a\\": \\"😀\\", + \\"b\\": \\"😀\\", + \\"c\\": \\"😀\\" +};" +`; + +exports[`modules issue #995: warnings 1`] = `Array []`; + exports[`modules should accepts all arguments for getLocalIdent option: errors 1`] = `Array []`; exports[`modules should accepts all arguments for getLocalIdent option: locals 1`] = ` diff --git a/test/fixtures/modules/issue-995.css b/test/fixtures/modules/issue-995.css new file mode 100644 index 00000000..8a01f251 --- /dev/null +++ b/test/fixtures/modules/issue-995.css @@ -0,0 +1,93 @@ +/* class="😀" */ +.a { + color: red; +} + +/* class="😀 😓" */ +.a.b { + color: red; +} + +/* class="😀" > class="😓" */ +.a .b { + color: red; +} + +/* class="😀" */ +.😀 { + color: red; +} + +/* class="😀 😓" */ +.😀.😓 { + color: red; +} + +/* class="😀" > class="😓" */ +.😀 .😓 { + color: red; +} + +/* class="😀" */ +.\1F600 { + color: red; +} + +/* class="😀 😓" */ +.\1F600.\1F613 { + color: red; +} + +/* class="😀" > class="😓" */ +.\1F600 .\1F613 { + color: red; +} + +/* Local */ + +/* class="😀" */ +:local(.a) { + color: red; +} + +/* class="😀 😓" */ +:local(.a.b) { + color: red; +} + +/* class="😀" > class="😓" */ +:local(.a .b) { + color: red; +} + +.\1F600 .a .\1F600 { + color: red; +} + +:local(.a .b .a) { + color: red; +} + +div:not(:local(.a)) { + color: red; +} + +:local(.a) .b { + color: red; +} + +.b :local(.a) { + color: red; +} + +.\1F613 :local(.a) { + color: red; +} + +.\1F613 :local(.a) { + color: red; +} + +:local(.a) > :local(.b) > :local(.c) { + color: red; +} diff --git a/test/fixtures/modules/tests-cases/issue-589/source.css b/test/fixtures/modules/tests-cases/issue-589/source.css index 582cbbd2..c9ab6c71 100644 --- a/test/fixtures/modules/tests-cases/issue-589/source.css +++ b/test/fixtures/modules/tests-cases/issue-589/source.css @@ -1,4 +1,4 @@ body:before { content: ''; - background: url('~!!file-loader!./img.png'); + background: url('~!!file-loader?esModule=false!./img.png'); } diff --git a/test/helpers.js b/test/helpers.js index b9f9a9f1..42b83bb9 100644 --- a/test/helpers.js +++ b/test/helpers.js @@ -150,6 +150,7 @@ const moduleConfig = (config) => { loader: 'file-loader', options: config.fileLoaderOptions || { name: '[name].[ext]', + esModule: false, }, }, }, diff --git a/test/modules-option.test.js b/test/modules-option.test.js index 90a45670..cae87404 100644 --- a/test/modules-option.test.js +++ b/test/modules-option.test.js @@ -532,4 +532,28 @@ describe('modules', () => { expect(stats.compilation.warnings).toMatchSnapshot('warnings'); expect(stats.compilation.errors).toMatchSnapshot('errors'); }); + + it('issue #995', async () => { + const config = { + loader: { + options: { + modules: { + mode: 'global', + localIdentName: '😀', + }, + }, + }, + }; + const testId = './modules/issue-995.css'; + const stats = await webpack(testId, config); + const { modules } = stats.toJson(); + const module = modules.find((m) => m.id === testId); + + expect(module.source).toMatchSnapshot('module'); + expect(evaluated(module.source, modules)).toMatchSnapshot( + 'module (evaluated)' + ); + expect(stats.compilation.warnings).toMatchSnapshot('warnings'); + expect(stats.compilation.errors).toMatchSnapshot('errors'); + }); }); From e21ab0073c1c37771996ac78bd3d7dc678affddb Mon Sep 17 00:00:00 2001 From: JIENIU$ Date: Fri, 29 Nov 2019 02:48:52 -0700 Subject: [PATCH 4/6] docs(readme): update default values for options (#1000) --- README.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 466a8729..df41b3d2 100644 --- a/README.md +++ b/README.md @@ -109,15 +109,15 @@ module.exports = { ## Options -| Name | Type | Default | Description | -| :-----------------------------------------: | :-------------------------: | :-----: | :--------------------------------------------------------------------- | -| **[`url`](#url)** | `{Boolean\|Function}` | `true` | Enables/Disables `url`/`image-set` functions handling | -| **[`import`](#import)** | `{Boolean\|Function}` | `true` | Enables/Disables `@import` at-rules handling | -| **[`modules`](#modules)** | `{Boolean\|String\|Object}` | `false` | Enables/Disables CSS Modules and their configuration | -| **[`sourceMap`](#sourcemap)** | `{Boolean}` | `false` | Enables/Disables generation of source maps | -| **[`importLoaders`](#importloaders)** | `{Number}` | `0` | Enables/Disables or setups number of loaders applied before CSS loader | -| **[`localsConvention`](#localsconvention)** | `{String}` | `asIs` | Style of exported classnames | -| **[`onlyLocals`](#onlylocals)** | `{Boolean}` | `false` | Export only locals | +| Name | Type | Default | Description | +| :-----------------------------------------: | :-------------------------: | :------: | :--------------------------------------------------------------------- | +| **[`url`](#url)** | `{Boolean\|Function}` | `true` | Enables/Disables `url`/`image-set` functions handling | +| **[`import`](#import)** | `{Boolean\|Function}` | `true` | Enables/Disables `@import` at-rules handling | +| **[`modules`](#modules)** | `{Boolean\|String\|Object}` | `false` | Enables/Disables CSS Modules and their configuration | +| **[`sourceMap`](#sourcemap)** | `{Boolean}` | `false` | Enables/Disables generation of source maps | +| **[`importLoaders`](#importloaders)** | `{Number}` | `0` | Enables/Disables or setups number of loaders applied before CSS loader | +| **[`localsConvention`](#localsconvention)** | `{String}` | `'asIs'` | Style of exported classnames | +| **[`onlyLocals`](#onlylocals)** | `{Boolean}` | `false` | Export only locals | ### `url` @@ -201,7 +201,7 @@ module.exports = { ### `import` -Type: `Boolean` +Type: `Boolean|Function` Default: `true` Enables/Disables `@import` at-rules handling. @@ -540,7 +540,7 @@ module.exports = { ##### `mode` Type: `String` -Default: `local` +Default: `'local'` Setup `mode` option. You can omit the value when you want `local` mode. @@ -567,15 +567,15 @@ module.exports = { ##### `localIdentName` Type: `String` -Default: `[hash:base64]` +Default: `'[hash:base64]'` You can configure the generated ident with the `localIdentName` query parameter. See [loader-utils's documentation](https://github.com/webpack/loader-utils#interpolatename) for more information on options. Recommendations: -- use `[path][name]__[local]` for development -- use `[hash:base64]` for production +- use `'[path][name]__[local]'` for development +- use `'[hash:base64]'` for production The `[local]` placeholder contains original class. @@ -782,7 +782,7 @@ This may change in the future when the module system (i. e. webpack) supports lo ### `localsConvention` Type: `String` -Default: `undefined` +Default: `'asIs'` Style of exported classnames. From 8f4d6f508187513347106a436eda993f874065f1 Mon Sep 17 00:00:00 2001 From: Evilebot Tnawi Date: Mon, 2 Dec 2019 16:25:47 +0300 Subject: [PATCH 5/6] fix: compatibility with ES modules syntax and hash in `url` function (#1001) --- src/runtime/getUrl.js | 14 +- src/utils.js | 15 +- test/__snapshots__/loader.test.js.snap | 84 +++++++++-- test/__snapshots__/url-option.test.js.snap | 138 +++++++++--------- .../runtime/__snapshots__/getUrl.test.js.snap | 58 ++++++-- test/runtime/getUrl.test.js | 82 ++++++++++- 6 files changed, 290 insertions(+), 101 deletions(-) diff --git a/src/runtime/getUrl.js b/src/runtime/getUrl.js index 9b8b136b..c2e3d506 100644 --- a/src/runtime/getUrl.js +++ b/src/runtime/getUrl.js @@ -1,4 +1,9 @@ -module.exports = (url, needQuotes) => { +module.exports = (url, options) => { + if (!options) { + // eslint-disable-next-line no-param-reassign + options = {}; + } + // eslint-disable-next-line no-underscore-dangle, no-param-reassign url = url.__esModule ? url.default : url; @@ -12,9 +17,14 @@ module.exports = (url, needQuotes) => { url = url.slice(1, -1); } + if (options.hash) { + // eslint-disable-next-line no-param-reassign + url += options.hash; + } + // Should url be wrapped? // See https://drafts.csswg.org/css-values-3/#urls - if (/["'() \t\n]/.test(url) || needQuotes) { + if (/["'() \t\n]/.test(url) || options.needQuotes) { return `"${url.replace(/"/g, '\\"').replace(/\n/g, '\\n')}"`; } diff --git a/src/utils.js b/src/utils.js index 6cb0572b..26140edf 100644 --- a/src/utils.js +++ b/src/utils.js @@ -242,10 +242,23 @@ function getUrlItemCode(item, loaderContext) { ? `"${singleQuery ? '?' : ''}${hashValue ? `#${hashValue}` : ''}"` : ''; + const options = []; + + if (hash) { + options.push(`hash: ${hash}`); + } + + if (needQuotes) { + options.push(`needQuotes: true`); + } + + const preparedOptions = + options.length > 0 ? `, { ${options.join(', ')} }` : ''; + return `var ${placeholder} = getUrl(require(${stringifyRequest( loaderContext, urlToRequest(normalizedUrl) - )})${hash ? ` + ${hash}` : ''}${needQuotes ? ', true' : ''});`; + )})${preparedOptions});`; } function getApiCode(loaderContext, sourceMap, onlyLocals) { diff --git a/test/__snapshots__/loader.test.js.snap b/test/__snapshots__/loader.test.js.snap index 68f488ce..43e9410e 100644 --- a/test/__snapshots__/loader.test.js.snap +++ b/test/__snapshots__/loader.test.js.snap @@ -102,7 +102,12 @@ function toComment(sourceMap) { exports[`loader should compile with \`css\` entry point (with \`modules\` and scope \`global\`): errors 1`] = `Array []`; exports[`loader should compile with \`css\` entry point (with \`modules\` and scope \`global\`): escape 1`] = ` -"module.exports = (url, needQuotes) => { +"module.exports = (url, options) => { + if (!options) { + // eslint-disable-next-line no-param-reassign + options = {}; + } + // eslint-disable-next-line no-underscore-dangle, no-param-reassign url = url.__esModule ? url.default : url; @@ -116,9 +121,14 @@ exports[`loader should compile with \`css\` entry point (with \`modules\` and sc url = url.slice(1, -1); } + if (options.hash) { + // eslint-disable-next-line no-param-reassign + url += options.hash; + } + // Should url be wrapped? // See https://drafts.csswg.org/css-values-3/#urls - if (/[\\"'() \\\\t\\\\n]/.test(url) || needQuotes) { + if (/[\\"'() \\\\t\\\\n]/.test(url) || options.needQuotes) { return \`\\"\${url.replace(/\\"/g, '\\\\\\\\\\"').replace(/\\\\n/g, '\\\\\\\\n')}\\"\`; } @@ -395,7 +405,12 @@ function toComment(sourceMap) { exports[`loader should compile with \`css\` entry point (with \`modules\` and scope \`local\`): errors 1`] = `Array []`; exports[`loader should compile with \`css\` entry point (with \`modules\` and scope \`local\`): escape 1`] = ` -"module.exports = (url, needQuotes) => { +"module.exports = (url, options) => { + if (!options) { + // eslint-disable-next-line no-param-reassign + options = {}; + } + // eslint-disable-next-line no-underscore-dangle, no-param-reassign url = url.__esModule ? url.default : url; @@ -409,9 +424,14 @@ exports[`loader should compile with \`css\` entry point (with \`modules\` and sc url = url.slice(1, -1); } + if (options.hash) { + // eslint-disable-next-line no-param-reassign + url += options.hash; + } + // Should url be wrapped? // See https://drafts.csswg.org/css-values-3/#urls - if (/[\\"'() \\\\t\\\\n]/.test(url) || needQuotes) { + if (/[\\"'() \\\\t\\\\n]/.test(url) || options.needQuotes) { return \`\\"\${url.replace(/\\"/g, '\\\\\\\\\\"').replace(/\\\\n/g, '\\\\\\\\n')}\\"\`; } @@ -712,7 +732,12 @@ function toComment(sourceMap) { exports[`loader should compile with \`css\` entry point: errors 1`] = `Array []`; exports[`loader should compile with \`css\` entry point: escape 1`] = ` -"module.exports = (url, needQuotes) => { +"module.exports = (url, options) => { + if (!options) { + // eslint-disable-next-line no-param-reassign + options = {}; + } + // eslint-disable-next-line no-underscore-dangle, no-param-reassign url = url.__esModule ? url.default : url; @@ -726,9 +751,14 @@ exports[`loader should compile with \`css\` entry point: escape 1`] = ` url = url.slice(1, -1); } + if (options.hash) { + // eslint-disable-next-line no-param-reassign + url += options.hash; + } + // Should url be wrapped? // See https://drafts.csswg.org/css-values-3/#urls - if (/[\\"'() \\\\t\\\\n]/.test(url) || needQuotes) { + if (/[\\"'() \\\\t\\\\n]/.test(url) || options.needQuotes) { return \`\\"\${url.replace(/\\"/g, '\\\\\\\\\\"').replace(/\\\\n/g, '\\\\\\\\n')}\\"\`; } @@ -1005,7 +1035,12 @@ function toComment(sourceMap) { exports[`loader should compile with \`js\` entry point: errors 1`] = `Array []`; exports[`loader should compile with \`js\` entry point: escape 1`] = ` -"module.exports = (url, needQuotes) => { +"module.exports = (url, options) => { + if (!options) { + // eslint-disable-next-line no-param-reassign + options = {}; + } + // eslint-disable-next-line no-underscore-dangle, no-param-reassign url = url.__esModule ? url.default : url; @@ -1019,9 +1054,14 @@ exports[`loader should compile with \`js\` entry point: escape 1`] = ` url = url.slice(1, -1); } + if (options.hash) { + // eslint-disable-next-line no-param-reassign + url += options.hash; + } + // Should url be wrapped? // See https://drafts.csswg.org/css-values-3/#urls - if (/[\\"'() \\\\t\\\\n]/.test(url) || needQuotes) { + if (/[\\"'() \\\\t\\\\n]/.test(url) || options.needQuotes) { return \`\\"\${url.replace(/\\"/g, '\\\\\\\\\\"').replace(/\\\\n/g, '\\\\\\\\n')}\\"\`; } @@ -1490,7 +1530,12 @@ exports.push([module.i, \\".foo {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]); /* 4 */ /***/ (function(module, exports) { -module.exports = (url, needQuotes) => { +module.exports = (url, options) => { + if (!options) { + // eslint-disable-next-line no-param-reassign + options = {}; + } + // eslint-disable-next-line no-underscore-dangle, no-param-reassign url = url.__esModule ? url.default : url; @@ -1504,9 +1549,14 @@ module.exports = (url, needQuotes) => { url = url.slice(1, -1); } + if (options.hash) { + // eslint-disable-next-line no-param-reassign + url += options.hash; + } + // Should url be wrapped? // See https://drafts.csswg.org/css-values-3/#urls - if (/[\\"'() \\\\t\\\\n]/.test(url) || needQuotes) { + if (/[\\"'() \\\\t\\\\n]/.test(url) || options.needQuotes) { return \`\\"\${url.replace(/\\"/g, '\\\\\\\\\\"').replace(/\\\\n/g, '\\\\\\\\n')}\\"\`; } @@ -1755,7 +1805,12 @@ exports.push([module.i, \\".foo {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]); /* 4 */ /***/ (function(module, exports) { -module.exports = (url, needQuotes) => { +module.exports = (url, options) => { + if (!options) { + // eslint-disable-next-line no-param-reassign + options = {}; + } + // eslint-disable-next-line no-underscore-dangle, no-param-reassign url = url.__esModule ? url.default : url; @@ -1769,9 +1824,14 @@ module.exports = (url, needQuotes) => { url = url.slice(1, -1); } + if (options.hash) { + // eslint-disable-next-line no-param-reassign + url += options.hash; + } + // Should url be wrapped? // See https://drafts.csswg.org/css-values-3/#urls - if (/[\\"'() \\\\t\\\\n]/.test(url) || needQuotes) { + if (/[\\"'() \\\\t\\\\n]/.test(url) || options.needQuotes) { return \`\\"\${url.replace(/\\"/g, '\\\\\\\\\\"').replace(/\\\\n/g, '\\\\\\\\n')}\\"\`; } diff --git a/test/__snapshots__/url-option.test.js.snap b/test/__snapshots__/url-option.test.js.snap index 590afdb9..4767f15d 100644 --- a/test/__snapshots__/url-option.test.js.snap +++ b/test/__snapshots__/url-option.test.js.snap @@ -298,20 +298,20 @@ var ___CSS_LOADER_URL___1___ = getUrl(require(\\"./font.woff2\\")); var ___CSS_LOADER_URL___2___ = getUrl(require(\\"./font.eot\\")); var ___CSS_LOADER_URL___3___ = getUrl(require(\\"package/font.ttf\\")); var ___CSS_LOADER_URL___4___ = getUrl(require(\\"./font with spaces.eot\\")); -var ___CSS_LOADER_URL___5___ = getUrl(require(\\"./font.svg\\") + \\"#svgFontName\\"); +var ___CSS_LOADER_URL___5___ = getUrl(require(\\"./font.svg\\"), { hash: \\"#svgFontName\\" }); var ___CSS_LOADER_URL___6___ = getUrl(require(\\"./font.woff2?foo=bar\\")); -var ___CSS_LOADER_URL___7___ = getUrl(require(\\"./font.eot\\") + \\"?#iefix\\"); -var ___CSS_LOADER_URL___8___ = getUrl(require(\\"./font with spaces.eot\\") + \\"?#iefix\\"); +var ___CSS_LOADER_URL___7___ = getUrl(require(\\"./font.eot\\"), { hash: \\"?#iefix\\" }); +var ___CSS_LOADER_URL___8___ = getUrl(require(\\"./font with spaces.eot\\"), { hash: \\"?#iefix\\" }); var ___CSS_LOADER_URL___9___ = getUrl(require(\\"./img1x.png\\")); var ___CSS_LOADER_URL___10___ = getUrl(require(\\"./img2x.png\\")); var ___CSS_LOADER_URL___11___ = getUrl(require(\\"./img-simple.png\\")); var ___CSS_LOADER_URL___12___ = getUrl(require(\\"../url/img-simple.png\\")); -var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./img1x.png\\"), true); -var ___CSS_LOADER_URL___14___ = getUrl(require(\\"./img2x.png\\"), true); -var ___CSS_LOADER_URL___15___ = getUrl(require(\\"./img3x.png\\"), true); -var ___CSS_LOADER_URL___16___ = getUrl(require(\\"./img1x.png?foo=bar\\"), true); -var ___CSS_LOADER_URL___17___ = getUrl(require(\\"./img1x.png\\") + \\"#hash\\", true); -var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img1x.png\\") + \\"?#iefix\\", true); +var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./img1x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___14___ = getUrl(require(\\"./img2x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___15___ = getUrl(require(\\"./img3x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___16___ = getUrl(require(\\"./img1x.png?foo=bar\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___17___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"#hash\\", needQuotes: true }); +var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"?#iefix\\", needQuotes: true }); var ___CSS_LOADER_URL___19___ = getUrl(require(\\"./img3x.png\\")); // Module exports.push([module.id, \\".class {\\\\n background: url('./img.png');\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\\\\\"./img.png\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(./img.png);\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\\\\\"./img.png#hash\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\\\n \\\\\\"./img.png\\\\\\"\\\\n );\\\\n}\\\\n\\\\n.class {\\\\n background: green url( './img.png' ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\\\\\"./img.png\\\\\\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( ./img.png ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(~package/img.png) url(./other-img.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\\\\\"./img img.png\\\\\\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( './img img.png' ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(/img.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) url(//example.com/image.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2042%2026%27%20fill%3D%27%2523007aff%27%3E%3Crect%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%271%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2711%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2712%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2722%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2723%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3C%2Fsvg%3E\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n filter: url('data:image/svg+xml;charset=utf-8,#filter');\\\\n}\\\\n\\\\n.class {\\\\n filter: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%5C%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%5C%22%3E%3Cfilter%20id%3D%5C%22filter%5C%22%3E%3CfeGaussianBlur%20in%3D%5C%22SourceAlpha%5C%22%20stdDeviation%3D%5C%220%5C%22%20%2F%3E%3CfeOffset%20dx%3D%5C%221%5C%22%20dy%3D%5C%222%5C%22%20result%3D%5C%22offsetblur%5C%22%20%2F%3E%3CfeFlood%20flood-color%3D%5C%22rgba(255%2C255%2C255%2C1)%5C%22%20%2F%3E%3CfeComposite%20in2%3D%5C%22offsetblur%5C%22%20operator%3D%5C%22in%5C%22%20%2F%3E%3CfeMerge%3E%3CfeMergeNode%20%2F%3E%3CfeMergeNode%20in%3D%5C%22SourceGraphic%5C%22%20%2F%3E%3C%2FfeMerge%3E%3C%2Ffilter%3E%3C%2Fsvg%3E%23filter');\\\\n}\\\\n\\\\n.highlight {\\\\n filter: url(#highlight);\\\\n}\\\\n\\\\n.highlight {\\\\n filter: url('#line-marker');\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\" + ___CSS_LOADER_URL___0___ + \\") format('woff'),\\\\n url(\\" + ___CSS_LOADER_URL___1___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___2___ + \\") format('eot'),\\\\n url(\\" + ___CSS_LOADER_URL___3___ + \\") format('truetype'),\\\\n url(\\" + ___CSS_LOADER_URL___4___ + \\") format(\\\\\\"embedded-opentype\\\\\\"),\\\\n url(\\" + ___CSS_LOADER_URL___5___ + \\") format('svg'),\\\\n url(\\" + ___CSS_LOADER_URL___6___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___7___ + \\") format('embedded-opentype'),\\\\n url(\\" + ___CSS_LOADER_URL___8___ + \\") format('embedded-opentype');\\\\n}\\\\n\\\\n@media (min-width: 500px) {\\\\n body {\\\\n background: url(\\\\\\"./img.png\\\\\\");\\\\n }\\\\n}\\\\n\\\\na {\\\\n content: \\\\\\"do not use url(path)\\\\\\";\\\\n}\\\\n\\\\nb {\\\\n content: 'do not \\\\\\"use\\\\\\" url(path)';\\\\n}\\\\n\\\\n@keyframes anim {\\\\n background: green url('./img.png') xyz;\\\\n}\\\\n\\\\n.a {\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___9___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___10___ + \\") 2x)\\\\n}\\\\n\\\\n.a {\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___9___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___10___ + \\") 2x)\\\\n}\\\\n\\\\n.class {\\\\n background: green url() xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url('') xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(\\\\\\"\\\\\\") xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(' ') xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(\\\\n ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(https://raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(//raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\\\\\"./img.png?foo\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\\\\\"./img.png?foo=bar\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\\\\\"./img.png?foo=bar#hash\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\\\\\"./img.png?foo=bar#hash\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\\\\\"./img.png?\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n background-image: url('./img.png') url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\") url('./img.png');\\\\n}\\\\n\\\\n.class {\\\\n background: ___CSS_LOADER_URL___;\\\\n background: ___CSS_LOADER_URL___INDEX___;\\\\n background: ___CSS_LOADER_URL___99999___;\\\\n background: ___CSS_LOADER_IMPORT___;\\\\n background: ___CSS_LOADER_IMPORT___INDEX___;\\\\n background: ___CSS_LOADER_IMPORT___99999___;\\\\n}\\\\n\\\\n.pure-url {\\\\n background: url(\\" + ___CSS_LOADER_URL___11___ + \\");\\\\n}\\\\n\\\\n.not-resolved {\\\\n background: url('/img-simple.png');\\\\n}\\\\n\\\\n.above-below {\\\\n background: url(\\" + ___CSS_LOADER_URL___12___ + \\");\\\\n}\\\\n\\\\n.tilde {\\\\n background: url('~package/img.png');\\\\n}\\\\n\\\\n.aliases {\\\\n background: url('~aliasesImg/img.png') ;\\\\n}\\\\n\\\\na {\\\\n background: url(./nested/img.png);\\\\n}\\\\n\\\\na {\\\\n background: url(nested/img.png);\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\\\\\"//at.alicdn.com/t/font_515771_emcns5054x3whfr.eot\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n /* Broken */\\\\n background-image: -webkit-image-set();\\\\n background-image: -webkit-image-set('');\\\\n background-image: image-set();\\\\n background-image: image-set('');\\\\n background-image: image-set(\\\\\\"\\\\\\");\\\\n background-image: image-set(\\\\\\"\\\\\\" 1x);\\\\n background-image: image-set(url());\\\\n background-image: image-set(\\\\n url()\\\\n );\\\\n background-image: image-set(URL());\\\\n background-image: image-set(url(''));\\\\n background-image: image-set(url(\\\\\\"\\\\\\"));\\\\n background-image: image-set(url('') 1x);\\\\n background-image: image-set(1x);\\\\n background-image: image-set(\\\\n 1x\\\\n );\\\\n background: image-set(calc(1rem + 1px) 1x);\\\\n\\\\n /* Strings */\\\\n background-image: -webkit-image-set(\\" + ___CSS_LOADER_URL___13___ + \\" 1x, \\" + ___CSS_LOADER_URL___14___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___13___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___13___ + \\" 1x, \\" + ___CSS_LOADER_URL___14___ + \\" 2x);\\\\n background-image: image-set(\\\\\\"./img img.png\\\\\\" 1x, \\\\\\"./img img.png\\\\\\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___13___ + \\" 1x, \\" + ___CSS_LOADER_URL___14___ + \\" 2x),\\\\n image-set(\\" + ___CSS_LOADER_URL___13___ + \\" 1x, \\" + ___CSS_LOADER_URL___14___ + \\" 2x);\\\\n background-image: image-set(\\\\n \\" + ___CSS_LOADER_URL___13___ + \\" 1x,\\\\n \\" + ___CSS_LOADER_URL___14___ + \\" 2x,\\\\n \\" + ___CSS_LOADER_URL___15___ + \\" 600dpi\\\\n );\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___16___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___17___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___18___ + \\" 1x);\\\\n\\\\n /* With \`url\` function */\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___9___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___10___ + \\") 2x);\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___9___ + \\") 1x);\\\\n background-image: -webkit-image-set(\\\\n url(\\" + ___CSS_LOADER_URL___9___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___9___ + \\") 1x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___9___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___9___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___10___ + \\") 2x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___9___ + \\") 1x,\\\\n url(\\" + ___CSS_LOADER_URL___10___ + \\") 2x,\\\\n url(\\" + ___CSS_LOADER_URL___19___ + \\") 600dpi\\\\n );\\\\n background-image: image-set(url(\\\\\\"./img img.png\\\\\\") 1x, url(\\\\\\"./img img.png\\\\\\") 2x);\\\\n\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___9___ + \\") 1x, \\" + ___CSS_LOADER_URL___14___ + \\" 2x);\\\\n}\\\\n\\", \\"\\"]); @@ -979,7 +979,7 @@ exports[`url option true and modules \`false\`: module 1`] = ` exports.i(require(\\"-!../../../src/index.js??ref--4-0!./imported.css\\"), \\"\\"); var getUrl = require(\\"../../../src/runtime/getUrl.js\\"); var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\")); -var ___CSS_LOADER_URL___1___ = getUrl(require(\\"./img.png\\") + \\"#hash\\"); +var ___CSS_LOADER_URL___1___ = getUrl(require(\\"./img.png\\"), { hash: \\"#hash\\" }); var ___CSS_LOADER_URL___2___ = getUrl(require(\\"package/img.png\\")); var ___CSS_LOADER_URL___3___ = getUrl(require(\\"./other-img.png\\")); var ___CSS_LOADER_URL___4___ = getUrl(require(\\"./img img.png\\")); @@ -988,28 +988,28 @@ var ___CSS_LOADER_URL___6___ = getUrl(require(\\"./font.woff2\\")); var ___CSS_LOADER_URL___7___ = getUrl(require(\\"./font.eot\\")); var ___CSS_LOADER_URL___8___ = getUrl(require(\\"package/font.ttf\\")); var ___CSS_LOADER_URL___9___ = getUrl(require(\\"./font with spaces.eot\\")); -var ___CSS_LOADER_URL___10___ = getUrl(require(\\"./font.svg\\") + \\"#svgFontName\\"); +var ___CSS_LOADER_URL___10___ = getUrl(require(\\"./font.svg\\"), { hash: \\"#svgFontName\\" }); var ___CSS_LOADER_URL___11___ = getUrl(require(\\"./font.woff2?foo=bar\\")); -var ___CSS_LOADER_URL___12___ = getUrl(require(\\"./font.eot\\") + \\"?#iefix\\"); -var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./font with spaces.eot\\") + \\"?#iefix\\"); +var ___CSS_LOADER_URL___12___ = getUrl(require(\\"./font.eot\\"), { hash: \\"?#iefix\\" }); +var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./font with spaces.eot\\"), { hash: \\"?#iefix\\" }); var ___CSS_LOADER_URL___14___ = getUrl(require(\\"./img1x.png\\")); var ___CSS_LOADER_URL___15___ = getUrl(require(\\"./img2x.png\\")); var ___CSS_LOADER_URL___16___ = getUrl(require(\\"./img.png?foo\\")); var ___CSS_LOADER_URL___17___ = getUrl(require(\\"./img.png?foo=bar\\")); -var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img.png?foo=bar\\") + \\"#hash\\"); +var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img.png?foo=bar\\"), { hash: \\"#hash\\" }); var ___CSS_LOADER_URL___19___ = getUrl(require(\\"./img.png?\\")); var ___CSS_LOADER_URL___20___ = getUrl(require(\\"./img-simple.png\\")); var ___CSS_LOADER_URL___21___ = getUrl(require(\\"../url/img-simple.png\\")); var ___CSS_LOADER_URL___22___ = getUrl(require(\\"aliasesImg/img.png\\")); var ___CSS_LOADER_URL___23___ = getUrl(require(\\"./nested/img.png\\")); var ___CSS_LOADER_URL___24___ = getUrl(require(\\"./nested/img.png\\")); -var ___CSS_LOADER_URL___25___ = getUrl(require(\\"./img1x.png\\"), true); -var ___CSS_LOADER_URL___26___ = getUrl(require(\\"./img2x.png\\"), true); -var ___CSS_LOADER_URL___27___ = getUrl(require(\\"./img img.png\\"), true); -var ___CSS_LOADER_URL___28___ = getUrl(require(\\"./img3x.png\\"), true); -var ___CSS_LOADER_URL___29___ = getUrl(require(\\"./img1x.png?foo=bar\\"), true); -var ___CSS_LOADER_URL___30___ = getUrl(require(\\"./img1x.png\\") + \\"#hash\\", true); -var ___CSS_LOADER_URL___31___ = getUrl(require(\\"./img1x.png\\") + \\"?#iefix\\", true); +var ___CSS_LOADER_URL___25___ = getUrl(require(\\"./img1x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___26___ = getUrl(require(\\"./img2x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___27___ = getUrl(require(\\"./img img.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___28___ = getUrl(require(\\"./img3x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___29___ = getUrl(require(\\"./img1x.png?foo=bar\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___30___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"#hash\\", needQuotes: true }); +var ___CSS_LOADER_URL___31___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"?#iefix\\", needQuotes: true }); var ___CSS_LOADER_URL___32___ = getUrl(require(\\"./img3x.png\\")); // Module exports.push([module.id, \\".class {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___1___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\\\n \\" + ___CSS_LOADER_URL___0___ + \\"\\\\n );\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(\\" + ___CSS_LOADER_URL___2___ + \\") url(\\" + ___CSS_LOADER_URL___3___ + \\") xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___4___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___4___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(/img.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) url(//example.com/image.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2042%2026%27%20fill%3D%27%2523007aff%27%3E%3Crect%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%271%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2711%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2712%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2722%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2723%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3C%2Fsvg%3E\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n filter: url('data:image/svg+xml;charset=utf-8,#filter');\\\\n}\\\\n\\\\n.class {\\\\n filter: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%5C%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%5C%22%3E%3Cfilter%20id%3D%5C%22filter%5C%22%3E%3CfeGaussianBlur%20in%3D%5C%22SourceAlpha%5C%22%20stdDeviation%3D%5C%220%5C%22%20%2F%3E%3CfeOffset%20dx%3D%5C%221%5C%22%20dy%3D%5C%222%5C%22%20result%3D%5C%22offsetblur%5C%22%20%2F%3E%3CfeFlood%20flood-color%3D%5C%22rgba(255%2C255%2C255%2C1)%5C%22%20%2F%3E%3CfeComposite%20in2%3D%5C%22offsetblur%5C%22%20operator%3D%5C%22in%5C%22%20%2F%3E%3CfeMerge%3E%3CfeMergeNode%20%2F%3E%3CfeMergeNode%20in%3D%5C%22SourceGraphic%5C%22%20%2F%3E%3C%2FfeMerge%3E%3C%2Ffilter%3E%3C%2Fsvg%3E%23filter');\\\\n}\\\\n\\\\n.highlight {\\\\n filter: url(#highlight);\\\\n}\\\\n\\\\n.highlight {\\\\n filter: url('#line-marker');\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\" + ___CSS_LOADER_URL___5___ + \\") format('woff'),\\\\n url(\\" + ___CSS_LOADER_URL___6___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___7___ + \\") format('eot'),\\\\n url(\\" + ___CSS_LOADER_URL___8___ + \\") format('truetype'),\\\\n url(\\" + ___CSS_LOADER_URL___9___ + \\") format(\\\\\\"embedded-opentype\\\\\\"),\\\\n url(\\" + ___CSS_LOADER_URL___10___ + \\") format('svg'),\\\\n url(\\" + ___CSS_LOADER_URL___11___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___12___ + \\") format('embedded-opentype'),\\\\n url(\\" + ___CSS_LOADER_URL___13___ + \\") format('embedded-opentype');\\\\n}\\\\n\\\\n@media (min-width: 500px) {\\\\n body {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n }\\\\n}\\\\n\\\\na {\\\\n content: \\\\\\"do not use url(path)\\\\\\";\\\\n}\\\\n\\\\nb {\\\\n content: 'do not \\\\\\"use\\\\\\" url(path)';\\\\n}\\\\n\\\\n@keyframes anim {\\\\n background: green url(\\" + ___CSS_LOADER_URL___0___ + \\") xyz;\\\\n}\\\\n\\\\n.a {\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x)\\\\n}\\\\n\\\\n.a {\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x)\\\\n}\\\\n\\\\n.class {\\\\n background: green url() xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url('') xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(\\\\\\"\\\\\\") xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(' ') xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(\\\\n ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(https://raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(//raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___16___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___17___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___18___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___18___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___19___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background-image: url(\\" + ___CSS_LOADER_URL___0___ + \\") url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\") url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: ___CSS_LOADER_URL___;\\\\n background: ___CSS_LOADER_URL___INDEX___;\\\\n background: ___CSS_LOADER_URL___99999___;\\\\n background: ___CSS_LOADER_IMPORT___;\\\\n background: ___CSS_LOADER_IMPORT___INDEX___;\\\\n background: ___CSS_LOADER_IMPORT___99999___;\\\\n}\\\\n\\\\n.pure-url {\\\\n background: url(\\" + ___CSS_LOADER_URL___20___ + \\");\\\\n}\\\\n\\\\n.not-resolved {\\\\n background: url('/img-simple.png');\\\\n}\\\\n\\\\n.above-below {\\\\n background: url(\\" + ___CSS_LOADER_URL___21___ + \\");\\\\n}\\\\n\\\\n.tilde {\\\\n background: url(\\" + ___CSS_LOADER_URL___2___ + \\");\\\\n}\\\\n\\\\n.aliases {\\\\n background: url(\\" + ___CSS_LOADER_URL___22___ + \\");\\\\n}\\\\n\\\\na {\\\\n background: url(\\" + ___CSS_LOADER_URL___23___ + \\");\\\\n}\\\\n\\\\na {\\\\n background: url(\\" + ___CSS_LOADER_URL___24___ + \\");\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\\\\\"//at.alicdn.com/t/font_515771_emcns5054x3whfr.eot\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n /* Broken */\\\\n background-image: -webkit-image-set();\\\\n background-image: -webkit-image-set('');\\\\n background-image: image-set();\\\\n background-image: image-set('');\\\\n background-image: image-set(\\\\\\"\\\\\\");\\\\n background-image: image-set(\\\\\\"\\\\\\" 1x);\\\\n background-image: image-set(url());\\\\n background-image: image-set(\\\\n url()\\\\n );\\\\n background-image: image-set(URL());\\\\n background-image: image-set(url(''));\\\\n background-image: image-set(url(\\\\\\"\\\\\\"));\\\\n background-image: image-set(url('') 1x);\\\\n background-image: image-set(1x);\\\\n background-image: image-set(\\\\n 1x\\\\n );\\\\n background: image-set(calc(1rem + 1px) 1x);\\\\n\\\\n /* Strings */\\\\n background-image: -webkit-image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___27___ + \\" 1x, \\" + ___CSS_LOADER_URL___27___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x),\\\\n image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\\\n \\" + ___CSS_LOADER_URL___25___ + \\" 1x,\\\\n \\" + ___CSS_LOADER_URL___26___ + \\" 2x,\\\\n \\" + ___CSS_LOADER_URL___28___ + \\" 600dpi\\\\n );\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___29___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___30___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___31___ + \\" 1x);\\\\n\\\\n /* With \`url\` function */\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x);\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x);\\\\n background-image: -webkit-image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x,\\\\n url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x,\\\\n url(\\" + ___CSS_LOADER_URL___32___ + \\") 600dpi\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___4___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___4___ + \\") 2x);\\\\n\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n}\\\\n\\", \\"\\"]); @@ -1378,7 +1378,7 @@ exports[`url option true and modules \`global\`: module 1`] = ` exports.i(require(\\"-!../../../src/index.js??ref--4-0!./imported.css\\"), \\"\\"); var getUrl = require(\\"../../../src/runtime/getUrl.js\\"); var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\")); -var ___CSS_LOADER_URL___1___ = getUrl(require(\\"./img.png\\") + \\"#hash\\"); +var ___CSS_LOADER_URL___1___ = getUrl(require(\\"./img.png\\"), { hash: \\"#hash\\" }); var ___CSS_LOADER_URL___2___ = getUrl(require(\\"package/img.png\\")); var ___CSS_LOADER_URL___3___ = getUrl(require(\\"./other-img.png\\")); var ___CSS_LOADER_URL___4___ = getUrl(require(\\"./img img.png\\")); @@ -1387,28 +1387,28 @@ var ___CSS_LOADER_URL___6___ = getUrl(require(\\"./font.woff2\\")); var ___CSS_LOADER_URL___7___ = getUrl(require(\\"./font.eot\\")); var ___CSS_LOADER_URL___8___ = getUrl(require(\\"package/font.ttf\\")); var ___CSS_LOADER_URL___9___ = getUrl(require(\\"./font with spaces.eot\\")); -var ___CSS_LOADER_URL___10___ = getUrl(require(\\"./font.svg\\") + \\"#svgFontName\\"); +var ___CSS_LOADER_URL___10___ = getUrl(require(\\"./font.svg\\"), { hash: \\"#svgFontName\\" }); var ___CSS_LOADER_URL___11___ = getUrl(require(\\"./font.woff2?foo=bar\\")); -var ___CSS_LOADER_URL___12___ = getUrl(require(\\"./font.eot\\") + \\"?#iefix\\"); -var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./font with spaces.eot\\") + \\"?#iefix\\"); +var ___CSS_LOADER_URL___12___ = getUrl(require(\\"./font.eot\\"), { hash: \\"?#iefix\\" }); +var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./font with spaces.eot\\"), { hash: \\"?#iefix\\" }); var ___CSS_LOADER_URL___14___ = getUrl(require(\\"./img1x.png\\")); var ___CSS_LOADER_URL___15___ = getUrl(require(\\"./img2x.png\\")); var ___CSS_LOADER_URL___16___ = getUrl(require(\\"./img.png?foo\\")); var ___CSS_LOADER_URL___17___ = getUrl(require(\\"./img.png?foo=bar\\")); -var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img.png?foo=bar\\") + \\"#hash\\"); +var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img.png?foo=bar\\"), { hash: \\"#hash\\" }); var ___CSS_LOADER_URL___19___ = getUrl(require(\\"./img.png?\\")); var ___CSS_LOADER_URL___20___ = getUrl(require(\\"./img-simple.png\\")); var ___CSS_LOADER_URL___21___ = getUrl(require(\\"../url/img-simple.png\\")); var ___CSS_LOADER_URL___22___ = getUrl(require(\\"aliasesImg/img.png\\")); var ___CSS_LOADER_URL___23___ = getUrl(require(\\"./nested/img.png\\")); var ___CSS_LOADER_URL___24___ = getUrl(require(\\"./nested/img.png\\")); -var ___CSS_LOADER_URL___25___ = getUrl(require(\\"./img1x.png\\"), true); -var ___CSS_LOADER_URL___26___ = getUrl(require(\\"./img2x.png\\"), true); -var ___CSS_LOADER_URL___27___ = getUrl(require(\\"./img img.png\\"), true); -var ___CSS_LOADER_URL___28___ = getUrl(require(\\"./img3x.png\\"), true); -var ___CSS_LOADER_URL___29___ = getUrl(require(\\"./img1x.png?foo=bar\\"), true); -var ___CSS_LOADER_URL___30___ = getUrl(require(\\"./img1x.png\\") + \\"#hash\\", true); -var ___CSS_LOADER_URL___31___ = getUrl(require(\\"./img1x.png\\") + \\"?#iefix\\", true); +var ___CSS_LOADER_URL___25___ = getUrl(require(\\"./img1x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___26___ = getUrl(require(\\"./img2x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___27___ = getUrl(require(\\"./img img.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___28___ = getUrl(require(\\"./img3x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___29___ = getUrl(require(\\"./img1x.png?foo=bar\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___30___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"#hash\\", needQuotes: true }); +var ___CSS_LOADER_URL___31___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"?#iefix\\", needQuotes: true }); var ___CSS_LOADER_URL___32___ = getUrl(require(\\"./img3x.png\\")); // Module exports.push([module.id, \\".class {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___1___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\\\n \\" + ___CSS_LOADER_URL___0___ + \\"\\\\n );\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(\\" + ___CSS_LOADER_URL___2___ + \\") url(\\" + ___CSS_LOADER_URL___3___ + \\") xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___4___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___4___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(/img.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) url(//example.com/image.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2042%2026%27%20fill%3D%27%2523007aff%27%3E%3Crect%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%271%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2711%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2712%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2722%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2723%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3C%2Fsvg%3E\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n filter: url('data:image/svg+xml;charset=utf-8,#filter');\\\\n}\\\\n\\\\n.class {\\\\n filter: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%5C%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%5C%22%3E%3Cfilter%20id%3D%5C%22filter%5C%22%3E%3CfeGaussianBlur%20in%3D%5C%22SourceAlpha%5C%22%20stdDeviation%3D%5C%220%5C%22%20%2F%3E%3CfeOffset%20dx%3D%5C%221%5C%22%20dy%3D%5C%222%5C%22%20result%3D%5C%22offsetblur%5C%22%20%2F%3E%3CfeFlood%20flood-color%3D%5C%22rgba(255%2C255%2C255%2C1)%5C%22%20%2F%3E%3CfeComposite%20in2%3D%5C%22offsetblur%5C%22%20operator%3D%5C%22in%5C%22%20%2F%3E%3CfeMerge%3E%3CfeMergeNode%20%2F%3E%3CfeMergeNode%20in%3D%5C%22SourceGraphic%5C%22%20%2F%3E%3C%2FfeMerge%3E%3C%2Ffilter%3E%3C%2Fsvg%3E%23filter');\\\\n}\\\\n\\\\n.highlight {\\\\n filter: url(#highlight);\\\\n}\\\\n\\\\n.highlight {\\\\n filter: url('#line-marker');\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\" + ___CSS_LOADER_URL___5___ + \\") format('woff'),\\\\n url(\\" + ___CSS_LOADER_URL___6___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___7___ + \\") format('eot'),\\\\n url(\\" + ___CSS_LOADER_URL___8___ + \\") format('truetype'),\\\\n url(\\" + ___CSS_LOADER_URL___9___ + \\") format(\\\\\\"embedded-opentype\\\\\\"),\\\\n url(\\" + ___CSS_LOADER_URL___10___ + \\") format('svg'),\\\\n url(\\" + ___CSS_LOADER_URL___11___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___12___ + \\") format('embedded-opentype'),\\\\n url(\\" + ___CSS_LOADER_URL___13___ + \\") format('embedded-opentype');\\\\n}\\\\n\\\\n@media (min-width: 500px) {\\\\n body {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n }\\\\n}\\\\n\\\\na {\\\\n content: \\\\\\"do not use url(path)\\\\\\";\\\\n}\\\\n\\\\nb {\\\\n content: 'do not \\\\\\"use\\\\\\" url(path)';\\\\n}\\\\n\\\\n@keyframes anim {\\\\n background: green url(\\" + ___CSS_LOADER_URL___0___ + \\") xyz;\\\\n}\\\\n\\\\n.a {\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x)\\\\n}\\\\n\\\\n.a {\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x)\\\\n}\\\\n\\\\n.class {\\\\n background: green url() xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url('') xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(\\\\\\"\\\\\\") xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(' ') xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(\\\\n ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(https://raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(//raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___16___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___17___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___18___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___18___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___19___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background-image: url(\\" + ___CSS_LOADER_URL___0___ + \\") url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\") url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: ___CSS_LOADER_URL___;\\\\n background: ___CSS_LOADER_URL___INDEX___;\\\\n background: ___CSS_LOADER_URL___99999___;\\\\n background: ___CSS_LOADER_IMPORT___;\\\\n background: ___CSS_LOADER_IMPORT___INDEX___;\\\\n background: ___CSS_LOADER_IMPORT___99999___;\\\\n}\\\\n\\\\n.pure-url {\\\\n background: url(\\" + ___CSS_LOADER_URL___20___ + \\");\\\\n}\\\\n\\\\n.not-resolved {\\\\n background: url('/img-simple.png');\\\\n}\\\\n\\\\n.above-below {\\\\n background: url(\\" + ___CSS_LOADER_URL___21___ + \\");\\\\n}\\\\n\\\\n.tilde {\\\\n background: url(\\" + ___CSS_LOADER_URL___2___ + \\");\\\\n}\\\\n\\\\n.aliases {\\\\n background: url(\\" + ___CSS_LOADER_URL___22___ + \\");\\\\n}\\\\n\\\\na {\\\\n background: url(\\" + ___CSS_LOADER_URL___23___ + \\");\\\\n}\\\\n\\\\na {\\\\n background: url(\\" + ___CSS_LOADER_URL___24___ + \\");\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\\\\\"//at.alicdn.com/t/font_515771_emcns5054x3whfr.eot\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n /* Broken */\\\\n background-image: -webkit-image-set();\\\\n background-image: -webkit-image-set('');\\\\n background-image: image-set();\\\\n background-image: image-set('');\\\\n background-image: image-set(\\\\\\"\\\\\\");\\\\n background-image: image-set(\\\\\\"\\\\\\" 1x);\\\\n background-image: image-set(url());\\\\n background-image: image-set(\\\\n url()\\\\n );\\\\n background-image: image-set(URL());\\\\n background-image: image-set(url(''));\\\\n background-image: image-set(url(\\\\\\"\\\\\\"));\\\\n background-image: image-set(url('') 1x);\\\\n background-image: image-set(1x);\\\\n background-image: image-set(\\\\n 1x\\\\n );\\\\n background: image-set(calc(1rem + 1px) 1x);\\\\n\\\\n /* Strings */\\\\n background-image: -webkit-image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___27___ + \\" 1x, \\" + ___CSS_LOADER_URL___27___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x),\\\\n image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\\\n \\" + ___CSS_LOADER_URL___25___ + \\" 1x,\\\\n \\" + ___CSS_LOADER_URL___26___ + \\" 2x,\\\\n \\" + ___CSS_LOADER_URL___28___ + \\" 600dpi\\\\n );\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___29___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___30___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___31___ + \\" 1x);\\\\n\\\\n /* With \`url\` function */\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x);\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x);\\\\n background-image: -webkit-image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x,\\\\n url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x,\\\\n url(\\" + ___CSS_LOADER_URL___32___ + \\") 600dpi\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___4___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___4___ + \\") 2x);\\\\n\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n}\\\\n\\", \\"\\"]); @@ -1777,7 +1777,7 @@ exports[`url option true and modules \`local\`: module 1`] = ` exports.i(require(\\"-!../../../src/index.js??ref--4-0!./imported.css\\"), \\"\\"); var getUrl = require(\\"../../../src/runtime/getUrl.js\\"); var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\")); -var ___CSS_LOADER_URL___1___ = getUrl(require(\\"./img.png\\") + \\"#hash\\"); +var ___CSS_LOADER_URL___1___ = getUrl(require(\\"./img.png\\"), { hash: \\"#hash\\" }); var ___CSS_LOADER_URL___2___ = getUrl(require(\\"package/img.png\\")); var ___CSS_LOADER_URL___3___ = getUrl(require(\\"./other-img.png\\")); var ___CSS_LOADER_URL___4___ = getUrl(require(\\"./img img.png\\")); @@ -1786,28 +1786,28 @@ var ___CSS_LOADER_URL___6___ = getUrl(require(\\"./font.woff2\\")); var ___CSS_LOADER_URL___7___ = getUrl(require(\\"./font.eot\\")); var ___CSS_LOADER_URL___8___ = getUrl(require(\\"package/font.ttf\\")); var ___CSS_LOADER_URL___9___ = getUrl(require(\\"./font with spaces.eot\\")); -var ___CSS_LOADER_URL___10___ = getUrl(require(\\"./font.svg\\") + \\"#svgFontName\\"); +var ___CSS_LOADER_URL___10___ = getUrl(require(\\"./font.svg\\"), { hash: \\"#svgFontName\\" }); var ___CSS_LOADER_URL___11___ = getUrl(require(\\"./font.woff2?foo=bar\\")); -var ___CSS_LOADER_URL___12___ = getUrl(require(\\"./font.eot\\") + \\"?#iefix\\"); -var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./font with spaces.eot\\") + \\"?#iefix\\"); +var ___CSS_LOADER_URL___12___ = getUrl(require(\\"./font.eot\\"), { hash: \\"?#iefix\\" }); +var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./font with spaces.eot\\"), { hash: \\"?#iefix\\" }); var ___CSS_LOADER_URL___14___ = getUrl(require(\\"./img1x.png\\")); var ___CSS_LOADER_URL___15___ = getUrl(require(\\"./img2x.png\\")); var ___CSS_LOADER_URL___16___ = getUrl(require(\\"./img.png?foo\\")); var ___CSS_LOADER_URL___17___ = getUrl(require(\\"./img.png?foo=bar\\")); -var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img.png?foo=bar\\") + \\"#hash\\"); +var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img.png?foo=bar\\"), { hash: \\"#hash\\" }); var ___CSS_LOADER_URL___19___ = getUrl(require(\\"./img.png?\\")); var ___CSS_LOADER_URL___20___ = getUrl(require(\\"./img-simple.png\\")); var ___CSS_LOADER_URL___21___ = getUrl(require(\\"../url/img-simple.png\\")); var ___CSS_LOADER_URL___22___ = getUrl(require(\\"aliasesImg/img.png\\")); var ___CSS_LOADER_URL___23___ = getUrl(require(\\"./nested/img.png\\")); var ___CSS_LOADER_URL___24___ = getUrl(require(\\"./nested/img.png\\")); -var ___CSS_LOADER_URL___25___ = getUrl(require(\\"./img1x.png\\"), true); -var ___CSS_LOADER_URL___26___ = getUrl(require(\\"./img2x.png\\"), true); -var ___CSS_LOADER_URL___27___ = getUrl(require(\\"./img img.png\\"), true); -var ___CSS_LOADER_URL___28___ = getUrl(require(\\"./img3x.png\\"), true); -var ___CSS_LOADER_URL___29___ = getUrl(require(\\"./img1x.png?foo=bar\\"), true); -var ___CSS_LOADER_URL___30___ = getUrl(require(\\"./img1x.png\\") + \\"#hash\\", true); -var ___CSS_LOADER_URL___31___ = getUrl(require(\\"./img1x.png\\") + \\"?#iefix\\", true); +var ___CSS_LOADER_URL___25___ = getUrl(require(\\"./img1x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___26___ = getUrl(require(\\"./img2x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___27___ = getUrl(require(\\"./img img.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___28___ = getUrl(require(\\"./img3x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___29___ = getUrl(require(\\"./img1x.png?foo=bar\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___30___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"#hash\\", needQuotes: true }); +var ___CSS_LOADER_URL___31___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"?#iefix\\", needQuotes: true }); var ___CSS_LOADER_URL___32___ = getUrl(require(\\"./img3x.png\\")); // Module exports.push([module.id, \\"._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___1___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\\\n \\" + ___CSS_LOADER_URL___0___ + \\"\\\\n );\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(\\" + ___CSS_LOADER_URL___2___ + \\") url(\\" + ___CSS_LOADER_URL___3___ + \\") xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url( \\" + ___CSS_LOADER_URL___4___ + \\" ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url( \\" + ___CSS_LOADER_URL___4___ + \\" ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(/img.png) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) url(//example.com/image.png) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2042%2026%27%20fill%3D%27%2523007aff%27%3E%3Crect%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%271%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2711%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2712%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2722%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2723%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3C%2Fsvg%3E\\\\\\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n filter: url('data:image/svg+xml;charset=utf-8,#filter');\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n filter: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%5C%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%5C%22%3E%3Cfilter%20id%3D%5C%22filter%5C%22%3E%3CfeGaussianBlur%20in%3D%5C%22SourceAlpha%5C%22%20stdDeviation%3D%5C%220%5C%22%20%2F%3E%3CfeOffset%20dx%3D%5C%221%5C%22%20dy%3D%5C%222%5C%22%20result%3D%5C%22offsetblur%5C%22%20%2F%3E%3CfeFlood%20flood-color%3D%5C%22rgba(255%2C255%2C255%2C1)%5C%22%20%2F%3E%3CfeComposite%20in2%3D%5C%22offsetblur%5C%22%20operator%3D%5C%22in%5C%22%20%2F%3E%3CfeMerge%3E%3CfeMergeNode%20%2F%3E%3CfeMergeNode%20in%3D%5C%22SourceGraphic%5C%22%20%2F%3E%3C%2FfeMerge%3E%3C%2Ffilter%3E%3C%2Fsvg%3E%23filter');\\\\n}\\\\n\\\\n.lml_5t-nQdGlKc9OtKjUO {\\\\n filter: url(#highlight);\\\\n}\\\\n\\\\n.lml_5t-nQdGlKc9OtKjUO {\\\\n filter: url('#line-marker');\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\" + ___CSS_LOADER_URL___5___ + \\") format('woff'),\\\\n url(\\" + ___CSS_LOADER_URL___6___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___7___ + \\") format('eot'),\\\\n url(\\" + ___CSS_LOADER_URL___8___ + \\") format('truetype'),\\\\n url(\\" + ___CSS_LOADER_URL___9___ + \\") format(\\\\\\"embedded-opentype\\\\\\"),\\\\n url(\\" + ___CSS_LOADER_URL___10___ + \\") format('svg'),\\\\n url(\\" + ___CSS_LOADER_URL___11___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___12___ + \\") format('embedded-opentype'),\\\\n url(\\" + ___CSS_LOADER_URL___13___ + \\") format('embedded-opentype');\\\\n}\\\\n\\\\n@media (min-width: 500px) {\\\\n body {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n }\\\\n}\\\\n\\\\na {\\\\n content: \\\\\\"do not use url(path)\\\\\\";\\\\n}\\\\n\\\\nb {\\\\n content: 'do not \\\\\\"use\\\\\\" url(path)';\\\\n}\\\\n\\\\n@keyframes O9YPhh3OZdzrkj25z-J92 {\\\\n background: green url(\\" + ___CSS_LOADER_URL___0___ + \\") xyz;\\\\n}\\\\n\\\\n._1fj5hnOVZ8KZVIGyZbPW3p {\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x)\\\\n}\\\\n\\\\n._1fj5hnOVZ8KZVIGyZbPW3p {\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x)\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url() xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url('') xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(\\\\\\"\\\\\\") xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(' ') xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(\\\\n ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(https://raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(//raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___16___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___17___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___18___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___18___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___19___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background-image: url(\\" + ___CSS_LOADER_URL___0___ + \\") url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\") url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: ___CSS_LOADER_URL___;\\\\n background: ___CSS_LOADER_URL___INDEX___;\\\\n background: ___CSS_LOADER_URL___99999___;\\\\n background: ___CSS_LOADER_IMPORT___;\\\\n background: ___CSS_LOADER_IMPORT___INDEX___;\\\\n background: ___CSS_LOADER_IMPORT___99999___;\\\\n}\\\\n\\\\n._2rb58RF5u2ij-3X8XSJaVP {\\\\n background: url(\\" + ___CSS_LOADER_URL___20___ + \\");\\\\n}\\\\n\\\\n.mrf4tRz4T71pNku_3IMH3 {\\\\n background: url('/img-simple.png');\\\\n}\\\\n\\\\n.c5dNFA35opKWoGz7aRj0k {\\\\n background: url(\\" + ___CSS_LOADER_URL___21___ + \\");\\\\n}\\\\n\\\\n._2Q5a0g3xEHAboOADfIxHa5 {\\\\n background: url(\\" + ___CSS_LOADER_URL___2___ + \\");\\\\n}\\\\n\\\\n._2TX-7lb63hK5h5DzELIAbU {\\\\n background: url(\\" + ___CSS_LOADER_URL___22___ + \\");\\\\n}\\\\n\\\\na {\\\\n background: url(\\" + ___CSS_LOADER_URL___23___ + \\");\\\\n}\\\\n\\\\na {\\\\n background: url(\\" + ___CSS_LOADER_URL___24___ + \\");\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\\\\\"//at.alicdn.com/t/font_515771_emcns5054x3whfr.eot\\\\\\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n /* Broken */\\\\n background-image: -webkit-image-set();\\\\n background-image: -webkit-image-set('');\\\\n background-image: image-set();\\\\n background-image: image-set('');\\\\n background-image: image-set(\\\\\\"\\\\\\");\\\\n background-image: image-set(\\\\\\"\\\\\\" 1x);\\\\n background-image: image-set(url());\\\\n background-image: image-set(\\\\n url()\\\\n );\\\\n background-image: image-set(URL());\\\\n background-image: image-set(url(''));\\\\n background-image: image-set(url(\\\\\\"\\\\\\"));\\\\n background-image: image-set(url('') 1x);\\\\n background-image: image-set(1x);\\\\n background-image: image-set(\\\\n 1x\\\\n );\\\\n background: image-set(calc(1rem + 1px) 1x);\\\\n\\\\n /* Strings */\\\\n background-image: -webkit-image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___27___ + \\" 1x, \\" + ___CSS_LOADER_URL___27___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x),\\\\n image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\\\n \\" + ___CSS_LOADER_URL___25___ + \\" 1x,\\\\n \\" + ___CSS_LOADER_URL___26___ + \\" 2x,\\\\n \\" + ___CSS_LOADER_URL___28___ + \\" 600dpi\\\\n );\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___29___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___30___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___31___ + \\" 1x);\\\\n\\\\n /* With \`url\` function */\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x);\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x);\\\\n background-image: -webkit-image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x,\\\\n url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x,\\\\n url(\\" + ___CSS_LOADER_URL___32___ + \\") 600dpi\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___4___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___4___ + \\") 2x);\\\\n\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n}\\\\n\\", \\"\\"]); @@ -2187,7 +2187,7 @@ exports[`url option true and modules \`true\`: module 1`] = ` exports.i(require(\\"-!../../../src/index.js??ref--4-0!./imported.css\\"), \\"\\"); var getUrl = require(\\"../../../src/runtime/getUrl.js\\"); var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\")); -var ___CSS_LOADER_URL___1___ = getUrl(require(\\"./img.png\\") + \\"#hash\\"); +var ___CSS_LOADER_URL___1___ = getUrl(require(\\"./img.png\\"), { hash: \\"#hash\\" }); var ___CSS_LOADER_URL___2___ = getUrl(require(\\"package/img.png\\")); var ___CSS_LOADER_URL___3___ = getUrl(require(\\"./other-img.png\\")); var ___CSS_LOADER_URL___4___ = getUrl(require(\\"./img img.png\\")); @@ -2196,28 +2196,28 @@ var ___CSS_LOADER_URL___6___ = getUrl(require(\\"./font.woff2\\")); var ___CSS_LOADER_URL___7___ = getUrl(require(\\"./font.eot\\")); var ___CSS_LOADER_URL___8___ = getUrl(require(\\"package/font.ttf\\")); var ___CSS_LOADER_URL___9___ = getUrl(require(\\"./font with spaces.eot\\")); -var ___CSS_LOADER_URL___10___ = getUrl(require(\\"./font.svg\\") + \\"#svgFontName\\"); +var ___CSS_LOADER_URL___10___ = getUrl(require(\\"./font.svg\\"), { hash: \\"#svgFontName\\" }); var ___CSS_LOADER_URL___11___ = getUrl(require(\\"./font.woff2?foo=bar\\")); -var ___CSS_LOADER_URL___12___ = getUrl(require(\\"./font.eot\\") + \\"?#iefix\\"); -var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./font with spaces.eot\\") + \\"?#iefix\\"); +var ___CSS_LOADER_URL___12___ = getUrl(require(\\"./font.eot\\"), { hash: \\"?#iefix\\" }); +var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./font with spaces.eot\\"), { hash: \\"?#iefix\\" }); var ___CSS_LOADER_URL___14___ = getUrl(require(\\"./img1x.png\\")); var ___CSS_LOADER_URL___15___ = getUrl(require(\\"./img2x.png\\")); var ___CSS_LOADER_URL___16___ = getUrl(require(\\"./img.png?foo\\")); var ___CSS_LOADER_URL___17___ = getUrl(require(\\"./img.png?foo=bar\\")); -var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img.png?foo=bar\\") + \\"#hash\\"); +var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img.png?foo=bar\\"), { hash: \\"#hash\\" }); var ___CSS_LOADER_URL___19___ = getUrl(require(\\"./img.png?\\")); var ___CSS_LOADER_URL___20___ = getUrl(require(\\"./img-simple.png\\")); var ___CSS_LOADER_URL___21___ = getUrl(require(\\"../url/img-simple.png\\")); var ___CSS_LOADER_URL___22___ = getUrl(require(\\"aliasesImg/img.png\\")); var ___CSS_LOADER_URL___23___ = getUrl(require(\\"./nested/img.png\\")); var ___CSS_LOADER_URL___24___ = getUrl(require(\\"./nested/img.png\\")); -var ___CSS_LOADER_URL___25___ = getUrl(require(\\"./img1x.png\\"), true); -var ___CSS_LOADER_URL___26___ = getUrl(require(\\"./img2x.png\\"), true); -var ___CSS_LOADER_URL___27___ = getUrl(require(\\"./img img.png\\"), true); -var ___CSS_LOADER_URL___28___ = getUrl(require(\\"./img3x.png\\"), true); -var ___CSS_LOADER_URL___29___ = getUrl(require(\\"./img1x.png?foo=bar\\"), true); -var ___CSS_LOADER_URL___30___ = getUrl(require(\\"./img1x.png\\") + \\"#hash\\", true); -var ___CSS_LOADER_URL___31___ = getUrl(require(\\"./img1x.png\\") + \\"?#iefix\\", true); +var ___CSS_LOADER_URL___25___ = getUrl(require(\\"./img1x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___26___ = getUrl(require(\\"./img2x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___27___ = getUrl(require(\\"./img img.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___28___ = getUrl(require(\\"./img3x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___29___ = getUrl(require(\\"./img1x.png?foo=bar\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___30___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"#hash\\", needQuotes: true }); +var ___CSS_LOADER_URL___31___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"?#iefix\\", needQuotes: true }); var ___CSS_LOADER_URL___32___ = getUrl(require(\\"./img3x.png\\")); // Module exports.push([module.id, \\"._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___1___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\\\n \\" + ___CSS_LOADER_URL___0___ + \\"\\\\n );\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(\\" + ___CSS_LOADER_URL___2___ + \\") url(\\" + ___CSS_LOADER_URL___3___ + \\") xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url( \\" + ___CSS_LOADER_URL___4___ + \\" ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url( \\" + ___CSS_LOADER_URL___4___ + \\" ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(/img.png) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) url(//example.com/image.png) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2042%2026%27%20fill%3D%27%2523007aff%27%3E%3Crect%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%271%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2711%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2712%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2722%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2723%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3C%2Fsvg%3E\\\\\\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n filter: url('data:image/svg+xml;charset=utf-8,#filter');\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n filter: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%5C%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%5C%22%3E%3Cfilter%20id%3D%5C%22filter%5C%22%3E%3CfeGaussianBlur%20in%3D%5C%22SourceAlpha%5C%22%20stdDeviation%3D%5C%220%5C%22%20%2F%3E%3CfeOffset%20dx%3D%5C%221%5C%22%20dy%3D%5C%222%5C%22%20result%3D%5C%22offsetblur%5C%22%20%2F%3E%3CfeFlood%20flood-color%3D%5C%22rgba(255%2C255%2C255%2C1)%5C%22%20%2F%3E%3CfeComposite%20in2%3D%5C%22offsetblur%5C%22%20operator%3D%5C%22in%5C%22%20%2F%3E%3CfeMerge%3E%3CfeMergeNode%20%2F%3E%3CfeMergeNode%20in%3D%5C%22SourceGraphic%5C%22%20%2F%3E%3C%2FfeMerge%3E%3C%2Ffilter%3E%3C%2Fsvg%3E%23filter');\\\\n}\\\\n\\\\n.lml_5t-nQdGlKc9OtKjUO {\\\\n filter: url(#highlight);\\\\n}\\\\n\\\\n.lml_5t-nQdGlKc9OtKjUO {\\\\n filter: url('#line-marker');\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\" + ___CSS_LOADER_URL___5___ + \\") format('woff'),\\\\n url(\\" + ___CSS_LOADER_URL___6___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___7___ + \\") format('eot'),\\\\n url(\\" + ___CSS_LOADER_URL___8___ + \\") format('truetype'),\\\\n url(\\" + ___CSS_LOADER_URL___9___ + \\") format(\\\\\\"embedded-opentype\\\\\\"),\\\\n url(\\" + ___CSS_LOADER_URL___10___ + \\") format('svg'),\\\\n url(\\" + ___CSS_LOADER_URL___11___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___12___ + \\") format('embedded-opentype'),\\\\n url(\\" + ___CSS_LOADER_URL___13___ + \\") format('embedded-opentype');\\\\n}\\\\n\\\\n@media (min-width: 500px) {\\\\n body {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n }\\\\n}\\\\n\\\\na {\\\\n content: \\\\\\"do not use url(path)\\\\\\";\\\\n}\\\\n\\\\nb {\\\\n content: 'do not \\\\\\"use\\\\\\" url(path)';\\\\n}\\\\n\\\\n@keyframes O9YPhh3OZdzrkj25z-J92 {\\\\n background: green url(\\" + ___CSS_LOADER_URL___0___ + \\") xyz;\\\\n}\\\\n\\\\n._1fj5hnOVZ8KZVIGyZbPW3p {\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x)\\\\n}\\\\n\\\\n._1fj5hnOVZ8KZVIGyZbPW3p {\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x)\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url() xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url('') xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(\\\\\\"\\\\\\") xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(' ') xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(\\\\n ) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(https://raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: green url(//raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___16___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___17___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___18___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___18___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: url(\\" + ___CSS_LOADER_URL___19___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background-image: url(\\" + ___CSS_LOADER_URL___0___ + \\") url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\") url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n background: ___CSS_LOADER_URL___;\\\\n background: ___CSS_LOADER_URL___INDEX___;\\\\n background: ___CSS_LOADER_URL___99999___;\\\\n background: ___CSS_LOADER_IMPORT___;\\\\n background: ___CSS_LOADER_IMPORT___INDEX___;\\\\n background: ___CSS_LOADER_IMPORT___99999___;\\\\n}\\\\n\\\\n._2rb58RF5u2ij-3X8XSJaVP {\\\\n background: url(\\" + ___CSS_LOADER_URL___20___ + \\");\\\\n}\\\\n\\\\n.mrf4tRz4T71pNku_3IMH3 {\\\\n background: url('/img-simple.png');\\\\n}\\\\n\\\\n.c5dNFA35opKWoGz7aRj0k {\\\\n background: url(\\" + ___CSS_LOADER_URL___21___ + \\");\\\\n}\\\\n\\\\n._2Q5a0g3xEHAboOADfIxHa5 {\\\\n background: url(\\" + ___CSS_LOADER_URL___2___ + \\");\\\\n}\\\\n\\\\n._2TX-7lb63hK5h5DzELIAbU {\\\\n background: url(\\" + ___CSS_LOADER_URL___22___ + \\");\\\\n}\\\\n\\\\na {\\\\n background: url(\\" + ___CSS_LOADER_URL___23___ + \\");\\\\n}\\\\n\\\\na {\\\\n background: url(\\" + ___CSS_LOADER_URL___24___ + \\");\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\\\\\"//at.alicdn.com/t/font_515771_emcns5054x3whfr.eot\\\\\\");\\\\n}\\\\n\\\\n._7NvzxsKlD5xT5cUVu5Ad- {\\\\n /* Broken */\\\\n background-image: -webkit-image-set();\\\\n background-image: -webkit-image-set('');\\\\n background-image: image-set();\\\\n background-image: image-set('');\\\\n background-image: image-set(\\\\\\"\\\\\\");\\\\n background-image: image-set(\\\\\\"\\\\\\" 1x);\\\\n background-image: image-set(url());\\\\n background-image: image-set(\\\\n url()\\\\n );\\\\n background-image: image-set(URL());\\\\n background-image: image-set(url(''));\\\\n background-image: image-set(url(\\\\\\"\\\\\\"));\\\\n background-image: image-set(url('') 1x);\\\\n background-image: image-set(1x);\\\\n background-image: image-set(\\\\n 1x\\\\n );\\\\n background: image-set(calc(1rem + 1px) 1x);\\\\n\\\\n /* Strings */\\\\n background-image: -webkit-image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___27___ + \\" 1x, \\" + ___CSS_LOADER_URL___27___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x),\\\\n image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\\\n \\" + ___CSS_LOADER_URL___25___ + \\" 1x,\\\\n \\" + ___CSS_LOADER_URL___26___ + \\" 2x,\\\\n \\" + ___CSS_LOADER_URL___28___ + \\" 600dpi\\\\n );\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___29___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___30___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___31___ + \\" 1x);\\\\n\\\\n /* With \`url\` function */\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x);\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x);\\\\n background-image: -webkit-image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x,\\\\n url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x,\\\\n url(\\" + ___CSS_LOADER_URL___32___ + \\") 600dpi\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___4___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___4___ + \\") 2x);\\\\n\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n}\\\\n\\", \\"\\"]); @@ -2597,7 +2597,7 @@ exports[`url option true: module 1`] = ` exports.i(require(\\"-!../../../src/index.js??ref--4-0!./imported.css\\"), \\"\\"); var getUrl = require(\\"../../../src/runtime/getUrl.js\\"); var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\")); -var ___CSS_LOADER_URL___1___ = getUrl(require(\\"./img.png\\") + \\"#hash\\"); +var ___CSS_LOADER_URL___1___ = getUrl(require(\\"./img.png\\"), { hash: \\"#hash\\" }); var ___CSS_LOADER_URL___2___ = getUrl(require(\\"package/img.png\\")); var ___CSS_LOADER_URL___3___ = getUrl(require(\\"./other-img.png\\")); var ___CSS_LOADER_URL___4___ = getUrl(require(\\"./img img.png\\")); @@ -2606,28 +2606,28 @@ var ___CSS_LOADER_URL___6___ = getUrl(require(\\"./font.woff2\\")); var ___CSS_LOADER_URL___7___ = getUrl(require(\\"./font.eot\\")); var ___CSS_LOADER_URL___8___ = getUrl(require(\\"package/font.ttf\\")); var ___CSS_LOADER_URL___9___ = getUrl(require(\\"./font with spaces.eot\\")); -var ___CSS_LOADER_URL___10___ = getUrl(require(\\"./font.svg\\") + \\"#svgFontName\\"); +var ___CSS_LOADER_URL___10___ = getUrl(require(\\"./font.svg\\"), { hash: \\"#svgFontName\\" }); var ___CSS_LOADER_URL___11___ = getUrl(require(\\"./font.woff2?foo=bar\\")); -var ___CSS_LOADER_URL___12___ = getUrl(require(\\"./font.eot\\") + \\"?#iefix\\"); -var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./font with spaces.eot\\") + \\"?#iefix\\"); +var ___CSS_LOADER_URL___12___ = getUrl(require(\\"./font.eot\\"), { hash: \\"?#iefix\\" }); +var ___CSS_LOADER_URL___13___ = getUrl(require(\\"./font with spaces.eot\\"), { hash: \\"?#iefix\\" }); var ___CSS_LOADER_URL___14___ = getUrl(require(\\"./img1x.png\\")); var ___CSS_LOADER_URL___15___ = getUrl(require(\\"./img2x.png\\")); var ___CSS_LOADER_URL___16___ = getUrl(require(\\"./img.png?foo\\")); var ___CSS_LOADER_URL___17___ = getUrl(require(\\"./img.png?foo=bar\\")); -var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img.png?foo=bar\\") + \\"#hash\\"); +var ___CSS_LOADER_URL___18___ = getUrl(require(\\"./img.png?foo=bar\\"), { hash: \\"#hash\\" }); var ___CSS_LOADER_URL___19___ = getUrl(require(\\"./img.png?\\")); var ___CSS_LOADER_URL___20___ = getUrl(require(\\"./img-simple.png\\")); var ___CSS_LOADER_URL___21___ = getUrl(require(\\"../url/img-simple.png\\")); var ___CSS_LOADER_URL___22___ = getUrl(require(\\"aliasesImg/img.png\\")); var ___CSS_LOADER_URL___23___ = getUrl(require(\\"./nested/img.png\\")); var ___CSS_LOADER_URL___24___ = getUrl(require(\\"./nested/img.png\\")); -var ___CSS_LOADER_URL___25___ = getUrl(require(\\"./img1x.png\\"), true); -var ___CSS_LOADER_URL___26___ = getUrl(require(\\"./img2x.png\\"), true); -var ___CSS_LOADER_URL___27___ = getUrl(require(\\"./img img.png\\"), true); -var ___CSS_LOADER_URL___28___ = getUrl(require(\\"./img3x.png\\"), true); -var ___CSS_LOADER_URL___29___ = getUrl(require(\\"./img1x.png?foo=bar\\"), true); -var ___CSS_LOADER_URL___30___ = getUrl(require(\\"./img1x.png\\") + \\"#hash\\", true); -var ___CSS_LOADER_URL___31___ = getUrl(require(\\"./img1x.png\\") + \\"?#iefix\\", true); +var ___CSS_LOADER_URL___25___ = getUrl(require(\\"./img1x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___26___ = getUrl(require(\\"./img2x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___27___ = getUrl(require(\\"./img img.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___28___ = getUrl(require(\\"./img3x.png\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___29___ = getUrl(require(\\"./img1x.png?foo=bar\\"), { needQuotes: true }); +var ___CSS_LOADER_URL___30___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"#hash\\", needQuotes: true }); +var ___CSS_LOADER_URL___31___ = getUrl(require(\\"./img1x.png\\"), { hash: \\"?#iefix\\", needQuotes: true }); var ___CSS_LOADER_URL___32___ = getUrl(require(\\"./img3x.png\\")); // Module exports.push([module.id, \\".class {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___1___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\\\n \\" + ___CSS_LOADER_URL___0___ + \\"\\\\n );\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___0___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(\\" + ___CSS_LOADER_URL___2___ + \\") url(\\" + ___CSS_LOADER_URL___3___ + \\") xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___4___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url( \\" + ___CSS_LOADER_URL___4___ + \\" ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(/img.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) url(//example.com/image.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n background-image: url(\\\\\\"data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2042%2026%27%20fill%3D%27%2523007aff%27%3E%3Crect%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%271%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2711%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2712%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3Crect%20y%3D%2722%27%20width%3D%274%27%20height%3D%274%27%2F%3E%3Crect%20x%3D%278%27%20y%3D%2723%27%20width%3D%2734%27%20height%3D%272%27%2F%3E%3C%2Fsvg%3E\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n filter: url('data:image/svg+xml;charset=utf-8,#filter');\\\\n}\\\\n\\\\n.class {\\\\n filter: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%5C%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%5C%22%3E%3Cfilter%20id%3D%5C%22filter%5C%22%3E%3CfeGaussianBlur%20in%3D%5C%22SourceAlpha%5C%22%20stdDeviation%3D%5C%220%5C%22%20%2F%3E%3CfeOffset%20dx%3D%5C%221%5C%22%20dy%3D%5C%222%5C%22%20result%3D%5C%22offsetblur%5C%22%20%2F%3E%3CfeFlood%20flood-color%3D%5C%22rgba(255%2C255%2C255%2C1)%5C%22%20%2F%3E%3CfeComposite%20in2%3D%5C%22offsetblur%5C%22%20operator%3D%5C%22in%5C%22%20%2F%3E%3CfeMerge%3E%3CfeMergeNode%20%2F%3E%3CfeMergeNode%20in%3D%5C%22SourceGraphic%5C%22%20%2F%3E%3C%2FfeMerge%3E%3C%2Ffilter%3E%3C%2Fsvg%3E%23filter');\\\\n}\\\\n\\\\n.highlight {\\\\n filter: url(#highlight);\\\\n}\\\\n\\\\n.highlight {\\\\n filter: url('#line-marker');\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\" + ___CSS_LOADER_URL___5___ + \\") format('woff'),\\\\n url(\\" + ___CSS_LOADER_URL___6___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___7___ + \\") format('eot'),\\\\n url(\\" + ___CSS_LOADER_URL___8___ + \\") format('truetype'),\\\\n url(\\" + ___CSS_LOADER_URL___9___ + \\") format(\\\\\\"embedded-opentype\\\\\\"),\\\\n url(\\" + ___CSS_LOADER_URL___10___ + \\") format('svg'),\\\\n url(\\" + ___CSS_LOADER_URL___11___ + \\") format('woff2'),\\\\n url(\\" + ___CSS_LOADER_URL___12___ + \\") format('embedded-opentype'),\\\\n url(\\" + ___CSS_LOADER_URL___13___ + \\") format('embedded-opentype');\\\\n}\\\\n\\\\n@media (min-width: 500px) {\\\\n body {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n }\\\\n}\\\\n\\\\na {\\\\n content: \\\\\\"do not use url(path)\\\\\\";\\\\n}\\\\n\\\\nb {\\\\n content: 'do not \\\\\\"use\\\\\\" url(path)';\\\\n}\\\\n\\\\n@keyframes anim {\\\\n background: green url(\\" + ___CSS_LOADER_URL___0___ + \\") xyz;\\\\n}\\\\n\\\\n.a {\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x)\\\\n}\\\\n\\\\n.a {\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x)\\\\n}\\\\n\\\\n.class {\\\\n background: green url() xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url('') xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(\\\\\\"\\\\\\") xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(' ') xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(\\\\n ) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(https://raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: green url(//raw.githubusercontent.com/webpack/media/master/logo/icon.png) xyz;\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___16___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___17___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___18___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___18___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: url(\\" + ___CSS_LOADER_URL___19___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background-image: url(\\" + ___CSS_LOADER_URL___0___ + \\") url(\\\\\\"data:image/svg+xml;charset=utf-8,\\\\\\") url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\\\n.class {\\\\n background: ___CSS_LOADER_URL___;\\\\n background: ___CSS_LOADER_URL___INDEX___;\\\\n background: ___CSS_LOADER_URL___99999___;\\\\n background: ___CSS_LOADER_IMPORT___;\\\\n background: ___CSS_LOADER_IMPORT___INDEX___;\\\\n background: ___CSS_LOADER_IMPORT___99999___;\\\\n}\\\\n\\\\n.pure-url {\\\\n background: url(\\" + ___CSS_LOADER_URL___20___ + \\");\\\\n}\\\\n\\\\n.not-resolved {\\\\n background: url('/img-simple.png');\\\\n}\\\\n\\\\n.above-below {\\\\n background: url(\\" + ___CSS_LOADER_URL___21___ + \\");\\\\n}\\\\n\\\\n.tilde {\\\\n background: url(\\" + ___CSS_LOADER_URL___2___ + \\");\\\\n}\\\\n\\\\n.aliases {\\\\n background: url(\\" + ___CSS_LOADER_URL___22___ + \\");\\\\n}\\\\n\\\\na {\\\\n background: url(\\" + ___CSS_LOADER_URL___23___ + \\");\\\\n}\\\\n\\\\na {\\\\n background: url(\\" + ___CSS_LOADER_URL___24___ + \\");\\\\n}\\\\n\\\\n@font-face {\\\\n src: url(\\\\\\"//at.alicdn.com/t/font_515771_emcns5054x3whfr.eot\\\\\\");\\\\n}\\\\n\\\\n.class {\\\\n /* Broken */\\\\n background-image: -webkit-image-set();\\\\n background-image: -webkit-image-set('');\\\\n background-image: image-set();\\\\n background-image: image-set('');\\\\n background-image: image-set(\\\\\\"\\\\\\");\\\\n background-image: image-set(\\\\\\"\\\\\\" 1x);\\\\n background-image: image-set(url());\\\\n background-image: image-set(\\\\n url()\\\\n );\\\\n background-image: image-set(URL());\\\\n background-image: image-set(url(''));\\\\n background-image: image-set(url(\\\\\\"\\\\\\"));\\\\n background-image: image-set(url('') 1x);\\\\n background-image: image-set(1x);\\\\n background-image: image-set(\\\\n 1x\\\\n );\\\\n background: image-set(calc(1rem + 1px) 1x);\\\\n\\\\n /* Strings */\\\\n background-image: -webkit-image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___27___ + \\" 1x, \\" + ___CSS_LOADER_URL___27___ + \\" 2x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x),\\\\n image-set(\\" + ___CSS_LOADER_URL___25___ + \\" 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n background-image: image-set(\\\\n \\" + ___CSS_LOADER_URL___25___ + \\" 1x,\\\\n \\" + ___CSS_LOADER_URL___26___ + \\" 2x,\\\\n \\" + ___CSS_LOADER_URL___28___ + \\" 600dpi\\\\n );\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___29___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___30___ + \\" 1x);\\\\n background-image: image-set(\\" + ___CSS_LOADER_URL___31___ + \\" 1x);\\\\n\\\\n /* With \`url\` function */\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x);\\\\n background-image: -webkit-image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x);\\\\n background-image: -webkit-image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x);\\\\n background-image: image-set(\\\\n url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x,\\\\n url(\\" + ___CSS_LOADER_URL___15___ + \\") 2x,\\\\n url(\\" + ___CSS_LOADER_URL___32___ + \\") 600dpi\\\\n );\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___4___ + \\") 1x, url(\\" + ___CSS_LOADER_URL___4___ + \\") 2x);\\\\n\\\\n background-image: image-set(url(\\" + ___CSS_LOADER_URL___14___ + \\") 1x, \\" + ___CSS_LOADER_URL___26___ + \\" 2x);\\\\n}\\\\n\\", \\"\\"]); diff --git a/test/runtime/__snapshots__/getUrl.test.js.snap b/test/runtime/__snapshots__/getUrl.test.js.snap index f03378f4..d3f84ed3 100644 --- a/test/runtime/__snapshots__/getUrl.test.js.snap +++ b/test/runtime/__snapshots__/getUrl.test.js.snap @@ -18,17 +18,17 @@ exports[`escape should escape url 8`] = `"\\"image\\\\\\"other.png\\""`; exports[`escape should escape url 9`] = `"\\"image\\\\nother.png\\""`; -exports[`escape should escape url 10`] = `"\\"image.png\\""`; +exports[`escape should escape url 10`] = `"image.png#hash"`; -exports[`escape should escape url 11`] = `"\\"image other.png\\""`; +exports[`escape should escape url 11`] = `"image.png#hash"`; -exports[`escape should escape url 12`] = `"\\"image other.png\\""`; +exports[`escape should escape url 12`] = `"image.png#hash"`; -exports[`escape should escape url 13`] = `"image.png"`; +exports[`escape should escape url 13`] = `"\\"image other.png#hash\\""`; -exports[`escape should escape url 14`] = `"image.png"`; +exports[`escape should escape url 14`] = `"\\"image other.png#hash\\""`; -exports[`escape should escape url 15`] = `"image.png"`; +exports[`escape should escape url 15`] = `"\\"image other.png#hash\\""`; exports[`escape should escape url 16`] = `"\\"image other.png\\""`; @@ -36,12 +36,48 @@ exports[`escape should escape url 17`] = `"\\"image other.png\\""`; exports[`escape should escape url 18`] = `"\\"image other.png\\""`; -exports[`escape should escape url 19`] = `"\\"image\\\\\\"other.png\\""`; +exports[`escape should escape url 19`] = `"image.png"`; -exports[`escape should escape url 20`] = `"\\"image\\\\nother.png\\""`; +exports[`escape should escape url 20`] = `"image.png"`; -exports[`escape should escape url 21`] = `"\\"image.png\\""`; +exports[`escape should escape url 21`] = `"image.png"`; -exports[`escape should escape url 22`] = `"\\"image.png\\""`; +exports[`escape should escape url 22`] = `"\\"image other.png\\""`; -exports[`escape should escape url 23`] = `"\\"image.png\\""`; +exports[`escape should escape url 23`] = `"\\"image other.png\\""`; + +exports[`escape should escape url 24`] = `"\\"image other.png\\""`; + +exports[`escape should escape url 25`] = `"\\"image\\\\\\"other.png\\""`; + +exports[`escape should escape url 26`] = `"\\"image\\\\nother.png\\""`; + +exports[`escape should escape url 27`] = `"image.png#hash"`; + +exports[`escape should escape url 28`] = `"image.png#hash"`; + +exports[`escape should escape url 29`] = `"image.png#hash"`; + +exports[`escape should escape url 30`] = `"\\"image other.png#hash\\""`; + +exports[`escape should escape url 31`] = `"\\"image other.png\\""`; + +exports[`escape should escape url 32`] = `"\\"image other.png\\""`; + +exports[`escape should escape url 33`] = `"\\"image other.png\\""`; + +exports[`escape should escape url 34`] = `"\\"image other.png#hash\\""`; + +exports[`escape should escape url 35`] = `"\\"image other.png#hash\\""`; + +exports[`escape should escape url 36`] = `"\\"image other.png#hash\\""`; + +exports[`escape should escape url 37`] = `"\\"image other.png#hash\\""`; + +exports[`escape should escape url 38`] = `"\\"image other.png#hash\\""`; + +exports[`escape should escape url 39`] = `"\\"image other.png#hash\\""`; + +exports[`escape should escape url 40`] = `"\\"image other.png#hash\\""`; + +exports[`escape should escape url 41`] = `"\\"image other.png#hash\\""`; diff --git a/test/runtime/getUrl.test.js b/test/runtime/getUrl.test.js index 6f3304dc..aecf8d26 100644 --- a/test/runtime/getUrl.test.js +++ b/test/runtime/getUrl.test.js @@ -12,9 +12,16 @@ describe('escape', () => { expect(getUrl('image"other.png')).toMatchSnapshot(); expect(getUrl('image\nother.png')).toMatchSnapshot(); - expect(getUrl('image.png', true)).toMatchSnapshot(); - expect(getUrl("'image other.png'", true)).toMatchSnapshot(); - expect(getUrl('"image other.png"', true)).toMatchSnapshot(); + expect(getUrl('image.png', { hash: '#hash' })).toMatchSnapshot(); + expect(getUrl('"image.png"', { hash: '#hash' })).toMatchSnapshot(); + expect(getUrl("'image.png'", { hash: '#hash' })).toMatchSnapshot(); + expect(getUrl('image other.png', { hash: '#hash' })).toMatchSnapshot(); + expect(getUrl('"image other.png"', { hash: '#hash' })).toMatchSnapshot(); + expect(getUrl("'image other.png'", { hash: '#hash' })).toMatchSnapshot(); + + expect(getUrl('image other.png', { needQuotes: true })).toMatchSnapshot(); + expect(getUrl("'image other.png'", { needQuotes: true })).toMatchSnapshot(); + expect(getUrl('"image other.png"', { needQuotes: true })).toMatchSnapshot(); expect( getUrl({ default: 'image.png', __esModule: true }) @@ -42,13 +49,76 @@ describe('escape', () => { ).toMatchSnapshot(); expect( - getUrl({ default: 'image.png', __esModule: true }, true) + getUrl({ default: 'image.png', __esModule: true }, { hash: '#hash' }) + ).toMatchSnapshot(); + expect( + getUrl({ default: '"image.png"', __esModule: true }, { hash: '#hash' }) + ).toMatchSnapshot(); + expect( + getUrl({ default: "'image.png'", __esModule: true }, { hash: '#hash' }) + ).toMatchSnapshot(); + expect( + getUrl( + { default: 'image other.png', __esModule: true }, + { hash: '#hash' } + ) + ).toMatchSnapshot(); + + expect( + getUrl( + { default: 'image other.png', __esModule: true }, + { needQuotes: true } + ) + ).toMatchSnapshot(); + expect( + getUrl( + { default: "'image other.png'", __esModule: true }, + { needQuotes: true } + ) + ).toMatchSnapshot(); + expect( + getUrl( + { default: '"image other.png"', __esModule: true }, + { needQuotes: true } + ) + ).toMatchSnapshot(); + + expect( + getUrl('image other.png', { hash: '#hash', needQuotes: true }) + ).toMatchSnapshot(); + expect( + getUrl('"image other.png"', { hash: '#hash', needQuotes: true }) + ).toMatchSnapshot(); + expect( + getUrl("'image other.png'", { hash: '#hash', needQuotes: true }) + ).toMatchSnapshot(); + expect( + getUrl('image other.png', { hash: '#hash', needQuotes: true }) + ).toMatchSnapshot(); + + expect( + getUrl( + { default: 'image other.png', __esModule: true }, + { hash: '#hash', needQuotes: true } + ) + ).toMatchSnapshot(); + expect( + getUrl( + { default: '"image other.png"', __esModule: true }, + { hash: '#hash', needQuotes: true } + ) ).toMatchSnapshot(); expect( - getUrl({ default: "'image.png'", __esModule: true }, true) + getUrl( + { default: "'image other.png'", __esModule: true }, + { hash: '#hash', needQuotes: true } + ) ).toMatchSnapshot(); expect( - getUrl({ default: '"image.png"', __esModule: true }, true) + getUrl( + { default: 'image other.png', __esModule: true }, + { hash: '#hash', needQuotes: true } + ) ).toMatchSnapshot(); }); }); From 77e705cd823e084968b4ee7d747d08fa16a038dc Mon Sep 17 00:00:00 2001 From: evilebottnawi Date: Mon, 2 Dec 2019 17:05:13 +0300 Subject: [PATCH 6/6] chore(release): 3.2.1 --- CHANGELOG.md | 8 ++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b23e349..e3c4a4c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [3.2.1](https://github.com/webpack-contrib/css-loader/compare/v3.2.0...v3.2.1) (2019-12-02) + + +### Bug Fixes + +* add an additional space after the escape sequence ([#998](https://github.com/webpack-contrib/css-loader/issues/998)) ([0961304](https://github.com/webpack-contrib/css-loader/commit/0961304020832fc9ca70cc708f4366e1f868e765)) +* compatibility with ES modules syntax and hash in `url` function ([#1001](https://github.com/webpack-contrib/css-loader/issues/1001)) ([8f4d6f5](https://github.com/webpack-contrib/css-loader/commit/8f4d6f508187513347106a436eda993f874065f1)) + ## [3.2.0](https://github.com/webpack-contrib/css-loader/compare/v3.1.0...v3.2.0) (2019-08-06) diff --git a/package-lock.json b/package-lock.json index 1aae4e87..0919b115 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "css-loader", - "version": "3.2.0", + "version": "3.2.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a449b412..a2acee79 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "css-loader", - "version": "3.2.0", + "version": "3.2.1", "description": "css loader module for webpack", "license": "MIT", "repository": "webpack-contrib/css-loader",