@forge/cli

Index: package/out/deploy/package-upload-deploy.js
===================================================================
--- package/out/deploy/package-upload-deploy.js
+++ package/out/deploy/package-upload-deploy.js
@@ -51,11 +51,18 @@
             }
         };
     }
     async packageUpload(details) {
-        const [resourcesToBeBundled, preBundledResources] = (0, lodash_1.partition)(details.resources, (res) => res.resourceType === 'nativeUI' && !res.package);
+        const [resourcesToBeBundled, preBundledResources] = (0, lodash_1.partition)(details.resources, cli_shared_1.shouldBundleResource);
         const i18nResourceBundle = await this.i18nResourceBundlingService.bundle(details.modules, details.i18nConfig);
-        const { runtimeArchivePath, nativeUiBundlesDetails, moduleList } = await this.packager.package(details.handlers, resourcesToBeBundled, details.packageConfig, i18nResourceBundle, details.i18nConfig);
+        const { runtimeArchivePath, nativeUiBundlesDetails, moduleList } = await this.packager.package({
+            handlers: details.handlers,
+            resources: resourcesToBeBundled,
+            allResources: details.resources,
+            packageConfig: details.packageConfig,
+            i18nResourceBundle,
+            i18nConfig: details.i18nConfig
+        });
         const resourcesArchives = await this.resourcePackagingService.zipResources([...preBundledResources, ...nativeUiBundlesDetails], i18nResourceBundle);
         let artifactUrl;
         let hostedResourceUploadId;
         let combinedArtifactUrl;