diff --git a/AUTHORS.md b/AUTHORS.md index 2442f6488..09559c2be 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -5,15 +5,18 @@ If an entry is incorrect or duplicated, add or correct the entry in `.mailmap` i - Aaron Gustafson - Adrienne L. Travis - Alex MacDonald +- Andy McCormick - Brandon Jones - Brian Litzinger - Dan Decker - Daniel Bingham - Derek Jones +- Douglas Black - Erwin Romkes - Gareth Davies - Geof Cowan - Greg Aker +- Jace Richardson - Jack McDade - James Mathias - Jason Matar @@ -23,7 +26,9 @@ If an entry is incorrect or duplicated, add or correct the entry in `.mailmap` i - Kevin Smith - Kyle Cotter - Leslie Camacho +- Maris Fisher - Matt Johnson +- Nathan van Bakel - Neil Mac - Pascal Kriete - Quinn Chrzan @@ -35,8 +40,9 @@ If an entry is incorrect or duplicated, add or correct the entry in `.mailmap` i - Stefan Rechsteiner - Travis Smith - Wes Baker +- dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -![](https://www.gravatar.com/avatar/323311bb4cc5af1a4b2c5c26b4cfc5a3.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/28fd78ec7f39c9667c57ddcda6b83351.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/59dbcce3920cc5b199e2c44807010465.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/44ef19fe2f0d9f5047279a585663fd67.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/069965463531f082c67fa8087eff0b05.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/3e9d57bf5c8481eca26817339b1a3bd2.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/29abcce86d2506d61ac673588eb8a7d1.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/bcf753700280546563d4a604e3a71060.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/91b623a1ab555390e8929b9be687f4c7.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/91d827f8f25f63b8112790de73a1d938.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/f210d8404df5251a228ddd1704c7e776.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/06fa48390d4d830b110af14955586a93.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/d97bb7470a585d1f835e0830c01f0b20.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/5cd8a4f8e479da78fc66fbb2367399d4.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/437961e2d136fff00e34ac97951e2044.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/deca48a51c0d0773715ad951c0440756.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/aa4bb05aae17dee79b899506017a39ee.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/b3aee19cfd195316fa300ba8e57e6fd2.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/135073ed48a5ff8fb6fcda84df0b5723.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/52b49de838ac68b9b5f7c9694a03bc2b.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/290aa1ca755c66ec25bb4906939329f3.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/9628e9a39607342152d295ff42d4a415.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/6dca8a36642550738e6eeb5c9a815e3c.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/1d157c5426bdf80e829b92446c930291.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/18b650e3eb0eb19d390b600b89c54a08.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/92508cc5ce3ed75dd47b4d508b0de8bd.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/9950bab22f7c1baaf19484f54cec5717.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/ec72c77b2a1e31882eaafa9c888c84eb.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/b7ad958da63fe6a6182f47391899d90c.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/218cd1d6a12024750e65a274b4932b42.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/df98acc8477e362af5f77be10c2edeac.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/abe6907032a1123faa49707bfb662ae2.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/94260e052fa9c0df9e87428d07c2966a.jpg?r=pg&d=robohash ) +![](https://www.gravatar.com/avatar/323311bb4cc5af1a4b2c5c26b4cfc5a3.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/28fd78ec7f39c9667c57ddcda6b83351.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/59dbcce3920cc5b199e2c44807010465.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/02553319e74f65aefabb110a9d83b121.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/44ef19fe2f0d9f5047279a585663fd67.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/069965463531f082c67fa8087eff0b05.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/3e9d57bf5c8481eca26817339b1a3bd2.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/29abcce86d2506d61ac673588eb8a7d1.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/bcf753700280546563d4a604e3a71060.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/5ca14d9704b3eee3260127bfcc6ecf42.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/91b623a1ab555390e8929b9be687f4c7.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/91d827f8f25f63b8112790de73a1d938.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/f210d8404df5251a228ddd1704c7e776.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/06fa48390d4d830b110af14955586a93.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/5113a79fa6bfde5c7e37186b530de617.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/d97bb7470a585d1f835e0830c01f0b20.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/5cd8a4f8e479da78fc66fbb2367399d4.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/437961e2d136fff00e34ac97951e2044.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/deca48a51c0d0773715ad951c0440756.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/aa4bb05aae17dee79b899506017a39ee.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/b3aee19cfd195316fa300ba8e57e6fd2.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/135073ed48a5ff8fb6fcda84df0b5723.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/52b49de838ac68b9b5f7c9694a03bc2b.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/290aa1ca755c66ec25bb4906939329f3.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/7f90f19e42cbaa5d9a2fe07c22f471cb.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/9628e9a39607342152d295ff42d4a415.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/9e595a12c0f91ec69ce04db281b2eb8f.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/6dca8a36642550738e6eeb5c9a815e3c.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/1d157c5426bdf80e829b92446c930291.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/18b650e3eb0eb19d390b600b89c54a08.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/92508cc5ce3ed75dd47b4d508b0de8bd.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/9950bab22f7c1baaf19484f54cec5717.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/ec72c77b2a1e31882eaafa9c888c84eb.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/b7ad958da63fe6a6182f47391899d90c.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/218cd1d6a12024750e65a274b4932b42.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/df98acc8477e362af5f77be10c2edeac.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/abe6907032a1123faa49707bfb662ae2.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/94260e052fa9c0df9e87428d07c2966a.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/48ea49be76d0c68403a7f3df87e3487d.jpg?r=pg&d=robohash ) Additionally, the following contributed content prior to 2011 when this repository was created: diff --git a/config.yml b/config.yml index 22454b754..f62d5499b 100644 --- a/config.yml +++ b/config.yml @@ -6,6 +6,6 @@ outputDir: build themeDir: theme customVariables: - current_version: '5.3.0' + current_version: '5.3.1' current_year: 2020 diff --git a/docs/add-ons/search/results.md b/docs/add-ons/search/results.md index cf5281c43..5a9a3e070 100755 --- a/docs/add-ons/search/results.md +++ b/docs/add-ons/search/results.md @@ -25,9 +25,9 @@ The Search Results Tag controls how you display results from your searches. Exam {lang:recent_comments} - {exp:search:search_results switch="resultRowOne|resultRowTwo"} + {exp:search:search_results} - + {title} {excerpt} {author} @@ -110,6 +110,14 @@ This parameter is replaced with the URL to the entry with the Entry ID appended The Template_Group/Template with which to display the member profile of the author of the entry. Typically, this variable will be specified as {member_path='member/index'}. +### `{switch=}` + + {switch="option_one|option_two|option_three"} + +This variable permits you to rotate through any number of values as the entries are displayed. The first entry will use "option_one", the second will use "option_two", the third "option_three", the fourth "option_one", and so on. + +Multiple instances of the {switch=} tag may be used and ExpressionEngine will intelligently keep track of each one. + ## Search Keywords Tag This tag lets you display the keywords used to perform a search. It is used on the search results page in order to show the user exactly what search terms they used: diff --git a/docs/development/legacy/libraries/email.md b/docs/development/legacy/libraries/email.md index 2d6fec4df..acd56b9b9 100755 --- a/docs/development/legacy/libraries/email.md +++ b/docs/development/legacy/libraries/email.md @@ -36,7 +36,7 @@ The Email class will automatically create all email headers and will process the ee()->email->to($recipient); ee()->email->subject($email_subject); ee()->email->message(entities_to_ascii($email_msg)); - ee()->email->Send(); + ee()->email->send(); ### Properties diff --git a/docs/development/services/model/relating-models.md b/docs/development/services/model/relating-models.md index 3940dce7b..22c4a9949 100755 --- a/docs/development/services/model/relating-models.md +++ b/docs/development/services/model/relating-models.md @@ -123,7 +123,7 @@ Here `left` describes the pivot table key connecting the current model and `righ ## Inverse Relationships -All relationships must be declared in both associated models. Thif tmproves code consistency and predictability by allowing both sides of the relationship to be altered without creating orphaned objects. This is particularly important when creating parent-child relationships that cascade their deletions automatically. +All relationships must be declared in both associated models. This improves code consistency and predictability by allowing both sides of the relationship to be altered without creating orphaned objects. This is particularly important when creating parent-child relationships that cascade their deletions automatically. When relating to models that are not your own, this becomes problematic since your addon cannot directly add relationships to native models. To get around this problem and to allow for native events to cascade to your models, you must declare all external dependencies in your `addon.setup.php` file: diff --git a/docs/fieldtypes/fluid.md b/docs/fieldtypes/fluid.md index 85aa95675..8cd9c9d3b 100755 --- a/docs/fieldtypes/fluid.md +++ b/docs/fieldtypes/fluid.md @@ -31,6 +31,10 @@ Fields can be used more than once and in any order. They can be re-ordered withi The frontend will output the various field contents in the order specified in the entry. +## Channel Form + +A fluid field cannot be used in the channel form. + ## Template Tags Fluid field content is ouput using variable pairs. An outer variable pair using the Fluid field's shortname wraps all content. Within that wrapper variable pair, each field can be output using a prefixed variable pair and the `{content}` variable. Within the prefixed variable pair, the `{content}` variable is used in place of the field's shortname. diff --git a/docs/installation/changelog.md b/docs/installation/changelog.md index ff423dc40..da04fb1ff 100755 --- a/docs/installation/changelog.md +++ b/docs/installation/changelog.md @@ -9,6 +9,22 @@ # ExpressionEngine v5 Change Log +## Version 5.3.1 + +Release Date: April 9, 2020 + +- **Added support for PHP 7.4** +- Fixed a bug ([#147](https://github.com/ExpressionEngine/ExpressionEngine/issues/147)) where `is_system_on` was changed to `y` when updating the CMS. +- Fixed a bug ([#188](https://github.com/ExpressionEngine/ExpressionEngine/issues/188)) where image uploads where failing because of missing integer casting. +- Fixed a bug ([#190](https://github.com/ExpressionEngine/ExpressionEngine/issues/190)) where omitting the return parameter for the `{exp:consent:form}` tag didn't redirect to same page as it was submitted on per the [docs](https://docs.expressionengine.com/latest/add-ons/consent.html#return). +- Fixed a bug ([#248](https://github.com/ExpressionEngine/ExpressionEngine/issues/248)) where the `after_channel_entry_save` extension hook would run twice when saving a new channel entry. +- Fixed a bug ([#292](https://github.com/ExpressionEngine/ExpressionEngine/issues/292)) where a user was unable to delete page uri or page template with default theme installed. +- Fixes a bug ([#321](https://github.com/ExpressionEngine/ExpressionEngine/issues/321)) where a warning was not being displayed when an entry was saved if a URI was entered in the Pages module without also selecting a template. +- Fixed a bug ([#337](https://github.com/ExpressionEngine/ExpressionEngine/issues/337)) where an entry with a URL title of `n` was being ignored. +- Fixed a bug ([#346](https://github.com/ExpressionEngine/ExpressionEngine/issues/346)) where strpos Non-string needles will be interpreted as strings in the future. +- Fixed a bug ([#382](https://github.com/ExpressionEngine/ExpressionEngine/issues/382)) where drag and drop fields were producing errors in MSM sites. + + ## Version 5.3.0 Release Date: September 28, 2019 diff --git a/package-lock.json b/package-lock.json old mode 100755 new mode 100644 index 2ce48fbd0..775e0528a --- a/package-lock.json +++ b/package-lock.json @@ -1049,7 +1049,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true + "dev": true, + "optional": true }, "assign-symbols": { "version": "1.0.0", @@ -1509,6 +1510,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", "dev": true, + "optional": true, "requires": { "delayed-stream": "~1.0.0" } @@ -1726,7 +1728,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true + "dev": true, + "optional": true }, "detect-file": { "version": "1.0.0", @@ -2045,7 +2048,8 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true + "dev": true, + "optional": true }, "fancy-log": { "version": "1.3.3", @@ -2257,7 +2261,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2278,12 +2283,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2298,17 +2305,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2425,7 +2435,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2437,6 +2448,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2451,6 +2463,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2458,12 +2471,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2482,6 +2497,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2562,7 +2578,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2574,6 +2591,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2659,7 +2677,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2695,6 +2714,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2714,6 +2734,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2757,12 +2778,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -2991,7 +3014,7 @@ }, "os-locale": { "version": "1.4.0", - "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { @@ -3000,7 +3023,7 @@ }, "string-width": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { @@ -3011,7 +3034,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { @@ -3374,7 +3397,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -3424,7 +3447,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { @@ -3653,7 +3676,8 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true + "dev": true, + "optional": true }, "jsesc": { "version": "2.5.2", @@ -3876,9 +3900,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", "dev": true }, "lodash.clone": { @@ -3906,9 +3930,9 @@ "dev": true }, "lodash.merge": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", - "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==", + "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.partialright": { @@ -4061,13 +4085,15 @@ "version": "1.37.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==", - "dev": true + "dev": true, + "optional": true }, "mime-types": { "version": "2.1.21", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", "dev": true, + "optional": true, "requires": { "mime-db": "~1.37.0" } @@ -4088,14 +4114,14 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.2.tgz", + "integrity": "sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA==" }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -4551,7 +4577,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, @@ -4616,7 +4642,7 @@ }, "kind-of": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", "dev": true } @@ -5097,7 +5123,8 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "dev": true, + "optional": true }, "semver": { "version": "5.6.0", @@ -5668,7 +5695,8 @@ "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true + "dev": true, + "optional": true }, "typedarray": { "version": "0.0.6", @@ -6049,7 +6077,7 @@ }, "string-width": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { @@ -6060,7 +6088,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { diff --git a/package.json b/package.json old mode 100755 new mode 100644 index 479c21e68..3a64a81f1 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "private": true, "dependencies": { - "minimist": "^1.2.0" + "minimist": "^1.2.2" }, "devDependencies": { "@babel/core": "^7.2.2",