refactor: refactor integration

Author: Augustach

.github/actions/setup/action.yml

@@ -4,10 +4,6 @@ The primary objective of this library is to significantly decrease the size of c
 
 ## Installation
 
-```sh
-npm install react-native-code-push-diff
-```
-
 ```sh
 yarn add react-native-code-push-diff
 ```
@@ -25,40 +21,39 @@ import { name as appName } from './app.json'
 AppRegistry.registerComponent(appName, () => App)
 ```
 
-2. Run the `code-push-diff release-react -a {YOUR_APP_NAME} -base {BRANCH_OR_COMMIT}` if you need to create and release a codepush bundle.
+2. Run the `code-push-diff release-react --app {YOUR_APP_NAME} --base {BRANCH_OR_COMMIT}` if you need to create and release a codepush bundle.
 
 ## How does it work?
 The `bundle` or `release-react` scripts initiate their process by generating bundles corresponding to the current active `git commit` and a specified `base` commit, which is provided as an argument. This step is crucial for identifying the exact changes in assets that have occurred between these two states. Following this, the scripts compute the differences in assets across the generated bundles to pinpoint which files have been modified or  added.
 
-To streamline the integration of these changes into the final bundle, the process involves creating a bundle_config.json file. This file acts as a manifest, listing the paths of all files that have undergone changes. With this configuration in hand, the scripts proceed to rebuild the bundle for a third and final time, this time incorporating only the assets that have been identified as changed, ensuring an optimized bundle size.
-
-The `react-native-code-push-diff/setup` plays a key role by setting up a custom source transformer based on [the specified transformer mechanism](https://github.com/facebook/react-native/blob/v0.71.7/Libraries/Image/resolveAssetSource.js#L77) in React Native. This transformer is designed to consult the `bundle_config.json` file at runtime. If it encounters a file whose path is listed in `bundle_config.json`, it recognises that file as modified. It makes sure that this file is extracted from the codepush bundle and not the main bundle, otherwise the file will be extracted from the `main` bundle.
+The `react-native-code-push-diff/setup` plays a key role by setting up a custom source transformer based on [the specified transformer mechanism](https://github.com/facebook/react-native/blob/v0.71.7/Libraries/Image/resolveAssetSource.js#L77) in React Native. It makes sure that this file is extracted from the codepush bundle and not the main bundle, otherwise the file will be extracted from the `main` bundle.
 
 ## Script Usage
 
 ### bundle
 
 The `bundle` command is designed to generate a codepush bundle incorporating only the assets that have changed:
 ```sh
-code-push-diff bundle {appOrOs} -base {branchOrCommit}
+yarn code-push-diff bundle {appOrOs} --base {branchOrCommit}
 ```
 
-- `appOrOs` -This parameter specifies the context in which the bundle is to be built. You can either input the name of an application as defined within your appcenter configuration or directly specify the platform for which you are building the bundle (`ios` or `android`).
+- `appOrOs` - this parameter specifies the context in which the bundle is to be built. You can either input the name of an application as defined within your appcenter configuration or directly specify the platform for which you are building the bundle (`ios` or `android`).
+
+- `branchOrCommit` - this argument determines the reference point for calculating asset differences. It should be the identifier of the branch or commit that served as the basis for your most recent application build. By specifying this, the script can accurately assess which assets have changed and need to be included in the codepush bundle, ensuring that your updates are both efficient and relevant.
 
-- `branchOrCommit` - This argument determines the reference point for calculating asset differences. It should be the identifier of the branch or commit that served as the basis for your most recent application build. By specifying this, the script can accurately assess which assets have changed and need to be included in the codepush bundle, ensuring that your updates are both efficient and relevant.
 
 For example:
-`code-push-diff i.kuchaev/AwesomeProject release-2.1`
+`code-push-diff bundle i.kuchaev/AwesomeProject --base release-2.1`
 
-Also the script apply all args for the [release-react](https://github.com/microsoft/code-push/tree/v3.0.1/cli#releasing-updates-react-native) command, like `plistFile`, `outputDir` etc.
+Also the script apply all args for the [release-react](https://github.com/microsoft/code-push/tree/v3.0.1/cli#releasing-updates-react-native) command, like `plist-file`, `output-dir` etc.
 
 For example:
-`code-push-diff i.kuchaev/AwesomeProject release-2.1 -plistFile ios/project/Info.plist`
+`code-push-diff bundle i.kuchaev/AwesomeProject --base release-2.1 --plist-file ios/project/Info.plist`
 
 ### release-react
 The `release-react` command leverages the code-push-diff bundle functionality to construct a bundle and then releases it to App Center:
 ```sh
-code-push-diff release-react -a {appName} -base {branchOrCommit}
+code-push-diff release-react --app {appName} --base {branchOrCommit}
 ```
 
 - `app` - This should be the exact name of your application as registered in App Center. It enables the script to correctly identify and target the application for the update release.
@@ -68,7 +63,7 @@ code-push-diff release-react -a {appName} -base {branchOrCommit}
 This script also supports all the parameters available for the [release-react command](https://github.com/microsoft/code-push/tree/v3.0.1/cli#releasing-updates-react-native) used by CodePush, , like `plistFile`, `outputDir` etc.
 
 ```sh
