@@ -87,6 +87,7 @@ const importProcessors = {
87
87
useHelperWrapper : true ,
88
88
useSafeImports : true ,
89
89
extendImportPathForNamedImports : true ,
90
+ embroiderStatic : true ,
90
91
messageFormat : 'json'
91
92
} ,
92
93
glimmer,
@@ -188,8 +189,11 @@ const importProcessors = {
188
189
const components = imported . info . components ;
189
190
const helpers = imported . info . helpers ;
190
191
const modifiers = imported . info . modifiers ;
192
+ const options = this . options ;
193
+
191
194
function findImport ( name : string ) {
192
195
return imports . find ( ( imp ) => {
196
+ if ( options . embroiderStatic && imp . shouldLookInFile ) return false ;
193
197
if ( imp . isStyle ) {
194
198
return name . split ( '.' ) [ 0 ] === imp . localName ;
195
199
}
@@ -355,11 +359,13 @@ const importProcessors = {
355
359
}
356
360
357
361
const createComponentLetBlockExpr = ( comp : [ key : string , info : { path : string } ] ) => {
358
- return importProcessors . glimmer . preprocess ( `{{#let (component "${ comp [ 1 ] . path } ") as |${ comp [ 0 ] } |}}{{/let}}` ) . body [ 0 ] as glimmer . AST . BlockStatement ;
362
+ const path = '__hbs__import_:' + comp [ 1 ] . path . replace ( / \\ / g, '/' ) ;
363
+ return importProcessors . glimmer . preprocess ( `{{#let (component "${ path } ") as |${ comp [ 0 ] } |}}{{/let}}` ) . body [ 0 ] as glimmer . AST . BlockStatement ;
359
364
} ;
360
365
const handleHelper = ( helper : { nodes : PathExpression [ ] , resolvedPath : string } ) => {
366
+ const path = '__hbs__import_:' + helper . resolvedPath . replace ( / \\ / g, '/' ) ;
361
367
if ( this . options . useModifierHelperHelpers ) {
362
- let lookup = `"${ helper . resolvedPath } "` ;
368
+ let lookup = `"${ path } "` ;
363
369
if ( this . options . useHelperWrapper ) {
364
370
lookup = `(ember-hbs-imports/helpers/lookup-helper this "${ helper . resolvedPath } ")` ;
365
371
}
@@ -371,8 +377,9 @@ const importProcessors = {
371
377
}
372
378
} ;
373
379
const handleModifier = ( modifier : { nodes : PathExpression [ ] , resolvedPath : string } ) => {
380
+ const path = '__hbs__import_:' + modifier . resolvedPath . replace ( / \\ / g, '/' ) ;
374
381
if ( this . options . useModifierHelperHelpers ) {
375
- let lookup = `"${ modifier . resolvedPath } "` ;
382
+ let lookup = `"${ path } "` ;
376
383
if ( this . options . useHelperWrapper ) {
377
384
lookup = `(ember-hbs-imports/helpers/lookup-modifier this "${ modifier . resolvedPath } ")` ;
378
385
}
0 commit comments