Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
662f6412
Unverified
Commit
662f6412
authored
Jan 28, 2026
by
Niklas Mischkulnig
Committed by
GitHub
Jan 28, 2026
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[backport] Turbopack: support pattern into exports field (#82757) (#89150)
parent
84de13f6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
586 additions
and
242 deletions
+586
-242
alias_map.rs
turbopack/crates/turbopack-core/src/resolve/alias_map.rs
+255
-139
mod.rs
turbopack/crates/turbopack-core/src/resolve/mod.rs
+64
-31
options.rs
turbopack/crates/turbopack-core/src/resolve/options.rs
+15
-8
pattern.rs
turbopack/crates/turbopack-core/src/resolve/pattern.rs
+91
-22
remap.rs
turbopack/crates/turbopack-core/src/resolve/remap.rs
+46
-26
graph.rs
turbopack/crates/turbopack-ecmascript/src/analyzer/graph.rs
+13
-8
graph.snapshot
...ack-ecmascript/tests/analyzer/graph/concat/graph.snapshot
+1
-1
index.js
...ecution/turbopack/resolving/dynamic-module/input/index.js
+7
-0
index.js
...ving/dynamic-module/input/node_modules/exports-a/index.js
+1
-0
package.json
.../dynamic-module/input/node_modules/exports-a/package.json
+6
-0
index.js
...ving/dynamic-module/input/node_modules/exports-b/index.js
+1
-0
package.json
.../dynamic-module/input/node_modules/exports-b/package.json
+6
-0
index.js
.../turbopack/resolving/exports-field-pattern/input/index.js
+56
-0
index.js
...ing/exports-field-pattern/input/node_modules/pkg/index.js
+1
-0
package.json
...exports-field-pattern/input/node_modules/pkg/package.json
+12
-0
a.js
...ing/exports-field-pattern/input/node_modules/pkg/src/a.js
+1
-0
b.js
...ing/exports-field-pattern/input/node_modules/pkg/src/b.js
+1
-0
c.js
...ing/exports-field-pattern/input/node_modules/pkg/src/c.js
+1
-0
index.js
...turbopack/resolving/tsconfig-paths-dynamic/input/index.js
+4
-4
foo.ts
...rbopack/resolving/tsconfig-paths-dynamic/input/src/foo.ts
+4
-3
No files found.
turbopack/crates/turbopack-core/src/resolve/alias_map.rs
View file @
662f6412
This diff is collapsed.
Click to expand it.
turbopack/crates/turbopack-core/src/resolve/mod.rs
View file @
662f6412
...
@@ -42,10 +42,12 @@ use crate::{
...
@@ -42,10 +42,12 @@ use crate::{
raw_module
::
RawModule
,
raw_module
::
RawModule
,
reference_type
::
ReferenceType
,
reference_type
::
ReferenceType
,
resolve
::{
resolve
::{
alias_map
::
AliasKey
,
node
::{
node_cjs_resolve_options
,
node_esm_resolve_options
},
node
::{
node_cjs_resolve_options
,
node_esm_resolve_options
},
parse
::
stringify_data_uri
,
parse
::
stringify_data_uri
,
pattern
::{
PatternMatch
,
read_matches
},
pattern
::{
PatternMatch
,
read_matches
},
plugin
::
AfterResolvePlugin
,
plugin
::
AfterResolvePlugin
,
remap
::
ReplacedSubpathValueResult
,
},
},
source
::{
OptionSource
,
Source
,
Sources
},
source
::{
OptionSource
,
Source
,
Sources
},
};
};
...
@@ -790,7 +792,7 @@ impl ResolveResult {
...
@@ -790,7 +792,7 @@ impl ResolveResult {
}
}
}
}
pub
fn
add_conditions
<
'a
>
(
&
mut
self
,
conditions
:
impl
IntoIterator
<
Item
=
(
&
'a
s
tr
,
bool
)
>
)
{
pub
fn
add_conditions
(
&
mut
self
,
conditions
:
impl
IntoIterator
<
Item
=
(
RcS
tr
,
bool
)
>
)
{
let
mut
primary
=
std
::
mem
::
take
(
&
mut
self
.primary
);
let
mut
primary
=
std
::
mem
::
take
(
&
mut
self
.primary
);
for
(
k
,
v
)
in
conditions
{
for
(
k
,
v
)
in
conditions
{
for
(
key
,
_
)
in
primary
.iter_mut
()
{
for
(
key
,
_
)
in
primary
.iter_mut
()
{
...
@@ -2702,6 +2704,8 @@ async fn resolve_into_package(
...
@@ -2702,6 +2704,8 @@ async fn resolve_into_package(
let
is_root_match
=
path
.is_match
(
""
)
||
path
.is_match
(
"/"
);
let
is_root_match
=
path
.is_match
(
""
)
||
path
.is_match
(
"/"
);
let
could_match_others
=
path
.could_match_others
(
""
);
let
could_match_others
=
path
.could_match_others
(
""
);
let
mut
export_path_request
=
path
.clone
();
export_path_request
.push_front
(
rcstr!
(
"."
)
.into
());
for
resolve_into_package
in
options_value
.into_package
.iter
()
{
for
resolve_into_package
in
options_value
.into_package
.iter
()
{
match
resolve_into_package
{
match
resolve_into_package
{
// handled by the `resolve_into_folder` call below
// handled by the `resolve_into_folder` call below
...
@@ -2717,23 +2721,13 @@ async fn resolve_into_package(
...
@@ -2717,23 +2721,13 @@ async fn resolve_into_package(
continue
;
continue
;
};
};
let
Some
(
path
)
=
path
.as_constant_string
()
else
{
bail!
(
"pattern into an exports field is not implemented yet"
);
};
let
path
=
if
path
==
"/"
{
rcstr!
(
"."
)
}
else
{
format!
(
".{path}"
)
.into
()
};
results
.push
(
results
.push
(
handle_exports_imports_field
(
handle_exports_imports_field
(
package_path
.clone
(),
package_path
.clone
(),
package_json_path
,
package_json_path
,
*
options
,
*
options
,
exports_field
,
exports_field
,
&
path
,
export_path_request
.clone
()
,
conditions
,
conditions
,
unspecified_conditions
,
unspecified_conditions
,
query
,
query
,
...
@@ -2944,7 +2938,7 @@ async fn handle_exports_imports_field(
...
@@ -2944,7 +2938,7 @@ async fn handle_exports_imports_field(
package_json_path
:
FileSystemPath
,
package_json_path
:
FileSystemPath
,
options
:
Vc
<
ResolveOptions
>
,
options
:
Vc
<
ResolveOptions
>
,
exports_imports_field
:
&
AliasMap
<
SubpathValue
>
,
exports_imports_field
:
&
AliasMap
<
SubpathValue
>
,
path
:
&
str
,
mut
path
:
Pattern
,
conditions
:
&
BTreeMap
<
RcStr
,
ConditionValue
>
,
conditions
:
&
BTreeMap
<
RcStr
,
ConditionValue
>
,
unspecified_conditions
:
&
ConditionValue
,
unspecified_conditions
:
&
ConditionValue
,
query
:
RcStr
,
query
:
RcStr
,
...
@@ -2952,47 +2946,86 @@ async fn handle_exports_imports_field(
...
@@ -2952,47 +2946,86 @@ async fn handle_exports_imports_field(
let
mut
results
=
Vec
::
new
();
let
mut
results
=
Vec
::
new
();
let
mut
conditions_state
=
FxHashMap
::
default
();
let
mut
conditions_state
=
FxHashMap
::
default
();
let
req
=
Pattern
::
Constant
(
format!
(
"{path}{query}"
)
.into
());
if
!
query
.is_empty
()
{
path
.push
(
query
.into
());
let
values
=
exports_imports_field
}
.lookup
(
&
req
)
let
req
=
path
;
.map
(
AliasMatch
::
try_into_self
)
.collect
::
<
Result
<
Vec
<
_
>>>
()
?
;
for
value
in
values
.iter
()
{
let
values
=
exports_imports_field
.lookup
(
&
req
);
if
value
.add_results
(
for
value
in
values
{
let
value
=
value
?
;
if
value
.output
.add_results
(
value
.prefix
,
value
.key
,
conditions
,
conditions
,
unspecified_conditions
,
unspecified_conditions
,
&
mut
conditions_state
,
&
mut
conditions_state
,
&
mut
results
,
&
mut
results
,
)
{
)
{
// Match found, stop (leveraging the lazy `lookup` iterator).
break
;
break
;
}
}
}
}
let
mut
resolved_results
=
Vec
::
new
();
let
mut
resolved_results
=
Vec
::
new
();
for
(
result_path
,
conditions
)
in
results
{
for
ReplacedSubpathValueResult
{
result_path
,
conditions
,
map_prefix
,
map_key
,
}
in
results
{
if
let
Some
(
result_path
)
=
result_path
.with_normalized_path
()
{
if
let
Some
(
result_path
)
=
result_path
.with_normalized_path
()
{
let
request
=
Request
::
parse
(
Pattern
::
Concatenation
(
vec!
[
let
request
=
Request
::
parse
(
Pattern
::
Concatenation
(
vec!
[
Pattern
::
Constant
(
rcstr!
(
"./"
)),
Pattern
::
Constant
(
rcstr!
(
"./"
)),
result_path
,
result_path
.clone
()
,
]))
]))
.
to_resolved
()
.
resolve
()
.await
?
;
.await
?
;
let
resolve_result
=
Box
::
pin
(
resolve_internal_inline
(
let
resolve_result
=
Box
::
pin
(
resolve_internal_inline
(
package_path
.clone
(),
package_path
.clone
(),
*
request
,
request
,
options
,
options
,
))
))
.await
?
;
.await
?
;
if
conditions
.is_empty
()
{
resolved_results
.push
(
resolve_result
.with_request
(
path
.into
()));
let
resolve_result
=
if
let
Some
(
req
)
=
req
.as_constant_string
()
{
resolve_result
.with_request
(
req
.clone
())
}
else
{
}
else
{
let
mut
resolve_result
=
resolve_result
.await
?
.with_request_ref
(
path
.into
());
match
map_key
{
AliasKey
::
Exact
=>
resolve_result
.with_request
(
map_prefix
.clone
()
.into
()),
AliasKey
::
Wildcard
{
..
}
=>
{
// - `req` is the user's request (key of the export map)
// - `result_path` is the final request (value of the export map), so
// effectively `'{foo}*{bar}'`
// Because of the assertion in AliasMapLookupIterator, `req` is of the
// form:
// - "prefix...<dynamic>" or
// - "prefix...<dynamic>...suffix"
let
mut
old_request_key
=
result_path
;
// Remove the Pattern::Constant(rcstr!("./")), from above again
old_request_key
.push_front
(
rcstr!
(
"./"
)
.into
());
let
new_request_key
=
req
.clone
();
resolve_result
.with_replaced_request_key_pattern
(
Pattern
::
new
(
old_request_key
),
Pattern
::
new
(
new_request_key
),
)
}
}
};
let
resolve_result
=
if
!
conditions
.is_empty
()
{
let
mut
resolve_result
=
resolve_result
.owned
()
.await
?
;
resolve_result
.add_conditions
(
conditions
);
resolve_result
.add_conditions
(
conditions
);
resolved_results
.push
(
resolve_result
.cell
());
resolve_result
.cell
()
}
}
else
{
resolve_result
};
resolved_results
.push
(
resolve_result
);
}
}
}
}
...
@@ -3047,7 +3080,7 @@ async fn resolve_package_internal_with_imports_field(
...
@@ -3047,7 +3080,7 @@ async fn resolve_package_internal_with_imports_field(
package_json_path
.clone
(),
package_json_path
.clone
(),
resolve_options
,
resolve_options
,
imports
,
imports
,
specifier
,
Pattern
::
Constant
(
specifier
.clone
())
,
conditions
,
conditions
,
unspecified_conditions
,
unspecified_conditions
,
RcStr
::
default
(),
RcStr
::
default
(),
...
...
turbopack/crates/turbopack-core/src/resolve/options.rs
View file @
662f6412
...
@@ -418,7 +418,10 @@ async fn import_mapping_to_result(
...
@@ -418,7 +418,10 @@ async fn import_mapping_to_result(
}
else
if
let
Some
(
request
)
=
request
.await
?
.request
()
{
}
else
if
let
Some
(
request
)
=
request
.await
?
.request
()
{
request
request
}
else
{
}
else
{
bail!
(
"Cannot resolve external reference without request"
)
bail!
(
"Cannot resolve external reference with dynamic request {:?}"
,
request
.request_pattern
()
.await
?
.describe_as_string
()
)
},
},
*
ty
,
*
ty
,
*
traced
,
*
traced
,
...
@@ -434,7 +437,10 @@ async fn import_mapping_to_result(
...
@@ -434,7 +437,10 @@ async fn import_mapping_to_result(
}
else
if
let
Some
(
request
)
=
request
.await
?
.request
()
{
}
else
if
let
Some
(
request
)
=
request
.await
?
.request
()
{
request
request
}
else
{
}
else
{
bail!
(
"Cannot resolve external reference without request"
)
bail!
(
"Cannot resolve external reference with dynamic request {:?}"
,
request
.request_pattern
()
.await
?
.describe_as_string
()
)
},
},
ty
:
*
ty
,
ty
:
*
ty
,
traced
:
*
traced
,
traced
:
*
traced
,
...
@@ -517,6 +523,12 @@ impl ImportMap {
...
@@ -517,6 +523,12 @@ impl ImportMap {
// relative requests must not match global wildcard aliases.
// relative requests must not match global wildcard aliases.
let
request_pattern
=
request
.request_pattern
()
.await
?
;
let
request_pattern
=
request
.request_pattern
()
.await
?
;
if
matches!
(
*
request_pattern
,
Pattern
::
Dynamic
|
Pattern
::
DynamicNoSlash
)
{
// You could probably conceive of cases where this isn't correct. But the dynamic will
// just match every single entry in the import map, which is not what we want.
return
Ok
(
ImportMapResult
::
NoEntry
);
}
let
(
req_rel
,
rest
)
=
request_pattern
.split_could_match
(
"./"
);
let
(
req_rel
,
rest
)
=
request_pattern
.split_could_match
(
"./"
);
let
(
req_rel_parent
,
req_rest
)
=
let
(
req_rel_parent
,
req_rest
)
=
rest
.map
(|
r
|
r
.split_could_match
(
"../"
))
.unwrap_or_default
();
rest
.map
(|
r
|
r
.split_could_match
(
"../"
))
.unwrap_or_default
();
...
@@ -540,12 +552,7 @@ impl ImportMap {
...
@@ -540,12 +552,7 @@ impl ImportMap {
.chain
(
lookup_rel_parent
.into_iter
())
.chain
(
lookup_rel_parent
.into_iter
())
.chain
(
lookup
.into_iter
())
.chain
(
lookup
.into_iter
())
.map
(
async
|
result
|
{
.map
(
async
|
result
|
{
import_mapping_to_result
(
import_mapping_to_result
(
*
result
?
.output.await
?
,
lookup_path
.clone
(),
request
)
.await
*
result
.try_join_into_self
()
.await
?
,
lookup_path
.clone
(),
request
,
)
.await
})
})
.try_join
()
.try_join
()
.await
?
;
.await
?
;
...
...
turbopack/crates/turbopack-core/src/resolve/pattern.rs
View file @
662f6412
...
@@ -80,6 +80,9 @@ fn longest_common_prefix<'a>(strings: &[&'a str]) -> &'a str {
...
@@ -80,6 +80,9 @@ fn longest_common_prefix<'a>(strings: &[&'a str]) -> &'a str {
if
strings
.is_empty
()
{
if
strings
.is_empty
()
{
return
""
;
return
""
;
}
}
if
let
[
single
]
=
strings
{
return
single
;
}
let
first
=
strings
[
0
];
let
first
=
strings
[
0
];
let
mut
len
=
first
.len
();
let
mut
len
=
first
.len
();
for
str
in
&
strings
[
1
..
]
{
for
str
in
&
strings
[
1
..
]
{
...
@@ -151,6 +154,10 @@ impl Pattern {
...
@@ -151,6 +154,10 @@ impl Pattern {
// Concatenations, so extracting the first/only Concatenation child
// Concatenations, so extracting the first/only Concatenation child
// elements is enough.
// elements is enough.
if
let
Pattern
::
Constant
(
c
)
=
self
{
return
c
;
}
fn
collect_constant_prefix
<
'a
:
'b
,
'b
>
(
pattern
:
&
'a
Pattern
,
result
:
&
mut
Vec
<&
'b
str
>
)
{
fn
collect_constant_prefix
<
'a
:
'b
,
'b
>
(
pattern
:
&
'a
Pattern
,
result
:
&
mut
Vec
<&
'b
str
>
)
{
match
pattern
{
match
pattern
{
Pattern
::
Constant
(
c
)
=>
{
Pattern
::
Constant
(
c
)
=>
{
...
@@ -328,10 +335,10 @@ impl Pattern {
...
@@ -328,10 +335,10 @@ impl Pattern {
self
.normalize
()
self
.normalize
()
}
}
///
/
Replace all `*`s in `template` with self.
/// Replace all `*`s in `template` with self.
///
/
///
///
/
Handle top-level alternatives separately so that multiple star placeholders
/// Handle top-level alternatives separately so that multiple star placeholders
///
/
match the same pattern instead of the whole alternative.
/// match the same pattern instead of the whole alternative.
pub
fn
spread_into_star
(
&
self
,
template
:
&
str
)
->
Pattern
{
pub
fn
spread_into_star
(
&
self
,
template
:
&
str
)
->
Pattern
{
if
template
.contains
(
"*"
)
{
if
template
.contains
(
"*"
)
{
let
alternatives
:
Box
<
dyn
Iterator
<
Item
=
&
Pattern
>>
=
match
self
{
let
alternatives
:
Box
<
dyn
Iterator
<
Item
=
&
Pattern
>>
=
match
self
{
...
@@ -388,6 +395,12 @@ impl Pattern {
...
@@ -388,6 +395,12 @@ impl Pattern {
*
self
=
pat
;
*
self
=
pat
;
return
;
return
;
}
}
if
let
Pattern
::
Constant
(
pat
)
=
&
pat
&&
pat
.is_empty
()
{
// Short-circuit to ignore when trying to append an empty string.
return
;
}
match
(
self
,
pat
)
{
match
(
self
,
pat
)
{
(
Pattern
::
Concatenation
(
list
),
Pattern
::
Concatenation
(
more
))
=>
{
(
Pattern
::
Concatenation
(
list
),
Pattern
::
Concatenation
(
more
))
=>
{
...
@@ -467,6 +480,12 @@ impl Pattern {
...
@@ -467,6 +480,12 @@ impl Pattern {
pub
fn
with_normalized_path
(
&
self
)
->
Option
<
Pattern
>
{
pub
fn
with_normalized_path
(
&
self
)
->
Option
<
Pattern
>
{
let
mut
new
=
self
.clone
();
let
mut
new
=
self
.clone
();
#[derive(Debug)]
enum
PathElement
{
Segment
(
Pattern
),
Separator
,
}
fn
normalize_path_internal
(
pattern
:
&
mut
Pattern
)
->
Option
<
()
>
{
fn
normalize_path_internal
(
pattern
:
&
mut
Pattern
)
->
Option
<
()
>
{
match
pattern
{
match
pattern
{
Pattern
::
Constant
(
c
)
=>
{
Pattern
::
Constant
(
c
)
=>
{
...
@@ -480,27 +499,49 @@ impl Pattern {
...
@@ -480,27 +499,49 @@ impl Pattern {
for
segment
in
list
.iter
()
{
for
segment
in
list
.iter
()
{
match
segment
{
match
segment
{
Pattern
::
Constant
(
str
)
=>
{
Pattern
::
Constant
(
str
)
=>
{
for
segment
in
str
.split
(
'/'
)
{
let
mut
iter
=
str
.split
(
'/'
)
.peekable
();
while
let
Some
(
segment
)
=
iter
.next
()
{
match
segment
{
match
segment
{
"."
|
""
=>
{}
"."
|
""
=>
{
// Ignore empty segments
continue
;
}
".."
=>
{
".."
=>
{
segments
.pop
()
?
;
if
segments
.is_empty
()
{
// Leaving root
return
None
;
}
if
let
Some
(
PathElement
::
Separator
)
=
segments
.last
()
&&
let
Some
(
PathElement
::
Segment
(
Pattern
::
Constant
(
_
),
))
=
segments
.get
(
segments
.len
()
-
2
)
{
// Resolve `foo/..`
segments
.truncate
(
segments
.len
()
-
2
);
continue
;
}
// Keep it, can't pop non-constant segment.
segments
.push
(
PathElement
::
Segment
(
Pattern
::
Constant
(
rcstr!
(
".."
),
)));
}
}
segment
=>
{
segment
=>
{
segments
.push
(
vec!
[
Pattern
::
Constant
(
segment
.into
())]);
segments
.push
(
PathElement
::
Segment
(
Pattern
::
Constant
(
segment
.into
(),
)));
}
}
}
}
}
if
str
.ends_with
(
"/"
)
{
if
iter
.peek
()
.is_some
()
{
segments
.push
(
vec!
[]);
// If not last, add separator
segments
.push
(
PathElement
::
Separator
);
}
}
}
}
}
Pattern
::
Dynamic
|
Pattern
::
DynamicNoSlash
=>
{
Pattern
::
Dynamic
|
Pattern
::
DynamicNoSlash
=>
{
if
segments
.is_empty
()
{
segments
.push
(
PathElement
::
Segment
(
segment
.clone
()));
segments
.push
(
vec!
[]);
}
let
last
=
segments
.last_mut
()
.unwrap
();
last
.push
(
segment
.clone
());
}
}
Pattern
::
Alternatives
(
_
)
|
Pattern
::
Concatenation
(
_
)
=>
{
Pattern
::
Alternatives
(
_
)
|
Pattern
::
Concatenation
(
_
)
=>
{
panic!
(
"for with_normalized_path the Pattern must be normalized"
);
panic!
(
"for with_normalized_path the Pattern must be normalized"
);
...
@@ -510,10 +551,10 @@ impl Pattern {
...
@@ -510,10 +551,10 @@ impl Pattern {
let
separator
=
rcstr!
(
"/"
);
let
separator
=
rcstr!
(
"/"
);
*
list
=
segments
*
list
=
segments
.into_iter
()
.into_iter
()
.flat_map
(|
c
|
{
.map
(|
c
|
match
c
{
std
::
iter
::
once
(
Pattern
::
Constant
(
separator
.clone
()))
.chain
(
c
)
PathElement
::
Segment
(
p
)
=>
p
,
PathElement
::
Separator
=>
Pattern
::
Constant
(
separator
.clone
()),
})
})
.skip
(
1
)
.collect
();
.collect
();
Some
(())
Some
(())
}
}
...
@@ -1984,6 +2025,12 @@ mod tests {
...
@@ -1984,6 +2025,12 @@ mod tests {
Pattern
::
Constant
(
rcstr!
(
"a/c/d"
))
Pattern
::
Constant
(
rcstr!
(
"a/c/d"
))
])
])
);
);
assert_eq!
(
Pattern
::
Constant
(
rcstr!
(
"a/b/"
))
.with_normalized_path
()
.unwrap
(),
Pattern
::
Constant
(
rcstr!
(
"a/b"
))
);
// Dynamic is a segment itself
// Dynamic is a segment itself
assert_eq!
(
assert_eq!
(
...
@@ -1994,10 +2041,14 @@ mod tests {
...
@@ -1994,10 +2041,14 @@ mod tests {
])
])
.with_normalized_path
()
.with_normalized_path
()
.unwrap
(),
.unwrap
(),
Pattern
::
Constant
(
rcstr!
(
"a/b/c"
))
Pattern
::
Concatenation
(
vec!
[
Pattern
::
Constant
(
rcstr!
(
"a/b/"
)),
Pattern
::
Dynamic
,
Pattern
::
Constant
(
rcstr!
(
"../c"
))
])
);
);
// Dynamic is
only part of the second
segment
// Dynamic is
part of a
segment
assert_eq!
(
assert_eq!
(
Pattern
::
Concatenation
(
vec!
[
Pattern
::
Concatenation
(
vec!
[
Pattern
::
Constant
(
rcstr!
(
"a/b"
)),
Pattern
::
Constant
(
rcstr!
(
"a/b"
)),
...
@@ -2006,7 +2057,25 @@ mod tests {
...
@@ -2006,7 +2057,25 @@ mod tests {
])
])
.with_normalized_path
()
.with_normalized_path
()
.unwrap
(),
.unwrap
(),
Pattern
::
Constant
(
rcstr!
(
"a/c"
))
Pattern
::
Concatenation
(
vec!
[
Pattern
::
Constant
(
rcstr!
(
"a/b"
)),
Pattern
::
Dynamic
,
Pattern
::
Constant
(
rcstr!
(
"../c"
))
])
);
assert_eq!
(
Pattern
::
Concatenation
(
vec!
[
Pattern
::
Constant
(
rcstr!
(
"src/"
)),
Pattern
::
Dynamic
,
Pattern
::
Constant
(
rcstr!
(
".js"
))
])
.with_normalized_path
()
.unwrap
(),
Pattern
::
Concatenation
(
vec!
[
Pattern
::
Constant
(
rcstr!
(
"src/"
)),
Pattern
::
Dynamic
,
Pattern
::
Constant
(
rcstr!
(
".js"
))
])
);
);
}
}
...
...
turbopack/crates/turbopack-core/src/resolve/remap.rs
View file @
662f6412
use
std
::{
collections
::
BTreeMap
,
fmt
::
Display
,
ops
::
Deref
};
use
std
::{
borrow
::
Cow
,
collections
::
BTreeMap
,
fmt
::
Display
,
ops
::
Deref
};
use
anyhow
::{
Result
,
bail
};
use
anyhow
::{
Result
,
bail
};
use
rustc_hash
::
FxHashMap
;
use
rustc_hash
::
FxHashMap
;
...
@@ -12,6 +12,7 @@ use super::{
...
@@ -12,6 +12,7 @@ use super::{
options
::
ConditionValue
,
options
::
ConditionValue
,
pattern
::
Pattern
,
pattern
::
Pattern
,
};
};
use
crate
::
resolve
::
alias_map
::
AliasKey
;
/// A small helper type to differentiate parsing exports and imports fields.
/// A small helper type to differentiate parsing exports and imports fields.
#[derive(Copy,
Clone)]
#[derive(Copy,
Clone)]
...
@@ -69,44 +70,44 @@ pub enum ReplacedSubpathValue {
...
@@ -69,44 +70,44 @@ pub enum ReplacedSubpathValue {
impl
AliasTemplate
for
SubpathValue
{
impl
AliasTemplate
for
SubpathValue
{
type
Output
<
'a
>
type
Output
<
'a
>
=
Re
sult
<
ReplacedSubpathValue
>
=
Re
placedSubpathValue
where
where
Self
:
'a
;
Self
:
'a
;
fn
convert
(
&
self
)
->
Re
sult
<
ReplacedSubpathValue
>
{
fn
convert
(
&
self
)
->
Re
placedSubpathValue
{
Ok
(
match
self
{
match
self
{
SubpathValue
::
Alternatives
(
list
)
=>
ReplacedSubpathValue
::
Alternatives
(
SubpathValue
::
Alternatives
(
list
)
=>
ReplacedSubpathValue
::
Alternatives
(
list
.iter
()
list
.iter
()
.map
(|
value
:
&
SubpathValue
|
value
.convert
())
.map
(|
value
:
&
SubpathValue
|
value
.convert
())
.collect
::
<
Result
<
Vec
<
_
>>>
()
?
,
.collect
::
<
Vec
<
_
>>
()
,
),
),
SubpathValue
::
Conditional
(
list
)
=>
ReplacedSubpathValue
::
Conditional
(
SubpathValue
::
Conditional
(
list
)
=>
ReplacedSubpathValue
::
Conditional
(
list
.iter
()
list
.iter
()
.map
(|(
condition
,
value
)|
Ok
((
condition
.clone
(),
value
.convert
()
?
)))
.map
(|(
condition
,
value
)|
(
condition
.clone
(),
value
.convert
(
)))
.collect
::
<
Result
<
Vec
<
_
>>>
()
?
,
.collect
::
<
Vec
<
_
>>
()
,
),
),
SubpathValue
::
Result
(
value
)
=>
ReplacedSubpathValue
::
Result
(
value
.clone
()
.into
()),
SubpathValue
::
Result
(
value
)
=>
ReplacedSubpathValue
::
Result
(
value
.clone
()
.into
()),
SubpathValue
::
Excluded
=>
ReplacedSubpathValue
::
Excluded
,
SubpathValue
::
Excluded
=>
ReplacedSubpathValue
::
Excluded
,
}
)
}
}
}
fn
replace
(
&
self
,
capture
:
&
Pattern
)
->
Re
sult
<
ReplacedSubpathValue
>
{
fn
replace
(
&
self
,
capture
:
&
Pattern
)
->
Re
placedSubpathValue
{
Ok
(
match
self
{
match
self
{
SubpathValue
::
Alternatives
(
list
)
=>
ReplacedSubpathValue
::
Alternatives
(
SubpathValue
::
Alternatives
(
list
)
=>
ReplacedSubpathValue
::
Alternatives
(
list
.iter
()
list
.iter
()
.map
(|
value
:
&
SubpathValue
|
value
.replace
(
capture
))
.map
(|
value
:
&
SubpathValue
|
value
.replace
(
capture
))
.collect
::
<
Result
<
Vec
<
_
>>>
()
?
,
.collect
::
<
Vec
<
_
>>
()
,
),
),
SubpathValue
::
Conditional
(
list
)
=>
ReplacedSubpathValue
::
Conditional
(
SubpathValue
::
Conditional
(
list
)
=>
ReplacedSubpathValue
::
Conditional
(
list
.iter
()
list
.iter
()
.map
(|(
condition
,
value
)|
Ok
((
condition
.clone
(),
value
.replace
(
capture
)
?
)))
.map
(|(
condition
,
value
)|
(
condition
.clone
(),
value
.replace
(
capture
)))
.collect
::
<
Result
<
Vec
<
_
>>>
()
?
,
.collect
::
<
Vec
<
_
>>
()
,
),
),
SubpathValue
::
Result
(
value
)
=>
{
SubpathValue
::
Result
(
value
)
=>
{
ReplacedSubpathValue
::
Result
(
capture
.spread_into_star
(
value
))
ReplacedSubpathValue
::
Result
(
capture
.spread_into_star
(
value
))
}
}
SubpathValue
::
Excluded
=>
ReplacedSubpathValue
::
Excluded
,
SubpathValue
::
Excluded
=>
ReplacedSubpathValue
::
Excluded
,
}
)
}
}
}
}
}
...
@@ -230,22 +231,35 @@ impl SubpathValue {
...
@@ -230,22 +231,35 @@ impl SubpathValue {
}
}
}
}
pub
struct
ReplacedSubpathValueResult
<
'a
,
'b
>
{
pub
result_path
:
Pattern
,
pub
conditions
:
Vec
<
(
RcStr
,
bool
)
>
,
pub
map_prefix
:
Cow
<
'a
,
str
>
,
pub
map_key
:
&
'b
AliasKey
,
}
impl
ReplacedSubpathValue
{
impl
ReplacedSubpathValue
{
// TODO
#[allow(clippy
::
type_complexity)]
/// Walks the [ReplacedSubpathValue] and adds results to the `target`
/// Walks the [ReplacedSubpathValue] and adds results to the `target`
/// vector. It uses the `conditions` to skip or enter conditional
/// vector. It uses the `conditions` to skip or enter conditional
/// results. The state of conditions is stored within
/// results. The state of conditions is stored within
/// `condition_overrides`, which is also exposed to the consumer.
/// `condition_overrides`, which is also exposed to the consumer.
pub
fn
add_results
<
'a
>
(
pub
fn
add_results
<
'a
,
'b
>
(
&
'a
self
,
self
,
prefix
:
Cow
<
'a
,
str
>
,
key
:
&
'b
AliasKey
,
conditions
:
&
BTreeMap
<
RcStr
,
ConditionValue
>
,
conditions
:
&
BTreeMap
<
RcStr
,
ConditionValue
>
,
unspecified_condition
:
&
ConditionValue
,
unspecified_condition
:
&
ConditionValue
,
condition_overrides
:
&
mut
FxHashMap
<
&
'a
s
tr
,
ConditionValue
>
,
condition_overrides
:
&
mut
FxHashMap
<
RcS
tr
,
ConditionValue
>
,
target
:
&
mut
Vec
<
(
&
'a
Pattern
,
Vec
<
(
&
'a
str
,
bool
)
>
)
>
,
target
:
&
mut
Vec
<
ReplacedSubpathValueResult
<
'a
,
'b
>
>
,
)
->
bool
{
)
->
bool
{
match
self
{
match
self
{
ReplacedSubpathValue
::
Alternatives
(
list
)
=>
{
ReplacedSubpathValue
::
Alternatives
(
list
)
=>
{
for
value
in
list
{
for
value
in
list
{
if
value
.add_results
(
if
value
.add_results
(
prefix
.clone
(),
key
,
conditions
,
conditions
,
unspecified_condition
,
unspecified_condition
,
condition_overrides
,
condition_overrides
,
...
@@ -263,12 +277,14 @@ impl ReplacedSubpathValue {
...
@@ -263,12 +277,14 @@ impl ReplacedSubpathValue {
}
else
{
}
else
{
condition_overrides
condition_overrides
.get
(
condition
.as_str
())
.get
(
condition
.as_str
())
.or_else
(||
conditions
.get
(
condition
))
.or_else
(||
conditions
.get
(
&
condition
))
.unwrap_or
(
unspecified_condition
)
.unwrap_or
(
unspecified_condition
)
};
};
match
condition_value
{
match
condition_value
{
ConditionValue
::
Set
=>
{
ConditionValue
::
Set
=>
{
if
value
.add_results
(
if
value
.add_results
(
prefix
.clone
(),
key
,
conditions
,
conditions
,
unspecified_condition
,
unspecified_condition
,
condition_overrides
,
condition_overrides
,
...
@@ -279,8 +295,10 @@ impl ReplacedSubpathValue {
...
@@ -279,8 +295,10 @@ impl ReplacedSubpathValue {
}
}
ConditionValue
::
Unset
=>
{}
ConditionValue
::
Unset
=>
{}
ConditionValue
::
Unknown
=>
{
ConditionValue
::
Unknown
=>
{
condition_overrides
.insert
(
condition
,
ConditionValue
::
Set
);
condition_overrides
.insert
(
condition
.clone
()
,
ConditionValue
::
Set
);
if
value
.add_results
(
if
value
.add_results
(
prefix
.clone
(),
key
,
conditions
,
conditions
,
unspecified_condition
,
unspecified_condition
,
condition_overrides
,
condition_overrides
,
...
@@ -296,17 +314,19 @@ impl ReplacedSubpathValue {
...
@@ -296,17 +314,19 @@ impl ReplacedSubpathValue {
false
false
}
}
ReplacedSubpathValue
::
Result
(
r
)
=>
{
ReplacedSubpathValue
::
Result
(
r
)
=>
{
target
.push
(
(
target
.push
(
ReplacedSubpathValueResult
{
r
,
r
esult_path
:
r
,
condition_overrides
condition
s
:
condition
_overrides
.iter
()
.iter
()
.filter_map
(|(
k
,
v
)|
match
v
{
.filter_map
(|(
k
,
v
)|
match
v
{
ConditionValue
::
Set
=>
Some
((
*
k
,
true
)),
ConditionValue
::
Set
=>
Some
((
k
.clone
()
,
true
)),
ConditionValue
::
Unset
=>
Some
((
*
k
,
false
)),
ConditionValue
::
Unset
=>
Some
((
k
.clone
()
,
false
)),
ConditionValue
::
Unknown
=>
None
,
ConditionValue
::
Unknown
=>
None
,
})
})
.collect
(),
.collect
(),
));
map_prefix
:
prefix
,
map_key
:
key
,
});
true
true
}
}
ReplacedSubpathValue
::
Excluded
=>
true
,
ReplacedSubpathValue
::
Excluded
=>
true
,
...
...
turbopack/crates/turbopack-ecmascript/src/analyzer/graph.rs
View file @
662f6412
...
@@ -20,7 +20,7 @@ use swc_core::{
...
@@ -20,7 +20,7 @@ use swc_core::{
visit
::{
fields
::
*
,
*
},
visit
::{
fields
::
*
,
*
},
},
},
};
};
use
turbo_rcstr
::
RcStr
;
use
turbo_rcstr
::
{
RcStr
,
rcstr
}
;
use
turbo_tasks
::
ResolvedVc
;
use
turbo_tasks
::
ResolvedVc
;
use
turbopack_core
::
source
::
Source
;
use
turbopack_core
::
source
::
Source
;
...
@@ -365,13 +365,18 @@ impl EvalContext {
...
@@ -365,13 +365,18 @@ impl EvalContext {
if
idx
.is_multiple_of
(
2
)
{
if
idx
.is_multiple_of
(
2
)
{
let
idx
=
idx
/
2
;
let
idx
=
idx
/
2
;
let
e
=
&
e
.quasis
[
idx
];
let
e
=
&
e
.quasis
[
idx
];
if
raw
{
if
raw
{
values
.push
(
JsValue
::
from
(
e
.raw
.clone
()));
// Ignore empty strings quasis, happens frequently with e.g. after the
// placeholder in `something${v}`.
if
!
e
.raw
.is_empty
()
{
values
.push
(
JsValue
::
from
(
e
.raw
.clone
()));
}
}
else
{
}
else
{
match
&
e
.cooked
{
match
&
e
.cooked
{
Some
(
v
)
=>
{
Some
(
v
)
=>
{
values
.push
(
JsValue
::
from
(
v
.clone
()));
if
!
v
.is_empty
()
{
values
.push
(
JsValue
::
from
(
v
.clone
()));
}
}
}
// This is actually unreachable
// This is actually unreachable
None
=>
return
JsValue
::
unknown_empty
(
true
,
""
),
None
=>
return
JsValue
::
unknown_empty
(
true
,
""
),
...
@@ -385,11 +390,11 @@ impl EvalContext {
...
@@ -385,11 +390,11 @@ impl EvalContext {
}
}
}
}
if
values
.len
()
==
1
{
match
values
.len
()
{
return
values
.into_iter
()
.next
()
.unwrap
();
0
=>
JsValue
::
Constant
(
ConstantValue
::
Str
(
rcstr!
(
""
)
.into
())),
1
=>
values
.into_iter
()
.next
()
.unwrap
(),
_
=>
JsValue
::
concat
(
values
),
}
}
JsValue
::
concat
(
values
)
}
}
fn
eval_ident
(
&
self
,
i
:
&
Ident
)
->
JsValue
{
fn
eval_ident
(
&
self
,
i
:
&
Ident
)
->
JsValue
{
...
...
turbopack/crates/turbopack-ecmascript/tests/analyzer/graph/concat/graph.snapshot
View file @
662f6412
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
"a",
"a",
Constant(
Constant(
Str(
Str(
Atom
(
RcStr
(
"",
"",
),
),
),
),
...
...
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/dynamic-module/input/index.js
View file @
662f6412
...
@@ -4,6 +4,9 @@ function requirePkg(s) {
...
@@ -4,6 +4,9 @@ function requirePkg(s) {
function
requireOrgPkg
(
s
)
{
function
requireOrgPkg
(
s
)
{
return
require
(
`@org/pkg-
${
s
}
`
)
return
require
(
`@org/pkg-
${
s
}
`
)
}
}
function
requireExportsField
(
s
)
{
return
require
(
`exports-
${
s
}
/foo`
)
}
it
(
'should correctly handle dynamic parts in regular package name'
,
()
=>
{
it
(
'should correctly handle dynamic parts in regular package name'
,
()
=>
{
expect
(
requirePkg
(
'a'
).
default
).
toBe
(
'pkg-a'
)
expect
(
requirePkg
(
'a'
).
default
).
toBe
(
'pkg-a'
)
...
@@ -15,3 +18,7 @@ it('should correctly handle dynamic parts in namespaced package name', () => {
...
@@ -15,3 +18,7 @@ it('should correctly handle dynamic parts in namespaced package name', () => {
expect
(
requireOrgPkg
(
'b'
).
default
).
toBe
(
'org/pkg-b'
)
expect
(
requireOrgPkg
(
'b'
).
default
).
toBe
(
'org/pkg-b'
)
expect
(
requireOrgPkg
(
'c'
).
default
).
toBe
(
'org/pkg-c'
)
expect
(
requireOrgPkg
(
'c'
).
default
).
toBe
(
'org/pkg-c'
)
})
})
it
(
'should correctly handle dynamic parts in regular package name with exports field'
,
()
=>
{
expect
(
requireExportsField
(
'a'
).
default
).
toBe
(
'exports-a'
)
expect
(
requireExportsField
(
'b'
).
default
).
toBe
(
'exports-b'
)
})
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/dynamic-module/input/node_modules/exports-a/index.js
0 → 100644
View file @
662f6412
export
default
'exports-a'
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/dynamic-module/input/node_modules/exports-a/package.json
0 → 100644
View file @
662f6412
{
"name"
:
"exports"
,
"exports"
:
{
"./foo"
:
"./index.js"
}
}
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/dynamic-module/input/node_modules/exports-b/index.js
0 → 100644
View file @
662f6412
export
default
'exports-b'
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/dynamic-module/input/node_modules/exports-b/package.json
0 → 100644
View file @
662f6412
{
"name"
:
"exports"
,
"exports"
:
{
"./foo"
:
"./index.js"
}
}
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/exports-field-pattern/input/index.js
0 → 100644
View file @
662f6412
function
requireRoot
(
s
)
{
return
require
(
`pkg/
${
s
}
`
)
}
function
requireExact
(
s
)
{
return
require
(
`pkg/exact-
${
s
}
`
)
}
function
requireWildcardSuffix
(
s
)
{
return
require
(
`pkg/wildcard-suffix-
${
s
}
`
)
}
function
requireWildcard
(
s
)
{
return
require
(
`pkg/wildcard-
${
s
}
`
)
}
function
requireExactAConstantSuffix
(
s
)
{
return
require
(
`pkg/
${
s
}
exact-a`
)
}
it
(
'should correctly handle dynamic requests into exports field (exact)'
,
()
=>
{
// TODO it currently only returns a single entry
// expect(requireExact('a').default).toBe('a')
// expect(requireExact('b').default).toBe('b')
expect
(
requireExact
(
'c'
).
default
).
toBe
(
'c'
)
})
it
(
'should correctly handle dynamic requests into exports field (wildcard with suffix)'
,
()
=>
{
expect
(
requireWildcardSuffix
(
'a'
).
default
).
toBe
(
'a'
)
expect
(
requireWildcardSuffix
(
'b'
).
default
).
toBe
(
'b'
)
expect
(
requireWildcardSuffix
(
'c'
).
default
).
toBe
(
'c'
)
})
it
(
'should correctly handle dynamic requests into exports field (wildcard)'
,
()
=>
{
expect
(
requireWildcard
(
'a'
).
default
).
toBe
(
'a'
)
expect
(
requireWildcard
(
'b'
).
default
).
toBe
(
'b'
)
expect
(
requireWildcard
(
'c'
).
default
).
toBe
(
'c'
)
})
it
(
'should correctly handle dynamic requests into exports field (empty dynamic prefix)'
,
()
=>
{
// TODO it currently only returns a single entry
// expect(requireExactAConstantSuffix('').default).toBe('a')
expect
(
requireExactAConstantSuffix
(
'sub/'
).
default
).
toBe
(
'a'
)
})
it
(
'should correctly handle dynamic requests into exports field (mixed)'
,
()
=>
{
// TODO it currently only returns a single entry
// expect(requireRoot('exact-a').default).toBe('a')
expect
(
requireRoot
(
'sub/exact-a'
).
default
).
toBe
(
'a'
)
// expect(requireRoot('exact-b').default).toBe('b')
// // expect(requireRoot('exact-c').default).toBe('c')
// expect(requireRoot('wildcard-suffix-a').default).toBe('a')
// expect(requireRoot('wildcard-suffix-b').default).toBe('b')
// expect(requireRoot('wildcard-suffix-c').default).toBe('c')
// expect(requireRoot('wildcard-a').default).toBe('a')
// expect(requireRoot('wildcard-b').default).toBe('b')
// expect(requireRoot('wildcard-c').default).toBe('c')
})
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/exports-field-pattern/input/node_modules/pkg/index.js
0 → 100644
View file @
662f6412
export
default
'pkg-a'
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/exports-field-pattern/input/node_modules/pkg/package.json
0 → 100644
View file @
662f6412
{
"name"
:
"pkg"
,
"version"
:
"0.0.0"
,
"exports"
:
{
"./exact-a"
:
"./src/a.js"
,
"./sub/exact-a"
:
"./src/a.js"
,
"./exact-b"
:
"./src/b.js"
,
"./exact-c"
:
"./src/c.js"
,
"./wildcard-suffix-*"
:
"./src/*.js"
,
"./wildcard-*"
:
"./src/*"
}
}
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/exports-field-pattern/input/node_modules/pkg/src/a.js
0 → 100644
View file @
662f6412
export
default
'a'
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/exports-field-pattern/input/node_modules/pkg/src/b.js
0 → 100644
View file @
662f6412
export
default
'b'
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/exports-field-pattern/input/node_modules/pkg/src/c.js
0 → 100644
View file @
662f6412
export
default
'c'
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/tsconfig-paths-dynamic/input/index.js
View file @
662f6412
import
{
loadSub
,
loadSubNested
,
loadSubFallback
}
from
'./src/foo'
import
{
loadSub
,
/* loadSubNested, */
loadSubFallback
}
from
'./src/foo'
it
(
'should support dynamic requests with tsconfig.paths'
,
()
=>
{
it
(
'should support dynamic requests with tsconfig.paths'
,
()
=>
{
expect
(
loadSub
(
'file2.js'
).
default
).
toBe
(
'file2'
)
expect
(
loadSub
(
'file2.js'
).
default
).
toBe
(
'file2'
)
...
@@ -8,9 +8,9 @@ it('should support dynamic requests with tsconfig.paths and without extension',
...
@@ -8,9 +8,9 @@ it('should support dynamic requests with tsconfig.paths and without extension',
expect
(
loadSub
(
'file2'
).
default
).
toBe
(
'file2'
)
expect
(
loadSub
(
'file2'
).
default
).
toBe
(
'file2'
)
})
})
it
(
'should support dynamic requests with tsconfig.paths and multiple dynamic parts'
,
()
=>
{
//
it('should support dynamic requests with tsconfig.paths and multiple dynamic parts', () => {
expect
(
loadSubNested
(
'file2'
).
default
).
toBe
(
'file2'
)
//
expect(loadSubNested('file2').default).toBe('file2')
})
//
})
it
(
'should support dynamic requests with tsconfig.paths fallbacks'
,
()
=>
{
it
(
'should support dynamic requests with tsconfig.paths fallbacks'
,
()
=>
{
expect
(
loadSubFallback
(
'file1'
).
default
).
toBe
(
'file1'
)
expect
(
loadSubFallback
(
'file1'
).
default
).
toBe
(
'file1'
)
...
...
turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/tsconfig-paths-dynamic/input/src/foo.ts
View file @
662f6412
...
@@ -2,9 +2,10 @@ export function loadSub(v: string) {
...
@@ -2,9 +2,10 @@ export function loadSub(v: string) {
return
require
(
`@/sub/
${
v
}
`
)
return
require
(
`@/sub/
${
v
}
`
)
}
}
export
function
loadSubNested
(
v
:
string
)
{
// TODO not supported
return
require
(
`@/sub-nested/
${
v
}
/
${
v
}
.js`
)
// export function loadSubNested(v: string) {
}
// return require(`@/sub-nested/${v}/${v}.js`)
// }
export
function
loadSubFallback
(
v
:
string
)
{
export
function
loadSubFallback
(
v
:
string
)
{
return
require
(
`@sub/
${
v
}
`
)
return
require
(
`@sub/
${
v
}
`
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment