Skip to content

Commit

Permalink
Bug 1614503 [wpt PR 21707] - [Import Maps] Make errors block the whol…
Browse files Browse the repository at this point in the history
…e resolution, Blink-side, a=testonly

Automatic update from web-platform-tests
[Import Maps] Make errors block the whole resolution, Blink-side

Reflects WICG/import-maps#205.

This CL updates tests from #205.

To match the behavior with the updated spec,
this CL turns non-String values into `null` entries
(i.e. make whole resolution fail without further fallback),
instead of ignoring such entries.
Other aspects were already conformant with the updated spec
(i.e. weren't matching with the spec before #205).

This CL updates (test-only) import maps serialization code
so that it matches with the reference implementation, i.e.
dump `null` entries as `null` instead of `[]`.

This CL also updates spec comments.

Bug: 990561, WICG/import-maps#184
Change-Id: Ifa2d04bf20fcef5575c14d135c328730ea09c454
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2037012
Commit-Queue: Hiroshige Hayashizaki <hiroshigechromium.org>
Reviewed-by: Kouhei Ueno <kouheichromium.org>
Cr-Commit-Position: refs/heads/master{#740847}

--

wpt-commits: 8767abfffb790e4928ac9433282928caa2357ee8
wpt-pr: 21707

UltraBlame original commit: e620b95565ea737f093567c22c6b8ce07e37b7dc
  • Loading branch information
marco-c committed Feb 18, 2020
1 parent 3393af0 commit d7cb97a
Show file tree
Hide file tree
Showing 7 changed files with 1,048 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,15 @@
.
json
'
'
resources
/
resolving
-
null
.
json
'
]
)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,16 @@ imports
:
{
"
unparseable2
"
:
null
"
unparseable3
"
:
null
"
invalidButParseable1
"
:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,31 @@ imports
"
:
{
"
foo1
"
:
null
"
foo2
"
:
null
"
foo3
"
:
null
"
foo4
"
:
null
"
foo5
"
:
null
}
"
scopes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,21 @@ imports
"
:
{
"
dotSlash
"
:
null
"
dotDotSlash
"
:
null
"
slash
"
:
null
}
"
scopes
Expand Down Expand Up @@ -520,6 +535,41 @@ imports
"
:
{
"
dotSlash1
"
:
null
"
dotDotSlash1
"
:
null
"
dotSlash2
"
:
null
"
dotDotSlash2
"
:
null
"
slash2
"
:
null
"
dotSlash3
"
:
null
"
dotDotSlash3
"
:
null
}
"
scopes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,36 @@ imports
:
{
"
null
"
:
null
"
boolean
"
:
null
"
number
"
:
null
"
object
"
:
null
"
array
"
:
null
"
array2
"
:
null
"
string
"
:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ imports
"
:
{
"
trailer
/
"
:
null
}
"
scopes
Expand Down
Loading

0 comments on commit d7cb97a

Please sign in to comment.