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

Commit 23b26d0

Browse files
author
Julio Farah
authored
Update segmentio-facade and remove component-querystring (#238)
* Update history * Update facade; remove component-querystring * force build * mergeable config
1 parent 16aad4c commit 23b26d0

File tree

4 files changed

+66
-39
lines changed

4 files changed

+66
-39
lines changed

.github/mergeable.yml

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,55 @@
1+
12
version: 2
23
mergeable:
3-
- when: pull_request.*
4-
name: 'PR description: versioning'
4+
- when: pull_request.*, pull_request_review.*
5+
name: Change Control Pre-Merge-Check
56
validate:
6-
- do: or
7-
validate:
8-
- do: dependent
9-
changed:
10-
file: '**/*'
11-
required: ['HISTORY.md']
12-
- do: description
13-
must_include:
14-
regex: 'New version is not required'
15-
message: 'Should cut a new version or explicitly documents new version not required in description'
16-
- when: pull_request.*
17-
name: 'PR description: testing'
18-
validate:
19-
- do: description
20-
must_include:
21-
regex: 'Testing completed successfully|Testing not required'
22-
message: 'Please describe how testing was done or explicitly state testing not required'
7+
- do: or
8+
validate:
9+
- do: and
10+
validate:
11+
- do: approvals
12+
min:
13+
count: 1
14+
- do: description
15+
or:
16+
- and:
17+
- must_exclude:
18+
regex: Testing completed successfully
19+
- must_include:
20+
regex: Testing not required
21+
- and:
22+
- must_include:
23+
regex: Testing completed successfully
24+
- must_exclude:
25+
regex: Testing not required
26+
- must_include:
27+
regex: 'CC-\d{4,5}'
28+
- do: title
29+
must_include:
30+
regex: stage|staging|README|non-prod|docs
31+
pass:
32+
- do: checks
33+
status: success
34+
payload:
35+
title: Mergeable Run has been Completed!
36+
summary: All the validators are passing!
37+
fail:
38+
- do: checks
39+
status: failure
40+
payload:
41+
title: Mergeable Run has been Completed!
42+
summary: "### Status: {{toUpperCase validationStatus}}\
43+
\nHere are some stats of the run:\
44+
\n{{#with validationSuites.[0]}} {{ validations.length }} validations were ran. {{/with}}\n"
45+
text: "{{#each validationSuites}}\n
46+
### {{{statusIcon status}}} Change-Control Pre-Merge Check \n
47+
#### All PRs must follow bellow Change-Control rules: \n
48+
* ##### {{#with validations.[0]}} {{{statusIcon status}}} Must have at least one approval.\n {{/with}}
49+
* ##### {{#with validations.[1]}} {{{statusIcon status}}} Description includes a testing plan: \n
50+
\t ##### \"Testing not required\" OR \"Testing completed successfully\" but NOT BOTH. \n
51+
\t ##### OR \n
52+
\t ##### Jira Change-Control ticket is included.\n {{/with}}\n\n
53+
#### PRs that are exempt from Change-Control: \n
54+
* ##### {{#with validations.[2]}} {{{statusIcon status}}} Title includes stage, staging, README, non-prod, docs.\n {{/with}}\n
55+
{{/each}}"

HISTORY.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 4.1.8 / 2020-03-23
2+
3+
- Fix Potential DOM-based XSS via prototype pollution
4+
15
# 4.0.4 / 2020-09-11
26

37
- Change the arguments of the main methods to be optional in the typedef to match the documentation. (#203)

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
"bind-all": "^1.0.0",
4848
"component-emitter": "^1.2.1",
4949
"component-event": "^0.1.4",
50-
"component-querystring": "^2.0.0",
5150
"component-type": "^1.2.1",
5251
"component-url": "^0.2.1",
5352
"debug": "^2.6.9",
@@ -58,7 +57,7 @@
5857
"new-date": "^1.0.0",
5958
"next-tick": "^0.2.2",
6059
"package-json-versionify": "^1.0.4",
61-
"segmentio-facade": "^3.0.2",
60+
"segmentio-facade": "^3.2.7",
6261
"spark-md5": "^2.0.2",
6362
"uuid": "^3.4.0"
6463
},

yarn.lock

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2491,21 +2491,10 @@ component-props@*:
24912491
version "1.1.1"
24922492
resolved "https://registry.yarnpkg.com/component-props/-/component-props-1.1.1.tgz#f9b7df9b9927b6e6d97c9bd272aa867670f34944"
24932493

2494-
component-querystring@^2.0.0:
2495-
version "2.0.0"
2496-
resolved "https://registry.yarnpkg.com/component-querystring/-/component-querystring-2.0.0.tgz#84a95d18e471c8491b043df240f0d18d4db527ec"
2497-
dependencies:
2498-
component-type "1.1.0"
2499-
trim "0.0.1"
2500-
25012494
25022495
version "1.0.0"
25032496
resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.0.0.tgz#1ed8812e32dd65099d433570757f111ea3d3d871"
25042497

2505-
2506-
version "1.1.0"
2507-
resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.1.0.tgz#95b666aad53e5c8d1f2be135c45b5d499197c0c5"
2508-
25092498
component-type@^1.2.0, component-type@^1.2.1:
25102499
version "1.2.1"
25112500
resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.2.1.tgz#8a47901700238e4fc32269771230226f24b415a9"
@@ -8095,17 +8084,18 @@ secure-keys@^1.0.0:
80958084
version "1.0.0"
80968085
resolved "https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca"
80978086

8098-
segmentio-facade@^3.0.2:
8099-
version "3.2.3"
8100-
resolved "https://registry.yarnpkg.com/segmentio-facade/-/segmentio-facade-3.2.3.tgz#7ddc6971801a482475b6a768184696a847e9197d"
8087+
segmentio-facade@^3.2.7:
8088+
version "3.2.7"
8089+
resolved "https://registry.yarnpkg.com/segmentio-facade/-/segmentio-facade-3.2.7.tgz#49241c9e16f78c72cccfaa2cb9fe8d07c0358910"
8090+
integrity sha512-DCxlTVG9gKIgpCD9MCBhRxxyj99k9V8ztoiwChfg2KgesIY2zZ2O91cgtMyIoK8NYwVTvSFtmY+X2vIBnMSyDw==
81018091
dependencies:
81028092
"@ndhoule/clone" "^1.0.0"
81038093
"@segment/isodate-traverse" "^1.0.0"
81048094
inherits "^2.0.1"
81058095
is-email "0.1.0"
81068096
new-date "^1.0.0"
81078097
obj-case "0.x"
8108-
trim "0.0.1"
8098+
trim "1.0.0"
81098099
type-component "0.0.1"
81108100

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

9428-
9429-
version "0.0.1"
9430-
resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
9418+
9419+
version "1.0.0"
9420+
resolved "https://registry.yarnpkg.com/trim/-/trim-1.0.0.tgz#fd1f30b878bdd2d8435fa0f2cc9cbb55f518be7d"
9421+
integrity sha512-UgtES1lYpE+f4WiGY5lyJlHchuGhTa/xMPH96g/B7gc+pEQPiL41s6ECm7Ky3hkhARG/u1SHGFcleJodAvQOKQ==
94319422

94329423
ts-node@^8.10.2:
94339424
version "8.10.2"

0 commit comments

Comments
 (0)