File tree Expand file tree Collapse file tree 3 files changed +8
-7
lines changed
Expand file tree Collapse file tree 3 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -534,6 +534,12 @@ export class Audit {
534534 private async resolveDeps ( deps : string [ ] , fromFile : string ) : Promise < InternalModule [ 'resolved' ] > {
535535 let resolved = new Map ( ) as NonNullable < InternalModule [ 'resolved' ] > ;
536536 for ( let dep of deps ) {
537+ if ( [ '@embroider/macros' ] . includes ( dep ) ) {
538+ // the audit process deliberately removes the @embroider /macros babel
539+ // plugins, so the imports are still present and should be left alone.
540+ continue ;
541+ }
542+
537543 let resolution = await this . resolver . nodeResolve ( dep , fromFile ) ;
538544 switch ( resolution . type ) {
539545 case 'virtual' :
@@ -542,11 +548,6 @@ export class Audit {
542548 this . scheduleVisit ( resolution . filename , fromFile ) ;
543549 break ;
544550 case 'not_found' :
545- if ( [ '@embroider/macros' , '@ember/template-factory' ] . includes ( dep ) ) {
546- // the audit process deliberately removes the @embroider /macros babel
547- // plugins, so the imports are still present and should be left alone.
548- continue ;
549- }
550551 resolved . set ( dep , { isResolutionFailure : true as true } ) ;
551552 break ;
552553 case 'real' :
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ async function githubMatrix() {
2727 dir,
2828 } ) ) ,
2929 ...suites
30- . filter ( s => s . name !== 'node ' ) // TODO: node tests do not work under windows yet
30+ . filter ( s => s . name !== 'jest-suites ' ) // TODO: jest tests do not work under windows yet
3131 . filter ( s => ! s . name . includes ( 'watch-mode' ) ) // TODO: watch tests are far too slow on windows right now
3232 . map ( s => ( {
3333 name : `${ s . name } windows` ,
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ const { module: Qmodule, test } = QUnit;
77// this is the bridge between our older Jest-based node tests and our newer
88// scenario-tester powered tests
99Scenarios . fromProject ( ( ) => new Project ( 'node-tests' ) )
10- . map ( 'node ' , ( ) => { } )
10+ . map ( 'jest-suites ' , ( ) => { } )
1111 . forEachScenario ( scenario => {
1212 Qmodule ( scenario . name , function ( ) {
1313 test ( 'run node tests' , async function ( assert ) {
You can’t perform that action at this time.
0 commit comments