Merge pull request #44006 from Expensify/revert-43971-revert-43785-fu…

…llstory-plugin-update

Revert "Revert "Fullstory plugin update. Annotation plugin fix.""

(cherry picked from commit cf0e8a3)

android/build.gradle

@@ -29,7 +29,7 @@ buildscript {
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
         classpath("com.google.firebase:perf-plugin:1.4.1")
         // Fullstory integration
-        classpath ("com.fullstory:gradle-plugin-local:1.47.0")
+        classpath ("com.fullstory:gradle-plugin-local:1.49.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

babel.config.js

@@ -3,16 +3,13 @@ require('dotenv').config();
 const IS_E2E_TESTING = process.env.E2E_TESTING === 'true';
 
 const defaultPresets = ['@babel/preset-react', '@babel/preset-env', '@babel/preset-flow', '@babel/preset-typescript'];
-const defaultPlugins = [
+let defaultPlugins = [
     // Adding the commonjs: true option to react-native-web plugin can cause styling conflicts
     ['react-native-web'],
 
     '@babel/transform-runtime',
     '@babel/plugin-proposal-class-properties',
 
-    // This will serve to map the classes correctly in FullStory
-    '@fullstory/babel-plugin-annotate-react',
-
     // We use `transform-class-properties` for transforming ReactNative libraries and do not use it for our own
     // source code transformation as we do not use class property assignment.
     'transform-class-properties',
@@ -21,6 +18,19 @@ const defaultPlugins = [
     'react-native-reanimated/plugin',
 ];
 
+// The Fullstory annotate plugin generated a few errors when executed in Electron. Let's
+// ignore it for desktop builds.
+if (!process.env.ELECTRON_ENV && process.env.npm_lifecycle_event !== 'desktop') {
+    console.debug('This is not a desktop build, adding babel-plugin-annotate-react');
+    defaultPlugins.push([
+        '@fullstory/babel-plugin-annotate-react',
+        {
+            'react-native-web': true,
+            native: true,
+        },
+    ]);
+}
+
 const webpack = {
     presets: defaultPresets,
     plugins: defaultPlugins,
@@ -45,7 +55,6 @@ const metro = {
             '@fullstory/babel-plugin-annotate-react',
             {
                 native: true,
-                setFSTagName: true,
             },
         ],
 

ios/Podfile

@@ -118,4 +118,4 @@ target 'NotificationServiceExtension' do
   pod 'AirshipServiceExtension'
 end
 
-pod 'FullStory', :http => 'https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz'
+pod 'FullStory', :http => 'https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz'

ios/Podfile.lock

@@ -138,7 +138,7 @@ PODS:
     - GoogleUtilities/Environment (~> 7.7)
     - "GoogleUtilities/NSData+zlib (~> 7.7)"
   - fmt (6.2.1)
-  - FullStory (1.48.0)
+  - FullStory (1.49.0)
   - fullstory_react-native (1.4.2):
     - FullStory (~> 1.14)
     - glog
@@ -2098,7 +2098,7 @@ DEPENDENCIES:
   - ExpoImageManipulator (from `../node_modules/expo-image-manipulator/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
-  - "FullStory (from `{:http=>\"https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz\"}`)"
+  - "FullStory (from `{:http=>\"https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz\"}`)"
   - "fullstory_react-native (from `../node_modules/@fullstory/react-native`)"
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
@@ -2263,7 +2263,7 @@ EXTERNAL SOURCES:
   FBLazyVector:
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
   FullStory:
-    :http: https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz
+    :http: https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz
   fullstory_react-native:
     :path: "../node_modules/@fullstory/react-native"
   glog:
@@ -2458,7 +2458,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   FullStory:
-    :http: https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz
+    :http: https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz
 
 SPEC CHECKSUMS:
   Airship: 5a6d3f8a982398940b0d48423bb9b8736717c123
@@ -2485,7 +2485,7 @@ SPEC CHECKSUMS:
   FirebasePerformance: 0c01a7a496657d7cea86d40c0b1725259d164c6c
   FirebaseRemoteConfig: 2d6e2cfdb49af79535c8af8a80a4a5009038ec2b
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  FullStory: 097347c823c21c655ca25fd8d5e6355a9326ec54
+  FullStory: c95f74445f871bc344cdc4a4e4ece61b5554e55d
   fullstory_react-native: 6cba8a2c054374a24a44dc4310407d9435459cae
   glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   GoogleAppMeasurement: 5ba1164e3c844ba84272555e916d0a6d3d977e91
@@ -2608,6 +2608,6 @@ SPEC CHECKSUMS:
   VisionCamera: 1394a316c7add37e619c48d7aa40b38b954bf055
   Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312
 
-PODFILE CHECKSUM: 66a5c97ae1059e4da1993a4ad95abe5d819f555b
+PODFILE CHECKSUM: d5e281e5370cb0211a104efd90eb5fa7af936e14
 
 COCOAPODS: 1.13.0

package.json

@@ -72,6 +72,7 @@
     "@formatjs/intl-locale": "^3.3.0",
     "@formatjs/intl-numberformat": "^8.5.0",
     "@formatjs/intl-pluralrules": "^5.2.2",
+    "@fullstory/babel-plugin-annotate-react": "github:fullstorydev/fullstory-babel-plugin-annotate-react#ryanwang/react-native-web-demo",
     "@fullstory/babel-plugin-react-native": "^1.2.1",
     "@fullstory/browser": "^2.0.3",
     "@fullstory/react-native": "^1.4.2",

web/index.html

@@ -130,7 +130,7 @@
     <link rel="manifest" href="/manifest.json" />
 </head>
 <body>
-    <% if (htmlWebpackPlugin.options.isWeb && htmlWebpackPlugin.options.isProduction) { %>
+    <% if (htmlWebpackPlugin.options.isWeb && (htmlWebpackPlugin.options.isProduction || htmlWebpackPlugin.options.isStaging)) { %>
         <!-- Google Tag Manager (noscript) -->
         <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-N4M3FLJZ" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         <!-- End Google Tag Manager (noscript) -->