govuk_publishing_components 17.12.2 → 17.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/govuk_publishing_components/components/feedback.js +7 -2
- data/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss +8 -2
- data/app/views/govuk_publishing_components/components/_checkboxes.html.erb +4 -0
- data/app/views/govuk_publishing_components/components/_radio.html.erb +5 -0
- data/app/views/govuk_publishing_components/components/docs/checkboxes.yml +41 -0
- data/app/views/govuk_publishing_components/components/docs/radio.yml +48 -0
- data/app/views/govuk_publishing_components/components/feedback/_problem_form.html.erb +1 -1
- data/app/views/govuk_publishing_components/components/feedback/_survey_signup_form.html.erb +1 -1
- data/lib/govuk_publishing_components/presenters/checkboxes_helper.rb +2 -1
- data/lib/govuk_publishing_components/version.rb +1 -1
- data/node_modules/accessible-autocomplete/package.json +1 -1
- data/node_modules/lodash/README.md +2 -2
- data/node_modules/lodash/core.js +1 -1
- data/node_modules/lodash/core.min.js +1 -1
- data/node_modules/lodash/lodash.js +1 -1
- data/node_modules/lodash/lodash.min.js +1 -1
- data/node_modules/lodash/package.json +13 -13
- data/node_modules/lodash/tag.js +43 -0
- data/node_modules/spdx-license-ids/index.json +8 -0
- data/node_modules/spdx-license-ids/package.json +13 -13
- data/node_modules/standard/package.json +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 458c9dcdf7dc0578315c0d5ec5c02d5e93c155625cf53f770d9d9f1706680203
|
|
4
|
+
data.tar.gz: 3f1f0afe46aff5ec70739b7dbc3cf79ef4d30eebcd5a08d7b165e27e87d113a6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9608142d53358a769f304ee17898b8cdef5d3f5676da3502533d0a5052fdf003efd4ed3ee14eaa8c99a6a40c90bf369fe71f1e8bfd524d5e11009fb0250799ae
|
|
7
|
+
data.tar.gz: 7c6765b1eb511c16fa4e74202c693b1979843a40472b43f8cb28a8dc3f8aa162a524f5d8d0ccb5d77205c03d70a74659a5b8a18e376b2ca336405991ae1c93ee
|
|
@@ -109,8 +109,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
|
109
109
|
var currentPathName = window.location.pathname.replace(/[^\s=?&]+(?:@|%40)[^\s=?&]+/, '[email]')
|
|
110
110
|
var finalPathName = encodeURI(currentPathName)
|
|
111
111
|
|
|
112
|
-
|
|
113
|
-
|
|
112
|
+
if (document.querySelectorAll('[name="email_survey_signup[ga_client_id]"]').length === 0) {
|
|
113
|
+
that.$surveyForm.append($('<input name="email_survey_signup[ga_client_id]" type="hidden">').val(gaClientId || '0'))
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
if (document.querySelectorAll('.gem-c-feedback__email-link#take-survey').length === 0) {
|
|
117
|
+
that.$surveyWrapper.append('<a href="https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=' + finalPathName + '&gcl=' + gaClientId + '" class="gem-c-feedback__email-link govuk-link" id="take-survey" target="_blank" rel="noopener noreferrer">Don’t have an email address?</a>')
|
|
118
|
+
}
|
|
114
119
|
}
|
|
115
120
|
|
|
116
121
|
function updateAriaAttributes (linkClicked) {
|
|
@@ -140,8 +140,14 @@
|
|
|
140
140
|
color: $govuk-error-colour;
|
|
141
141
|
}
|
|
142
142
|
|
|
143
|
+
.gem-c-feedback__survey-container {
|
|
144
|
+
@include govuk-media-query($until: tablet) {
|
|
145
|
+
padding: govuk-spacing(4);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
|
|
143
149
|
.gem-c-feedback__form {
|
|
144
|
-
margin
|
|
150
|
+
margin: govuk-spacing(3) govuk-spacing(2) 0 govuk-spacing(2);
|
|
145
151
|
padding: govuk-spacing(3) 0;
|
|
146
152
|
border-top: govuk-spacing(2) solid govuk-colour("blue");
|
|
147
153
|
|
|
@@ -173,7 +179,7 @@
|
|
|
173
179
|
@include govuk-link-style-default;
|
|
174
180
|
@include govuk-font(19);
|
|
175
181
|
float: right;
|
|
176
|
-
margin: 0
|
|
182
|
+
margin: 0 govuk-spacing(1) govuk-spacing(2) 0;
|
|
177
183
|
|
|
178
184
|
@include govuk-media-query($from: tablet) {
|
|
179
185
|
padding-top: 0;
|
|
@@ -10,6 +10,10 @@
|
|
|
10
10
|
<%= tag.fieldset class: "govuk-fieldset", "aria-describedby": cb_helper.fieldset_describedby do %>
|
|
11
11
|
<%= cb_helper.heading_markup %>
|
|
12
12
|
|
|
13
|
+
<% if cb_helper.description %>
|
|
14
|
+
<%= tag.p cb_helper.description, class: "govuk-body" %>
|
|
15
|
+
<% end %>
|
|
16
|
+
|
|
13
17
|
<% if cb_helper.hint_text %>
|
|
14
18
|
<%= tag.span cb_helper.hint_text, id: "#{id}-hint", class: "govuk-hint" %>
|
|
15
19
|
<% end %>
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
small ||= false
|
|
8
8
|
inline ||= false
|
|
9
9
|
is_page_heading ||= false
|
|
10
|
+
description ||= nil
|
|
10
11
|
hint ||= nil
|
|
11
12
|
error_message ||= nil
|
|
12
13
|
error_items ||= []
|
|
@@ -40,6 +41,10 @@
|
|
|
40
41
|
<% end %>
|
|
41
42
|
<% end %>
|
|
42
43
|
|
|
44
|
+
<% if description.present? %>
|
|
45
|
+
<%= tag.p description, class: "govuk-body" %>
|
|
46
|
+
<% end %>
|
|
47
|
+
|
|
43
48
|
<% if hint %>
|
|
44
49
|
<%= render "govuk_publishing_components/components/hint", {
|
|
45
50
|
id: hint_id,
|
|
@@ -63,6 +63,47 @@ examples:
|
|
|
63
63
|
value: "green"
|
|
64
64
|
- label: "Blue"
|
|
65
65
|
value: "blue"
|
|
66
|
+
with_description_text:
|
|
67
|
+
description: |
|
|
68
|
+
If a description text is added, it is displayed under the legend but before the hint text.
|
|
69
|
+
The description text can only render text and not govspeak specific syntax.
|
|
70
|
+
This is a pattern that is used across GOV.UK where a question is followed by a description.
|
|
71
|
+
data:
|
|
72
|
+
name: "favourite_skittle"
|
|
73
|
+
heading: "Choose your favourite skittles"
|
|
74
|
+
description: |
|
|
75
|
+
Skittles consist of hard sugar shells imprinted with the letter "S".
|
|
76
|
+
The interior consists mainly of sugar, corn syrup, and hydrogenated
|
|
77
|
+
palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
|
|
78
|
+
hint_text: "Taste the rainbow"
|
|
79
|
+
items:
|
|
80
|
+
- label: "Red"
|
|
81
|
+
value: "red"
|
|
82
|
+
- label: "Green"
|
|
83
|
+
value: "green"
|
|
84
|
+
- label: "Blue"
|
|
85
|
+
value: "blue"
|
|
86
|
+
with_description_text_and_header:
|
|
87
|
+
description: |
|
|
88
|
+
If a description text is added with a page heading, it is displayed under the heading but before the hint text.
|
|
89
|
+
The description text can only render text and not govspeak specific syntax.
|
|
90
|
+
This is a pattern that is used across GOV.UK where a question is followed by a description.
|
|
91
|
+
data:
|
|
92
|
+
name: "favourite_skittle"
|
|
93
|
+
heading: "Choose your favourite skittles"
|
|
94
|
+
is_page_heading: true
|
|
95
|
+
description: |
|
|
96
|
+
Skittles consist of hard sugar shells imprinted with the letter "S".
|
|
97
|
+
The interior consists mainly of sugar, corn syrup, and hydrogenated
|
|
98
|
+
palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
|
|
99
|
+
hint_text: "Taste the rainbow"
|
|
100
|
+
items:
|
|
101
|
+
- label: "Red"
|
|
102
|
+
value: "red"
|
|
103
|
+
- label: "Green"
|
|
104
|
+
value: "green"
|
|
105
|
+
- label: "Blue"
|
|
106
|
+
value: "blue"
|
|
66
107
|
without_hint_text:
|
|
67
108
|
description: Hint text can be removed entirely with this option. Note that this option can be combined with the visually_hide_heading option.
|
|
68
109
|
data:
|
|
@@ -120,6 +120,54 @@ examples:
|
|
|
120
120
|
text: "Yes"
|
|
121
121
|
- value: "no"
|
|
122
122
|
text: "No"
|
|
123
|
+
with_description_only:
|
|
124
|
+
data:
|
|
125
|
+
name: "radio-group-description"
|
|
126
|
+
heading: "What is your favourite colour?"
|
|
127
|
+
description: |
|
|
128
|
+
Skittles consist of hard sugar shells imprinted with the letter "S".
|
|
129
|
+
The interior consists mainly of sugar, corn syrup, and hydrogenated
|
|
130
|
+
palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
|
|
131
|
+
items:
|
|
132
|
+
- value: "red"
|
|
133
|
+
text: "Red"
|
|
134
|
+
- value: "green"
|
|
135
|
+
text: "Green"
|
|
136
|
+
- value: "blue"
|
|
137
|
+
text: "Blue"
|
|
138
|
+
with_description_and_hint:
|
|
139
|
+
data:
|
|
140
|
+
name: "radio-group-description"
|
|
141
|
+
heading: "What is your favourite colour?"
|
|
142
|
+
description: |
|
|
143
|
+
Skittles consist of hard sugar shells imprinted with the letter "S".
|
|
144
|
+
The interior consists mainly of sugar, corn syrup, and hydrogenated
|
|
145
|
+
palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
|
|
146
|
+
hint: "Choose the colour"
|
|
147
|
+
items:
|
|
148
|
+
- value: "red"
|
|
149
|
+
text: "Red"
|
|
150
|
+
- value: "green"
|
|
151
|
+
text: "Green"
|
|
152
|
+
- value: "blue"
|
|
153
|
+
text: "Blue"
|
|
154
|
+
with_description_and_page_heading:
|
|
155
|
+
data:
|
|
156
|
+
name: "radio-group-description"
|
|
157
|
+
heading: "What is your favourite colour?"
|
|
158
|
+
is_page_heading: true
|
|
159
|
+
description: |
|
|
160
|
+
Skittles consist of hard sugar shells imprinted with the letter "S".
|
|
161
|
+
The interior consists mainly of sugar, corn syrup, and hydrogenated
|
|
162
|
+
palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
|
|
163
|
+
hint: "Choose the colour"
|
|
164
|
+
items:
|
|
165
|
+
- value: "red"
|
|
166
|
+
text: "Red"
|
|
167
|
+
- value: "green"
|
|
168
|
+
text: "Green"
|
|
169
|
+
- value: "blue"
|
|
170
|
+
text: "Blue"
|
|
123
171
|
with_hint_text_on_radios:
|
|
124
172
|
data:
|
|
125
173
|
name: "radio-group-hint-text"
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
aria-expanded="true"
|
|
13
13
|
role="button">Close</a>
|
|
14
14
|
|
|
15
|
-
<div class="gem-c-feedback__grid-row">
|
|
15
|
+
<div class="gem-c-feedback__grid-row gem-c-feedback__survey-container">
|
|
16
16
|
<div class="gem-c-feedback__column-two-thirds">
|
|
17
17
|
<div class="gem-c-feedback__error-summary gem-c-feedback__js-show js-hidden js-errors" tabindex="-1"></div>
|
|
18
18
|
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
aria-expanded="true"
|
|
13
13
|
role="button">Close</a>
|
|
14
14
|
|
|
15
|
-
<div class="gem-c-feedback__grid-row">
|
|
15
|
+
<div class="gem-c-feedback__grid-row gem-c-feedback__survey-container">
|
|
16
16
|
<div class="gem-c-feedback__column-two-thirds" id="survey-wrapper">
|
|
17
17
|
<div class="gem-c-feedback__error-summary js-hidden js-errors" tabindex="-1"></div>
|
|
18
18
|
|
|
@@ -4,7 +4,7 @@ module GovukPublishingComponents
|
|
|
4
4
|
include ActionView::Helpers
|
|
5
5
|
include ActionView::Context
|
|
6
6
|
|
|
7
|
-
attr_reader :items, :name, :css_classes, :list_classes, :error, :has_conditional, :has_nested, :id, :hint_text
|
|
7
|
+
attr_reader :items, :name, :css_classes, :list_classes, :error, :has_conditional, :has_nested, :id, :hint_text, :description
|
|
8
8
|
|
|
9
9
|
def initialize(options)
|
|
10
10
|
@items = options[:items] || []
|
|
@@ -23,6 +23,7 @@ module GovukPublishingComponents
|
|
|
23
23
|
@id = options[:id] || "checkboxes-#{SecureRandom.hex(4)}"
|
|
24
24
|
@heading = options[:heading] || nil
|
|
25
25
|
@is_page_heading = options[:is_page_heading]
|
|
26
|
+
@description = options[:description] || nil
|
|
26
27
|
@no_hint_text = options[:no_hint_text]
|
|
27
28
|
@hint_text = options[:hint_text] || "Select all that apply." unless @no_hint_text
|
|
28
29
|
@visually_hide_heading = options[:visually_hide_heading]
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"/"
|
|
50
50
|
],
|
|
51
51
|
"_resolved": "git://github.com/alphagov/accessible-autocomplete.git#3523dd9fffc70cbd9f6f555f75863c33a709f49e",
|
|
52
|
-
"_shasum": "
|
|
52
|
+
"_shasum": "87e6ae08ea863c228e3338e9bc58a7ce2c9dd507",
|
|
53
53
|
"_shrinkwrap": null,
|
|
54
54
|
"_spec": "accessible-autocomplete@git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support",
|
|
55
55
|
"_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# lodash v4.17.
|
|
1
|
+
# lodash v4.17.14
|
|
2
2
|
|
|
3
3
|
The [Lodash](https://lodash.com/) library exported as [Node.js](https://nodejs.org/) modules.
|
|
4
4
|
|
|
@@ -28,7 +28,7 @@ var at = require('lodash/at');
|
|
|
28
28
|
var curryN = require('lodash/fp/curryN');
|
|
29
29
|
```
|
|
30
30
|
|
|
31
|
-
See the [package source](https://github.com/lodash/lodash/tree/4.17.
|
|
31
|
+
See the [package source](https://github.com/lodash/lodash/tree/4.17.14-npm) for more details.
|
|
32
32
|
|
|
33
33
|
**Note:**<br>
|
|
34
34
|
Install [n_](https://www.npmjs.com/package/n_) for Lodash use in the Node.js < 6 REPL.
|
data/node_modules/lodash/core.js
CHANGED
|
@@ -25,5 +25,5 @@ return G(2,n)},o.pick=$n,o.slice=function(n,t,r){var e=null==n?0:n.length;return
|
|
|
25
25
|
return t(n),n},o.thru=function(n,t){return t(n)},o.toArray=function(n){return M(n)?n.length?A(n):[]:W(n)},o.values=W,o.extend=Bn,Y(o,o),o.clone=function(n){return V(n)?Nn(n)?A(n):k(n,_n(n)):n},o.escape=function(n){return(n=Q(n))&&rn.test(n)?n.replace(tn,fn):n},o.every=function(n,t,r){return t=r?Z:t,f(n,g(t))},o.find=An,o.forEach=z,o.has=function(n,t){return null!=n&&pn.call(n,t)},o.head=q,o.identity=X,o.indexOf=P,o.isArguments=n,o.isArray=Nn,o.isBoolean=function(n){return true===n||false===n||H(n)&&"[object Boolean]"==hn.call(n);
|
|
26
26
|
},o.isDate=function(n){return H(n)&&"[object Date]"==hn.call(n)},o.isEmpty=function(t){return M(t)&&(Nn(t)||L(t)||U(t.splice)||n(t))?!t.length:!_n(t).length},o.isEqual=function(n,t){return b(n,t)},o.isFinite=function(n){return typeof n=="number"&&gn(n)},o.isFunction=U,o.isNaN=function(n){return K(n)&&n!=+n},o.isNull=function(n){return null===n},o.isNumber=K,o.isObject=V,o.isRegExp=function(n){return H(n)&&"[object RegExp]"==hn.call(n)},o.isString=L,o.isUndefined=function(n){return n===Z},o.last=function(n){
|
|
27
27
|
var t=null==n?0:n.length;return t?n[t-1]:Z},o.max=function(n){return n&&n.length?a(n,X,v):Z},o.min=function(n){return n&&n.length?a(n,X,_):Z},o.noConflict=function(){return on._===this&&(on._=vn),this},o.noop=function(){},o.reduce=C,o.result=function(n,t,r){return t=null==n?Z:n[t],t===Z&&(t=r),U(t)?t.call(n):t},o.size=function(n){return null==n?0:(n=M(n)?n:_n(n),n.length)},o.some=function(n,t,r){return t=r?Z:t,E(n,g(t))},o.uniqueId=function(n){var t=++sn;return Q(n)+t},o.each=z,o.first=q,Y(o,function(){
|
|
28
|
-
var n={};return s(o,function(t,r){pn.call(o.prototype,r)||(n[r]=t)}),n}(),{chain:false}),o.VERSION="4.17.
|
|
28
|
+
var n={};return s(o,function(t,r){pn.call(o.prototype,r)||(n[r]=t)}),n}(),{chain:false}),o.VERSION="4.17.14",mn("pop join replace reverse split push shift sort splice unshift".split(" "),function(n){var t=(/^(?:replace|split)$/.test(n)?String.prototype:an)[n],r=/^(?:push|sort|unshift)$/.test(n)?"tap":"thru",e=/^(?:pop|join|replace|shift)$/.test(n);o.prototype[n]=function(){var n=arguments;if(e&&!this.__chain__){var u=this.value();return t.apply(Nn(u)?u:[],n)}return this[r](function(r){return t.apply(Nn(r)?r:[],n);
|
|
29
29
|
})}}),o.prototype.toJSON=o.prototype.valueOf=o.prototype.value=function(){return w(this.__wrapped__,this.__actions__)},typeof define=="function"&&typeof define.amd=="object"&&define.amd?(on._=o, define(function(){return o})):cn?((cn.exports=o)._=o,un._=o):on._=o}).call(this);
|
|
@@ -125,7 +125,7 @@ a=(i?a.replace(P,""):a).replace(Z,"$1").replace(q,"$1;"),a="function("+(t||"obj"
|
|
|
125
125
|
An.toInteger=Eu,An.toLength=ku,An.toLower=function(n){return Iu(n).toLowerCase()},An.toNumber=Su,An.toSafeInteger=function(n){return n?pt(Eu(n),-9007199254740991,9007199254740991):0===n?n:0},An.toString=Iu,An.toUpper=function(n){return Iu(n).toUpperCase()},An.trim=function(n,t,r){return(n=Iu(n))&&(r||t===T)?n.replace(un,""):n&&(t=yr(t))?(n=M(n),r=M(t),t=I(n,r),r=R(n,r)+1,Or(n,t,r).join("")):n},An.trimEnd=function(n,t,r){return(n=Iu(n))&&(r||t===T)?n.replace(fn,""):n&&(t=yr(t))?(n=M(n),t=R(n,M(t))+1,
|
|
126
126
|
Or(n,0,t).join("")):n},An.trimStart=function(n,t,r){return(n=Iu(n))&&(r||t===T)?n.replace(on,""):n&&(t=yr(t))?(n=M(n),t=I(n,M(t)),Or(n,t).join("")):n},An.truncate=function(n,t){var r=30,e="...";if(du(t))var u="separator"in t?t.separator:u,r="length"in t?Eu(t.length):r,e="omission"in t?yr(t.omission):e;n=Iu(n);var i=n.length;if(Rn.test(n))var o=M(n),i=o.length;if(r>=i)return n;if(i=r-D(e),1>i)return e;if(r=o?Or(o,0,i).join(""):n.slice(0,i),u===T)return r+e;if(o&&(i+=r.length-i),hf(u)){if(n.slice(i).search(u)){
|
|
127
127
|
var f=r;for(u.global||(u=Xu(u.source,Iu(_n.exec(u))+"g")),u.lastIndex=0;o=u.exec(f);)var c=o.index;r=r.slice(0,c===T?i:c)}}else n.indexOf(yr(u),i)!=i&&(u=r.lastIndexOf(u),-1<u&&(r=r.slice(0,u)));return r+e},An.unescape=function(n){return(n=Iu(n))&&G.test(n)?n.replace(V,tt):n},An.uniqueId=function(n){var t=++fi;return Iu(n)+t},An.upperCase=Tf,An.upperFirst=$f,An.each=nu,An.eachRight=tu,An.first=qe,Nu(An,function(){var n={};return mt(An,function(t,r){oi.call(An.prototype,r)||(n[r]=t)}),n}(),{chain:false
|
|
128
|
-
}),An.VERSION="4.17.
|
|
128
|
+
}),An.VERSION="4.17.14",r("bind bindKey curry curryRight partial partialRight".split(" "),function(n){An[n].placeholder=An}),r(["drop","take"],function(n,t){Un.prototype[n]=function(r){r=r===T?1:Ui(Eu(r),0);var e=this.__filtered__&&!t?new Un(this):this.clone();return e.__filtered__?e.__takeCount__=Ci(r,e.__takeCount__):e.__views__.push({size:Ci(r,4294967295),type:n+(0>e.__dir__?"Right":"")}),e},Un.prototype[n+"Right"]=function(t){return this.reverse()[n](t).reverse()}}),r(["filter","map","takeWhile"],function(n,t){
|
|
129
129
|
var r=t+1,e=1==r||3==r;Un.prototype[n]=function(n){var t=this.clone();return t.__iteratees__.push({iteratee:ye(n,3),type:r}),t.__filtered__=t.__filtered__||e,t}}),r(["head","last"],function(n,t){var r="take"+(t?"Right":"");Un.prototype[n]=function(){return this[r](1).value()[0]}}),r(["initial","tail"],function(n,t){var r="drop"+(t?"":"Right");Un.prototype[n]=function(){return this.__filtered__?new Un(this):this[r](1)}}),Un.prototype.compact=function(){return this.filter($u)},Un.prototype.find=function(n){
|
|
130
130
|
return this.filter(n).head()},Un.prototype.findLast=function(n){return this.reverse().find(n)},Un.prototype.invokeMap=fr(function(n,t){return typeof n=="function"?new Un(this):this.map(function(r){return Lt(r,n,t)})}),Un.prototype.reject=function(n){return this.filter(au(ye(n)))},Un.prototype.slice=function(n,t){n=Eu(n);var r=this;return r.__filtered__&&(0<n||0>t)?new Un(r):(0>n?r=r.takeRight(-n):n&&(r=r.drop(n)),t!==T&&(t=Eu(t),r=0>t?r.dropRight(-t):r.take(t-n)),r)},Un.prototype.takeRightWhile=function(n){
|
|
131
131
|
return this.reverse().takeWhile(n).reverse()},Un.prototype.toArray=function(){return this.take(4294967295)},mt(Un.prototype,function(n,t){var r=/^(?:filter|find|map|reject)|While$/.test(t),e=/^(?:head|last)$/.test(t),u=An[e?"take"+("last"==t?"Right":""):t],i=e||/^find/.test(t);u&&(An.prototype[t]=function(){function t(n){return n=u.apply(An,a([n],f)),e&&h?n[0]:n}var o=this.__wrapped__,f=e?[1]:arguments,c=o instanceof Un,l=f[0],s=c||ff(o);s&&r&&typeof l=="function"&&1!=l.length&&(c=s=false);var h=this.__chain__,p=!!this.__actions__.length,l=i&&!h,c=c&&!p;
|
|
@@ -15,19 +15,19 @@
|
|
|
15
15
|
],
|
|
16
16
|
"_from": "lodash@>=4.0.0 <5.0.0",
|
|
17
17
|
"_hasShrinkwrap": false,
|
|
18
|
-
"_id": "lodash@4.17.
|
|
18
|
+
"_id": "lodash@4.17.14",
|
|
19
19
|
"_inCache": true,
|
|
20
20
|
"_location": "/lodash",
|
|
21
|
-
"_nodeVersion": "
|
|
21
|
+
"_nodeVersion": "8.16.0",
|
|
22
22
|
"_npmOperationalInternal": {
|
|
23
23
|
"host": "s3://npm-registry-packages",
|
|
24
|
-
"tmp": "tmp/lodash_4.17.
|
|
24
|
+
"tmp": "tmp/lodash_4.17.14_1562773479015_0.866734273135471"
|
|
25
25
|
},
|
|
26
26
|
"_npmUser": {
|
|
27
27
|
"name": "jdalton",
|
|
28
28
|
"email": "john.david.dalton@gmail.com"
|
|
29
29
|
},
|
|
30
|
-
"_npmVersion": "6.
|
|
30
|
+
"_npmVersion": "6.4.1",
|
|
31
31
|
"_phantomChildren": {},
|
|
32
32
|
"_requested": {
|
|
33
33
|
"raw": "lodash@^4.0.0",
|
|
@@ -48,8 +48,8 @@
|
|
|
48
48
|
"/standard/table",
|
|
49
49
|
"/table"
|
|
50
50
|
],
|
|
51
|
-
"_resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.
|
|
52
|
-
"_shasum": "
|
|
51
|
+
"_resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
|
|
52
|
+
"_shasum": "9ce487ae66c96254fe20b599f21b6816028078ba",
|
|
53
53
|
"_shrinkwrap": null,
|
|
54
54
|
"_spec": "lodash@^4.0.0",
|
|
55
55
|
"_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ/node_modules/eslint",
|
|
@@ -75,12 +75,12 @@
|
|
|
75
75
|
"devDependencies": {},
|
|
76
76
|
"directories": {},
|
|
77
77
|
"dist": {
|
|
78
|
-
"integrity": "sha512-
|
|
79
|
-
"shasum": "
|
|
80
|
-
"tarball": "https://registry.npmjs.org/lodash/-/lodash-4.17.
|
|
81
|
-
"fileCount":
|
|
82
|
-
"unpackedSize":
|
|
83
|
-
"npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\
|
|
78
|
+
"integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
|
|
79
|
+
"shasum": "9ce487ae66c96254fe20b599f21b6816028078ba",
|
|
80
|
+
"tarball": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
|
|
81
|
+
"fileCount": 1051,
|
|
82
|
+
"unpackedSize": 1403248,
|
|
83
|
+
"npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJdJgfnCRA9TVsSAnZWagAAIekP/id0qFzyGAg/X1h0jFNU\nE2A++zPr6a/PkI9Ri33ODt+k4+S/2i9UiaJvzOyKxR8CgQ/IC6wlpCqZyyH0\nCQ8E8jrccKPc2EnRSxUIRe9ypMK2SwRuLEnDh0cF65q+gdj8qmUTWpFv3fFv\nSLYkDg9vG1Bxkcm5tk9DxM+ge2Ra3Hv257w5CtVWNsjW6ndVrdj2jmLF5Pgz\nL2B2+DIRoRISGXjqNXKRZ0rY6DR9ceQIoez3mHExCUAwCb6EXlXYPtzCi/Ap\nugZrrLYMYagB42NQ9B2DmtV6IQSIvjmpmAzhTXMafp92BJUGX9SizQENNNkx\nok1Jlsb4D0FjuJuXohzrXKKosRUt1kNDtVETzEUAyK761bDOucAwhUVTy/X+\nPoPfQK8eAoeTK6Vy70v/lBqrlCa6PMrqgFdPSmJZUGRdqIL4jX1zUsoeumTv\nrpgVlDhKWxPj5eJVq/uypXr5t52dxgXwY11OxMa/nvtCMZFZwUQ4j83DnAcJ\n6cxPKZDKv+2Nuo1OoKYY6SEgiyvcGDJqSTDH1yRTG33SjodQFggLFvFy2l3Y\nFmjAAaCksPawgPz303NAeAWPAbT2sytinl4treWBUec3gmDqRWGimP5Ygp/R\nbxrjI5oHXt+1giA3BMr3or4eQ9vitIhD8ki1wWLUKmsnMoUfZyw9AmYh1TPI\njRkX\r\n=f1r9\r\n-----END PGP SIGNATURE-----\r\n"
|
|
84
84
|
},
|
|
85
85
|
"homepage": "https://lodash.com/",
|
|
86
86
|
"icon": "https://lodash.com/icon.svg",
|
|
@@ -111,5 +111,5 @@
|
|
|
111
111
|
"scripts": {
|
|
112
112
|
"test": "echo \"See https://travis-ci.org/lodash-archive/lodash-cli for testing details.\""
|
|
113
113
|
},
|
|
114
|
-
"version": "4.17.
|
|
114
|
+
"version": "4.17.14"
|
|
115
115
|
}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var _ = require('lodash'),
|
|
4
|
+
childProcess = require('child_process'),
|
|
5
|
+
execSync = childProcess.execSync,
|
|
6
|
+
semver = require('semver'),
|
|
7
|
+
spawn = childProcess.spawn;
|
|
8
|
+
|
|
9
|
+
var branch = 'npm-packages';
|
|
10
|
+
|
|
11
|
+
var reLine = /^.*$/gm;
|
|
12
|
+
|
|
13
|
+
var output = execSync('git log ' + branch + ' --pretty=format:"%s | %h"').toString();
|
|
14
|
+
|
|
15
|
+
var pairs = _.map(output.match(reLine), function(value) {
|
|
16
|
+
var pair = _.map(_.trim(value, '"\'').split('|'), _.trim);
|
|
17
|
+
pair[0] = _.result(/\d+(?:\.\d+)*/.exec(pair[0]), 0, '');
|
|
18
|
+
return pair;
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
pairs = _.filter(pairs, '0');
|
|
22
|
+
|
|
23
|
+
pairs.sort(function(a, b) {
|
|
24
|
+
return semver.gt(a[0], b[0]) ? 1 : (semver.lt(a[0], b[0]) ? -1 : 0);
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
pairs = pairs.map(function(pair) {
|
|
28
|
+
var tag = pair[0] + (branch == 'master' ? '' : '-' + branch);
|
|
29
|
+
return [
|
|
30
|
+
//'git checkout ' + tag + ' && git commit --amend --no-edit --date "`date`"',
|
|
31
|
+
'git tag -f -a -m ' + tag + ' "' + tag + '" ' + pair[1],
|
|
32
|
+
'git push -f origin ' + tag
|
|
33
|
+
];
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
_.each(pairs, function(pair, index) {
|
|
37
|
+
_.each(pair, function(command) {
|
|
38
|
+
_.delay(function() {
|
|
39
|
+
console.log(command)
|
|
40
|
+
execSync(command);
|
|
41
|
+
}, 1000 * index);
|
|
42
|
+
});
|
|
43
|
+
});
|
|
@@ -45,6 +45,7 @@
|
|
|
45
45
|
"BSD-3-Clause-No-Nuclear-License",
|
|
46
46
|
"BSD-3-Clause-No-Nuclear-License-2014",
|
|
47
47
|
"BSD-3-Clause-No-Nuclear-Warranty",
|
|
48
|
+
"BSD-3-Clause-Open-MPI",
|
|
48
49
|
"BSD-4-Clause",
|
|
49
50
|
"BSD-4-Clause-UC",
|
|
50
51
|
"BSD-Protection",
|
|
@@ -55,6 +56,7 @@
|
|
|
55
56
|
"Beerware",
|
|
56
57
|
"BitTorrent-1.0",
|
|
57
58
|
"BitTorrent-1.1",
|
|
59
|
+
"BlueOak-1.0.0",
|
|
58
60
|
"Borceux",
|
|
59
61
|
"CATOSL-1.1",
|
|
60
62
|
"CC-BY-1.0",
|
|
@@ -87,6 +89,7 @@
|
|
|
87
89
|
"CC-BY-SA-2.5",
|
|
88
90
|
"CC-BY-SA-3.0",
|
|
89
91
|
"CC-BY-SA-4.0",
|
|
92
|
+
"CC-PDDC",
|
|
90
93
|
"CC0-1.0",
|
|
91
94
|
"CDDL-1.0",
|
|
92
95
|
"CDDL-1.1",
|
|
@@ -269,6 +272,7 @@
|
|
|
269
272
|
"PDDL-1.0",
|
|
270
273
|
"PHP-3.0",
|
|
271
274
|
"PHP-3.01",
|
|
275
|
+
"Parity-6.0.0",
|
|
272
276
|
"Plexus",
|
|
273
277
|
"PostgreSQL",
|
|
274
278
|
"Python-2.0",
|
|
@@ -287,12 +291,15 @@
|
|
|
287
291
|
"SGI-B-1.0",
|
|
288
292
|
"SGI-B-1.1",
|
|
289
293
|
"SGI-B-2.0",
|
|
294
|
+
"SHL-0.5",
|
|
295
|
+
"SHL-0.51",
|
|
290
296
|
"SISSL",
|
|
291
297
|
"SISSL-1.2",
|
|
292
298
|
"SMLNJ",
|
|
293
299
|
"SMPPL",
|
|
294
300
|
"SNIA",
|
|
295
301
|
"SPL-1.0",
|
|
302
|
+
"SSPL-1.0",
|
|
296
303
|
"SWL",
|
|
297
304
|
"Saxpath",
|
|
298
305
|
"Sendmail",
|
|
@@ -340,6 +347,7 @@
|
|
|
340
347
|
"Zimbra-1.3",
|
|
341
348
|
"Zimbra-1.4",
|
|
342
349
|
"Zlib",
|
|
350
|
+
"blessing",
|
|
343
351
|
"bzip2-1.0.5",
|
|
344
352
|
"bzip2-1.0.6",
|
|
345
353
|
"copyleft-next-0.3.0",
|
|
@@ -15,19 +15,19 @@
|
|
|
15
15
|
],
|
|
16
16
|
"_from": "spdx-license-ids@>=3.0.0 <4.0.0",
|
|
17
17
|
"_hasShrinkwrap": false,
|
|
18
|
-
"_id": "spdx-license-ids@3.0.
|
|
18
|
+
"_id": "spdx-license-ids@3.0.5",
|
|
19
19
|
"_inCache": true,
|
|
20
20
|
"_location": "/spdx-license-ids",
|
|
21
|
-
"_nodeVersion": "
|
|
21
|
+
"_nodeVersion": "12.6.0",
|
|
22
22
|
"_npmOperationalInternal": {
|
|
23
23
|
"host": "s3://npm-registry-packages",
|
|
24
|
-
"tmp": "tmp/spdx-license-ids_3.0.
|
|
24
|
+
"tmp": "tmp/spdx-license-ids_3.0.5_1562834201821_0.7906489918867339"
|
|
25
25
|
},
|
|
26
26
|
"_npmUser": {
|
|
27
27
|
"name": "shinnn",
|
|
28
28
|
"email": "snnskwtnb@gmail.com"
|
|
29
29
|
},
|
|
30
|
-
"_npmVersion": "6.
|
|
30
|
+
"_npmVersion": "6.10.0",
|
|
31
31
|
"_phantomChildren": {},
|
|
32
32
|
"_requested": {
|
|
33
33
|
"raw": "spdx-license-ids@^3.0.0",
|
|
@@ -42,8 +42,8 @@
|
|
|
42
42
|
"/spdx-correct",
|
|
43
43
|
"/spdx-expression-parse"
|
|
44
44
|
],
|
|
45
|
-
"_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.
|
|
46
|
-
"_shasum": "
|
|
45
|
+
"_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
|
|
46
|
+
"_shasum": "3694b5804567a458d3c8045842a6358632f62654",
|
|
47
47
|
"_shrinkwrap": null,
|
|
48
48
|
"_spec": "spdx-license-ids@^3.0.0",
|
|
49
49
|
"_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ/node_modules/spdx-correct",
|
|
@@ -66,17 +66,17 @@
|
|
|
66
66
|
},
|
|
67
67
|
"directories": {},
|
|
68
68
|
"dist": {
|
|
69
|
-
"integrity": "sha512-
|
|
70
|
-
"shasum": "
|
|
71
|
-
"tarball": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.
|
|
69
|
+
"integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
|
|
70
|
+
"shasum": "3694b5804567a458d3c8045842a6358632f62654",
|
|
71
|
+
"tarball": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
|
|
72
72
|
"fileCount": 4,
|
|
73
|
-
"unpackedSize":
|
|
74
|
-
"npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\
|
|
73
|
+
"unpackedSize": 8027,
|
|
74
|
+
"npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJdJvUaCRA9TVsSAnZWagAAjMkP/0Sd+5yZb69oUsEoJnmF\naKUyiZQy0Y9dLPkflRzERsAm+EPghE273DfkOX+RIivycNFuBeOIjOJYtfGo\nvVlNMUgH8visktCTkX3T2eioEcQyR6dQk1JQtyhwJUH2P916Q49HVVR+/hZj\nfi/BotbLC21+cIjRR2z1VkAe3OpPPUytGPRZdKj5qi4HF/gtsq3IxkEbbG2t\nMF5jLes3k4VVg0UMV9j3HQUhsc25dhzna/OMDKhDSfwaOgj4eNctDHga6LSh\nx0rlx2/lvnaTgmqm4JAwBbFVxEsTp+Alpp2uXC7z6v0NOori2YYBP2s7zhFO\ny0BEAeryLMGtwQ16rfr6bTTNd9aPmQSF8uUDJ2Iay9dS1GDTqiFvdN2BvM9+\n+GXES/xA5DhFtk2UWsBJt/udeh9eGxoZ4E7lORtdkdHFgqmO+hjJmrNNKegd\naKoGOaYnR1/l2BG0oQvlkiXiRjDpEzRMu6kH/rCPIXZrXTEPXezIcEn14Mwh\nPN+K1IjaZaepc3g3YNkL76QQX57VbslEk7Mdpr+X0ygFd/s60/KZsAjnF1Aq\nZzblCBuK58idvCrEr1s5z39A9NYZ0ka/EPaMt+hZPJQ8cry3euva6lZiXXKR\n8K60CPxnG7mqSVSdj4LR3kViLNUnGTh/wSddKcQPIBsD+Nn+KYbfvmFU03BI\nPD5D\r\n=rrT1\r\n-----END PGP SIGNATURE-----\r\n"
|
|
75
75
|
},
|
|
76
76
|
"eslintConfig": {
|
|
77
77
|
"extends": "@shinnn"
|
|
78
78
|
},
|
|
79
|
-
"gitHead": "
|
|
79
|
+
"gitHead": "2bc004aae6f30d625d3aad95eac09d9aaf1c97cc",
|
|
80
80
|
"homepage": "https://github.com/shinnn/spdx-license-ids#readme",
|
|
81
81
|
"keywords": [
|
|
82
82
|
"spdx",
|
|
@@ -108,5 +108,5 @@
|
|
|
108
108
|
"pretest": "eslint .",
|
|
109
109
|
"test": "node test.js"
|
|
110
110
|
},
|
|
111
|
-
"version": "3.0.
|
|
111
|
+
"version": "3.0.5"
|
|
112
112
|
}
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: govuk_publishing_components
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 17.
|
|
4
|
+
version: 17.13.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- GOV.UK Dev
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-07-
|
|
11
|
+
date: 2019-07-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: gds-api-adapters
|
|
@@ -5369,6 +5369,7 @@ files:
|
|
|
5369
5369
|
- node_modules/lodash/subtract.js
|
|
5370
5370
|
- node_modules/lodash/sum.js
|
|
5371
5371
|
- node_modules/lodash/sumBy.js
|
|
5372
|
+
- node_modules/lodash/tag.js
|
|
5372
5373
|
- node_modules/lodash/tail.js
|
|
5373
5374
|
- node_modules/lodash/take.js
|
|
5374
5375
|
- node_modules/lodash/takeRight.js
|