govuk_publishing_components 17.5.0 → 17.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36ffc6adb457eb3a50384d4f70cb662aad748f8c846910298eac869ab85e16e8
-  data.tar.gz: 0c54cbe36fe79aecdbccf79777d52b5be76e4430474b4f23a53bcfadcf15c40a
+  metadata.gz: 8651dd059443fe10e5427099eb551d6d38e766671e3b85da2965a2d8d88fa210
+  data.tar.gz: 10f295771ea3de1c3d02613ad7c9308efe1bc452ababa999c284ca0a18c47f2c
 SHA512:
-  metadata.gz: 2cc367ffbc827b9b67083ac71620324c394f720c91d61491b4278e3c8e77fa276c117c8a0ddc01fd397e98657f047cd3c4e82d92f75f45844aa21221abc6902a
-  data.tar.gz: b8794c4a6b9d2624ac25defdf29f6218635fd54bdda63b9718b50636186aa50d6a83f71512f82152329e5e43a3e25f86468cf98d8a3f398e7553a724740b2b93
+  metadata.gz: b1c4286f50885f7da74dec49930a7c3562b156ddf0a71dd3e634b6e87c8af51fe7bb757ee43f1dec640ec16db8bb0f6e267c819e8140715c5b77f7052c032ae0
+  data.tar.gz: b7aa46cd63fa06f2a50f927d0a4941dbd1dbfe78e70075cbffea5f0b4880345a9bbf009e5999c30bffd519390d1d16bfc9ca85494ea2099dc8a15053e623b359

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

@@ -11,6 +11,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.$module.setCookieConsent = this.setCookieConsent.bind(this)
 
     this.$module.newCookieBanner = document.querySelector('.gem-c-cookie-banner--new')
