Merge pull request #367 from adobe/staging

Staging -> Main for 6.0.2 release

.gitignore

@@ -108,7 +108,7 @@ build/
 xcuserdata/
 packages/.DS_Store
 
-js/
+dist/
 test/.DS_Store
 
 .yarn/

.npmignore

@@ -0,0 +1,68 @@
+sample/
+.github/
+.git/
+
+# Built application files
+android/*/build/
+
+# Crashlytics configuations
+android/com_crashlytics_export_strings.xml
+
+# Local configuration file (sdk path, etc)
+android/local.properties
+
+# Gradle generated files
+android/.gradle/
+
+# Signing files
+android/.signing/
+
+# User-specific configurations
+android/.idea/gradle.xml
+android/.idea/libraries/
+android/.idea/workspace.xml
+android/.idea/tasks.xml
+android/.idea/.name
+android/.idea/compiler.xml
+android/.idea/copyright/profiles_settings.xml
+android/.idea/encodings.xml
+android/.idea/misc.xml
+android/.idea/modules.xml
+android/.idea/scopes/scope_settings.xml
+android/.idea/vcs.xml
+android/*.iml
+
+# Xcode
+*.pbxuser
+*.mode1v3
+*.mode2v3
+*.perspectivev3
+*.xcuserstate
+ios/Pods
+ios/build
+*project.xcworkspace*
+*xcuserdata*
+ios/*.xcworkspace
+ios/*.podspec
+
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.dbandroid/gradle
+android/gradlew
+android/build
+android/gradlew.bat
+android/gradle/
+__tests__
+.circleci/
+.opensource/
+jest/
+CONTRIBUTING.md
+CODE_OF_CONDUCT.md
+Makefile
+*.tgz
+tsconfig.json

apps/AEPSampleApp/README.md

@@ -23,6 +23,12 @@ In `apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainApplication
 yarn install && yarn sampleapp:ios:pod:install
 ```
 
+### Build packages
+
+```
+yarn run build
+```
+
 ### Run instructions for iOS:
 
 ```

apps/AEPSampleApp/extensions/OptimizeView.tsx

@@ -47,11 +47,11 @@ const defaultPropositions = {
 
 export default ({navigation}: any) => {
   const [version, setVersion] = useState('0.0.0');
-  const [textProposition, setTextProposition] = useState<Proposition>(null);
-  const [imageProposition, setImageProposition] = useState<Proposition>(null);
+  const [textProposition, setTextProposition] = useState<Proposition>();
+  const [imageProposition, setImageProposition] = useState<Proposition>();
   const [htmlProposition, setHtmlProposition] = useState<Proposition>();
-  const [jsonProposition, setJsonProposition] = useState<Proposition>(null);
-  const [targetProposition, setTargetProposition] = useState<Proposition>(null);
+  const [jsonProposition, setJsonProposition] = useState<Proposition>();
+  const [targetProposition, setTargetProposition] = useState<Proposition | undefined>();
 
   const decisionScopeText = new DecisionScope(
     'eyJ4ZG06YWN0aXZpdHlJZCI6Inhjb3JlOm9mZmVyLWFjdGl2aXR5OjE0MWM4NTg2MmRiMDQ4YzkiLCJ4ZG06cGxhY2VtZW50SWQiOiJ4Y29yZTpvZmZlci1wbGFjZW1lbnQ6MTQxYzZkNWQzOGYwNDg5NyJ9',
@@ -82,7 +82,7 @@ export default ({navigation}: any) => {
   };
 
   const updatePropositions = () => {
-    Optimize.updatePropositions(decisionScopes, null, null);
+    Optimize.updatePropositions(decisionScopes);
     console.log('Updated Propositions');
   };
 

apps/AEPSampleApp/extensions/TargetView.tsx

@@ -63,7 +63,7 @@ function TargetView({navigation}: NavigationProps) {
 
     const targetOrder = new TargetOrder('ADCKKIM', 344.3, purchaseIDs);
     const targetProduct = new TargetProduct('24D3412', 'Books');
-    const parameters1 = new TargetParameters(mboxParameters1, null, null, null);
+    const parameters1 = new TargetParameters(mboxParameters1);
     const request1 = new TargetRequestObject(
       'clickTestRyan',
       parameters1,
@@ -109,7 +109,7 @@ function TargetView({navigation}: NavigationProps) {
   };
 
   const displayedLocations = () =>
-    Target.displayedLocations(['clickTestRyan', 'clickTestRyan'], null);
+    Target.displayedLocations(['clickTestRyan', 'clickTestRyan']);
 
   const clickedLocation = () => {
     const purchaseIDs = ['34', '125'];
@@ -134,7 +134,7 @@ function TargetView({navigation}: NavigationProps) {
 
     const targetOrder = new TargetOrder('ADCKKIM', 344.3, purchaseIDs);
     const targetProduct = new TargetProduct('24D3412', 'Books');
-    const parameters1 = new TargetParameters(mboxParameters1, null, null, null);
+    const parameters1 = new TargetParameters(mboxParameters1);
     const prefetch1 = new TargetPrefetchObject('clickTestRyan', parameters1);
 
     const parameters2 = new TargetParameters(

apps/AEPSampleApp/ios/AEPSampleApp.xcodeproj/project.pbxproj

@@ -594,7 +594,10 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -662,7 +665,10 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;

apps/AEPSampleApp/ios/Podfile.lock

@@ -137,45 +137,45 @@ PODS:
     - fmt (~> 6.2.1)
     - glog
     - libevent
-  - RCTAEPAssurance (6.0.1):
+  - RCTAEPAssurance (6.0.2):
     - AEPAssurance (< 6.0.0, >= 5.0.0)
     - React
-  - RCTAEPCampaignClassic (6.0.1):
+  - RCTAEPCampaignClassic (6.0.2):
     - AEPCampaignClassic (< 6.0.0, >= 5.0.0)
     - React
-  - RCTAEPCore (6.0.1):
+  - RCTAEPCore (6.0.2):
     - AEPCore (< 6.0.0, >= 5.0.0)
     - AEPIdentity (< 6.0.0, >= 5.0.0)
     - AEPLifecycle (< 6.0.0, >= 5.0.0)
     - AEPSignal (< 6.0.0, >= 5.0.0)
     - React
-  - RCTAEPEdge (6.0.1):
+  - RCTAEPEdge (6.0.2):
     - AEPEdge (< 6.0.0, >= 5.0.0)
     - React
-  - RCTAEPEdgeBridge (6.0.1):
+  - RCTAEPEdgeBridge (6.0.2):
     - AEPEdgeBridge (< 6.0.0, >= 5.0.0)
     - React
-  - RCTAEPEdgeConsent (6.0.1):
+  - RCTAEPEdgeConsent (6.0.2):
     - AEPEdgeConsent (< 6.0.0, >= 5.0.0)
     - React
-  - RCTAEPEdgeIdentity (6.0.1):
+  - RCTAEPEdgeIdentity (6.0.2):
     - AEPEdgeIdentity (< 6.0.0, >= 5.0.0)
     - React
-  - RCTAEPMessaging (6.0.1):
+  - RCTAEPMessaging (6.0.2):
     - AEPMessaging (< 6.0.0, >= 5.0.0)
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
-  - RCTAEPOptimize (6.0.1):
+  - RCTAEPOptimize (6.0.2):
     - AEPOptimize (< 6.0.0, >= 5.0.0)
     - React
-  - RCTAEPPlaces (6.0.1):
+  - RCTAEPPlaces (6.0.2):
     - AEPPlaces (< 6.0.0, >= 5.0.0)
     - React
-  - RCTAEPTarget (6.0.1):
+  - RCTAEPTarget (6.0.2):
     - AEPTarget (< 6.0.0, >= 5.0.0)
     - React
-  - RCTAEPUserProfile (6.0.1):
+  - RCTAEPUserProfile (6.0.2):
     - AEPUserProfile (< 6.0.0, >= 5.0.0)
     - React
   - RCTRequired (0.73.6)
@@ -1027,9 +1027,9 @@ PODS:
   - React-Mapbuffer (0.73.6):
     - glog
     - React-debug
-  - react-native-safe-area-context (4.9.0):
+  - react-native-safe-area-context (4.10.1):
     - React-Core
-  - react-native-webview (13.8.6):
+  - react-native-webview (13.10.2):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1202,19 +1202,20 @@ PODS:
     - React-perflogger (= 0.73.6)
   - RNCMaskedView (0.3.1):
     - React-Core
-  - RNGestureHandler (2.16.0):
+  - RNGestureHandler (2.16.2):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
-  - RNReanimated (3.8.1):
+  - RNReanimated (3.11.0):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
     - ReactCommon/turbomodule/core
-  - RNScreens (3.30.1):
+  - RNScreens (3.31.1):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
+    - React-RCTImage
   - SocketRocket (0.6.1)
   - Yoga (1.14.0)
 
@@ -1516,18 +1517,18 @@ SPEC CHECKSUMS:
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
-  RCTAEPAssurance: 2d52c139f09cff35246efe5e98c796c1fd370879
-  RCTAEPCampaignClassic: 17701ea04372f69e4757cc9168dc587916916966
-  RCTAEPCore: afc43da4c34177576a47592aad18c222865e9019
-  RCTAEPEdge: 309cbae2ccc7cc522b6a812987b8a5319f4cdb86
-  RCTAEPEdgeBridge: f0e058d9c40344208bb757bd3300519d8907874a
-  RCTAEPEdgeConsent: 56f47777ee1f3d05fb74cd5fe44d659636bdcbd2
-  RCTAEPEdgeIdentity: 1233f5637d171fb8cc6ec146372133faf26b03d3
-  RCTAEPMessaging: 47180b0f6e1df378d8b58954a96918682e45d1d1
-  RCTAEPOptimize: 7eeeb8bf5643005af70fc337ce2345b5dcca75bf
-  RCTAEPPlaces: f872e5aa1d7e8f9f660efa6df1a879296bdd499c
-  RCTAEPTarget: 0e88abd5d1dabc81f8797f315cefc8e99b052333
-  RCTAEPUserProfile: 2d3d96fd3425bc213bac32e9413dd0fa4552d9a0
+  RCTAEPAssurance: 3d4b85f170ed9279110b1542dbfb6e5d5d0a5cc1
+  RCTAEPCampaignClassic: 02efa05ebad01b8c17726e6e37bccb10b62174dd
+  RCTAEPCore: 6153158b90917c9354e9b5fe838b3c4dfd7f3bda
+  RCTAEPEdge: e3ce0e7f80516f51f95920384ac2fa9a9432935d
+  RCTAEPEdgeBridge: 6b2c46794e433f46037d3841c808fa15d1ec22db
+  RCTAEPEdgeConsent: 15a69df3f757e648164948bed5832d6063a360eb
+  RCTAEPEdgeIdentity: edf4bd7150e5afbcb4d28e80fa8c1e1872a93b86
+  RCTAEPMessaging: c53a3249f51bed62b085239fa878e13e8e9f018e
+  RCTAEPOptimize: 8e4bffa750ec968d2309a7788cca10ca9e4228da
+  RCTAEPPlaces: 6682b683ebc9debaf959d358d2522ce6e90b825e
+  RCTAEPTarget: dfa4808f76f46c3df23fe55298229f11f6467036
+  RCTAEPUserProfile: 894fb60774881d062a4dacf035017c13eca2a13b
   RCTRequired: ca1d7414aba0b27efcfa2ccd37637edb1ab77d96
   RCTTypeSafety: 678e344fb976ff98343ca61dc62e151f3a042292
   React: e296bcebb489deaad87326067204eb74145934ab
@@ -1548,8 +1549,8 @@ SPEC CHECKSUMS:
   React-jsinspector: 85583ef014ce53d731a98c66a0e24496f7a83066
   React-logger: 3eb80a977f0d9669468ef641a5e1fabbc50a09ec
   React-Mapbuffer: 84ea43c6c6232049135b1550b8c60b2faac19fab
-  react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b
-  react-native-webview: d6607cbbe7bad689cc08d6d5e35cbf9938093223
+  react-native-safe-area-context: dcab599c527c2d7de2d76507a523d20a0b83823d
+  react-native-webview: c461fed0b58be5ee5180c3c3092a1d5dcb214a94
   React-nativeconfig: b4d4e9901d4cabb57be63053fd2aa6086eb3c85f
   React-NativeModulesApple: cd26e56d56350e123da0c1e3e4c76cb58a05e1ee
   React-perflogger: 5f49905de275bac07ac7ea7f575a70611fa988f2
@@ -1571,12 +1572,12 @@ SPEC CHECKSUMS:
   React-utils: d16c1d2251c088ad817996621947d0ac8167b46c
   ReactCommon: 2aa35648354bd4c4665b9a5084a7d37097b89c10
   RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906
-  RNGestureHandler: bc2cdb2dc42facdf34992ae364b8a728e19a3686
-  RNReanimated: 8a4d86eb951a4a99d8e86266dc71d7735c0c30a9
-  RNScreens: b6b64d956af3715adbfe84808694ae82d3fec74f
+  RNGestureHandler: 96439cf6543defdde87459e48cd1a3f0e45a008e
+  RNReanimated: 6cfa556540186ce7ae7a0b048f369236b1d86ebb
+  RNScreens: 134a7511b12b8eb440b87aac21e36a71295d6024
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: 805bf71192903b20fc14babe48080582fee65a80
 
 PODFILE CHECKSUM: 28c6df2071ba56279db6503a2577505ae5b10b15
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2

apps/AEPSampleApp/types/props.ts

@@ -0,0 +1,3 @@
+export interface NavigationProps {
+  navigation: any;
+}

package.json

@@ -10,7 +10,7 @@
   },
   "scripts": {
     "clean": "rm yarn.lock & find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +",
-    "prebuild": "npx lerna exec --ignore aepsampleapp -- rm -rf js",
+    "prebuild": "npx lerna exec --ignore aepsampleapp -- rm -rf dist",
     "build": "npx lerna exec --ignore aepsampleapp -- tsc",
     "test": "jest",
     "sampleapp:ios:pod:update": "cd apps/AEPSampleApp/ios && pod update",

packages/assurance/.npmignore

@@ -67,3 +67,4 @@ CONTRIBUTING.md
 CODE_OF_CONDUCT.md
 Makefile
 *.tgz
+tsconfig.json

packages/assurance/__tests__/AssuranceTests.ts

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 */
 
 import { NativeModules } from 'react-native';
-import { Assurance } from '../ts';
+import { Assurance } from '../src';
 
 describe('Assurance', () => {
   it('extensionVersion is called', async () => {