build: embed emission and other pods (#6920)

* embed # Conflicts: # ios/Artsy.xcodeproj/project.pbxproj * test * ok * aha * more * try this * lol how was this not caught in xcode? * fix * done * why did these not commit lol? * 15.5 * Delete Brewfile.lock.json * merge * bomb cache * more * lets try * a bit more * better * add back * bring back convenience method * bring back ARWindow
artsy · Jun 27, 2022 · 6bee19f · 6bee19f
1 parent 4e68ed3
commit 6bee19f
Show file tree

Hide file tree

Showing 255 changed files with 1,838 additions and 1,957 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,9 +39,8 @@ commands:
             scripts/generate-manifest.js .manifests/node_modules '^yarn\.lock$' '^patches/' '^package\.json$'
             scripts/generate-manifest.js .manifests/js_transform '^\.manifests/node_modules' '^babel\.config\.js' '^relay\.config\.js' '^jest\.config\.js'
             scripts/generate-manifest.js .manifests/js_bundle '^\.manifests/js_transform' '^data/' '^index\.ios\.js' '^src/(?!.*(__mocks__|__fixtures__))'
-            ls -lR emission > .manifests/emission_pod_file_list
-            scripts/generate-manifest.js .manifests/cocoapods '^Podfile' '^Gemfile' '^\.manifests/emission_pod_file_list'
-            scripts/generate-manifest.js .manifests/native_code '^\.manifests/node_modules' '^Podfile' '^Gemfile' '^emission/' '^Artsy' '^patches/react-native' '^\.env\.example'
+            scripts/generate-manifest.js .manifests/cocoapods '^Podfile' '^Gemfile'
+            scripts/generate-manifest.js .manifests/native_code '^\.manifests/node_modules' '^Podfile' '^Gemfile' '^dist/' '^Artsy' '^patches/react-native' '^\.env\.example'
             scripts/generate-manifest.js .manifests/android_native '^\.manifests/node_modules' '^android/' '^patches/react-native' '^\.env\.example'
   setup-env-file:
     steps:
@@ -104,23 +103,23 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v6-js_bundle-{{ checksum ".manifests/js_bundle" }}
+            - v7-js_bundle-{{ checksum ".manifests/js_bundle" }}
       - restore_cache:
           keys:
             - v6-metro-{{ checksum ".manifests/js_transform" }}
       - run:
           name: Bundle emission
-          command: ls emission/Pod/Assets/Emission.js || yarn bundle-for-native-ci:ios
+          command: ls dist/jsbundle.js || yarn bundle-for-native-ci:ios
       - save_cache:
           key: v6-metro-{{ checksum ".manifests/js_transform" }}
           paths:
             - .metro
       - save_cache:
-          key: v6-js_bundle-{{ checksum ".manifests/js_bundle" }}
+          key: v7-js_bundle-{{ checksum ".manifests/js_bundle" }}
           paths:
-            - emission/Pod/Assets/Emission.js
-            - emission/Pod/Assets/Emission.js.map
-            - emission/Pod/Assets/assets
+            - dist/jsbundle.js
+            - dist/jsbundle.js.map
+            - dist/assets
   install-gems:
     steps:
       - restore_cache:
@@ -155,12 +154,15 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v6-app_build_ios-{{ checksum ".manifests/app_build" }}
+            - v7-app_build_ios-{{ checksum ".manifests/app_build" }}
+      - run:
+          name: Download fonts from s3
+          command: ./scripts/download-assets
       - run:
           name: Build App
           command: ./scripts/ci-ios
       - save_cache:
-          key: v6-app_build_ios-{{ checksum ".manifests/app_build" }}
+          key: v7-app_build_ios-{{ checksum ".manifests/app_build" }}
           paths:
             - derived_data
             - node_modules/react-native-config
@@ -225,7 +227,7 @@ jobs:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
 
     macos:
-      xcode: 13.2.1
+      xcode: 13.4.1
 
     steps:
       - checkout
@@ -269,7 +271,7 @@ jobs:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
 
     macos:
-      xcode: 13.2.1
+      xcode: 13.4.1
 
     steps:
       - checkout
@@ -285,7 +287,7 @@ jobs:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
 
     macos:
-      xcode: 13.2.1
+      xcode: 13.4.1
 
     steps:
       - checkout
@@ -350,7 +352,7 @@ jobs:
       - bundle-js
       - run:
           name: Generate app_build manifest
-          command: ./scripts/generate-manifest.js .manifests/app_build '^\./manifests/native_code' '^emission/Pod/Assets/'
+          command: ./scripts/generate-manifest.js .manifests/app_build '^\./manifests/native_code' '^dist/'
       - store_artifacts:
           path: .manifests
       - store_test_results:
@@ -359,14 +361,14 @@ jobs:
           root: .
           paths:
             - .manifests
-            - emission/Pod/Assets
+            - dist
 
   build-test-app-ios:
     environment:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
 
     macos:
-      xcode: 13.2.1
+      xcode: 13.4.1
 
     steps:
       - attach_workspace:
@@ -464,7 +466,7 @@ jobs:
     environment:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
     macos:
-      xcode: 13.2.1
+      xcode: 13.4.1
     steps:
       - checkout
       - install-gems
@@ -511,7 +513,7 @@ jobs:
     environment:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
     macos:
-      xcode: 13.2.1
+      xcode: 13.4.1
     steps:
       - checkout
       - install-gems

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
-# Xcode
+# macos
 .DS_Store
+
+# Xcode
 build/
 *.pbxuser
 !default.pbxuser
@@ -17,15 +19,12 @@ DerivedData
 .idea/
 *.xcscmblueprint
 .pt
+.clang-format
 .build
-tmtags
-tmtagsHistory
-config/releasenotes.txt
-Podfile.local
-ios/Artsy.xcodeproj/project.xcworkspace/xcshareddata/
-.vendor/
-compiler_commands.json
 .swiftpm
+xcode_test_raw.log
+xcode_build_raw.log
+.recordingSnapshots
 
 # Artsy Development APN certificate
 net.artsy.artsy.dev.pem
@@ -40,53 +39,41 @@ Preview.html
 fastlane/report.xml
 fastlane/Preview.html
 
-.vscode/.browse.VC.db
-
-
+# bundler
 .vendor
 
-# regular Pods. No longer a submodule
+# Cocoa Pods
 Pods
 
 # build artefacts
 derived_data
-ios/Artsy/Networking/ARReactPackagerHost.m
 
-# COPIED FROM EMISSION
-
-# Xcode
-xcode_build_raw.log
-
-## Build generated
-dist
+## js bundle
+dist/*
 
 # Custom
-
 node_modules
 npm-debug.log
 .vscode/launchReactNative.js
 .vscode/.react/
 .vscode/typings
 .vscode/tasks.json.old
+.vscode/.browse.VC.db
 .apphub
 coverage
 package-lock.json
 yarn-error.log
 .awcache
 
-# Use a custom, cached location for Jest to save transpiling
-# on every PR
+# jest
 .jest/cache
 
 # Danger artifacts
 tslint-errors.json
 
-# TypeScript Logs
+# typescript
 tsc_raw.log
 
-# Emission bundle
-emission/Pod/Assets/*
-
 # query map
 data/complete.queryMap.json
 
@@ -108,32 +95,24 @@ native-code-checksum.hash
 **/.env*
 !.env.example
 
-# Ignore test artefacts
-xcode_test_raw.log
-
-.recordingSnapshots
-
 # Android/IntelliJ
-#
 build/
 .idea
 .gradle
 local.properties
 *.iml
 google-services.json
 
-# BUCK
-buck-out/
-\.buckd/
+# android
 *.keystore
 !debug.keystore
 android-secret.json
 
-
 # Fonts
 android/app/src/main/assets/fonts/*
 ios/eigen/fonts/*
-
+# old native screen needs these there
+ios/Artsy/View_Controllers/Live_Auctions/Resources/Artsy/fonts/*
 
 # Firebase files
 android/app/google-services.json
@@ -143,7 +122,7 @@ eigen-firebase-app-distribution.json
 metaflags.json
 
 # Relay
-src/__generated__/*
+src/__generated__
 
 # jest circleci reports
 reports
@@ -152,6 +131,8 @@ reports
 Brewfile.lock.json
 
 
+#########################################################
 # Keep this rule last.
 # Keep these, so we can keep the folders these appear in.
 !.gitkeep
+#########################################################
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -66,6 +66,10 @@
     {
       "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
     },
+    {
+      "path": "detect_secrets.filters.common.is_baseline_file",
+      "filename": ".secrets.baseline"
+    },
     {
       "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
       "min_level": 2
@@ -100,12 +104,13 @@
     {
       "path": "detect_secrets.filters.regex.should_exclude_file",
       "pattern": [
-        "/.lock$/",
-        "/.png$/",
-        "/.webp$/",
-        "/.jpg$/",
-        "/.jar$/",
-        "/__generated__/"
+        "\\.lock$",
+        "\\.png$",
+        "\\.webp$",
+        "\\.jpg$",
+        "\\.jar$",
+        "__generated__",
+        "ios\\/.*\\.xcscheme$"
       ]
     }
   ],
@@ -119,79 +124,6 @@
         "line_number": 153
       }
     ],
-    "ios/Artsy.xcodeproj/xcshareddata/xcschemes/Artsy (Release).xcscheme": [
-      {
-        "type": "Hex High Entropy String",
-        "filename": "ios/Artsy.xcodeproj/xcshareddata/xcschemes/Artsy (Release).xcscheme",
-        "hashed_secret": "6760dd79e63f3070b115309c8e3f331873583739",
-        "is_verified": false,
-        "line_number": 17
-      }
-    ],
-    "ios/Artsy.xcodeproj/xcshareddata/xcschemes/Artsy.xcscheme": [
-      {
-        "type": "Hex High Entropy String",
-        "filename": "ios/Artsy.xcodeproj/xcshareddata/xcschemes/Artsy.xcscheme",
-        "hashed_secret": "6760dd79e63f3070b115309c8e3f331873583739",
-        "is_verified": false,
-        "line_number": 17
-      },
-      {
-        "type": "Hex High Entropy String",
-        "filename": "ios/Artsy.xcodeproj/xcshareddata/xcschemes/Artsy.xcscheme",
-        "hashed_secret": "413d9fce7ba73a33498cd56d00de37a94f9a5dcc",
-        "is_verified": false,
-        "line_number": 66
-      }
-    ],
-    "ios/Artsy.xcodeproj/xcshareddata/xcschemes/ArtsyStickers.xcscheme": [
-      {
-        "type": "Hex High Entropy String",
-        "filename": "ios/Artsy.xcodeproj/xcshareddata/xcschemes/ArtsyStickers.xcscheme",
-        "hashed_secret": "f2da6516b69b8481bd41d2f1999c27528476a884",
-        "is_verified": false,
-        "line_number": 18
-      },
-      {
-        "type": "Hex High Entropy String",
-        "filename": "ios/Artsy.xcodeproj/xcshareddata/xcschemes/ArtsyStickers.xcscheme",
-        "hashed_secret": "6760dd79e63f3070b115309c8e3f331873583739",
-        "is_verified": false,
-        "line_number": 32
-      }
-    ],
-    "ios/Artsy.xcodeproj/xcshareddata/xcschemes/ArtsyWidgetExtension.xcscheme": [
-      {
-        "type": "Hex High Entropy String",
-        "filename": "ios/Artsy.xcodeproj/xcshareddata/xcschemes/ArtsyWidgetExtension.xcscheme",
-        "hashed_secret": "2255720efaddbe53eb12ca90f0305e5366176dee",
-        "is_verified": false,
-        "line_number": 18
-      },
-      {
-        "type": "Hex High Entropy String",
-        "filename": "ios/Artsy.xcodeproj/xcshareddata/xcschemes/ArtsyWidgetExtension.xcscheme",
-        "hashed_secret": "6760dd79e63f3070b115309c8e3f331873583739",
-        "is_verified": false,
-        "line_number": 32
-      }
-    ],
-    "ios/Artsy.xcodeproj/xcshareddata/xcschemes/BrazePushServiceExtension.xcscheme": [
-      {
-        "type": "Hex High Entropy String",
-        "filename": "ios/Artsy.xcodeproj/xcshareddata/xcschemes/BrazePushServiceExtension.xcscheme",
-        "hashed_secret": "caba76e37ddbef7c0c23916896fe82170bc370c7",
-        "is_verified": false,
-        "line_number": 18
-      },
-      {
-        "type": "Hex High Entropy String",
-        "filename": "ios/Artsy.xcodeproj/xcshareddata/xcschemes/BrazePushServiceExtension.xcscheme",
-        "hashed_secret": "6760dd79e63f3070b115309c8e3f331873583739",
-        "is_verified": false,
-        "line_number": 32
-      }
-    ],
     "ios/Artsy/Constants/ARAppConstants.m": [
       {
         "type": "Secret Keyword",
@@ -482,5 +414,5 @@
       }
     ]
   },
-  "generated_at": "2022-06-03T15:04:55Z"
+  "generated_at": "2022-06-13T16:45:26Z"
 }
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -352,4 +352,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   2.3.5
+   2.3.13
diff --git a/emission/Pod/Assets/.gitkeep → dist/.gitkeep b/emission/Pod/Assets/.gitkeep → dist/.gitkeep
-Original file line number
+Diff line change
@@ Expand Up / @@ -352,4 +352,4 @@ DEPENDENCIES @@
       xcpretty
     BUNDLED WITH
-.3.5
+.3.13