+    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
@@ -62,10 +63,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   CookieBanner.prototype.showNewCookieMessage = function () {
-    var newCookieBanner = document.querySelector('.gem-c-cookie-banner--new')
-
     // Hide the cookie banner on the cookie settings page, to avoid circular journeys
-    if (newCookieBanner && window.location.pathname === '/help/cookies') {
+    if (this.$module.newCookieBanner && window.location.pathname === '/help/cookies') {
       this.$module.style.display = 'none'
     } else {
       var shouldHaveCookieMessage = (this.$module && window.GOVUK.cookie('seen_cookie_message') !== 'true')
@@ -95,15 +94,15 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   CookieBanner.prototype.setCookieConsent = function () {
     window.GOVUK.approveAllCookieTypes()
     this.$module.showConfirmationMessage()
+    this.$module.cookieBannerConfirmationMessage.focus()
     window.GOVUK.cookie('seen_cookie_message', 'true', { days: 365 })
   }
 
   CookieBanner.prototype.showConfirmationMessage = function () {
     this.$cookieBannerMainContent = document.querySelector('.gem-c-cookie-banner__wrapper')
-    this.$cookieBannerConfirmationMessage = document.querySelector('.gem-c-cookie-banner__confirmation')
 
     this.$cookieBannerMainContent.style.display = 'none'
-    this.$cookieBannerConfirmationMessage.style.display = 'block'
+    this.$module.cookieBannerConfirmationMessage.style.display = 'block'
   }
 
   Modules.CookieBanner = CookieBanner

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

@@ -9,7 +9,7 @@
   message = cookie_banner_helper.message
 %>
 
-<div id="<%= id %>" class="<%= cookie_banner_class %>" data-module="cookie-banner" aria-live="polite">
+<div id="<%= id %>" class="<%= cookie_banner_class %>" data-module="cookie-banner" aria-live="polite" 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 %>
@@ -45,7 +45,7 @@
   </div>
 
   <% if new_cookie_banner %>
-    <div class="gem-c-cookie-banner__confirmation govuk-width-container">
+    <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>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '17.5.0'.freeze
+  VERSION = '17.6.0'.freeze
 end

data/node_modules/accessible-autocomplete/package.json

@@ -49,7 +49,7 @@
     "/"
   ],
   "_resolved": "git://github.com/alphagov/accessible-autocomplete.git#3523dd9fffc70cbd9f6f555f75863c33a709f49e",
-  "_shasum": "efc904831e7b0323c5495b35554bd3bc167ae18c",
+  "_shasum": "709a9f211b61c5c83da1c6f4e8c904ef30803db3",
   "_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/resolve/lib/async.js

@@ -73,8 +73,8 @@ module.exports = function resolve(x, options, callback) {
             } else loadAsFile(res, opts.package, onfile);
         } else loadNodeModules(x, basedir, function (err, n, pkg) {
             if (err) cb(err);
-            else if (n) cb(null, n, pkg);
             else if (core[x]) return cb(null, x);
+            else if (n) cb(null, n, pkg);
             else {
                 var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
                 moduleError.code = 'MODULE_NOT_FOUND';

data/node_modules/resolve/lib/node-modules-paths.js

@@ -18,7 +18,7 @@ var getNodeModulesDirs = function getNodeModulesDirs(absoluteStart, modules) {
 
     return paths.reduce(function (dirs, aPath) {
         return dirs.concat(modules.map(function (moduleDir) {
-            return path.join(prefix, aPath, moduleDir);
+            return path.resolve(prefix, aPath, moduleDir);
         }));
     }, []);
 };

data/node_modules/resolve/lib/sync.js

@@ -59,6 +59,8 @@ module.exports = function (x, options) {
         if (x === '..' || x.slice(-1) === '/') res += '/';
         var m = loadAsFileSync(res) || loadAsDirectorySync(res);
         if (m) return m;
+    } else if (core[x]) {
+        return x;
     } else {
         var n = loadNodeModulesSync(x, absoluteStart);
         if (n) return n;

data/node_modules/resolve/package.json

@@ -15,13 +15,13 @@
   ],
   "_from": "resolve@>=1.6.0 <2.0.0",
   "_hasShrinkwrap": false,
-  "_id": "resolve@1.11.0",
+  "_id": "resolve@1.11.1",
   "_inCache": true,
   "_location": "/resolve",
-  "_nodeVersion": "12.1.0",
+  "_nodeVersion": "12.3.1",
   "_npmOperationalInternal": {
     "host": "s3://npm-registry-packages",
-    "tmp": "tmp/resolve_1.11.0_1557946811120_0.4088999308496508"
+    "tmp": "tmp/resolve_1.11.1_1559588786109_0.9881098789520049"
   },
   "_npmUser": {
     "name": "ljharb",
@@ -44,8 +44,8 @@
     "/eslint-plugin-node",
     "/normalize-package-data"
   ],
-  "_resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
-  "_shasum": "4014870ba296176b86343d50b60f3b50609ce232",
+  "_resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+  "_shasum": "ea10d8110376982fef578df8fc30b9ac30a07a3e",
   "_shrinkwrap": null,
   "_spec": "resolve@^1.6.0",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ/node_modules/eslint-plugin-import",
@@ -71,14 +71,14 @@
   },
   "directories": {},
   "dist": {
-    "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
-    "shasum": "4014870ba296176b86343d50b60f3b50609ce232",
-    "tarball": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
-    "fileCount": 85,
-    "unpackedSize": 140059,
-    "npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJc3GG7CRA9TVsSAnZWagAAHfUP/14z/m0dy+F21lIsBxHb\nVecF7kLUXXzSuYuIUIE/bh4WGsY3sy6VZPTgPKdZv5BZf4EWWQIGSGwu1x11\nAkjx9P0+lMS8VOEO5bWgX36hMMZXp+cL4uFMgqWKyyNOS2uNGIoaQVgBKWQH\nTfNST4DGMZtc5VhJNg8mCTJP6puwCNNGm3jVRPmVQgOUZ+38JEmZY+BmcUK4\nxWOTSTRKFjc3w5QozCTvHMTHaG9TDKDDYL82Fahr7j8/p5NQ9zFTxVv1C2RL\nqz5sThGQKHKL9Jbhosbu/hpByfxDaYcYstAmFOQI9CsL+w5D327Q6bQ1IK5F\nDa4PO0tFQM2dhzSI/hwqJb8kzDcxIk11ToHcI0M5xsYy3tOgGjUrQcjhrqxi\nKaNXkEcBy2r4Pl/A3JXJi6jGUb4xt7evADsAypW0gCS8vktY7Ty9Ru6mcGWU\n+NFRYrz0xWgIfV70G1FNxQ/FXniJsiy6tPZy/eMducmGMUV39enpCmloREgh\ntOrxrU1wY60x5SCp6cT+B6IK7tmSsPsfbLLres9T1vWemDkKmWgSr5rh6LVA\n1VUrDI8qjtIhMfiQLNJSizlk+pBdrk2I5NWjiBQgDAi+YDOvQesIitTQ1veW\n4CGJ165gQ7IYvWKiRC9BSdcQ+GbHsbJOC/R8K/tThcrnfeNSEHCL1u/covlX\nsezS\r\n=s5dL\r\n-----END PGP SIGNATURE-----\r\n"
+    "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+    "shasum": "ea10d8110376982fef578df8fc30b9ac30a07a3e",
+    "tarball": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+    "fileCount": 88,
+    "unpackedSize": 141483,
+    "npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJc9W+yCRA9TVsSAnZWagAAAnoP/3ljhkyB1pqgkVpT+3z8\nDjM5zmU/Iy3IXo28jJGas8WSL5cVrlIsdAw+uWxbj3LzBhz3v8VwAPLHcMfo\nuaW6Q6hRdKRhhzRkFl1Ip2nG9x5JQQDBOVKUF4RJ9CRh/DxxTjPQYsexO0jm\nxTJveQCHUG7ZtPq69hR/gTXQsUWTxxwOgaODCnoUKHGa5hKXoeVQgqETxM0r\nPzr0qbMe32zNxpjbhzlmDN+dCWaWD9th+IpdjQHevRZK+K7MpLO7KyXegRoW\n3pqdYtxbJZaDSk8m7EmYzzNecdcBmATsJXRqjip2fQvpd5tOiUAN39F3D7I5\nOaXipbR6x8oLu0yYQzQmtEeAH+l58Wig3JF0j00/9PTkBDEWpASiJ9jWMqbC\n+eESL7W9GhCjGCmG3sfdyPCJRKdOalLwrks8vNuuHh0ER594uqxmm5aJONeo\ndHa0leuuFd777oU1mUptcRY8T5U2oSCHvezeIbDAJ4L3DBCziPTB6t09Devs\nmo2GHQTspSHbfeGQBi2Awo1ZaDRisvOpL6ZQYB7xAx1EfdmsNjUWu3fGR99l\nuR8KELYRRQk16ZZxmkxoJ4Am5ocaOh18q/oBxo1p02mUUy7mW3kH86KC8uNy\n+V8Yr6PXW/81JUz0uV3bKrHqC7UiL6dByOGzLRNDzfBkblIgJere8mg2VAgY\nVSBr\r\n=Nz4z\r\n-----END PGP SIGNATURE-----\r\n"
   },
-  "gitHead": "da345f39588998003a53a7d9959c4df40e04fb23",
+  "gitHead": "b234492f27a2437b1b281edd432b4d97163db95c",
   "homepage": "https://github.com/browserify/resolve#readme",
   "keywords": [
     "resolve",
@@ -270,5 +270,5 @@
     "test:multirepo": "cd ./test/resolver/multirepo && npm install && npm test",
     "tests-only": "tape test/*.js"
   },
-  "version": "1.11.0"
+  "version": "1.11.1"
 }

data/node_modules/resolve/test/node-modules-paths.js

@@ -118,4 +118,26 @@ test('node-modules-paths', function (t) {
 
         t.end();
     });
+
+    t.test('combine paths correctly on Windows', function (t) {
+        var start = 'C:\\Users\\username\\myProject\\src';
+        var paths = [];
+        var moduleDirectories = ['node_modules', start];
+        var dirs = nodeModulesPaths(start, { paths: paths, moduleDirectory: moduleDirectories });
+
+        t.equal(dirs.indexOf(path.resolve(start)) > -1, true, 'should contain start dir');
+
+        t.end();
+    });
+
+    t.test('combine paths correctly on non-Windows', { skip: process.platform === 'win32' }, function (t) {
+        var start = '/Users/username/git/myProject/src';
+        var paths = [];
+        var moduleDirectories = ['node_modules', '/Users/username/git/myProject/src'];
+        var dirs = nodeModulesPaths(start, { paths: paths, moduleDirectory: moduleDirectories });
+
+        t.equal(dirs.indexOf(path.resolve(start)) > -1, true, 'should contain start dir');
+
+        t.end();
+    });
 });

