govuk_publishing_components 17.7.0 → 17.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a3c34586d67a16119aeac7a55f462e222d46afedbc1676d9189de64879c69b6
-  data.tar.gz: 8d3435fb34861e37f3be74f810b8c347142875be94555a35e1e99be964078056
+  metadata.gz: 41295a866621f3e54259818f8895a0f862b7c0d6531b653fdc888c77081d4b99
+  data.tar.gz: 699bb29b66ac166b9d01b1b6d99fb7200789003ea24c4669c908c64acfd88f39
 SHA512:
-  metadata.gz: 35a3fda9195eb7f0449af19ce54086cbb4371a44c352c90395b96092716d5799d1b8438d4b35a2e27d2e3e95f7f6d91eb47df322c1ce5f8760cb792ef2a16444
-  data.tar.gz: 79dd0c477f41e0e0f9966765e9623ab14860d06c76c6139f65d77e0ddee5f555ceec1bb9619b394a37c6edafd0d85c28d6ec4bc4e78b6816857ae7b5a9465f77
+  metadata.gz: b12605c7b190ccb2e35a1a495cc890ac8ab70c86b688bf879f38831858e59d51f7b248ed3fd37079271f71894da0ae888439e8f987526b30b898505ee96437ea
+  data.tar.gz: 82e55616e941f2aa976354ef0a4bbdbf042c89f4f220994fda42e93b451ee52dc659cebdb1731c631f7e52d9dc519703d595c51932c739bbab3681dce2919980

data/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js

@@ -10,29 +10,16 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.$module.showConfirmationMessage = this.showConfirmationMessage.bind(this)
     this.$module.setCookieConsent = this.setCookieConsent.bind(this)
 
-    this.$module.newCookieBanner = document.querySelector('.gem-c-cookie-banner--new')
+    this.$module.newCookieBanner = document.querySelectorAll('.gem-c-cookie-banner--new, .gem-c-cookie-banner')
     this.$module.cookieBannerConfirmationMessage = document.querySelector('.gem-c-cookie-banner__confirmation')
 
     // Temporary check while we have 2 banners co-existing.
     // Once the new banner has been deployed, we will be able to remove code relating to the old banner
     // Separating the code out like this does mean some repetition, but will make it easier to remove later
-    if (this.$module.newCookieBanner) {
-      this.setupNewCookieMessage()
-    } else {
-      this.setupCookieMessage()
-    }
+    this.setupCookieMessage()
   }
 
   CookieBanner.prototype.setupCookieMessage = function () {
-    this.$hideLink = this.$module.querySelector('a[data-hide-cookie-banner]')
-    if (this.$hideLink) {
-      this.$hideLink.addEventListener('click', this.$module.hideCookieMessage)
-    }
-
-    this.showCookieMessage()
-  }
-
-  CookieBanner.prototype.setupNewCookieMessage = function () {
     this.$hideLink = this.$module.querySelector('button[data-hide-cookie-banner]')
     if (this.$hideLink) {
       this.$hideLink.addEventListener('click', this.$module.hideCookieMessage)
@@ -51,18 +38,10 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       }
     }
 