-code-push-diff i.kuchaev/AwesomeProject release-2.1 -plistFile ios/project/Info.plist -rallout 50
+code-push-diff release-react --app i.kuchaev/AwesomeProject --base release-2.1 --plist-file ios/project/Info.plist --rallout 50
 ```
 
 ## Contributing

.github/workflows/ci.yml

@@ -1,17 +1,3 @@
-const path = require('path')
-const pak = require('../package.json')
-
 module.exports = {
   presets: ['module:@react-native/babel-preset'],
-  plugins: [
-    [
-      'module-resolver',
-      {
-        extensions: ['.tsx', '.ts', '.js', '.json'],
-        alias: {
-          [pak.name]: path.join(__dirname, '..', pak.source),
-        },
-      },
-    ],
-  ],
 }

README.md

@@ -1,11 +1,4 @@
 const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config')
-const path = require('path')
-const escape = require('escape-string-regexp')
-const exclusionList = require('metro-config/src/defaults/exclusionList')
-const pak = require('../package.json')
-
-const root = path.resolve(__dirname, '..')
-const modules = Object.keys({ ...pak.peerDependencies })
 
 /**
  * Metro configuration
@@ -14,19 +7,6 @@ const modules = Object.keys({ ...pak.peerDependencies })
  * @type {import('metro-config').MetroConfig}
  */
 const config = {
-  watchFolders: [root],
-
-  // We need to make sure that only one version is loaded for peerDependencies
-  // So we block them at the root, and alias them to the versions in example's node_modules
-  resolver: {
-    blacklistRE: exclusionList(modules.map((m) => new RegExp(`^${escape(path.join(root, 'node_modules', m))}\\/.*$`))),
-
-    extraNodeModules: modules.reduce((acc, name) => {
-      acc[name] = path.join(__dirname, 'node_modules', name)
-      return acc
-    }, {}),
-  },
-
   transformer: {
     getTransformOptions: async () => ({
       transform: {

bundle_config.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "react": "18.2.0",
     "react-native": "0.73.4",
-    "react-native-code-push-diff": "../react-native-code-push-diff-0.0.0-local.40.tgz"
+    "react-native-code-push-diff": "../react-native-code-push-diff-1.0.0-local-7.tgz"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

example/babel.config.js

@@ -3540,7 +3540,7 @@ __metadata:
     pod-install: ^0.1.0
     react: 18.2.0
     react-native: 0.73.4
-    react-native-code-push-diff: ../react-native-code-push-diff-0.0.0-local.40.tgz
+    react-native-code-push-diff: ../react-native-code-push-diff-1.0.0-local-7.tgz
   languageName: unknown
   linkType: soft
 
@@ -7434,9 +7434,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-code-push-diff@file:../react-native-code-push-diff-0.0.0-local.40.tgz::locator=codepushdiffexample%40workspace%3A.":
-  version: 0.0.0-local.40
-  resolution: "react-native-code-push-diff@file:../react-native-code-push-diff-0.0.0-local.40.tgz::locator=codepushdiffexample%40workspace%3A."
+"react-native-code-push-diff@file:../react-native-code-push-diff-1.0.0-local-7.tgz::locator=codepushdiffexample%40workspace%3A.":
+  version: 1.0.0-local-7
+  resolution: "react-native-code-push-diff@file:../react-native-code-push-diff-1.0.0-local-7.tgz::locator=codepushdiffexample%40workspace%3A."
   dependencies:
     simple-git: ^3.22.0
     yargs: ^17.7.2
@@ -7446,7 +7446,7 @@ __metadata:
     react-native: "*"
   bin:
     code-push-diff: ./commonjs/cli/index.js
-  checksum: f36e5238d0273f72c72e2c38ac2383ed3b629a3a19d21b45b11be79f1426b74d64b2420de949294f5a1624fe72df9d04d2e85a9f8e7922616892ec2ddc60aa10
+  checksum: 7c7d97d98e255bb3d04e7bf5352dc7de20207f6bc3af2733a7ce6f93ce5aaa05ab868a80b78cadaf92dec78db95784543a2f219f5211217c935ffaea587106ed
   languageName: node
   linkType: hard
 

example/metro.config.js

@@ -1,11 +1,11 @@
 {
   "name": "react-native-code-push-diff",
-  "version": "0.0.0-local.40",
+  "version": "1.0.0",
   "description": "This library builds upon the foundational strengths of the react-native-code-push library, adding advanced functionality to precisely identify and manage differences between code-push builds.",
-  "main": "commonjs/setup/index.js",
-  "module": "module/setup/index.js",
-  "types": "typescript/src/setup/index.d.ts",
-  "react-native": "src/setup/index.ts",
+  "main": "commonjs/react-native/index.js",
+  "module": "module/react-native/index.js",
+  "types": "typescript/src/react-native/index.d.ts",
+  "react-native": "src/react-native/index.ts",
   "source": "src",
   "files": [
     "bundle",

example/package.json

@@ -1,8 +1,8 @@
 {
   "name": "react-native-code-push-diff/setup",
   "private": true,
-  "main": "../commonjs/setup/index.js",
-  "module": "../module/setup/index.js",
-  "types": "../typescript/src/setup/index.d.ts",
-  "react-native": "../src/setup/index.ts"
+  "main": "../commonjs/react-native/setup.js",
+  "module": "../module/react-native/setup.js",
+  "types": "../typescript/src/react-native/setup.d.ts",
+  "react-native": "../src/react-native/setup.ts"
 }