data/node_modules/resolve/test/resolver.js

@@ -283,17 +283,6 @@ test('without basedir', function (t) {
     });
 });
 
-test('#25: node modules with the same name as node stdlib modules', function (t) {
-    t.plan(1);
-
-    var resolverDir = path.join(__dirname, 'resolver/punycode');
-
-    resolve('punycode', { basedir: resolverDir }, function (err, res, pkg) {
-        if (err) t.fail(err);
-        t.equal(res, path.join(resolverDir, 'node_modules/punycode/index.js'));
-    });
-});
-
 test('#52 - incorrectly resolves module-paths like "./someFolder/" when there is a file of the same name', function (t) {
     t.plan(2);
 

data/node_modules/resolve/test/resolver_sync.js

@@ -184,17 +184,6 @@ test('incorrect main', function (t) {
     t.end();
 });
 
-test('#25: node modules with the same name as node stdlib modules', function (t) {
-    var resolverDir = path.join(__dirname, 'resolver/punycode');
-
-    t.equal(
-        resolve.sync('punycode', { basedir: resolverDir }),
-        path.join(resolverDir, 'node_modules/punycode/index.js')
-    );
-
-    t.end();
-});
-
 var stubStatSync = function stubStatSync(fn) {
     var fs = require('fs');
     var statSync = fs.statSync;

data/node_modules/resolve/test/shadowed_core.js

@@ -0,0 +1,38 @@
+var test = require('tape');
+var resolve = require('../');
+var path = require('path');
+
+test('shadowed core modules still return core module', function (t) {
+    t.plan(2);
+
+    resolve('util', { basedir: path.join(__dirname, 'shadowed_core') }, function (err, res) {
+        t.ifError(err);
+        t.equal(res, 'util');
+    });
+});
+
+test('shadowed core modules still return core module [sync]', function (t) {
+    t.plan(1);
+
+    var res = resolve.sync('util', { basedir: path.join(__dirname, 'shadowed_core') });
+
+    t.equal(res, 'util');
+});
+
+test('shadowed core modules return shadow when appending `/`', function (t) {
+    t.plan(2);
+
+    resolve('util/', { basedir: path.join(__dirname, 'shadowed_core') }, function (err, res) {
+        t.ifError(err);
+        t.equal(res, path.join(__dirname, 'shadowed_core/node_modules/util/index.js'));
+    });
+});
+
+test('shadowed core modules return shadow when appending `/` [sync]', function (t) {
+    t.plan(1);
+
+    var res = resolve.sync('util/', { basedir: path.join(__dirname, 'shadowed_core') });
+
+    t.equal(res, path.join(__dirname, 'shadowed_core/node_modules/util/index.js'));
+});
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 17.5.0
+  version: 17.6.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
@@ -5787,6 +5787,7 @@ files:
 - node_modules/resolve/lib/sync.js
 - node_modules/resolve/package.json
 - node_modules/resolve/readme.markdown
+- node_modules/resolve/reaf
 - node_modules/resolve/test/core.js
 - node_modules/resolve/test/dotdot.js
 - node_modules/resolve/test/dotdot/abc/index.js
@@ -5848,6 +5849,8 @@ files:
 - node_modules/resolve/test/resolver/symlinked/_/node_modules/foo.js
 - node_modules/resolve/test/resolver/without_basedir/main.js
 - node_modules/resolve/test/resolver_sync.js
+- node_modules/resolve/test/shadowed_core.js
+- node_modules/resolve/test/shadowed_core/node_modules/util/index.js
 - node_modules/resolve/test/subdirs.js
 - node_modules/resolve/test/symlinks.js
 - node_modules/restore-cursor/index.js