move js stuff to repo root

.circleci/config.yml

@@ -91,7 +91,7 @@ jobs:
 
       - run:
           name: Bundle emission
-          command: cd emission && yarn bundle-for-native-ci
+          command: yarn bundle-for-native-ci
 
       - save_cache:
           key: v4-pods-{{ checksum "Podfile.lock" }}
@@ -147,22 +147,22 @@ jobs:
 
       - restore_cache:
           keys:
-            - v3-yarn-{{ checksum "emission/yarn.lock" }}
+            - v3-yarn-{{ checksum "yarn.lock" }}
             # Fall back to using the latest cache if no exact match is found.
             - v3-yarn-
 
       - run:
           name: Install Yarn Dependencies
-          command: cd emission && yarn install --ignore-engines
+          command: yarn install --ignore-engines
 
       - save_cache:
-          key: v3-yarn-{{ checksum "emission/yarn.lock" }}
+          key: v3-yarn-{{ checksum "yarn.lock" }}
           paths:
-            - emission/node_modules
+            - node_modules
 
       - run:
           name: Deploy via auto-release
-          command: cd emission && yarn update-metaphysics
+          command: yarn update-metaphysics
 
 workflows:
   version: 2

.gitattributes

@@ -1 +1,3 @@
 CHANGELOG.yml merge=union
+src/__generated__/*.graphql.ts linguist-generated
+src/__generated__/*.queryMap.json linguist-generated

.gitignore

@@ -52,12 +52,42 @@ iOSInjectionProject/
 fastlane/Gemfile.lock
 Artsy.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 
-# React Native pods. See: Podfile
-rn_pods
-
 # regular Pods. No longer a submodule
 Pods
 
 # build artefacts
 derived_data
 Artsy/Networking/ARReactPackagerHost.m
+
+# COPIED FROM EMISSION
+
+# Xcode
+
+## Build generated
+dist
+
+# Custom
+
+node_modules
+npm-debug.log
+.vscode/launchReactNative.js
+.vscode/.react/
+.vscode/typings
+.apphub
+coverage
+package-lock.json
+yarn-error.log
+.awcache
+
+# Use a custom, cached location for Jest to save transpiling
+# on every PR
+.jest/cache
+
+# Danger artifacts
+tslint-errors.json
+
+# TypeScript Logs
+tsc_raw.log
+
+# Emission bundle
+emission/Pod/Assets/Emission.js*

.travis.yml

@@ -11,19 +11,18 @@ cache:
     # General SwiftPM
     # Danger Swift plugins, like Yams
     - .build
-    - emission/node_modules
-    - emission/.jest/cache
+    - node_modules
+    - .jest/cache
 
 install:
   # Grab the latest Danger JS from npm
   - nvm use 12
   - npm install -g danger
   - npm install -g yarn
-  - pushd emission && yarn install && popd
+  - yarn install
 
 script:
   # Run the Dangerfile.swift
   - swift run danger-swift ci
-  - cd emission
   - yarn ci
   - yarn danger ci --verbose

.vscode/extensions.json

@@ -1,8 +1,6 @@
 {
   // See http://go.microsoft.com/fwlink/?LinkId=827846
   // for the documentation about the extensions.json format
-  "recommendations": [
-    "Orta.vscode-ios-common-files",
-    "Orta.vscode-danger",
-  ]
+  "recommendations": ["Orta.vscode-ios-common-files", "Orta.vscode-danger", "artsy.artsy-studio-extension-pack"],
+  "unwantedRecommendations": ["prisma.vscode-graphql"]
 }

emission/.vscode/settings.json → .vscode/settings.json

@@ -28,9 +28,6 @@
     "build": true,
     ".awcache": true,
     ".happypack": true,
-    "Example/build": true,
-    "Example/DerivedData": true,
-    "Example/Pods/Headers/**": true
   },
   "search.exclude": {
     "**/node_modules": true,
@@ -61,7 +58,6 @@
     "matt"
   ],
   "cSpell.diagnosticLevel": "Hint",
-  "clang.compilationDatabase": "${workspaceRoot}/Example/compile_commands.json",
   "typescript.tsdk": "./node_modules/typescript/lib",
   "todohighlight.exclude": ["node_modules/**", ".vscode/**", "externals/**"],
   "tslint.autoFixOnSave": true,

Artsy.xcodeproj/project.pbxproj

@@ -4616,7 +4616,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Artsy/Pods-Artsy-frameworks.sh",
-				"${PODS_ROOT}/../emission/node_modules/@mapbox/react-native-mapbox-gl/ios/Mapbox.framework",
+				"${PODS_ROOT}/../node_modules/@mapbox/react-native-mapbox-gl/ios/Mapbox.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -4649,7 +4649,6 @@
 				"${PODS_ROOT}/Artsy+UIFonts/Pod/Assets/Unica77LL-Regular.otf",
 				"${PODS_ROOT}/Artsy+UILabels/Pod/Assets/Chevron_Black.png",
 				"${PODS_ROOT}/Artsy+UILabels/Pod/Assets/[email protected]",
-				"${PODS_ROOT}/../emission/Pod/Assets/Emission.js",
 				"${PODS_ROOT}/../emission/Pod/Assets/assets",
 				"${PODS_ROOT}/Extraction/Extraction/Assets/[email protected]",
 				"${PODS_ROOT}/FBSDKCoreKit/FacebookSDKStrings.bundle",
@@ -4674,7 +4673,6 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Unica77LL-Regular.otf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Chevron_Black.png",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/[email protected]",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Emission.js",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/assets",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/[email protected]",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FacebookSDKStrings.bundle",

Artsy/App/ARAppDelegate+Emission.m

@@ -86,7 +86,7 @@ - (void)setupEmission;
         [self setupSharedEmissionWithPackagerURL:packagerURL];
 
     } else if ([AROptions boolForOption:AROptionsDevReactEnv]) {
-        NSString *bundleUrlString = [NSString stringWithFormat:@"http://%@:8081/Example/Emission/index.ios.bundle?platform=ios&dev=true", [ARReactPackagerHost hostname]];
+        NSString *bundleUrlString = [NSString stringWithFormat:@"http://%@:8081/index.ios.bundle?platform=ios&dev=true", [ARReactPackagerHost hostname]];
         NSURL *packagerURL = [NSURL URLWithString:bundleUrlString];
         [self setupSharedEmissionWithPackagerURL:packagerURL];
 

Podfile

@@ -22,16 +22,9 @@ installing_pods = ARGV.include?('install') || ARGV.include?('update')
 
 npm_vendored_podspecs = {}
 if installing_pods
-  system 'pushd emission; yarn install --ignore-engines; popd'
-
-  npm_vendored_podspecs = JSON.parse(File.read('./emission/npm-podspecs.json'), symbolize_names: true)
-  npm_vendored_podspecs.update(npm_vendored_podspecs) do |_pod_name, props|
-    if props[:path]
-      props.merge path: File.join('./emission/', props[:path])
-    else
-      props.merge podspec: File.join('./emission/', props[:podspec])
-    end
-  end
+  system 'yarn install --ignore-engines'
+
+  npm_vendored_podspecs = JSON.parse(File.read('./npm-podspecs.json'), symbolize_names: true)
 
   # Remove DevSupport pod on CI builds, which are used to deploy prod builds.
   if ENV['CIRCLE_BUILD_NUM']