Skip to content
This repository was archived by the owner on Sep 3, 2022. It is now read-only.

Update segmentio-facade and remove component-querystring #238

Merged
merged 4 commits into from
Mar 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 52 additions & 19 deletions .github/mergeable.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,55 @@

version: 2
mergeable:
- when: pull_request.*
name: 'PR description: versioning'
- when: pull_request.*, pull_request_review.*
name: Change Control Pre-Merge-Check
validate:
- do: or
validate:
- do: dependent
changed:
file: '**/*'
required: ['HISTORY.md']
- do: description
must_include:
regex: 'New version is not required'
message: 'Should cut a new version or explicitly documents new version not required in description'
- when: pull_request.*
name: 'PR description: testing'
validate:
- do: description
must_include:
regex: 'Testing completed successfully|Testing not required'
message: 'Please describe how testing was done or explicitly state testing not required'
- do: or
validate:
- do: and
validate:
- do: approvals
min:
count: 1
- do: description
or:
- and:
- must_exclude:
regex: Testing completed successfully
- must_include:
regex: Testing not required
- and:
- must_include:
regex: Testing completed successfully
- must_exclude:
regex: Testing not required
- must_include:
regex: 'CC-\d{4,5}'
- do: title
must_include:
regex: stage|staging|README|non-prod|docs
pass:
- do: checks
status: success
payload:
title: Mergeable Run has been Completed!
summary: All the validators are passing!
fail:
- do: checks
status: failure
payload:
title: Mergeable Run has been Completed!
summary: "### Status: {{toUpperCase validationStatus}}\
\nHere are some stats of the run:\
\n{{#with validationSuites.[0]}} {{ validations.length }} validations were ran. {{/with}}\n"
text: "{{#each validationSuites}}\n
### {{{statusIcon status}}} Change-Control Pre-Merge Check \n
#### All PRs must follow bellow Change-Control rules: \n
* ##### {{#with validations.[0]}} {{{statusIcon status}}} Must have at least one approval.\n {{/with}}
* ##### {{#with validations.[1]}} {{{statusIcon status}}} Description includes a testing plan: \n
\t ##### \"Testing not required\" OR \"Testing completed successfully\" but NOT BOTH. \n
\t ##### OR \n
\t ##### Jira Change-Control ticket is included.\n {{/with}}\n\n
#### PRs that are exempt from Change-Control: \n
* ##### {{#with validations.[2]}} {{{statusIcon status}}} Title includes stage, staging, README, non-prod, docs.\n {{/with}}\n
{{/each}}"
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 4.1.8 / 2020-03-23

- Fix Potential DOM-based XSS via prototype pollution

# 4.0.4 / 2020-09-11

- Change the arguments of the main methods to be optional in the typedef to match the documentation. (#203)
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"bind-all": "^1.0.0",
"component-emitter": "^1.2.1",
"component-event": "^0.1.4",
"component-querystring": "^2.0.0",
"component-type": "^1.2.1",
"component-url": "^0.2.1",
"debug": "^2.6.9",
Expand All @@ -58,7 +57,7 @@
"new-date": "^1.0.0",
"next-tick": "^0.2.2",
"package-json-versionify": "^1.0.4",
"segmentio-facade": "^3.0.2",
"segmentio-facade": "^3.2.7",
"spark-md5": "^2.0.2",
"uuid": "^3.4.0"
},
Expand Down
27 changes: 9 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2491,21 +2491,10 @@ component-props@*:
version "1.1.1"
resolved "https://registry.yarnpkg.com/component-props/-/component-props-1.1.1.tgz#f9b7df9b9927b6e6d97c9bd272aa867670f34944"

component-querystring@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/component-querystring/-/component-querystring-2.0.0.tgz#84a95d18e471c8491b043df240f0d18d4db527ec"
dependencies:
component-type "1.1.0"
trim "0.0.1"

[email protected]:
version "1.0.0"
resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.0.0.tgz#1ed8812e32dd65099d433570757f111ea3d3d871"

[email protected]:
version "1.1.0"
resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.1.0.tgz#95b666aad53e5c8d1f2be135c45b5d499197c0c5"

component-type@^1.2.0, component-type@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.2.1.tgz#8a47901700238e4fc32269771230226f24b415a9"
Expand Down Expand Up @@ -8095,17 +8084,18 @@ secure-keys@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca"

segmentio-facade@^3.0.2:
version "3.2.3"
resolved "https://registry.yarnpkg.com/segmentio-facade/-/segmentio-facade-3.2.3.tgz#7ddc6971801a482475b6a768184696a847e9197d"
segmentio-facade@^3.2.7:
version "3.2.7"
resolved "https://registry.yarnpkg.com/segmentio-facade/-/segmentio-facade-3.2.7.tgz#49241c9e16f78c72cccfaa2cb9fe8d07c0358910"
integrity sha512-DCxlTVG9gKIgpCD9MCBhRxxyj99k9V8ztoiwChfg2KgesIY2zZ2O91cgtMyIoK8NYwVTvSFtmY+X2vIBnMSyDw==
dependencies:
"@ndhoule/clone" "^1.0.0"
"@segment/isodate-traverse" "^1.0.0"
inherits "^2.0.1"
is-email "0.1.0"
new-date "^1.0.0"
obj-case "0.x"
trim "0.0.1"
trim "1.0.0"
type-component "0.0.1"

semver-compare@^1.0.0:
Expand Down Expand Up @@ -9425,9 +9415,10 @@ trim-right@^1.0.1:
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=

[email protected]:
version "0.0.1"
resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
[email protected]:
version "1.0.0"
resolved "https://registry.yarnpkg.com/trim/-/trim-1.0.0.tgz#fd1f30b878bdd2d8435fa0f2cc9cbb55f518be7d"
integrity sha512-UgtES1lYpE+f4WiGY5lyJlHchuGhTa/xMPH96g/B7gc+pEQPiL41s6ECm7Ky3hkhARG/u1SHGFcleJodAvQOKQ==

ts-node@^8.10.2:
version "8.10.2"
Expand Down