govuk_publishing_components 17.12.2 → 17.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e378a81af0dbad3fd5c4488392e206caea94860c97d96f69ca5b4ef60f467a00
-  data.tar.gz: 962167955c291d9c253306e40af7376795cce74885eac27f481bf5c0bf445192
+  metadata.gz: 458c9dcdf7dc0578315c0d5ec5c02d5e93c155625cf53f770d9d9f1706680203
+  data.tar.gz: 3f1f0afe46aff5ec70739b7dbc3cf79ef4d30eebcd5a08d7b165e27e87d113a6
 SHA512:
-  metadata.gz: a78962e9ebbef0c54b8a90dbbc85b75ddee1a89a3618fe78422ff165e4471f209cb37a8557b1a99123f4622ea6964bb93805de1409116977c08157e2c0c8a59d
-  data.tar.gz: fc0e46eb9968f7b8d125307e16213676b15a38361376bf93e3041caf3464cfed6cbc8c32dc8879e1f6d39bc3540b1d33bcff28fea795788568b77f851bae5082
+  metadata.gz: 9608142d53358a769f304ee17898b8cdef5d3f5676da3502533d0a5052fdf003efd4ed3ee14eaa8c99a6a40c90bf369fe71f1e8bfd524d5e11009fb0250799ae
+  data.tar.gz: 7c6765b1eb511c16fa4e74202c693b1979843a40472b43f8cb28a8dc3f8aa162a524f5d8d0ccb5d77205c03d70a74659a5b8a18e376b2ca336405991ae1c93ee

data/app/assets/javascripts/govuk_publishing_components/components/feedback.js

@@ -109,8 +109,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         var currentPathName = window.location.pathname.replace(/[^\s=?&]+(?:@|%40)[^\s=?&]+/, '[email]')
         var finalPathName = encodeURI(currentPathName)
 
-        that.$surveyForm.append($('<input name="email_survey_signup[ga_client_id]" type="hidden">').val(gaClientId || '0'))
-        that.$surveyWrapper.append('<a href="https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=' + finalPathName + '&amp;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>')
+        if (document.querySelectorAll('[name="email_survey_signup[ga_client_id]"]').length === 0) {
+          that.$surveyForm.append($('<input name="email_survey_signup[ga_client_id]" type="hidden">').val(gaClientId || '0'))
+        }
+
+        if (document.querySelectorAll('.gem-c-feedback__email-link#take-survey').length === 0) {
+          that.$surveyWrapper.append('<a href="https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=' + finalPathName + '&amp;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>')
+        }
       }
 
       function updateAriaAttributes (linkClicked) {

data/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss

@@ -140,8 +140,14 @@
   color: $govuk-error-colour;
 }
 
