govuk_publishing_components 16.29.0 → 17.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (185) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js +46 -23
  3. data/app/assets/javascripts/govuk_publishing_components/components/feedback.js +8 -2
  4. data/app/assets/javascripts/govuk_publishing_components/lib/cookie-functions.js +101 -21
  5. data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js +9 -2
  6. data/app/assets/stylesheets/govuk_publishing_components/_all_components.scss +0 -1
  7. data/app/assets/stylesheets/govuk_publishing_components/components/_button.scss +4 -6
  8. data/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss +36 -5
  9. data/app/assets/stylesheets/govuk_publishing_components/components/_heading.scss +14 -14
  10. data/app/assets/stylesheets/govuk_publishing_components/components/_highlight-boxes.scss +23 -23
  11. data/app/assets/stylesheets/govuk_publishing_components/components/_inverse-header.scss +8 -8
  12. data/app/assets/stylesheets/govuk_publishing_components/components/_lead-paragraph.scss +2 -2
  13. data/app/assets/stylesheets/govuk_publishing_components/components/_metadata.scss +8 -8
  14. data/app/assets/stylesheets/govuk_publishing_components/components/_organisation-logo.scss +10 -10
  15. data/app/assets/stylesheets/govuk_publishing_components/components/_previous-and-next-navigation.scss +11 -14
  16. data/app/assets/stylesheets/govuk_publishing_components/components/_related-navigation.scss +14 -14
  17. data/app/assets/stylesheets/govuk_publishing_components/components/_share-links.scss +8 -8
  18. data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav-header.scss +7 -7
  19. data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav-related.scss +20 -16
  20. data/app/assets/stylesheets/govuk_publishing_components/components/_subscription-links.scss +4 -4
  21. data/app/assets/stylesheets/govuk_publishing_components/components/_success-alert.scss +5 -5
  22. data/app/assets/stylesheets/govuk_publishing_components/components/_taxonomy-list.scss +5 -5
  23. data/app/assets/stylesheets/govuk_publishing_components/components/_title.scss +8 -8
  24. data/app/assets/stylesheets/govuk_publishing_components/components/print/_step-by-step-nav-header.scss +1 -1
  25. data/app/views/govuk_publishing_components/components/_cookie_banner.html.erb +33 -25
  26. data/app/views/govuk_publishing_components/components/_error_summary.html.erb +4 -2
  27. data/app/views/govuk_publishing_components/components/_notice.html.erb +4 -1
  28. data/app/views/govuk_publishing_components/components/docs/cookie_banner.yml +2 -0
  29. data/app/views/govuk_publishing_components/components/docs/error_summary.yml +6 -0
  30. data/app/views/govuk_publishing_components/components/docs/notice.yml +6 -0
  31. data/app/views/govuk_publishing_components/components/docs/success_alert.yml +1 -1
  32. data/lib/govuk_publishing_components/presenters/cookie_banner_helper.rb +0 -4
  33. data/lib/govuk_publishing_components/version.rb +1 -1
  34. data/node_modules/accessible-autocomplete/dist/accessible-autocomplete.min.js +1 -1
  35. data/node_modules/accessible-autocomplete/dist/accessible-autocomplete.min.js.map +1 -1
  36. data/node_modules/accessible-autocomplete/dist/lib/accessible-autocomplete.preact.min.js +1 -1
  37. data/node_modules/accessible-autocomplete/dist/lib/accessible-autocomplete.preact.min.js.map +1 -1
  38. data/node_modules/accessible-autocomplete/dist/lib/accessible-autocomplete.react.min.js +1 -1
  39. data/node_modules/accessible-autocomplete/dist/lib/accessible-autocomplete.react.min.js.map +1 -1
  40. data/node_modules/accessible-autocomplete/package.json +3 -3
  41. data/node_modules/accessible-autocomplete/src/autocomplete.js +4 -2
  42. data/node_modules/accessible-autocomplete/src/wrapper.js +5 -1
  43. data/node_modules/d/CHANGELOG.md +9 -0
  44. data/node_modules/d/CHANGES +4 -0
  45. data/node_modules/d/LICENSE +12 -16
  46. data/node_modules/d/README.md +49 -19
  47. data/node_modules/d/auto-bind.js +11 -10
  48. data/node_modules/d/index.js +23 -24
  49. data/node_modules/d/lazy.js +21 -23
  50. data/node_modules/d/package.json +63 -16
  51. data/node_modules/d/test/auto-bind.js +6 -7
  52. data/node_modules/d/test/index.js +78 -51
  53. data/node_modules/d/test/lazy.js +65 -50
  54. data/node_modules/es6-weak-map/CHANGELOG.md +5 -0
  55. data/node_modules/es6-weak-map/LICENSE +12 -16
  56. data/node_modules/es6-weak-map/README.md +34 -19
  57. data/node_modules/es6-weak-map/implement.js +9 -5
  58. data/node_modules/es6-weak-map/index.js +2 -2
  59. data/node_modules/es6-weak-map/is-implemented.js +10 -9
  60. data/node_modules/es6-weak-map/is-native-implemented.js +3 -3
  61. data/node_modules/es6-weak-map/is-weak-map.js +8 -8
  62. data/node_modules/es6-weak-map/package.json +30 -19
  63. data/node_modules/es6-weak-map/polyfill.js +31 -32
  64. data/node_modules/es6-weak-map/test/implement.js +4 -2
  65. data/node_modules/es6-weak-map/test/index.js +4 -3
  66. data/node_modules/es6-weak-map/test/is-implemented.js +9 -8
  67. data/node_modules/es6-weak-map/test/is-native-implemented.js +4 -2
  68. data/node_modules/es6-weak-map/test/is-weak-map.js +4 -4
  69. data/node_modules/es6-weak-map/test/polyfill.js +13 -13
  70. data/node_modules/es6-weak-map/test/valid-weak-map.js +22 -9
  71. data/node_modules/es6-weak-map/valid-weak-map.js +5 -5
  72. data/node_modules/resolve/lib/async.js +1 -1
  73. data/node_modules/resolve/lib/node-modules-paths.js +1 -1
  74. data/node_modules/resolve/lib/sync.js +0 -2
  75. data/node_modules/resolve/package.json +13 -13
  76. data/node_modules/resolve/test/node-modules-paths.js +0 -22
  77. data/node_modules/resolve/test/resolver.js +11 -0
  78. data/node_modules/resolve/test/resolver_sync.js +11 -0
  79. data/node_modules/standard/node_modules/ms/index.js +2 -2
  80. data/node_modules/standard/node_modules/ms/package.json +205 -16
  81. data/node_modules/standard/node_modules/ms/readme.md +1 -1
  82. data/node_modules/type/CHANGELOG.md +62 -0
  83. data/node_modules/type/README.md +743 -0
  84. data/node_modules/type/array-length/coerce.js +10 -0
  85. data/node_modules/type/array-length/ensure.js +10 -0
  86. data/node_modules/type/array-like/ensure.js +9 -0
  87. data/node_modules/type/array-like/is.js +21 -0
  88. data/node_modules/type/array/ensure.js +9 -0
  89. data/node_modules/type/array/is.js +27 -0
  90. data/node_modules/type/date/ensure.js +9 -0
  91. data/node_modules/type/date/is.js +26 -0
  92. data/node_modules/type/error/ensure.js +9 -0
  93. data/node_modules/type/error/is.js +24 -0
  94. data/node_modules/type/finite/coerce.js +8 -0
  95. data/node_modules/type/finite/ensure.js +10 -0
  96. data/node_modules/type/function/ensure.js +9 -0
  97. data/node_modules/type/function/is.js +19 -0
  98. data/node_modules/type/integer/coerce.js +11 -0
  99. data/node_modules/type/integer/ensure.js +10 -0
  100. data/node_modules/type/iterable/ensure.js +9 -0
  101. data/node_modules/type/iterable/is.js +20 -0
  102. data/node_modules/type/lib/is-to-string-tag-supported.js +3 -0
  103. data/node_modules/type/lib/resolve-exception.js +21 -0
  104. data/node_modules/type/lib/safe-to-string.js +10 -0
  105. data/node_modules/type/lib/to-short-string.js +29 -0
  106. data/node_modules/type/natural-number/coerce.js +10 -0
  107. data/node_modules/type/natural-number/ensure.js +10 -0
  108. data/node_modules/type/number/coerce.js +14 -0
  109. data/node_modules/type/number/ensure.js +10 -0
  110. data/node_modules/type/object/ensure.js +9 -0
  111. data/node_modules/type/object/is.js +11 -0
  112. data/node_modules/type/package.json +159 -0
  113. data/node_modules/type/plain-function/ensure.js +9 -0
  114. data/node_modules/type/plain-function/is.js +11 -0
  115. data/node_modules/type/plain-object/ensure.js +9 -0
  116. data/node_modules/type/plain-object/is.js +28 -0
  117. data/node_modules/type/promise/ensure.js +9 -0
  118. data/node_modules/type/promise/is.js +27 -0
  119. data/node_modules/type/prototype/is.js +13 -0
  120. data/node_modules/type/reg-exp/ensure.js +9 -0
  121. data/node_modules/type/reg-exp/is.js +37 -0
  122. data/node_modules/type/safe-integer/coerce.js +13 -0
  123. data/node_modules/type/safe-integer/ensure.js +10 -0
  124. data/node_modules/type/string/coerce.js +23 -0
  125. data/node_modules/type/string/ensure.js +10 -0
  126. data/node_modules/type/test/_lib/arrow-function-if-supported.js +4 -0
  127. data/node_modules/type/test/_lib/class-if-supported.js +4 -0
  128. data/node_modules/type/test/array-length/coerce.js +47 -0
  129. data/node_modules/type/test/array-length/ensure.js +19 -0
  130. data/node_modules/type/test/array-like/ensure.js +24 -0
  131. data/node_modules/type/test/array-like/is.js +47 -0
  132. data/node_modules/type/test/array/ensure.js +20 -0
  133. data/node_modules/type/test/array/is.js +41 -0
  134. data/node_modules/type/test/date/ensure.js +20 -0
  135. data/node_modules/type/test/date/is.js +46 -0
  136. data/node_modules/type/test/error/ensure.js +20 -0
  137. data/node_modules/type/test/error/is.js +42 -0
  138. data/node_modules/type/test/finite/coerce.js +40 -0
  139. data/node_modules/type/test/finite/ensure.js +17 -0
  140. data/node_modules/type/test/function/ensure.js +20 -0
  141. data/node_modules/type/test/function/is.js +46 -0
  142. data/node_modules/type/test/integer/coerce.js +49 -0
  143. data/node_modules/type/test/integer/ensure.js +17 -0
  144. data/node_modules/type/test/iterable/ensure.js +24 -0
  145. data/node_modules/type/test/iterable/is.js +50 -0
  146. data/node_modules/type/test/lib/is-to-string-tag-supported.js +10 -0
  147. data/node_modules/type/test/lib/resolve-exception.js +39 -0
  148. data/node_modules/type/test/lib/safe-to-string.js +32 -0
  149. data/node_modules/type/test/lib/to-short-string.js +41 -0
  150. data/node_modules/type/test/natural-number/coerce.js +47 -0
  151. data/node_modules/type/test/natural-number/ensure.js +19 -0
  152. data/node_modules/type/test/number/coerce.js +40 -0
  153. data/node_modules/type/test/number/ensure.js +17 -0
  154. data/node_modules/type/test/object/ensure.js +20 -0
  155. data/node_modules/type/test/object/is.js +30 -0
  156. data/node_modules/type/test/plain-function/ensure.js +20 -0
  157. data/node_modules/type/test/plain-function/is.js +56 -0
  158. data/node_modules/type/test/plain-object/ensure.js +20 -0
  159. data/node_modules/type/test/plain-object/is.js +47 -0
  160. data/node_modules/type/test/promise/ensure.js +20 -0
  161. data/node_modules/type/test/promise/is.js +39 -0
  162. data/node_modules/type/test/prototype/is.js +39 -0
  163. data/node_modules/type/test/reg-exp/ensure.js +20 -0
  164. data/node_modules/type/test/reg-exp/is.js +47 -0
  165. data/node_modules/type/test/safe-integer/coerce.js +49 -0
  166. data/node_modules/type/test/safe-integer/ensure.js +19 -0
  167. data/node_modules/type/test/string/coerce.js +36 -0
  168. data/node_modules/type/test/string/ensure.js +17 -0
  169. data/node_modules/type/test/thenable/ensure.js +20 -0
  170. data/node_modules/type/test/thenable/is.js +44 -0
  171. data/node_modules/type/test/time-value/coerce.js +47 -0
  172. data/node_modules/type/test/time-value/ensure.js +17 -0
  173. data/node_modules/type/test/value/ensure.js +20 -0
  174. data/node_modules/type/test/value/is.js +29 -0
  175. data/node_modules/type/thenable/ensure.js +9 -0
  176. data/node_modules/type/thenable/is.js +9 -0
  177. data/node_modules/type/time-value/coerce.js +12 -0
  178. data/node_modules/type/time-value/ensure.js +10 -0
  179. data/node_modules/type/value/ensure.js +9 -0
  180. data/node_modules/type/value/is.js +6 -0
  181. metadata +118 -21
  182. data/app/assets/stylesheets/govuk_publishing_components/components/_taxonomy-navigation.scss +0 -94
  183. data/node_modules/resolve/reaf +0 -0
  184. data/node_modules/resolve/test/shadowed_core.js +0 -38
  185. data/node_modules/resolve/test/shadowed_core/node_modules/util/index.js +0 -0
