react-native-update-cli 2.2.1 → 2.2.3

package/lib/bundle.js

@@ -183,9 +183,9 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
     } else if (cli.taro) {
         bundleCommand = 'build';
     }
-    reactNativeBundleArgs.push(cliPath, bundleCommand, '--assets-dest', outputFolder, '--bundle-output', _path.default.join(outputFolder, platform === 'harmony' ? 'bundle.harmony.js' : bundleName));
+    reactNativeBundleArgs.push(cliPath, bundleCommand);
     if (platform !== 'harmony') {
-        reactNativeBundleArgs.push('--platform', platform, '--reset-cache');
+        reactNativeBundleArgs.push('--platform', platform, '--assets-dest', outputFolder, '--bundle-output', _path.default.join(outputFolder, bundleName), '--reset-cache');
     }
     if (cli.taro) {
         reactNativeBundleArgs.push('--type', 'rn');
@@ -256,19 +256,34 @@ async function copyHarmonyBundle(outputFolder) {
         await _fsextra.remove(_path.default.join(harmonyRawPath, 'update.json'));
         await _fsextra.copy('update.json', _path.default.join(harmonyRawPath, 'update.json'));
         await _fsextra.ensureDir(outputFolder);
-        const files = await _fsextra.readdir(harmonyRawPath);
-        for (const file of files){
-            if (file !== 'update.json' && file !== 'meta.json') {
-                const sourcePath = _path.default.join(harmonyRawPath, file);
-                const destPath = _path.default.join(outputFolder, file);
-                const stat = await _fsextra.stat(sourcePath);
+        // Recursively copy files with special handling for assets directory
+        async function copyFilesRecursively(srcDir, destDir, relativePath = '') {
+            const fullSrcPath = _path.default.join(srcDir, relativePath);
+            const items = await _fsextra.readdir(fullSrcPath);
+            for (const item of items){
+                const itemRelativePath = _path.default.join(relativePath, item);
+                const itemSrcPath = _path.default.join(srcDir, itemRelativePath);
+                // Skip update.json and meta.json at root level
+                if (!relativePath && (item === 'update.json' || item === 'meta.json')) {
+                    continue;
+                }
+                const stat = await _fsextra.stat(itemSrcPath);
                 if (stat.isFile()) {
-                    await _fsextra.copy(sourcePath, destPath);
+                    // Special handling: remove 'assets/' prefix to move files up one level
+                    let itemDestPath = itemRelativePath;
+                    if (itemDestPath.startsWith('assets/') || itemDestPath.startsWith('assets\\')) {
+                        itemDestPath = itemDestPath.replace(/^assets[\\/]/, '');
+                    }
+                    const fullDestPath = _path.default.join(destDir, itemDestPath);
+                    await _fsextra.ensureDir(_path.default.dirname(fullDestPath));
+                    await _fsextra.copy(itemSrcPath, fullDestPath);
                 } else if (stat.isDirectory()) {
-                    await _fsextra.copy(sourcePath, destPath);
+                    // Recursively process subdirectories
+                    await copyFilesRecursively(srcDir, destDir, itemRelativePath);
                 }
             }
         }
+        await copyFilesRecursively(harmonyRawPath, outputFolder);
     } catch (error) {
         console.error((0, _i18n.t)('copyHarmonyBundleError', {
             error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
   "bin": {

package/src/bundle.ts

@@ -163,20 +163,18 @@ async function runReactNativeBundleCommand({
     bundleCommand = 'build';
   }
 
-  reactNativeBundleArgs.push(
-    cliPath,
-    bundleCommand,
-    '--assets-dest',
-    outputFolder,
-    '--bundle-output',
-    path.join(
-      outputFolder,
-      platform === 'harmony' ? 'bundle.harmony.js' : bundleName,
-    ),
-  );
+  reactNativeBundleArgs.push(cliPath, bundleCommand);
 
   if (platform !== 'harmony') {
-    reactNativeBundleArgs.push('--platform', platform, '--reset-cache');
+    reactNativeBundleArgs.push(
+      '--platform',
+      platform,
+      '--assets-dest',
+      outputFolder,
+      '--bundle-output',
+      path.join(outputFolder, bundleName),
+      '--reset-cache',
+    );
   }
 
   if (cli.taro) {
@@ -272,20 +270,47 @@ async function copyHarmonyBundle(outputFolder: string) {
     await fs.copy('update.json', path.join(harmonyRawPath, 'update.json'));
     await fs.ensureDir(outputFolder);
 
-    const files = await fs.readdir(harmonyRawPath);
-    for (const file of files) {
-      if (file !== 'update.json' && file !== 'meta.json') {
-        const sourcePath = path.join(harmonyRawPath, file);
-        const destPath = path.join(outputFolder, file);
-        const stat = await fs.stat(sourcePath);
+    // Recursively copy files with special handling for assets directory
+    async function copyFilesRecursively(
+      srcDir: string,
+      destDir: string,
+      relativePath = '',
+    ) {
+      const fullSrcPath = path.join(srcDir, relativePath);
+      const items = await fs.readdir(fullSrcPath);
+
+      for (const item of items) {
+        const itemRelativePath = path.join(relativePath, item);
+        const itemSrcPath = path.join(srcDir, itemRelativePath);
+
+        // Skip update.json and meta.json at root level
+        if (!relativePath && (item === 'update.json' || item === 'meta.json')) {
+          continue;
+        }
+
+        const stat = await fs.stat(itemSrcPath);
 
         if (stat.isFile()) {
-          await fs.copy(sourcePath, destPath);
+          // Special handling: remove 'assets/' prefix to move files up one level
+          let itemDestPath = itemRelativePath;
+          if (
+            itemDestPath.startsWith('assets/') ||
+            itemDestPath.startsWith('assets\\')
+          ) {
+            itemDestPath = itemDestPath.replace(/^assets[\\/]/, '');
+          }
+
+          const fullDestPath = path.join(destDir, itemDestPath);
+          await fs.ensureDir(path.dirname(fullDestPath));
+          await fs.copy(itemSrcPath, fullDestPath);
         } else if (stat.isDirectory()) {
-          await fs.copy(sourcePath, destPath);
+          // Recursively process subdirectories
+          await copyFilesRecursively(srcDir, destDir, itemRelativePath);
         }
       }
     }
+
+    await copyFilesRecursively(harmonyRawPath, outputFolder);
   } catch (error: any) {
     console.error(t('copyHarmonyBundleError', { error }));
     throw new Error(t('copyFileFailed', { error: error.message }));