+.gem-c-feedback__survey-container {
+  @include govuk-media-query($until: tablet) {
+    padding: govuk-spacing(4);
+  }
+}
+
 .gem-c-feedback__form {
-  margin-top: govuk-spacing(3);
+  margin: govuk-spacing(3) govuk-spacing(2) 0 govuk-spacing(2);
   padding: govuk-spacing(3) 0;
   border-top: govuk-spacing(2) solid govuk-colour("blue");
 
@@ -173,7 +179,7 @@
   @include govuk-link-style-default;
   @include govuk-font(19);
   float: right;
-  margin: 0 0 govuk-spacing(2) 0;
+  margin: 0 govuk-spacing(1) govuk-spacing(2) 0;
 
   @include govuk-media-query($from: tablet) {
     padding-top: 0;

data/app/views/govuk_publishing_components/components/_checkboxes.html.erb

@@ -10,6 +10,10 @@
       <%= tag.fieldset class: "govuk-fieldset", "aria-describedby": cb_helper.fieldset_describedby do %>
         <%= cb_helper.heading_markup %>
 
+        <% if cb_helper.description %>
+          <%= tag.p cb_helper.description, class: "govuk-body" %>
+        <% end %>
+
         <% if cb_helper.hint_text %>
           <%= tag.span cb_helper.hint_text, id: "#{id}-hint", class: "govuk-hint" %>
         <% end %>

data/app/views/govuk_publishing_components/components/_radio.html.erb

@@ -7,6 +7,7 @@
   small ||= false
   inline ||= false
   is_page_heading ||= false
+  description ||= nil
   hint ||= nil
   error_message ||= nil
   error_items ||= []
@@ -40,6 +41,10 @@
       <% end %>
     <% end %>
 
+    <% if description.present? %>
+      <%= tag.p description, class: "govuk-body" %>
+    <% end %>
+
     <% if hint %>
       <%= render "govuk_publishing_components/components/hint", {
         id: hint_id,

data/app/views/govuk_publishing_components/components/docs/checkboxes.yml

@@ -63,6 +63,47 @@ examples:
           value: "green"
         - label: "Blue"
           value: "blue"
+  with_description_text:
+    description: |
+      If a description text is added, it is displayed under the legend but before the hint text.
+      The description text can only render text and not govspeak specific syntax.
+      This is a pattern that is used across GOV.UK where a question is followed by a description.
+    data:
+      name: "favourite_skittle"
+      heading: "Choose your favourite skittles"
+      description: |
+        Skittles consist of hard sugar shells imprinted with the letter "S".
+        The interior consists mainly of sugar, corn syrup, and hydrogenated 
+        palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
+      hint_text: "Taste the rainbow"
+      items:
+        - label: "Red"
+          value: "red"
+        - label: "Green"
+          value: "green"
+        - label: "Blue"
+          value: "blue"
+  with_description_text_and_header:
+    description: |
+      If a description text is added with a page heading, it is displayed under the heading but before the hint text.
+      The description text can only render text and not govspeak specific syntax.
+      This is a pattern that is used across GOV.UK where a question is followed by a description.
+    data:
+      name: "favourite_skittle"
+      heading: "Choose your favourite skittles"
+      is_page_heading: true
+      description: |
+        Skittles consist of hard sugar shells imprinted with the letter "S".
+        The interior consists mainly of sugar, corn syrup, and hydrogenated 
+        palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
+      hint_text: "Taste the rainbow"
+      items:
+        - label: "Red"
+          value: "red"
+        - label: "Green"
+          value: "green"
+        - label: "Blue"
+          value: "blue"
   without_hint_text:
     description: Hint text can be removed entirely with this option. Note that this option can be combined with the visually_hide_heading option.
     data:

data/app/views/govuk_publishing_components/components/docs/radio.yml

@@ -120,6 +120,54 @@ examples:
         text: "Yes"
       - value: "no"
         text: "No"
+  with_description_only:
+    data:
+      name: "radio-group-description"
+      heading: "What is your favourite colour?"
+      description: |
+        Skittles consist of hard sugar shells imprinted with the letter "S".
+        The interior consists mainly of sugar, corn syrup, and hydrogenated 
+        palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
+      items:
+      - value: "red"
+        text: "Red"
+      - value: "green"
+        text: "Green"
+      - value: "blue"
+        text: "Blue"
+  with_description_and_hint:
+    data:
+      name: "radio-group-description"
+      heading: "What is your favourite colour?"
+      description: |
+        Skittles consist of hard sugar shells imprinted with the letter "S".
+        The interior consists mainly of sugar, corn syrup, and hydrogenated 
+        palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
+      hint: "Choose the colour"
+      items:
+      - value: "red"
+        text: "Red"
+      - value: "green"
+        text: "Green"
+      - value: "blue"
+        text: "Blue"
+  with_description_and_page_heading:
+    data:
+      name: "radio-group-description"
+      heading: "What is your favourite colour?"
+      is_page_heading: true
+      description: |
+        Skittles consist of hard sugar shells imprinted with the letter "S".
+        The interior consists mainly of sugar, corn syrup, and hydrogenated 
+        palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
+      hint: "Choose the colour"
+      items:
+      - value: "red"
+        text: "Red"
+      - value: "green"
+        text: "Green"
+      - value: "blue"
+        text: "Blue"
   with_hint_text_on_radios:
     data:
       name: "radio-group-hint-text"

data/app/views/govuk_publishing_components/components/feedback/_problem_form.html.erb

@@ -12,7 +12,7 @@
     aria-expanded="true"
     role="button">Close</a>
 
-  <div class="gem-c-feedback__grid-row">
+  <div class="gem-c-feedback__grid-row gem-c-feedback__survey-container">
     <div class="gem-c-feedback__column-two-thirds">
       <div class="gem-c-feedback__error-summary gem-c-feedback__js-show js-hidden js-errors" tabindex="-1"></div>
 

data/app/views/govuk_publishing_components/components/feedback/_survey_signup_form.html.erb

@@ -12,7 +12,7 @@
     aria-expanded="true"
     role="button">Close</a>
 
-  <div class="gem-c-feedback__grid-row">
+  <div class="gem-c-feedback__grid-row gem-c-feedback__survey-container">
     <div class="gem-c-feedback__column-two-thirds" id="survey-wrapper">
       <div class="gem-c-feedback__error-summary js-hidden js-errors" tabindex="-1"></div>
 

data/lib/govuk_publishing_components/presenters/checkboxes_helper.rb

@@ -4,7 +4,7 @@ module GovukPublishingComponents
       include ActionView::Helpers
       include ActionView::Context
 
-      attr_reader :items, :name, :css_classes, :list_classes, :error, :has_conditional, :has_nested, :id, :hint_text
+      attr_reader :items, :name, :css_classes, :list_classes, :error, :has_conditional, :has_nested, :id, :hint_text, :description
 
       def initialize(options)
         @items = options[:items] || []
@@ -23,6 +23,7 @@ module GovukPublishingComponents
         @id = options[:id] || "checkboxes-#{SecureRandom.hex(4)}"
         @heading = options[:heading] || nil
         @is_page_heading = options[:is_page_heading]
+        @description = options[:description] || nil
         @no_hint_text = options[:no_hint_text]
         @hint_text = options[:hint_text] || "Select all that apply." unless @no_hint_text
         @visually_hide_heading = options[:visually_hide_heading]

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '17.12.2'.freeze
+  VERSION = '17.13.0'.freeze
 end

data/node_modules/accessible-autocomplete/package.json

@@ -49,7 +49,7 @@
     "/"
   ],
   "_resolved": "git://github.com/alphagov/accessible-autocomplete.git#3523dd9fffc70cbd9f6f555f75863c33a709f49e",
-  "_shasum": "0c969459725dd0e4c826d2acc3b23209c23e9c32",
+  "_shasum": "87e6ae08ea863c228e3338e9bc58a7ce2c9dd507",
   "_shrinkwrap": null,
   "_spec": "accessible-autocomplete@git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ",

data/node_modules/lodash/README.md

@@ -1,4 +1,4 @@
-# lodash v4.17.13
+# lodash v4.17.14
 
 The [Lodash](https://lodash.com/) library exported as [Node.js](https://nodejs.org/) modules.
 
@@ -28,7 +28,7 @@ var at = require('lodash/at');
 var curryN = require('lodash/fp/curryN');
 ```
 
-See the [package source](https://github.com/lodash/lodash/tree/4.17.13-npm) for more details.
+See the [package source](https://github.com/lodash/lodash/tree/4.17.14-npm) for more details.
 
 **Note:**<br>
 Install [n_](https://www.npmjs.com/package/n_) for Lodash use in the Node.js < 6 REPL.

data/node_modules/lodash/core.js

@@ -13,7 +13,7 @@
   var undefined;
 
   /** Used as the semantic version number. */
-  var VERSION = '4.17.13';
+  var VERSION = '4.17.14';
 
   /** Error message constants. */
   var FUNC_ERROR_TEXT = 'Expected a function';

data/node_modules/lodash/core.min.js

@@ -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
 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);
 },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){
 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(){
-var n={};return s(o,function(t,r){pn.call(o.prototype,r)||(n[r]=t)}),n}(),{chain:false}),o.VERSION="4.17.13",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);
+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);
 })}}),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);

data/node_modules/lodash/lodash.js

@@ -12,7 +12,7 @@
   var undefined;
 
   /** Used as the semantic version number. */
-  var VERSION = '4.17.13';
+  var VERSION = '4.17.14';
 
   /** Used as the size to enable large array optimizations. */
   var LARGE_ARRAY_SIZE = 200;

data/node_modules/lodash/lodash.min.js

@@ -125,7 +125,7 @@ a=(i?a.replace(P,""):a).replace(Z,"$1").replace(q,"$1;"),a="function("+(t||"obj"
 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,
 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)){
 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
-}),An.VERSION="4.17.13",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){
+}),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){
 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){
 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){
 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;

data/node_modules/lodash/package.json

@@ -15,19 +15,19 @@
   ],
   "_from": "lodash@>=4.0.0 <5.0.0",
   "_hasShrinkwrap": false,
-  "_id": "lodash@4.17.13",
+  "_id": "lodash@4.17.14",
   "_inCache": true,
   "_location": "/lodash",
-  "_nodeVersion": "12.2.0",
+  "_nodeVersion": "8.16.0",
   "_npmOperationalInternal": {
     "host": "s3://npm-registry-packages",
-    "tmp": "tmp/lodash_4.17.13_1562711078256_0.5295983360095642"
+    "tmp": "tmp/lodash_4.17.14_1562773479015_0.866734273135471"
   },
   "_npmUser": {
     "name": "jdalton",
     "email": "john.david.dalton@gmail.com"
   },
-  "_npmVersion": "6.9.2",
+  "_npmVersion": "6.4.1",
   "_phantomChildren": {},
   "_requested": {
     "raw": "lodash@^4.0.0",
@@ -48,8 +48,8 @@
     "/standard/table",
     "/table"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.13.tgz",
-  "_shasum": "0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93",
+  "_resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+  "_shasum": "9ce487ae66c96254fe20b599f21b6816028078ba",
   "_shrinkwrap": null,
   "_spec": "lodash@^4.0.0",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ/node_modules/eslint",
@@ -75,12 +75,12 @@
   "devDependencies": {},
   "directories": {},
   "dist": {
-    "integrity": "sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA==",
-    "shasum": "0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93",
-    "tarball": "https://registry.npmjs.org/lodash/-/lodash-4.17.13.tgz",
-    "fileCount": 1050,
-    "unpackedSize": 1402106,
-    "npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJdJRQmCRA9TVsSAnZWagAAEs4P/0PLmRJNSdqRke3QMgyY\neXUmg0xuTuMrvJ5/sL+m92y0J0SDY4prWomQPtYlKlyKoiMnuQAxmHrzKPBL\nNK8ihO2raHjEQqYco/Sz0D3aTbU2UIqC/q8zR3Rr8FbvUIdUHH3INxvRV7H9\nvS/Rab874XzDz49iKHP5kozDoYEyyTBBtbCWDa/cQdpwIZcbugH2bsF1eD0l\n9SmD0eBHYjmBNSyumGM7Gz7jRNSbsfvO0mhFIcyKAQjG7VSNbk2nplhzDRT6\nK7pnHPiQgnHqqp8Q20aXwdh2un1JypHd09F1zTYin0HZ7N6XuJW8QfRgSB/C\nwn783x5+IACPSSd3GHBufNR7rwGYTWlJnDQwfXzuhjS6pOMW5476+nAboZTo\nBfFS28kTJ3wPCZgx47F+3OCXyMbzUAUhfvFqLn9FKBLqCt22CWZa18BBfU8/\nb43RO0EogUjn1J9nuJuLmTIUbLTRtFzbKR00I6GIdgmKa4b8bU/ElKHv2bxr\nC7q22/oJc5vh+N5WmlmKBgHYZFDXODw7lCsmQb2xSDK+ruQQ5VgQ1FQ/1bcV\nQp85/GugrlLngZ8nVu22D8JVZXsHGMO2ebqUHHTZEKFEKTznpUNUZRsIpa5L\nbp53ChE62TOjNnfhzbCLLocZ6FVh17IK3gf2XBl1vW3vrM3ogdEpScYGsoyc\njdnc\r\n=u9y/\r\n-----END PGP SIGNATURE-----\r\n"
+    "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
+    "shasum": "9ce487ae66c96254fe20b599f21b6816028078ba",
+    "tarball": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+    "fileCount": 1051,
+    "unpackedSize": 1403248,
+    "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"
   },
   "homepage": "https://lodash.com/",
   "icon": "https://lodash.com/icon.svg",
@@ -111,5 +111,5 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash-archive/lodash-cli for testing details.\""
   },
-  "version": "4.17.13"
+  "version": "4.17.14"
 }

data/node_modules/lodash/tag.js

@@ -0,0 +1,43 @@
+'use strict';
+
+var _ = require('lodash'),
+    childProcess = require('child_process'),
+    execSync = childProcess.execSync,
+    semver = require('semver'),
+    spawn = childProcess.spawn;
+
+var branch = 'npm-packages';
+
+var reLine = /^.*$/gm;
+
+var output = execSync('git log ' + branch + ' --pretty=format:"%s | %h"').toString();
+
+var pairs = _.map(output.match(reLine), function(value) {
+  var pair = _.map(_.trim(value, '"\'').split('|'), _.trim);
+  pair[0] = _.result(/\d+(?:\.\d+)*/.exec(pair[0]), 0, '');
+  return pair;
+});
+
+pairs = _.filter(pairs, '0');
+
+pairs.sort(function(a, b) {
+  return semver.gt(a[0], b[0]) ? 1 : (semver.lt(a[0], b[0]) ? -1 : 0);
+});
+
+pairs = pairs.map(function(pair) {
+  var tag = pair[0] + (branch == 'master' ? '' : '-' + branch);
+  return [
+    //'git checkout ' + tag + ' && git commit --amend --no-edit --date "`date`"',
+    'git tag -f -a -m ' + tag + ' "' + tag + '" ' + pair[1],
+    'git push -f origin ' + tag
+  ];
+});
+
+_.each(pairs, function(pair, index) {
+  _.each(pair, function(command) {
+    _.delay(function() {
+      console.log(command)
+      execSync(command);
+    }, 1000 * index);
+  });
+});

data/node_modules/spdx-license-ids/index.json

@@ -45,6 +45,7 @@
 	"BSD-3-Clause-No-Nuclear-License",
 	"BSD-3-Clause-No-Nuclear-License-2014",
 	"BSD-3-Clause-No-Nuclear-Warranty",
+	"BSD-3-Clause-Open-MPI",
 	"BSD-4-Clause",
 	"BSD-4-Clause-UC",
 	"BSD-Protection",
@@ -55,6 +56,7 @@
 	"Beerware",
 	"BitTorrent-1.0",
 	"BitTorrent-1.1",
+	"BlueOak-1.0.0",
 	"Borceux",
 	"CATOSL-1.1",
 	"CC-BY-1.0",
@@ -87,6 +89,7 @@
 	"CC-BY-SA-2.5",
 	"CC-BY-SA-3.0",
 	"CC-BY-SA-4.0",
+	"CC-PDDC",
 	"CC0-1.0",
 	"CDDL-1.0",
 	"CDDL-1.1",
@@ -269,6 +272,7 @@
 	"PDDL-1.0",
 	"PHP-3.0",
 	"PHP-3.01",
+	"Parity-6.0.0",
 	"Plexus",
 	"PostgreSQL",
 	"Python-2.0",
@@ -287,12 +291,15 @@
 	"SGI-B-1.0",
 	"SGI-B-1.1",
 	"SGI-B-2.0",
+	"SHL-0.5",
+	"SHL-0.51",
 	"SISSL",
 	"SISSL-1.2",
 	"SMLNJ",
 	"SMPPL",
 	"SNIA",
 	"SPL-1.0",
+	"SSPL-1.0",
 	"SWL",
 	"Saxpath",
 	"Sendmail",
@@ -340,6 +347,7 @@
 	"Zimbra-1.3",
 	"Zimbra-1.4",
 	"Zlib",
+	"blessing",
 	"bzip2-1.0.5",
 	"bzip2-1.0.6",
 	"copyleft-next-0.3.0",

data/node_modules/spdx-license-ids/package.json

@@ -15,19 +15,19 @@
   ],
   "_from": "spdx-license-ids@>=3.0.0 <4.0.0",
   "_hasShrinkwrap": false,
-  "_id": "spdx-license-ids@3.0.4",
+  "_id": "spdx-license-ids@3.0.5",
   "_inCache": true,
   "_location": "/spdx-license-ids",
-  "_nodeVersion": "11.13.0",
+  "_nodeVersion": "12.6.0",
   "_npmOperationalInternal": {
     "host": "s3://npm-registry-packages",
-    "tmp": "tmp/spdx-license-ids_3.0.4_1554558683841_0.32336491674892054"
+    "tmp": "tmp/spdx-license-ids_3.0.5_1562834201821_0.7906489918867339"
   },
   "_npmUser": {
     "name": "shinnn",
     "email": "snnskwtnb@gmail.com"
   },
-  "_npmVersion": "6.9.0",
+  "_npmVersion": "6.10.0",
   "_phantomChildren": {},
   "_requested": {
     "raw": "spdx-license-ids@^3.0.0",
@@ -42,8 +42,8 @@
     "/spdx-correct",
     "/spdx-expression-parse"
   ],
-  "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
-  "_shasum": "75ecd1a88de8c184ef015eafb51b5b48bfd11bb1",
+  "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+  "_shasum": "3694b5804567a458d3c8045842a6358632f62654",
   "_shrinkwrap": null,
   "_spec": "spdx-license-ids@^3.0.0",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ/node_modules/spdx-correct",
@@ -66,17 +66,17 @@
   },
   "directories": {},
   "dist": {
-    "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==",
-    "shasum": "75ecd1a88de8c184ef015eafb51b5b48bfd11bb1",
-    "tarball": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
+    "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+    "shasum": "3694b5804567a458d3c8045842a6358632f62654",
+    "tarball": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
     "fileCount": 4,
-    "unpackedSize": 7903,
-    "npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJcqK7cCRA9TVsSAnZWagAALWMP/1nr34W51ig8XQFRGAEY\n+TwOah3IAE5kQ5QEi047RtiPU66qGKmBRHZE0+rgRrcoIwIlPEUO7kKMt4RZ\n6jKTQ5QeLKst88NOQIzxJsRam85r5/fakCvdXjE+4mnVqYoI7kWLnnl7RTB/\n/VDpZONMgfdV3G2vTnf/OojDnz/7zhgQih/H7iA32WY5kzyF8fAY7/WvMjBc\nI3A1M47vmUTPyYv45qjZ5z7TC7b1wz3omatNnMVE0Mf1XIBTv/JJzyhXdZ9F\ndCuDuIQNEPZZKj3FTY/b28f76VxkuUohgxFWjRf97ge7Oi7XOBjw1JkHCHY/\nc4cmj0bJ4dlHVfvlgMJb2G+8dhhxj4GwBiF+c4enKSiIO/jR/51wPbGagbYS\nOoKpF1HqHA1CskPSeeqpk8rH2aO5CJafsWSFWQa//13HqD9L9Fo7mZsn8uaD\nwPO7v3PcJS7R2wqKtF14DUndyKDp3F8Da3gmXW9wH21T5Df2ZX2MCoCzkHdE\nCj3DCV36QLJGW9rLCJ4neoBjkfKz6ifZ7nwPFITQ2xtXG4artemSMHAXQpnC\n1SN9RICQzRQ1m14p316fQTAovWbmXpB0Ysohhuk7oMappntvjiMnZu21k6LG\nuBiFdoIzjbeX/wla4cmqeYh+9Nyf16VGAbY7AwMvU6sU3yNvfnKntBEIzT1R\nLxCB\r\n=sw+A\r\n-----END PGP SIGNATURE-----\r\n"
+    "unpackedSize": 8027,
+    "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"
   },
   "eslintConfig": {
     "extends": "@shinnn"
   },
-  "gitHead": "09f914ab6c75354b80c18d8343c5dbbd210adcb3",
+  "gitHead": "2bc004aae6f30d625d3aad95eac09d9aaf1c97cc",
   "homepage": "https://github.com/shinnn/spdx-license-ids#readme",
   "keywords": [
     "spdx",
@@ -108,5 +108,5 @@
     "pretest": "eslint .",
     "test": "node test.js"
   },
-  "version": "3.0.4"
+  "version": "3.0.5"
 }

data/node_modules/standard/package.json

@@ -53,7 +53,7 @@
     "json-schema-traverse": "0.4.1",
     "json-stable-stringify-without-jsonify": "1.0.1",
     "levn": "0.3.0",
-    "lodash": "4.17.13",
+    "lodash": "4.17.14",
     "mimic-fn": "1.2.0",
     "minimatch": "3.0.4",
     "mkdirp": "0.5.1",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 17.12.2
+  version: 17.13.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
@@ -5369,6 +5369,7 @@ files:
 - node_modules/lodash/subtract.js
 - node_modules/lodash/sum.js
 - node_modules/lodash/sumBy.js
+- node_modules/lodash/tag.js
 - node_modules/lodash/tail.js
 - node_modules/lodash/take.js
 - node_modules/lodash/takeRight.js