-    this.showNewCookieMessage()
+    this.showCookieMessage()
   }
 
   CookieBanner.prototype.showCookieMessage = function () {
-    var shouldHaveCookieMessage = (this.$module && window.GOVUK.cookie('seen_cookie_message') !== 'true')
-
-    if (shouldHaveCookieMessage) {
-      this.$module.style.display = 'block'
-    }
-  }
-
-  CookieBanner.prototype.showNewCookieMessage = function () {
     // Hide the cookie banner on the cookie settings page, to avoid circular journeys
     if (this.$module.newCookieBanner && window.location.pathname === '/help/cookies') {
       this.$module.style.display = 'none'

data/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss

@@ -1,5 +1,4 @@
-$govuk-cookie-banner-background: #d5e8f3;
-$govuk-cookie-banner-background-new: govuk-colour("white");
+$govuk-cookie-banner-background: govuk-colour("white");
 $govuk-cookie-banner-text-green: #00823b;
 
 .js-enabled {
@@ -13,19 +12,7 @@ $govuk-cookie-banner-text-green: #00823b;
   @include govuk-font($size: 16);
   padding: govuk-spacing(2) 0;
   background-color: $govuk-cookie-banner-background;
-}
-
-.gem-c-cookie-banner__message {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.gem-c-cookie-banner__hide-link {
-  display: none;
-
-  .js-enabled & {
-    display: inline-block;
-  }
+  border: 2px solid govuk-colour("black");
 }
 
 // Styles for the new version of the cookie banner
@@ -34,7 +21,7 @@ $govuk-cookie-banner-text-green: #00823b;
   border: 2px solid govuk-colour("black");
 }
 
-.gem-c-cookie-banner--new .gem-c-cookie-banner__message {
+.gem-c-cookie-banner__message {
   display: inline-block;
   margin-bottom: govuk-spacing(1);
   padding-right: govuk-spacing(4);
@@ -134,8 +121,9 @@ $govuk-cookie-banner-text-green: #00823b;
 // Override the styles from govuk_template
 // scss-lint:disable IdSelector
 // sass-lint:disable no-ids
-.gem-c-cookie-banner--new#global-cookie-message {
-  background-color: $govuk-cookie-banner-background-new;
+.gem-c-cookie-banner--new#global-cookie-message,
+.gem-c-cookie-banner#global-cookie-message {
+  background-color: $govuk-cookie-banner-background;
   padding: govuk-spacing(4) 0;
   box-sizing: border-box;
 

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

@@ -1,55 +1,45 @@
 <%
-  new_cookie_banner ||= false
   id ||= 'global-cookie-message'
-
-  cookie_banner_class = new_cookie_banner ? "gem-c-cookie-banner--new" : "gem-c-cookie-banner"
-
-  cookie_banner_helper = GovukPublishingComponents::Presenters::CookieBannerHelper.new(local_assigns)
-
-  message = cookie_banner_helper.message
+  message ||= "GOV.UK uses cookies to make the site simpler."
 %>
 
-<div id="<%= id %>" class="<%= cookie_banner_class %>" data-module="cookie-banner" role="region" aria-label="cookie banner">
+<div id="<%= id %>" class="gem-c-cookie-banner" data-module="cookie-banner" role="region" aria-label="cookie banner">
   <div class="gem-c-cookie-banner__wrapper govuk-width-container">
     <p class="gem-c-cookie-banner__message"><%= message %></p>
-    <% if new_cookie_banner %>
-      <div class="gem-c-cookie-banner__buttons">
-        <div class="gem-c-cookie-banner__button gem-c-cookie-banner__button-accept">
-          <%= render "govuk_publishing_components/components/button", {
-            text: "Accept cookies",
-            secondary: true,
-            inline_layout: true,
-            data_attributes: {
-              module: "track-click",
-              "accept-cookies": "true",
-              "track-category": "cookieBanner",
-              "track-action": "Cookie banner accepted"
-            }
-          } %>
-        </div>
-        <div class="gem-c-cookie-banner__button gem-c-cookie-banner__button-settings">
-          <%= render "govuk_publishing_components/components/button", {
-            text: "Cookie settings",
-            href: "/help/cookies",
-            secondary: true,
-            inline_layout: true,
-            data_attributes: {
-              module: "track-click",
-              "track-category": "cookieBanner",
-              "track-action": "Cookie banner settings clicked"
-            }
-          } %>
-        </div>
+    <div class="gem-c-cookie-banner__buttons">
+      <div class="gem-c-cookie-banner__button gem-c-cookie-banner__button-accept">
+        <%= render "govuk_publishing_components/components/button", {
+          text: "Accept cookies",
+          secondary: true,
+          inline_layout: true,
+          data_attributes: {
+            module: "track-click",
+            "accept-cookies": "true",
+            "track-category": "cookieBanner",
+            "track-action": "Cookie banner accepted"
+          }
+        } %>
+      </div>
+      <div class="gem-c-cookie-banner__button gem-c-cookie-banner__button-settings">
+        <%= render "govuk_publishing_components/components/button", {
+          text: "Cookie settings",
+          href: "/help/cookies",
+          secondary: true,
+          inline_layout: true,
+          data_attributes: {
+            module: "track-click",
+            "track-category": "cookieBanner",
+            "track-action": "Cookie banner settings clicked"
+          }
+        } %>
       </div>
-    <% end %>
+    </div>
   </div>
 
-  <% if new_cookie_banner %>
-    <div class="gem-c-cookie-banner__confirmation govuk-width-container" tabindex="-1">
-      <p class="gem-c-cookie-banner__confirmation-message">
-        You&#8217;ve accepted all cookies. You can <a class="govuk-link" href="/help/cookies" data-module="track-click" data-track-category="cookieBanner" data-track-action="Cookie banner settings clicked from confirmation">change your cookie settings</a> at any time.
-      </p>
-      <button class="gem-c-cookie-banner__hide-button" data-hide-cookie-banner="true" data-module="track-click" data-track-category="cookieBanner" data-track-action="Hide cookie banner">Hide</button>
-    </div>
-  <% end %>
+  <div class="gem-c-cookie-banner__confirmation govuk-width-container" tabindex="-1">
+    <p class="gem-c-cookie-banner__confirmation-message">
+      You&#8217;ve accepted all cookies. You can <a class="govuk-link" href="/help/cookies" data-module="track-click" data-track-category="cookieBanner" data-track-action="Cookie banner settings clicked from confirmation">change your cookie settings</a> at any time.
+    </p>
+    <button class="gem-c-cookie-banner__hide-button" data-hide-cookie-banner="true" data-module="track-click" data-track-category="cookieBanner" data-track-action="Hide cookie banner">Hide</button>
+  </div>
 </div>

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

@@ -21,7 +21,3 @@ examples:
     data:
       id: custom-message
       message: GOV.UK uses cookies to make the site simpler. <a class="govuk-link" href="/help/cookies">Find out more about cookies</a>
-  new_cookie_banner:
-    description: FOR TESTING PURPOSES ONLY. This is a new proposed iteration of the cookie banner. The current banner will remain the same across the live site for now.
-    data:
-        new_cookie_banner: true

data/lib/govuk_publishing_components.rb

@@ -26,7 +26,6 @@ require "govuk_publishing_components/presenters/image_card_helper"
 require "govuk_publishing_components/presenters/organisation_logo_helper"
 require "govuk_publishing_components/presenters/highlight_boxes_helper"
 require "govuk_publishing_components/presenters/taxonomy_list_helper"
-require "govuk_publishing_components/presenters/cookie_banner_helper"
 
 require "govuk_publishing_components/app_helpers/taxon_breadcrumbs"
 require "govuk_publishing_components/app_helpers/table_helper"

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '17.7.0'.freeze
+  VERSION = '17.8.0'.freeze
 end

data/node_modules/accessible-autocomplete/package.json

@@ -49,7 +49,7 @@
     "/"
   ],
   "_resolved": "git://github.com/alphagov/accessible-autocomplete.git#3523dd9fffc70cbd9f6f555f75863c33a709f49e",
-  "_shasum": "1f80c0f6496bc9005bdc5742bd3a6f47e3a44be0",
+  "_shasum": "541747a32fce9d43242a06a4393c974da99ce3af",
   "_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/define-properties/package.json

@@ -38,7 +38,8 @@
     "type": "range"
   },
   "_requiredBy": [
-    "/array-includes"
+    "/array-includes",
+    "/object.assign"
   ],
   "_resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
   "_shasum": "cf88da6cbee26fe6db7094f61d870cbd84cee9f1",

data/node_modules/function-bind/package.json

@@ -39,7 +39,8 @@
   },
   "_requiredBy": [
     "/es-abstract",
-    "/has"
+    "/has",
+    "/object.assign"
   ],
   "_resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
   "_shasum": "a56899d3ea3c9bab874bb9773b7c5ede92f4895d",

data/node_modules/has-symbols/package.json

@@ -38,7 +38,8 @@
     "type": "range"
   },
   "_requiredBy": [
-    "/is-symbol"
+    "/is-symbol",
+    "/object.assign"
   ],
   "_resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
   "_shasum": "ba1a8f1af2a0fc39650f5c850367704122063b44",

