govuk_publishing_components 16.28.0 → 16.29.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/views/govuk_publishing_components/components/_date_input.html.erb +9 -6
- data/app/views/govuk_publishing_components/components/_error_message.html.erb +6 -1
- data/app/views/govuk_publishing_components/components/_file_upload.html.erb +5 -9
- data/app/views/govuk_publishing_components/components/_input.html.erb +5 -9
- data/app/views/govuk_publishing_components/components/_radio.html.erb +5 -9
- data/app/views/govuk_publishing_components/components/_textarea.html.erb +5 -9
- data/app/views/govuk_publishing_components/components/docs/date_input.yml +7 -0
- data/app/views/govuk_publishing_components/components/docs/error_message.yml +6 -0
- data/lib/govuk_publishing_components/version.rb +1 -1
- data/node_modules/accessible-autocomplete/package.json +1 -1
- data/node_modules/resolve/lib/async.js +1 -1
- data/node_modules/resolve/lib/node-modules-paths.js +1 -1
- data/node_modules/resolve/lib/sync.js +2 -0
- data/node_modules/resolve/package.json +13 -13
- data/node_modules/resolve/reaf +0 -0
- data/node_modules/resolve/test/node-modules-paths.js +22 -0
- data/node_modules/resolve/test/resolver.js +0 -11
- data/node_modules/resolve/test/resolver_sync.js +0 -11
- data/node_modules/resolve/test/shadowed_core.js +38 -0
- data/node_modules/resolve/test/shadowed_core/node_modules/util/index.js +0 -0
- metadata +13 -10
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e8047aceaeee07563168532b4770f4281f8fc0d0b3269ff8b42840b713c06a67
|
|
4
|
+
data.tar.gz: 16e3fd19901d80548760a58ef8859a09a421fcc1a2faa96664801deed8b9be9c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1f17c20b503ad606df0ecc3ae95a685d28251c00350a6201d40821eaff8bc16f81638df34ecc3b8221a8d7954da2fbc7106088b25c2bc7ac32d275c088ef6c20
|
|
7
|
+
data.tar.gz: ca2fe0a8f76a04780e378abf896ae484b54c42010ca16295275d708ed59f0ce471ebd709af91b2933adc052ecc32caba07a7ba65042a7cfebeb97a07a58f00f1
|
|
@@ -10,20 +10,22 @@
|
|
|
10
10
|
legend_text ||= nil
|
|
11
11
|
hint ||= nil
|
|
12
12
|
error_message ||= nil
|
|
13
|
+
error_items ||= []
|
|
13
14
|
describedby ||= nil
|
|
15
|
+
has_error ||= error_message || error_items.any?
|
|
14
16
|
|
|
15
17
|
css_classes = %w(gem-c-date-input govuk-date-input)
|
|
16
18
|
form_group_css_classes = %w(govuk-form-group)
|
|
17
|
-
form_group_css_classes << "govuk-form-group--error" if
|
|
19
|
+
form_group_css_classes << "govuk-form-group--error" if has_error
|
|
18
20
|
|
|
19
21
|
hint_id = "hint-#{SecureRandom.hex(4)}"
|
|
20
22
|
error_id = "error-#{SecureRandom.hex(4)}"
|
|
21
23
|
|
|
22
24
|
aria_described_by ||= nil
|
|
23
|
-
if hint ||
|
|
25
|
+
if hint || has_error || describedby
|
|
24
26
|
aria_described_by = []
|
|
25
27
|
aria_described_by << hint_id if hint
|
|
26
|
-
aria_described_by << error_id if
|
|
28
|
+
aria_described_by << error_id if has_error
|
|
27
29
|
aria_described_by << describedby if describedby
|
|
28
30
|
aria_described_by = aria_described_by.join(" ")
|
|
29
31
|
end
|
|
@@ -40,10 +42,11 @@
|
|
|
40
42
|
} %>
|
|
41
43
|
<% end %>
|
|
42
44
|
|
|
43
|
-
<% if
|
|
45
|
+
<% if has_error %>
|
|
44
46
|
<%= render "govuk_publishing_components/components/error_message", {
|
|
45
47
|
id: error_id,
|
|
46
|
-
text: error_message
|
|
48
|
+
text: error_message,
|
|
49
|
+
items: error_items,
|
|
47
50
|
} %>
|
|
48
51
|
<% end %>
|
|
49
52
|
|
|
@@ -55,7 +58,7 @@
|
|
|
55
58
|
text: item[:label] || item[:name].capitalize
|
|
56
59
|
},
|
|
57
60
|
grouped: true,
|
|
58
|
-
has_error:
|
|
61
|
+
has_error: has_error,
|
|
59
62
|
name: name ? (name + "[" + item[:name] + "]") : item[:name],
|
|
60
63
|
value: item[:value],
|
|
61
64
|
width: item[:width],
|
|
@@ -3,8 +3,13 @@
|
|
|
3
3
|
classes ||= ''
|
|
4
4
|
css_classes = %w( gem-c-error-message govuk-error-message )
|
|
5
5
|
css_classes << classes if classes
|
|
6
|
-
|
|
6
|
+
items ||= []
|
|
7
7
|
|
|
8
|
+
if items.any?
|
|
9
|
+
errors = items.map { |item| capture { item[:text] } }
|
|
10
|
+
text = raw(errors.join("<br />"))
|
|
11
|
+
end
|
|
12
|
+
%>
|
|
8
13
|
<%= tag.span id: id, class: css_classes do %>
|
|
9
14
|
<span class="govuk-visually-hidden">Error:</span> <%= text %>
|
|
10
15
|
<% end %>
|
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
label ||= nil
|
|
8
8
|
hint ||= nil
|
|
9
9
|
error_message ||= nil
|
|
10
|
-
error_items ||=
|
|
11
|
-
has_error = error_message || error_items
|
|
10
|
+
error_items ||= []
|
|
11
|
+
has_error = error_message || error_items.any?
|
|
12
12
|
hint_id = "hint-#{SecureRandom.hex(4)}"
|
|
13
13
|
error_id = "error-#{SecureRandom.hex(4)}"
|
|
14
14
|
|
|
@@ -38,15 +38,11 @@
|
|
|
38
38
|
} %>
|
|
39
39
|
<% end %>
|
|
40
40
|
|
|
41
|
-
<% if
|
|
41
|
+
<% if has_error %>
|
|
42
42
|
<%= render "govuk_publishing_components/components/error_message", {
|
|
43
43
|
id: error_id,
|
|
44
|
-
text: error_message
|
|
45
|
-
|
|
46
|
-
<% elsif error_items %>
|
|
47
|
-
<%= render "govuk_publishing_components/components/error_message", {
|
|
48
|
-
id: error_id,
|
|
49
|
-
text: raw(error_items.map { |item| item[:text] }.join("<br/>"))
|
|
44
|
+
text: error_message,
|
|
45
|
+
items: error_items,
|
|
50
46
|
} %>
|
|
51
47
|
<% end %>
|
|
52
48
|
|
|
@@ -10,14 +10,14 @@
|
|
|
10
10
|
label ||= nil
|
|
11
11
|
hint ||= nil
|
|
12
12
|
error_message ||= nil
|
|
13
|
-
error_items ||=
|
|
13
|
+
error_items ||= []
|
|
14
14
|
grouped ||= nil
|
|
15
15
|
autofocus ||= nil
|
|
16
16
|
tabindex ||= nil
|
|
17
17
|
readonly ||= nil
|
|
18
18
|
maxlength ||= nil
|
|
19
19
|
width ||= nil
|
|
20
|
-
has_error ||= error_message || error_items
|
|
20
|
+
has_error ||= error_message || error_items.any?
|
|
21
21
|
hint_id = "hint-#{SecureRandom.hex(4)}"
|
|
22
22
|
error_id = "error-#{SecureRandom.hex(4)}"
|
|
23
23
|
search_icon ||= nil
|
|
@@ -53,15 +53,11 @@
|
|
|
53
53
|
} %>
|
|
54
54
|
<% end %>
|
|
55
55
|
|
|
56
|
-
<% if
|
|
56
|
+
<% if has_error %>
|
|
57
57
|
<%= render "govuk_publishing_components/components/error_message", {
|
|
58
58
|
id: error_id,
|
|
59
|
-
text: error_message
|
|
60
|
-
|
|
61
|
-
<% elsif error_items %>
|
|
62
|
-
<%= render "govuk_publishing_components/components/error_message", {
|
|
63
|
-
id: error_id,
|
|
64
|
-
text: raw(error_items.map { |item| item[:text] }.join("<br/>"))
|
|
59
|
+
text: error_message,
|
|
60
|
+
items: error_items,
|
|
65
61
|
} %>
|
|
66
62
|
<% end %>
|
|
67
63
|
|
|
@@ -9,9 +9,9 @@
|
|
|
9
9
|
is_page_heading ||= false
|
|
10
10
|
hint ||= nil
|
|
11
11
|
error_message ||= nil
|
|
12
|
-
error_items ||=
|
|
12
|
+
error_items ||= []
|
|
13
13
|
|
|
14
|
-
has_error = error_message || error_items
|
|
14
|
+
has_error = error_message || error_items.any?
|
|
15
15
|
hint_id = "hint-#{SecureRandom.hex(4)}" if hint
|
|
16
16
|
error_id = "error-#{SecureRandom.hex(4)}"
|
|
17
17
|
|
|
@@ -47,15 +47,11 @@
|
|
|
47
47
|
} %>
|
|
48
48
|
<% end %>
|
|
49
49
|
|
|
50
|
-
<% if
|
|
50
|
+
<% if has_error %>
|
|
51
51
|
<%= render "govuk_publishing_components/components/error_message", {
|
|
52
52
|
id: error_id,
|
|
53
|
-
text: error_message
|
|
54
|
-
|
|
55
|
-
<% elsif error_items %>
|
|
56
|
-
<%= render "govuk_publishing_components/components/error_message", {
|
|
57
|
-
id: error_id,
|
|
58
|
-
text: raw(error_items.map { |item| item[:text] }.join("<br/>"))
|
|
53
|
+
text: error_message,
|
|
54
|
+
items: error_items,
|
|
59
55
|
} %>
|
|
60
56
|
<% end %>
|
|
61
57
|
|
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
local_assigns[:margin_bottom] ||= 6
|
|
11
11
|
local_assigns[:margin_bottom] = 6 if local_assigns[:margin_bottom] > 9
|
|
12
12
|
error_message ||= nil
|
|
13
|
-
error_items ||=
|
|
13
|
+
error_items ||= []
|
|
14
14
|
character_count ||= nil
|
|
15
15
|
maxlength ||= nil
|
|
16
16
|
hint_id = "hint-#{SecureRandom.hex(4)}"
|
|
17
|
-
has_error ||= error_message || error_items
|
|
17
|
+
has_error ||= error_message || error_items.any?
|
|
18
18
|
error_id = "error-#{SecureRandom.hex(4)}"
|
|
19
19
|
|
|
20
20
|
shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
|
|
@@ -47,15 +47,11 @@
|
|
|
47
47
|
} %>
|
|
48
48
|
<% end %>
|
|
49
49
|
|
|
50
|
-
<% if
|
|
50
|
+
<% if has_error %>
|
|
51
51
|
<%= render "govuk_publishing_components/components/error_message", {
|
|
52
52
|
id: error_id,
|
|
53
|
-
text: error_message
|
|
54
|
-
|
|
55
|
-
<% elsif error_items %>
|
|
56
|
-
<%= render "govuk_publishing_components/components/error_message", {
|
|
57
|
-
id: error_id,
|
|
58
|
-
text: raw(error_items.map { |item| item[:text] }.join("<br/>"))
|
|
53
|
+
text: error_message,
|
|
54
|
+
items: error_items,
|
|
59
55
|
} %>
|
|
60
56
|
<% end %>
|
|
61
57
|
|
|
@@ -38,6 +38,13 @@ examples:
|
|
|
38
38
|
legend_text: "What is your date of birth?"
|
|
39
39
|
hint: "For example, 31 3 1980"
|
|
40
40
|
error_message: "Error message goes here"
|
|
41
|
+
with_error_items:
|
|
42
|
+
data:
|
|
43
|
+
legend_text: "What is your date of birth?"
|
|
44
|
+
hint: "For example, 31 3 1980"
|
|
45
|
+
error_items:
|
|
46
|
+
- text: "Error 1"
|
|
47
|
+
- text: "Error 2"
|
|
41
48
|
with_custom_items:
|
|
42
49
|
data:
|
|
43
50
|
legend_text: "Beth yw eich dyddiad geni?"
|
|
@@ -14,3 +14,9 @@ examples:
|
|
|
14
14
|
default:
|
|
15
15
|
data:
|
|
16
16
|
text: "Please enter your National Insurance Number"
|
|
17
|
+
with_items:
|
|
18
|
+
description: Error items are a common pattern where a collection of error is passed with each item having a text attribute of the error
|
|
19
|
+
data:
|
|
20
|
+
items:
|
|
21
|
+
- text: Error 1
|
|
22
|
+
- text: Error 2
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"/"
|
|
50
50
|
],
|
|
51
51
|
"_resolved": "git://github.com/alphagov/accessible-autocomplete.git#97727b82f2283469e85523598cb62615a4de944b",
|
|
52
|
-
"_shasum": "
|
|
52
|
+
"_shasum": "528c974d57b04be48a757fbc38b77c43f931112e",
|
|
53
53
|
"_shrinkwrap": null,
|
|
54
54
|
"_spec": "accessible-autocomplete@git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support",
|
|
55
55
|
"_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ",
|
|
@@ -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 (n) cb(null, n, pkg);
|
|
77
76
|
else if (core[x]) return cb(null, x);
|
|
77
|
+
else if (n) cb(null, n, pkg);
|
|
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.
|
|
21
|
+
return path.resolve(prefix, aPath, moduleDir);
|
|
22
22
|
}));
|
|
23
23
|
}, []);
|
|
24
24
|
};
|
|
@@ -59,6 +59,8 @@ 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;
|
|
62
64
|
} else {
|
|
63
65
|
var n = loadNodeModulesSync(x, absoluteStart);
|
|
64
66
|
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.
|
|
18
|
+
"_id": "resolve@1.11.1",
|
|
19
19
|
"_inCache": true,
|
|
20
20
|
"_location": "/resolve",
|
|
21
|
-
"_nodeVersion": "12.1
|
|
21
|
+
"_nodeVersion": "12.3.1",
|
|
22
22
|
"_npmOperationalInternal": {
|
|
23
23
|
"host": "s3://npm-registry-packages",
|
|
24
|
-
"tmp": "tmp/resolve_1.11.
|
|
24
|
+
"tmp": "tmp/resolve_1.11.1_1559588786109_0.9881098789520049"
|
|
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.
|
|
48
|
-
"_shasum": "
|
|
47
|
+
"_resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
|
|
48
|
+
"_shasum": "ea10d8110376982fef578df8fc30b9ac30a07a3e",
|
|
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-
|
|
75
|
-
"shasum": "
|
|
76
|
-
"tarball": "https://registry.npmjs.org/resolve/-/resolve-1.11.
|
|
77
|
-
"fileCount":
|
|
78
|
-
"unpackedSize":
|
|
79
|
-
"npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\
|
|
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"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "b234492f27a2437b1b281edd432b4d97163db95c",
|
|
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.
|
|
273
|
+
"version": "1.11.1"
|
|
274
274
|
}
|
|
File without changes
|
|
@@ -118,4 +118,26 @@ 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
|
+
});
|
|
121
143
|
});
|
|
@@ -283,17 +283,6 @@ 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
|
-
|
|
297
286
|
test('#52 - incorrectly resolves module-paths like "./someFolder/" when there is a file of the same name', function (t) {
|
|
298
287
|
t.plan(2);
|
|
299
288
|
|
|
@@ -184,17 +184,6 @@ 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
|
-
|
|
198
187
|
var stubStatSync = function stubStatSync(fn) {
|
|
199
188
|
var fs = require('fs');
|
|
200
189
|
var statSync = fs.statSync;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
var test = require('tape');
|
|
2
|
+
var resolve = require('../');
|
|
3
|
+
var path = require('path');
|
|
4
|
+
|
|
5
|
+
test('shadowed core modules still return core module', function (t) {
|
|
6
|
+
t.plan(2);
|
|
7
|
+
|
|
8
|
+
resolve('util', { basedir: path.join(__dirname, 'shadowed_core') }, function (err, res) {
|
|
9
|
+
t.ifError(err);
|
|
10
|
+
t.equal(res, 'util');
|
|
11
|
+
});
|
|
12
|
+
});
|
|
13
|
+
|
|
14
|
+
test('shadowed core modules still return core module [sync]', function (t) {
|
|
15
|
+
t.plan(1);
|
|
16
|
+
|
|
17
|
+
var res = resolve.sync('util', { basedir: path.join(__dirname, 'shadowed_core') });
|
|
18
|
+
|
|
19
|
+
t.equal(res, 'util');
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
test('shadowed core modules return shadow when appending `/`', function (t) {
|
|
23
|
+
t.plan(2);
|
|
24
|
+
|
|
25
|
+
resolve('util/', { basedir: path.join(__dirname, 'shadowed_core') }, function (err, res) {
|
|
26
|
+
t.ifError(err);
|
|
27
|
+
t.equal(res, path.join(__dirname, 'shadowed_core/node_modules/util/index.js'));
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
test('shadowed core modules return shadow when appending `/` [sync]', function (t) {
|
|
32
|
+
t.plan(1);
|
|
33
|
+
|
|
34
|
+
var res = resolve.sync('util/', { basedir: path.join(__dirname, 'shadowed_core') });
|
|
35
|
+
|
|
36
|
+
t.equal(res, path.join(__dirname, 'shadowed_core/node_modules/util/index.js'));
|
|
37
|
+
});
|
|
38
|
+
|
|
File without changes
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: govuk_publishing_components
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 16.
|
|
4
|
+
version: 16.29.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- GOV.UK Dev
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-06-
|
|
11
|
+
date: 2019-06-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: gds-api-adapters
|
|
@@ -142,14 +142,14 @@ dependencies:
|
|
|
142
142
|
requirements:
|
|
143
143
|
- - "~>"
|
|
144
144
|
- !ruby/object:Gem::Version
|
|
145
|
-
version: 2.
|
|
145
|
+
version: 2.18.0
|
|
146
146
|
type: :development
|
|
147
147
|
prerelease: false
|
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
|
149
149
|
requirements:
|
|
150
150
|
- - "~>"
|
|
151
151
|
- !ruby/object:Gem::Version
|
|
152
|
-
version: 2.
|
|
152
|
+
version: 2.18.0
|
|
153
153
|
- !ruby/object:Gem::Dependency
|
|
154
154
|
name: foreman
|
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -207,33 +207,33 @@ dependencies:
|
|
|
207
207
|
- !ruby/object:Gem::Version
|
|
208
208
|
version: '3.2'
|
|
209
209
|
- !ruby/object:Gem::Dependency
|
|
210
|
-
name:
|
|
210
|
+
name: govuk_test
|
|
211
211
|
requirement: !ruby/object:Gem::Requirement
|
|
212
212
|
requirements:
|
|
213
213
|
- - "~>"
|
|
214
214
|
- !ruby/object:Gem::Version
|
|
215
|
-
version:
|
|
215
|
+
version: 0.4.3
|
|
216
216
|
type: :development
|
|
217
217
|
prerelease: false
|
|
218
218
|
version_requirements: !ruby/object:Gem::Requirement
|
|
219
219
|
requirements:
|
|
220
220
|
- - "~>"
|
|
221
221
|
- !ruby/object:Gem::Version
|
|
222
|
-
version:
|
|
222
|
+
version: 0.4.3
|
|
223
223
|
- !ruby/object:Gem::Dependency
|
|
224
|
-
name:
|
|
224
|
+
name: jasmine
|
|
225
225
|
requirement: !ruby/object:Gem::Requirement
|
|
226
226
|
requirements:
|
|
227
227
|
- - "~>"
|
|
228
228
|
- !ruby/object:Gem::Version
|
|
229
|
-
version:
|
|
229
|
+
version: 2.4.0
|
|
230
230
|
type: :development
|
|
231
231
|
prerelease: false
|
|
232
232
|
version_requirements: !ruby/object:Gem::Requirement
|
|
233
233
|
requirements:
|
|
234
234
|
- - "~>"
|
|
235
235
|
- !ruby/object:Gem::Version
|
|
236
|
-
version:
|
|
236
|
+
version: 2.4.0
|
|
237
237
|
- !ruby/object:Gem::Dependency
|
|
238
238
|
name: rspec-rails
|
|
239
239
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -5786,6 +5786,7 @@ files:
|
|
|
5786
5786
|
- node_modules/resolve/lib/sync.js
|
|
5787
5787
|
- node_modules/resolve/package.json
|
|
5788
5788
|
- node_modules/resolve/readme.markdown
|
|
5789
|
+
- node_modules/resolve/reaf
|
|
5789
5790
|
- node_modules/resolve/test/core.js
|
|
5790
5791
|
- node_modules/resolve/test/dotdot.js
|
|
5791
5792
|
- node_modules/resolve/test/dotdot/abc/index.js
|
|
@@ -5847,6 +5848,8 @@ files:
|
|
|
5847
5848
|
- node_modules/resolve/test/resolver/symlinked/_/node_modules/foo.js
|
|
5848
5849
|
- node_modules/resolve/test/resolver/without_basedir/main.js
|
|
5849
5850
|
- node_modules/resolve/test/resolver_sync.js
|
|
5851
|
+
- node_modules/resolve/test/shadowed_core.js
|
|
5852
|
+
- node_modules/resolve/test/shadowed_core/node_modules/util/index.js
|
|
5850
5853
|
- node_modules/resolve/test/subdirs.js
|
|
5851
5854
|
- node_modules/resolve/test/symlinks.js
|
|
5852
5855
|
- node_modules/restore-cursor/index.js
|