chore: Clean up post merge

packages/core/src/config/asset-import-strategy/default-asset-import-strategy.ts

@@ -2,7 +2,7 @@ import fs from 'fs-extra';
 import http from 'http';
 import https from 'https';
 import path from 'path';
-import { from } from 'rxjs';
+import { from, lastValueFrom } from 'rxjs';
 import { delay, retryWhen, take, tap } from 'rxjs/operators';
 import { Readable } from 'stream';
 import { URL } from 'url';
@@ -67,8 +67,8 @@ export class DefaultAssetImportStrategy implements AssetImportStrategy {
 
     private getStreamFromUrl(assetUrl: string): Promise<Readable> {
         const { retryCount, retryDelayMs } = this.options ?? {};
-        return from(fetchUrl(assetUrl))
-            .pipe(
+        return lastValueFrom(
+            from(fetchUrl(assetUrl)).pipe(
                 retryWhen(errors =>
                     errors.pipe(
                         tap(value => {
@@ -79,8 +79,8 @@ export class DefaultAssetImportStrategy implements AssetImportStrategy {
                         take(retryCount ?? 3),
                     ),
                 ),
-            )
-            .toPromise();
+            ),
+        );
     }
 
     private getStreamFromLocalFile(assetPath: string): Readable {

yarn.lock

@@ -7320,7 +7320,7 @@ delegates@^1.0.0:
   resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-denque@^1.1.0:
+denque@^1.1.0, denque@^1.5.0:
   version "1.5.1"
   resolved "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf"
   integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
@@ -15567,7 +15567,7 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
-redis-commands@1.7.0:
+redis-commands@1.7.0, redis-commands@^1.7.0:
   version "1.7.0"
   resolved "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz#15a6fea2d58281e27b1cd1acfb4b293e278c3a89"
   integrity sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==
@@ -15584,6 +15584,16 @@ redis-parser@^3.0.0:
   dependencies:
     redis-errors "^1.0.0"
 
+redis@^3.0.2:
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz#766851117e80653d23e0ed536254677ab647638c"
+  integrity sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==
+  dependencies:
+    denque "^1.5.0"
+    redis-commands "^1.7.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+
 reflect-metadata@^0.1.13, reflect-metadata@^0.1.2:
   version "0.1.13"
   resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"