data/node_modules/jsx-ast-utils/CHANGELOG.md

@@ -1,3 +1,19 @@
+2.2.0 / 2019-06-25
+==================
+- (fix) Fix getLiteralPropValue for TS-specific node types.
+- (chore) upgrade dependencies.
+- (improvement) Stop throwing errors when unknown AST nodes are encountered.
+- (dev) CI changes.
+
+2.1.0 / 2018-04-19
+==================
+- Fix undefined bug for template strings. #45
+- Adding support for `objectRestSpread` within props #60
+- Accommodate ExperimentalSpreadProperty in prop values #75
+- Account for SpreadElement AST Nodes #76
+- Support OptionalMemberExpression AST nodes #77
+- Add support to Typescript's node types #72
+
 2.0.1 / 2017-08-31
 ==================
 - [fix] Add support for BindExpression

data/node_modules/jsx-ast-utils/__tests__/helper.js

@@ -37,3 +37,5 @@ export function extractProp(code, prop = 'foo') {
   const { attributes: props } = node;
   return getProp(props, prop);
 }
+
+export const describeIfNotBabylon = fallbackToBabylon ? describe.skip : describe;

data/node_modules/jsx-ast-utils/__tests__/src/getPropLiteralValue-test.js

@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 /* eslint no-template-curly-in-string: 0 */
 import assert from 'assert';