@@ -1,3 +1,5 @@
1
- 'use strict';
1
+ "use strict";
2
2
 
3
- module.exports = function (t, a) { a(typeof t, 'boolean'); };
3
+ module.exports = function (t, a) {
4
+ a(typeof t, "boolean");
5
+ };
@@ -1,15 +1,15 @@
1
- 'use strict';
1
+ "use strict";
2
2
 
3
- var WeakMapPoly = require('../polyfill');
3
+ var WeakMapPoly = require("../polyfill");
4
4
 
5
5
  module.exports = function (t, a) {
6
6
  a(t(undefined), false, "Undefined");
7
7
  a(t(null), false, "Null");
8
8
  a(t(true), false, "Primitive");
9
- a(t('raz'), false, "String");
9
+ a(t("raz"), false, "String");
10
10
  a(t({}), false, "Object");
11
11
  a(t([]), false, "Array");
12
- if (typeof WeakMap !== 'undefined') {
12
+ if (typeof WeakMap !== "undefined") {
13
13
  a(t(new WeakMap()), true, "Native");
14
14
  }
15
15
  a(t(new WeakMapPoly()), true, "Polyfill");
@@ -1,23 +1,23 @@
1
- 'use strict';
1
+ "use strict";
2
2
 
3
3
  module.exports = function (T, a) {
4
- var x = {}, y = {}, z = {}, arr = [[x, 'raz'], [y, 'dwa']], map = new T(arr);
4
+ var obj1 = {}, obj2 = {}, obj3 = {}, arr = [[obj1, "raz"], [obj2, "dwa"]], map = new T(arr);
5
5
 
6
6
  a(map instanceof T, true, "WeakMap");
7
- a(map.has(x), true, "Has: true");
8
- a(map.get(x), 'raz', "Get: contains");
9
- a(map.has(z), false, "Has: false");
10
- a(map.get(z), undefined, "Get: doesn't contain");
11
- a(map.set(z, 'trzy'), map, "Set: return");
12
- a(map.has(z), true, "Add");
7
+ a(map.has(obj1), true, "Has: true");
8
+ a(map.get(obj1), "raz", "Get: contains");
9
+ a(map.has(obj3), false, "Has: false");
10
+ a(map.get(obj3), undefined, "Get: doesn't contain");
11
+ a(map.set(obj3, "trzy"), map, "Set: return");
12
+ a(map.has(obj3), true, "Add");
13
13
  a(map.delete({}), false, "Delete: false");
14
14
 
15
- a(map.delete(x), true, "Delete: true");
16
- a(map.get(x), undefined, "Get: after delete");
17
- a(map.has(x), false, "Has: after delete");
15
+ a(map.delete(obj1), true, "Delete: true");
16
+ a(map.get(obj1), undefined, "Get: after delete");
17
+ a(map.has(obj1), false, "Has: after delete");
18
18
 
19
19
  a.h1("Empty initialization");
20
20
  map = new T();
21
- map.set(x, 'bar');
22
- a(map.get(x), 'bar');
21
+ map.set(obj1, "bar");
22
+ a(map.get(obj1), "bar");
23
23
  };
@@ -1,16 +1,29 @@
1
- 'use strict';
1
+ "use strict";
2
2
 
3
- var WeakMapPoly = require('../polyfill');
3
+ var WeakMapPoly = require("../polyfill");
4
4
 
5
5
  module.exports = function (t, a) {
6
6
  var map;
7
- a.throws(function () { t(undefined); }, TypeError, "Undefined");
8
- a.throws(function () { t(null); }, TypeError, "Null");
9
- a.throws(function () { t(true); }, TypeError, "Primitive");
10
- a.throws(function () { t('raz'); }, TypeError, "String");
11
- a.throws(function () { t({}); }, TypeError, "Object");
12
- a.throws(function () { t([]); }, TypeError, "Array");
13
- if (typeof WeakMap !== 'undefined') {
7
+
8
+ a.throws(function () {
9
+ t(undefined);
10
+ }, TypeError, "Undefined");
11
+ a.throws(function () {
12
+ t(null);
13
+ }, TypeError, "Null");
14
+ a.throws(function () {
15
+ t(true);
16
+ }, TypeError, "Primitive");
17
+ a.throws(function () {
18
+ t("raz");
19
+ }, TypeError, "String");
20
+ a.throws(function () {
21
+ t({});
22
+ }, TypeError, "Object");
23
+ a.throws(function () {
24
+ t([]);
25
+ }, TypeError, "Array");
26
+ if (typeof WeakMap !== "undefined") {
14
27
  map = new WeakMap();
15
28
  a(t(map), map, "Native");
16
29
  }
@@ -1,8 +1,8 @@
1
- 'use strict';
1
+ "use strict";
2
2
 
3
- var isWeakMap = require('./is-weak-map');
3
+ var isWeakMap = require("./is-weak-map");
4
4
 
5
- module.exports = function (x) {
6
- if (!isWeakMap(x)) throw new TypeError(x + " is not a WeakMap");
7
- return x;
5
+ module.exports = function (value) {
6
+ if (!isWeakMap(value)) throw new TypeError(value + " is not a WeakMap");
7
+ return value;
8
8
  };
@@ -73,8 +73,8 @@ module.exports = function resolve(x, options, callback) {
73
73
  } else loadAsFile(res, opts.package, onfile);
74
74
  } else loadNodeModules(x, basedir, function (err, n, pkg) {
75
75
  if (err) cb(err);
76
- else if (core[x]) return cb(null, x);
77
76
  else if (n) cb(null, n, pkg);
77
+ else if (core[x]) return cb(null, x);
78
78
  else {
79
79
  var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
80
80
  moduleError.code = 'MODULE_NOT_FOUND';
@@ -18,7 +18,7 @@ var getNodeModulesDirs = function getNodeModulesDirs(absoluteStart, modules) {
18
18
 
19
19
  return paths.reduce(function (dirs, aPath) {
20
20
  return dirs.concat(modules.map(function (moduleDir) {
21
- return path.resolve(prefix, aPath, moduleDir);
21
+ return path.join(prefix, aPath, moduleDir);
22
22
  }));
23
23
  }, []);
24
24
  };
@@ -59,8 +59,6 @@ module.exports = function (x, options) {
59
59
  if (x === '..' || x.slice(-1) === '/') res += '/';
60
60
  var m = loadAsFileSync(res) || loadAsDirectorySync(res);
61
61
  if (m) return m;
62
- } else if (core[x]) {
63
- return x;
64
62
  } else {
65
63
  var n = loadNodeModulesSync(x, absoluteStart);
66
64
  if (n) return n;
@@ -15,13 +15,13 @@
15
15
  ],
16
16
  "_from": "resolve@>=1.6.0 <2.0.0",
17
17
  "_hasShrinkwrap": false,
18
- "_id": "resolve@1.11.1",
18
+ "_id": "resolve@1.11.0",
19
19
  "_inCache": true,
20
20
  "_location": "/resolve",
21
- "_nodeVersion": "12.3.1",
21
+ "_nodeVersion": "12.1.0",
22
22
  "_npmOperationalInternal": {
23
23
  "host": "s3://npm-registry-packages",
24
- "tmp": "tmp/resolve_1.11.1_1559588786109_0.9881098789520049"
24
+ "tmp": "tmp/resolve_1.11.0_1557946811120_0.4088999308496508"
25
25
  },
26
26
  "_npmUser": {
27
27
  "name": "ljharb",
@@ -44,8 +44,8 @@
44
44
  "/eslint-plugin-node",
45
45
  "/normalize-package-data"
46
46
  ],
47
- "_resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
48
- "_shasum": "ea10d8110376982fef578df8fc30b9ac30a07a3e",
47
+ "_resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
48
+ "_shasum": "4014870ba296176b86343d50b60f3b50609ce232",
49
49
  "_shrinkwrap": null,
50
50
  "_spec": "resolve@^1.6.0",
51
51
  "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ/node_modules/eslint-plugin-import",
@@ -71,14 +71,14 @@
71
71
  },
72
72
  "directories": {},
73
73
  "dist": {
74
- "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
75
- "shasum": "ea10d8110376982fef578df8fc30b9ac30a07a3e",
76
- "tarball": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
77
- "fileCount": 88,
78
- "unpackedSize": 141483,
79
- "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"
74
+ "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
75
+ "shasum": "4014870ba296176b86343d50b60f3b50609ce232",
76
+ "tarball": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
77
+ "fileCount": 85,
78
+ "unpackedSize": 140059,
79
+ "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"
80
80
  },
81
- "gitHead": "b234492f27a2437b1b281edd432b4d97163db95c",
81
+ "gitHead": "da345f39588998003a53a7d9959c4df40e04fb23",
82
82
  "homepage": "https://github.com/browserify/resolve#readme",
83
83
  "keywords": [
84
84
  "resolve",
@@ -270,5 +270,5 @@
270
270
  "test:multirepo": "cd ./test/resolver/multirepo && npm install && npm test",
271
271
  "tests-only": "tape test/*.js"
272
272
  },
273
- "version": "1.11.1"
273
+ "version": "1.11.0"
274
274
  }
@@ -118,26 +118,4 @@ test('node-modules-paths', function (t) {
118
118
 
119
119
  t.end();
120
120
  });
121
-
122
- t.test('combine paths correctly on Windows', function (t) {
123
- var start = 'C:\\Users\\username\\myProject\\src';
124
- var paths = [];
125
- var moduleDirectories = ['node_modules', start];
126
- var dirs = nodeModulesPaths(start, { paths: paths, moduleDirectory: moduleDirectories });
127
-
128
- t.equal(dirs.indexOf(path.resolve(start)) > -1, true, 'should contain start dir');
129
-
130
- t.end();
131
- });
132
-
133
- t.test('combine paths correctly on non-Windows', { skip: process.platform === 'win32' }, function (t) {
134
- var start = '/Users/username/git/myProject/src';
135
- var paths = [];
136
- var moduleDirectories = ['node_modules', '/Users/username/git/myProject/src'];
137
- var dirs = nodeModulesPaths(start, { paths: paths, moduleDirectory: moduleDirectories });
138
-
139
- t.equal(dirs.indexOf(path.resolve(start)) > -1, true, 'should contain start dir');
140
-
141
- t.end();
142
- });
143
121
  });
@@ -283,6 +283,17 @@ test('without basedir', function (t) {
283
283
  });
284
284
  });
285
285
 
286
+ test('#25: node modules with the same name as node stdlib modules', function (t) {
287
+ t.plan(1);
288
+
289
+ var resolverDir = path.join(__dirname, 'resolver/punycode');
290
+
291
+ resolve('punycode', { basedir: resolverDir }, function (err, res, pkg) {
292
+ if (err) t.fail(err);
293
+ t.equal(res, path.join(resolverDir, 'node_modules/punycode/index.js'));
294
+ });
295
+ });
296
+
286
297
  test('#52 - incorrectly resolves module-paths like "./someFolder/" when there is a file of the same name', function (t) {
287
298
  t.plan(2);
288
299
 
@@ -184,6 +184,17 @@ test('incorrect main', function (t) {
184
184
  t.end();
185
185
  });
186
186
 
187
+ test('#25: node modules with the same name as node stdlib modules', function (t) {
188
+ var resolverDir = path.join(__dirname, 'resolver/punycode');
189
+
190
+ t.equal(
191
+ resolve.sync('punycode', { basedir: resolverDir }),
192
+ path.join(resolverDir, 'node_modules/punycode/index.js')
193
+ );
194
+
195
+ t.end();
196
+ });
197
+
187
198
  var stubStatSync = function stubStatSync(fn) {
188
199
  var fs = require('fs');
189
200
  var statSync = fs.statSync;
@@ -28,7 +28,7 @@ module.exports = function(val, options) {
28
28
  var type = typeof val;
29
29
  if (type === 'string' && val.length > 0) {
30
30
  return parse(val);
31
- } else if (type === 'number' && isNaN(val) === false) {
31
+ } else if (type === 'number' && isFinite(val)) {
32
32
  return options.long ? fmtLong(val) : fmtShort(val);
33
33
  }
34
34
  throw new Error(
@@ -50,7 +50,7 @@ function parse(str) {
50
50
  if (str.length > 100) {
51
51
  return;
52
52
  }
53
- var match = /^((?:\d+)?\-?\d?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(
53
+ var match = /^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(
54
54
  str
55
55
  );
56
56
  if (!match) {
@@ -14,19 +14,20 @@
14
14
  ]
15
15
  ],
16
16
  "_from": "ms@>=2.1.1 <3.0.0",
17
- "_id": "ms@2.1.1",
17
+ "_hasShrinkwrap": false,
18
+ "_id": "ms@2.1.2",
18
19
  "_inCache": true,
19
20
  "_location": "/standard/ms",
20
- "_nodeVersion": "9.2.0",
21
+ "_nodeVersion": "10.15.3",
21
22
  "_npmOperationalInternal": {
22
23
  "host": "s3://npm-registry-packages",
23
- "tmp": "tmp/ms-2.1.1.tgz_1512066615982_0.7117063472978771"
24
+ "tmp": "tmp/ms_2.1.2_1559842315767_0.4700607530567853"
24
25
  },
25
26
  "_npmUser": {
26
- "name": "leo",
27
- "email": "leo@zeit.co"
27
+ "name": "styfle",
28
+ "email": "steven@ceriously.com"
28
29
  },
29
- "_npmVersion": "5.5.1",
30
+ "_npmVersion": "6.4.1",
30
31
  "_phantomChildren": {},
31
32
  "_requested": {
32
33
  "raw": "ms@^2.1.1",
@@ -40,8 +41,8 @@
40
41
  "_requiredBy": [
41
42
  "/standard/debug"
42
43
  ],
43
- "_resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
44
- "_shasum": "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a",
44
+ "_resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
45
+ "_shasum": "d09d1f357b443f493382a8eb3ccd183872ae6009",
45
46
  "_shrinkwrap": null,
46
47
  "_spec": "ms@^2.1.1",
47
48
  "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ/node_modules/standard/node_modules/debug",
@@ -59,9 +60,12 @@
59
60
  },
60
61
  "directories": {},
61
62
  "dist": {
62
- "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
63
- "shasum": "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a",
64
- "tarball": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"
63
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
64
+ "shasum": "d09d1f357b443f493382a8eb3ccd183872ae6009",
65
+ "tarball": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
66
+ "fileCount": 4,
67
+ "unpackedSize": 6842,
68
+ "npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJc+U4MCRA9TVsSAnZWagAA71AP/2rpu0zYdK5Z/BXrrKNW\nljsVOs4oHNJ2jeZrzpcV8eZUZ6zAi78plyxcnMCbbG+TrpjXrPcb8qFq630G\nS6+srbEF0lCGCc+ktJrNJPTeXkDxukQXVrepgZ2kxZ4m3q/QIAVoK4t9ebuH\nNYa+39wwET9oPuPsk+YY0Z7fQ1vadyuzHYOrRmtudV3ZtyT0k74Ec3IhKamW\nlLDJtCklD7IGcwirrvPssxmYu8WP+PAyFnrVaOW+iior1o07oWO2mk7sk3Fx\nwBSBFf7vZqFJP6Qg1m3TVBAiipL+Pf+b3Dy8fhmn4NhTGj/9Wl7f/LcqogOV\nV9l77qsZldCERBwmwLsHlMyCSSl/b2qaz28ZBTRwHtHdo19QT6MqX8Yvomy4\n+gyPBBAHC6bqqLZ0veRKzSNFfJYoFw8tQzyjSjpmYcdxaB5w4z4QPZAkZCku\ns+sooI5Xo33E9rcEDWmyqxdUud+Au/fTttg0dReYe8NVrUgzyk4T1W+D7I4k\nu3XV7O9bOaJiBTNsb22lGIC6E/HtjfoqW7iwl0cdZ8iZcPTBClkzsy9Hz6a4\nmNKDARFL0wjzWF/CoXyKcI6t9ruOepTQRfbAtZDAo4LEYj/bGiqm2kbX5AP6\nicCOlufTNip74l2bXv2sJNwtjGzEYF/S79Oyc49IP/ovIua4quXXtSjAh8Bg\nLrV/\r\n=GrYx\r\n-----END PGP SIGNATURE-----\r\n"
65
69
  },
66
70
  "eslintConfig": {
67
71
  "extends": "eslint:recommended",
@@ -70,10 +74,7 @@
70
74
  "es6": true
71
75
  }
72
76
  },
73
- "files": [
74
- "index.js"
75
- ],
76
- "gitHead": "fe0bae301a6c41f68a01595658a4f4f0dcba0e84",
77
+ "gitHead": "7920885eb232fbe7a5efdab956d3e7c507c92ddf",
77
78
  "homepage": "https://github.com/zeit/ms#readme",
78
79
  "license": "MIT",
79
80
  "lint-staged": {
@@ -85,13 +86,201 @@
85
86
  },
86
87
  "main": "./index",
87
88
  "maintainers": [
89
+ {
90
+ "name": "alexaltea",
91
+ "email": "alexandro@phi.nz"
92
+ },
93
+ {
94
+ "name": "anatrajkovska",
95
+ "email": "ana.trajkovska2015@gmail.com"
96
+ },
97
+ {
98
+ "name": "andybitz",
99
+ "email": "artzbitz@gmail.com"
100
+ },
101
+ {
102
+ "name": "arunoda",
103
+ "email": "arunoda.susiripala@gmail.com"
104
+ },
105
+ {
106
+ "name": "arzafran",
107
+ "email": "franco@basement.studio"
108
+ },
109
+ {
110
+ "name": "atcastle",
111
+ "email": "atcastle@gmail.com"
112
+ },
113
+ {
114
+ "name": "b3nnyl",
115
+ "email": "ciao@sylin.me"
116
+ },
117
+ {
118
+ "name": "caarlos0",
119
+ "email": "caarlos0@gmail.com"
120
+ },
121
+ {
122
+ "name": "codetheory",
123
+ "email": "thecodetheory@gmail.com"
124
+ },
125
+ {
126
+ "name": "coetry",
127
+ "email": "allenhai03@gmail.com"
128
+ },
129
+ {
130
+ "name": "dav-is",
131
+ "email": "mail@connordav.is"
132
+ },
133
+ {
134
+ "name": "fivepointseven",
135
+ "email": "fivepointseven@icloud.com"
136
+ },
137
+ {
138
+ "name": "guybedford",
139
+ "email": "guybedford@gmail.com"
140
+ },
141
+ {
142
+ "name": "hharnisc",
143
+ "email": "hharnisc@gmail.com"
144
+ },
145
+ {
146
+ "name": "huvik",
147
+ "email": "lukas@huvar.cz"
148
+ },
149
+ {
150
+ "name": "iamevilrabbit",
151
+ "email": "hello@evilrabb.it"
152
+ },
153
+ {
154
+ "name": "igorklopov",
155
+ "email": "igor@klopov.com"
156
+ },
157
+ {
158
+ "name": "ijjk",
159
+ "email": "jj@jjsweb.site"
160
+ },
161
+ {
162
+ "name": "janicklas-ralph",
163
+ "email": "janicklasralph036@gmail.com"
164
+ },
165
+ {
166
+ "name": "javivelasco",
167
+ "email": "javier.velasco86@gmail.com"
168
+ },
169
+ {
170
+ "name": "joecohens",
171
+ "email": "joecohenr@gmail.com"
172
+ },
173
+ {
174
+ "name": "juancampa",
175
+ "email": "juancampa@gmail.com"
176
+ },
88
177
  {
89
178
  "name": "leo",
90
179
  "email": "leo@zeit.co"
91
180
  },
181
+ {
182
+ "name": "lfades",
183
+ "email": "luisito453@gmail.com"
184
+ },
185
+ {
186
+ "name": "lucleray",
187
+ "email": "luc.leray@gmail.com"
188
+ },
189
+ {
190
+ "name": "manovotny",
191
+ "email": "manovotny@gmail.com"
192
+ },
193
+ {
194
+ "name": "marcosnils",
195
+ "email": "marcosnils@gmail.com"
196
+ },
197
+ {
198
+ "name": "matheuss",
199
+ "email": "me@matheus.top"
200
+ },
201
+ {
202
+ "name": "mfix22",
203
+ "email": "mrfix84@gmail.com"
204
+ },
205
+ {
206
+ "name": "mglagola",
207
+ "email": "mark.glagola@gmail.com"
208
+ },
209
+ {
210
+ "name": "msweeneydev",
211
+ "email": "mail@msweeneydev.com"
212
+ },
213
+ {
214
+ "name": "nkzawa",
215
+ "email": "naoyuki.kanezawa@gmail.com"
216
+ },
217
+ {
218
+ "name": "olliv",
219
+ "email": "olli@zeit.co"
220
+ },
221
+ {
222
+ "name": "paco",
223
+ "email": "pvco.coursey@gmail.com"
224
+ },
225
+ {
226
+ "name": "paulogdm",
227
+ "email": "paulogdemitri@gmail.com"
228
+ },
229
+ {
230
+ "name": "quietshu",
231
+ "email": "ds303077135@gmail.com"
232
+ },
233
+ {
234
+ "name": "rabaut",
235
+ "email": "rabautse@gmail.com"
236
+ },
237
+ {
238
+ "name": "ragojose",
239
+ "email": "ragojosefrancisco@gmail.com"
240
+ },
92
241
  {
93
242
  "name": "rauchg",
94
243
  "email": "rauchg@gmail.com"
244
+ },
245
+ {
246
+ "name": "sarupbanskota",
247
+ "email": "sbanskota08@gmail.com"
248
+ },
249
+ {
250
+ "name": "skllcrn",
251
+ "email": "skllcrn@zeit.co"
252
+ },
253
+ {
254
+ "name": "sophearak",
255
+ "email": "t.sophearak@gmail.com"
256
+ },
257
+ {
258
+ "name": "styfle",
259
+ "email": "steven@ceriously.com"
260
+ },
261
+ {
262
+ "name": "timer",
263
+ "email": "timer150@gmail.com"
264
+ },
265
+ {
266
+ "name": "timneutkens",
267
+ "email": "tim@timneutkens.nl"
268
+ },
269
+ {
270
+ "name": "tootallnate",
271
+ "email": "nathan@tootallnate.net"
272
+ },
273
+ {
274
+ "name": "umegaya",
275
+ "email": "iyatomi@gmail.com"
276
+ },
277
+ {
278
+ "name": "williamli",
279
+ "email": "williamli@bbi.io"
280
+ },
281
+ {
282
+ "name": "zeit-bot",
283
+ "email": "team@zeit.co"
95
284
  }
96
285
  ],
97
286
  "name": "ms",
@@ -106,5 +295,5 @@
106
295
  "precommit": "lint-staged",
107
296
  "test": "mocha tests.js"
108
297
  },
109
- "version": "2.1.1"
298
+ "version": "2.1.2"
110
299
  }