-import { extractProp } from '../helper';
+import { extractProp, describeIfNotBabylon, changePlugins } from '../helper';
 import { getLiteralPropValue } from '../../src/getPropValue';
 
 describe('getLiteralPropValue', () => {
@@ -19,7 +19,7 @@ describe('getLiteralPropValue', () => {
     assert.equal(expected, actual);
   });
 
-  it('should throw error when trying to get value from unknown node type', () => {
+  it('should not throw error when trying to get value from unknown node type', () => {
     const prop = {
       type: 'JSXAttribute',
       value: {
@@ -27,9 +27,11 @@ describe('getLiteralPropValue', () => {
       },
     };
 
-    assert.throws(() => {
+    assert.doesNotThrow(() => {
       getLiteralPropValue(prop);
     }, Error);
+
+    assert.equal(null, getLiteralPropValue(prop));
   });
 
   describe('Null', () => {
@@ -465,4 +467,38 @@ describe('getLiteralPropValue', () => {
       assert.deepEqual(expected, actual);
     });
   });
+
+  describeIfNotBabylon('Typescript', () => {
+    beforeEach(() => {
+      changePlugins(pls => [...pls, 'typescript']);
+    });
+
+    it('should return string representation of variable identifier wrapped in a Typescript non-null assertion', () => {
+      const prop = extractProp('<div foo={bar!} />');
+
+      const expected = null;
+      const actual = getLiteralPropValue(prop);
+
+      assert.equal(expected, actual);
+    });
+
+    it('should return string representation of variable identifier wrapped in a deep Typescript non-null assertion', () => {
+      const prop = extractProp('<div foo={(bar!)!} />');
+
+      const expected = null;
+      const actual = getLiteralPropValue(prop);
+
+      assert.equal(expected, actual);
+    });
+
+    it('should return string representation of variable identifier wrapped in a Typescript type coercion', () => {
+      changePlugins(pls => [...pls, 'typescript']);
+      const prop = extractProp('<div foo={bar as any} />');
+
+      const expected = null;
+      const actual = getLiteralPropValue(prop);
+
+      assert.equal(expected, actual);
+    });
+  });
 });

data/node_modules/jsx-ast-utils/__tests__/src/getPropValue-test.js

@@ -1,11 +1,14 @@
 /* eslint-env mocha */
 /* eslint no-template-curly-in-string: 0 */
 import assert from 'assert';
-import { extractProp, changePlugins, fallbackToBabylon } from '../helper';
+import {
+  extractProp,
+  changePlugins,
+  fallbackToBabylon,
+  describeIfNotBabylon,
+} from '../helper';
 import getPropValue from '../../src/getPropValue';
 
-const describeIfNotBabylon = fallbackToBabylon ? describe.skip : describe;
-
 describe('getPropValue', () => {
   it('should export a function', () => {
     const expected = 'function';
@@ -29,9 +32,11 @@ describe('getPropValue', () => {
       },
     };
 
-    assert.throws(() => {
+    assert.doesNotThrow(() => {
       getPropValue(prop);
     }, Error);
+
+    assert.equal(null, getPropValue(prop));
   });
 
   describe('Null', () => {

data/node_modules/jsx-ast-utils/lib/values/expressions/ObjectExpression.js

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = extractValueFromObjectExpression;
+
+var _object = require('object.assign');
+
+var _object2 = _interopRequireDefault(_object);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 /**
  * Extractor function for an ObjectExpression type value node.
  * An object expression is using {}.
@@ -14,11 +21,11 @@ function extractValueFromObjectExpression(value) {
   // eslint-disable-next-line global-require
   var getValue = require('./index.js').default;
   return value.properties.reduce(function (obj, property) {
-    var object = Object.assign({}, obj);
+    var object = (0, _object2.default)({}, obj);
     // Support types: SpreadProperty and ExperimentalSpreadProperty
     if (/^(?:Experimental)?Spread(?:Property|Element)$/.test(property.type)) {
       if (property.argument.type === 'ObjectExpression') {
-        return Object.assign(object, extractValueFromObjectExpression(property.argument));
+        return (0, _object2.default)(object, extractValueFromObjectExpression(property.argument));
       }
     } else {
       object[getValue(property.key)] = getValue(property.value);

data/node_modules/jsx-ast-utils/lib/values/expressions/index.js

@@ -6,6 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = extract;
 exports.extractLiteral = extractLiteral;
 
+var _object = require('object.assign');
+
+var _object2 = _interopRequireDefault(_object);
+
 var _Literal = require('../Literal');
 
 var _Literal2 = _interopRequireDefault(_Literal);
@@ -145,19 +149,26 @@ function extract(value) {
 
 
   while (type === 'TSNonNullExpression' || type === 'TSAsExpression') {
-    expression = expression.expression;
-    type = expression.type;
+    var _expression2 = expression;
+    type = _expression2.type;
+
+    if (expression.expression) {
+      var _expression3 = expression;
+      expression = _expression3.expression;
+    }
   }
 
   if (TYPES[type] === undefined) {
-    throw new Error(errorMessage(type));
+    // eslint-disable-next-line no-console
+    console.error(errorMessage(type));
+    return null;
   }
 
   return TYPES[type](expression);
 }
 
 // Composition map of types to their extractor functions to handle literals.
-var LITERAL_TYPES = Object.assign({}, TYPES, {
+var LITERAL_TYPES = (0, _object2.default)({}, TYPES, {
   Literal: function Literal(value) {
     var extractedVal = TYPES.Literal.call(undefined, value);
     var isNull = extractedVal === null;
@@ -196,7 +207,9 @@ var LITERAL_TYPES = Object.assign({}, TYPES, {
     });
   },
   BindExpression: noop,
-  SpreadElement: noop
+  SpreadElement: noop,
+  TSNonNullExpression: noop,
+  TSAsExpression: noop
 });
 
 /**
@@ -216,7 +229,9 @@ function extractLiteral(value) {
 
 
   if (LITERAL_TYPES[type] === undefined) {
-    throw new Error(errorMessage(type));
+    // eslint-disable-next-line no-console
+    console.error(errorMessage(type));
+    return null;
   }
 
   return LITERAL_TYPES[type](expression);