fix lint errors before git commit

2026-11-14 19:12:55 -10:00 · 2019-04-03 11:25:53 +02:00
60 changed files with 2090 additions and 2133 deletions
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    ["env", {
+      "targets": {
+        "node": "8.9"
+      }
+    }]
+  ],
+  "plugins": [
+    ["module-resolver", {
+      "alias": {
+        "turtle": "./build"
+      }
+    }]
+  ]
+}
@@ -3,7 +3,7 @@ version: 2.1
 executors:
  nix: &nix
    docker:
-      - image: lnl7/nix:2.2
+      - image: lnl7/nix:2.1.2
    # Symlink to the readline-enabled bash which is the default command of the container
    shell: /run/current-system/sw/bin/bash -leo pipefail
    working_directory: ~/turtle
@@ -33,12 +33,10 @@ commands:
          command: |
            nix-env -iA \
              nixpkgs.binutils \
-              nixpkgs.curl \
              nixpkgs.direnv \
              nixpkgs.findutils \
              nixpkgs.gawk \
              nixpkgs.git \
-              nixpkgs.gnused \
              nixpkgs.gnutar \
              nixpkgs.gzip \
              nixpkgs.openssh \
@@ -139,12 +137,11 @@ commands:

 jobs:
  build:
-    executor: nix
+    docker:
+      - image: circleci/node:8.12
    steps:
-      - setup
-      - restore_yarn_cache
+      - checkout
      - run: yarn
-      - save_yarn_cache
      - run: yarn lint
      - run: yarn build

@@ -156,7 +153,7 @@ jobs:
      - run: yarn
      - save_yarn_cache
      - run:
-          name: Run unit tests
+          name: Run iOS smoke tests
          command: ./scripts/tests/runUnitTestsCI.sh

  ios_smoke_tests:
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 source_local() {
  file=./.envrc.local
@@ -17,7 +17,4 @@ export EXPO_TURTLE_TOOLS_DIR="$(pwd)/tools"

 if [ -z "$EXPO_UNIVERSE_DIR" ]; then
  PATH_add $EXPO_TURTLE_TOOLS_DIR/bin
-  if [ "$CI" = "true" ]; then
-    PATH_add $EXPO_TURTLE_TOOLS_DIR/ci/bin
-  fi
 fi
@@ -2,7 +2,6 @@

 node_modules
 yarn-error.log
-google-cloud-credentials.json

 /build/
 /workingdir/*
@@ -1 +0,0 @@
-fixtures/
@@ -1 +0,0 @@
-v8.15.1
@@ -5,49 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

 ## [Unreleased]
-
-## [0.7.2] - 2019-05-09
-### Removed
- Support for `CLIENT_LOGGER_LEVEL` env variable.
-### Added
- Support for Android tarballs without `universe-package.json`.
-### Changed
- Upgraded `@expo/traveling-fastlane-darwin` to 1.9.4 (fixes issues with generating provisioning profiles for ad-hoc builds).
-
-## [0.7.1] - 2019-05-06
-### Fixed
- Resolving `fastlane` version when `LC_ALL` is not set.
-
-## [0.7.0] - 2019-05-06
-### Added
- Support for custom Android builds.
-### Changed
- Refactored logger.
-### Fixed
- `platform` log field wrongly set to `ios` for Android builds (when using `turtle-cli`).
- Brought back `jobID` and `experienceName` fields to Android logs.
-
-## [0.6.1] - 2019-04-23
-### Added
- Checking fastlane version before running build (turtle-cli).
-### Changed
- Updated iOS shell app for SDK 32 to fix AppAuth issue.
- Babel replaced by ttypescript.
- Updated xdl to 53.5.3 and @expo/spawn-async to 1.4.2, so that error stack traces should be more informative now.
-### Fixed
- Brought back `jobID` and `experienceName` fields to GCloud logs.
-### Removed
- `buidAndroidTarballLocally.sh` script (it has been moved to expo repository - [expo/expo#4022](https://github.com/expo/expo/pull/4022)).
-
-## [0.6.0] - 2019-04-09
-### Changed
- Removed Branch module from Android shell apps for all SDK versions.
-
-## [0.5.15] - 2019-04-03
 ### Added
 - Turtle smoke tests are now being executed on CircleCI from the context of this repository.
 ### Changed
- Updated iOS shell app for SDK 32 (fixes [this loading issue for slow connections](https://github.com/expo/expo/issues/3574)).
 - Minor infra changes (doesn't affect users).
 - Error logs format - error objects are now passed in an object being passed as the first argument to logger function.
 ### Removed
@@ -99,19 +99,18 @@ RUN rm gradle-4.4-all.zip
 ENV GRADLE_HOME /usr/local/gradle-4.4
 ENV PATH ${GRADLE_HOME}/bin:$PATH

+# Install Gulp
+RUN npm install -g gulp-cli
+
 ADD . /app

 RUN for SDK_VERSION in `ls /app/workingdir/android/`; do \
      cd /app/workingdir/android/$SDK_VERSION && \
-      if [ -f universe-package.json ]; then \
      mv package.json exponent-package.json && \
      mv universe-package.json package.json && \
      yarn install && \
      mv package.json universe-package.json && \
-      mv exponent-package.json package.json; \
-      else \
-      yarn install; \
-      fi \
+      mv exponent-package.json package.json \
    ; done

 WORKDIR /app
@@ -1,15 +1,6 @@
 #!/usr/bin/env node
 'use strict';

-const subcommand = process.argv[2];
-if (subcommand) {
-  const [, platform] = subcommand.split(':');
-  if (platform === 'ios' || platform === 'android') {
-    // so that logs have correct platform set
-    process.env.PLATFORM = platform;
-  }
-}
-
 require('source-map-support').install();
 require('../build/bin/env').initOfflineEnv();
 require('../build/bin/index').run('turtle');
@@ -0,0 +1,91 @@
+'use strict';
+
+const childProcess = require('child_process');
+const util = require('util');
+const path = require('path');
+
+const gulp = require('gulp');
+const babel = require('gulp-babel');
+const changed = require('gulp-changed');
+const nodemon = require('gulp-nodemon');
+const plumber = require('gulp-plumber');
+const sourcemaps = require('gulp-sourcemaps');
+const ts = require('gulp-typescript');
+const rimraf = require('rimraf');
+
+const rimrafAsync = util.promisify(rimraf);
+
+const tsProject = ts.createProject('tsconfig.json');
+
+gulp.task('clean', async () => {
+  console.log(`Removing build directories...`);
+  await rimrafAsync('build');
+});
+
+gulp.task('build:server', () => {
+  console.log(`Compiling the Node.js server JavaScript...`);
+  return tsProject
+    .src()
+    .pipe(plumber())
+    .pipe(changed('build'))
+    .pipe(sourcemaps.init())
+    .pipe(tsProject())
+    .pipe(babel())
+    .pipe(
+      sourcemaps.write('.', {
+        includeContent: false,
+        sourceRoot: '../src',
+      })
+    )
+    .pipe(gulp.dest('build'));
+});
+
+gulp.task('watch:source', async () => {
+  console.log(`Watching for changes to the Node.js server JavaScript...`);
+  gulp.watch('src/**/*.(t|j)s', gulp.series('build:server'));
+});
+
+gulp.task('watch:local', createWatchTask('development'));
+gulp.task('watch:server', createWatchTask('production'));
+
+function createWatchTask(nodeEnv) {
+  return async () => {
+    console.log(`Starting the Node.js server and watching for changes (NODE_ENV=${nodeEnv})...`);
+    // Run nodemon in a separate process to isolate its side effects on stdio streams
+    let nodeCmd = 'node';
+    if (nodeEnv === 'development') {
+      nodeCmd += ' --inspect=:9315';
+    }
+    nodemon({
+      script: './build/server.js',
+      execMap: {
+        js: nodeCmd,
+      },
+      env: {
+        NODE_ENV: nodeEnv,
+      },
+
+      watch: ['./build'],
+      stdout: false,
+      readable: false,
+    }).on('readable', function() {
+      const bunyan = childProcess.fork(
+        path.join('.', 'node_modules', '.bin', 'bunyan'),
+        ['-o', 'short', '-l', 'debug', '--color'],
+        { silent: true }
+      );
+
+      bunyan.stdout.pipe(process.stdout);
+      bunyan.stderr.pipe(process.stderr);
+      this.stdout.pipe(bunyan.stdin);
+      this.stderr.pipe(bunyan.stdin);
+    });
+  };
+}
+
+gulp.task(
+  'watch',
+  gulp.series('clean', 'build:server', gulp.parallel('watch:source', 'watch:local'))
+);
+
+gulp.task('default', gulp.series('watch'));
@@ -1,6 +0,0 @@
-{
-  "watch": ["src"],
-  "ext": "ts",
-  "ignore": ["src/**/*.test.ts"],
-  "exec": "ts-node -r tsconfig-paths/register --files src/server.ts"
-}
@@ -1,18 +1,20 @@
 {
  "name": "turtle-cli",
-  "version": "0.7.2",
+  "version": "0.5.14",
  "description": "The command-line tool for building standalone Expo apps",
  "preferGlobal": true,
  "scripts": {
-    "start": "EXPENV_OVERRIDES=local-common,local,local-queue expenv nodemon | bunyan -o short -l debug --color",
+    "start": "EXPENV_OVERRIDES=local-common,local,local-queue expenv gulp",
    "start:ios": "PLATFORM=ios yarn start",
    "start:android": "PLATFORM=android yarn start",
+    "watch": "EXPENV_OVERRIDES=local-common,local,local-queue expenv gulp watch:source",
    "bin:turtle": "./bin/turtle.js",
    "lint": "tslint -c tslint.json 'src/**/*.ts'",
    "lint:fix": "yarn lint --fix",
-    "prepare": "rimraf ./build && yarn build",
-    "build": "ttsc",
+    "prepare": "yarn build",
+    "build": "gulp build:server",
    "build:production": "./scripts/build.sh",
+    "build:android-tarball:local": "./scripts/android/buildAndroidTarballLocally.sh",
    "secrets:init-private": "./scripts/initPrivateSecrets.sh",
    "set-workingdir:remote": "./scripts/setWorkingdirMode.sh remote",
    "set-workingdir:local": "./scripts/setWorkingdirMode.sh local",
@@ -33,10 +35,9 @@
    "ssh:android:connect": "./scripts/ssh/connectToAndroidPod.sh",
    "ssh:ios:ips": "./scripts/ssh/findIosIps.sh",
    "set-priorities": "yarn set-priorities:local",
-    "set-priorities:default": "expenv ts-node -r tsconfig-paths/register --files src/scripts/setConfigurations.ts",
-    "set-priorities:local": "EXPENV_OVERRIDES=local-common,local,local-queue yarn set-priorities:default",
-    "set-priorities:staging": "yarn set-priorities:default",
-    "set-priorities:production": "EXPENV_OVERRIDES=prod yarn set-priorities:default"
+    "set-priorities:local": "EXPENV_OVERRIDES=local-common,local,local-queue expenv babel-node scripts/setConfigurations.js",
+    "set-priorities:staging": "expenv babel-node scripts/setConfigurations.js",
+    "set-priorities:production": "EXPENV_OVERRIDES=prod expenv babel-node scripts/setConfigurations.js"
  },
  "husky": {
    "hooks": {
@@ -83,29 +84,37 @@
    "@types/progress": "^2.0.1",
    "@types/raven": "^2.5.1",
    "@types/request": "^2.47.1",
-    "@types/semver": "^6.0.0",
    "@types/sharp": "^0.17.8",
    "@types/tar": "^4.0.0",
    "@types/uuid": "^3.4.3",
    "@types/which": "^1.3.1",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.3",
+    "babel-jest": "^23.6.0",
+    "babel-plugin-module-resolver": "^3.1.1",
+    "babel-preset-env": "^1.6.1",
+    "gulp": "github:gulpjs/gulp#4.0",
+    "gulp-babel": "^7.0.1",
+    "gulp-changed": "^3.2.0",
+    "gulp-nodemon": "^2.4.1",
+    "gulp-plumber": "^1.2.0",
+    "gulp-sourcemaps": "^2.6.4",
+    "gulp-typescript": "^4.0.2",
    "husky": "^1.3.1",
    "jest": "^23.6.0",
    "lint-staged": "^8.1.5",
    "nock": "^10.0.1",
-    "nodemon": "^1.18.11",
+    "nodemon": "^1.18.7",
    "release-it": "^10.0.0",
    "rimraf": "^2.6.2",
+    "source-map-loader": "^0.2.3",
    "ts-jest": "^23.10.4",
-    "ts-node": "^8.0.3",
-    "ts-transformer-imports": "^0.4.1",
-    "tsconfig-paths": "^3.8.0",
    "tslint": "^5.10.0",
    "tslint-eslint-rules": "^5.4.0",
-    "ttypescript": "^1.5.6",
-    "typescript": "^3.4.2"
+    "typescript": "^3.0.1"
  },
  "dependencies": {
-    "@expo/spawn-async": "^1.4.2",
+    "@expo/spawn-async": "^1.4.0",
    "@google-cloud/logging-bunyan": "^0.9.5",
    "async-retry": "^1.2.1",
    "aws-sdk": "^2.226.1",
@@ -124,15 +133,14 @@
    "raven": "^2.6.2",
    "request": "^2.88.0",
    "request-progress": "^3.0.0",
-    "semver": "^6.0.0",
    "sharp": "^0.21.0",
    "source-map-support": "^0.5.6",
    "tar": "^4.4.6",
    "uuid": "^3.2.1",
    "which": "^1.3.1",
-    "xdl": "53.5.4"
+    "xdl": "53.1.6-alpha.2"
  },
  "optionalDependencies": {
-    "@expo/traveling-fastlane-darwin": "1.9.4"
+    "@expo/traveling-fastlane-darwin": "^1.8.1"
  }
 }
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -xeo pipefail
+
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
+ARTIFACTS_DIR="$ROOT_DIR/artifacts"
+TEMP_DIR="/tmp/android-shell-app"
+
+mkdir -p $ARTIFACTS_DIR
+rm -rf $TEMP_DIR
+mkdir -p $TEMP_DIR
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/tools-public $TEMP_DIR/tools-public
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/secrets $TEMP_DIR/secrets
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/template-files $TEMP_DIR/template-files
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/android $TEMP_DIR/android
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/package.json $TEMP_DIR/package.json
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/expokit-npm-package $TEMP_DIR/expokit-npm-package
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/packages $TEMP_DIR/packages
+ln -s ${EXPO_UNIVERSE_DIR}/libraries/eslint-config-universe $TEMP_DIR/eslint-config-universe
+ln -s ${EXPO_UNIVERSE_DIR}/libraries/json-file $TEMP_DIR/json-file
+ln -s ${EXPO_UNIVERSE_DIR}/libraries/osascript $TEMP_DIR/osascript
+ln -s ${EXPO_UNIVERSE_DIR}/libraries/schemer $TEMP_DIR/schemer
+ln -s ${EXPO_UNIVERSE_DIR}/package.json $TEMP_DIR/universe-package.json
+
+# generate dynamic macros
+mkdir -p $TEMP_DIR/android/expoview/src/main/java/host/exp/exponent/generated/
+cd $TEMP_DIR/tools-public
+./generate-dynamic-macros-android.sh
+rm -rf $TEMP_DIR/secrets
+
+cd $TEMP_DIR; tar -czhf $ARTIFACTS_DIR/android-shell-builder.tar.gz .
+rm -rf $TEMP_DIR
@@ -1,13 +1,12 @@
-
+import { env } from 'turtle/utils/env';
+import { connect, RedisClient } from 'turtle/utils/redis';
 import { PLATFORMS } from 'turtle/constants';
-import logger from 'turtle/logger';
 import {
  createConfigurationsKey,
  createDefaultConfigurationKey,
  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
+  NORMAL_CONFIGURATION,
 } from 'turtle/utils/priorities';
-import { connect, RedisClient } from 'turtle/utils/redis';

 const TIMEOUT = 3000;

@@ -26,34 +25,36 @@ const TIMEOUT = 3000;
 // they should come back to using configurations no. 1 and 2.
 // If there are no more available configurations from the table, the default configuration is used.

+
 const AVAILABLE_CONFIGURATIONS_IOS = [
-  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
 ];

 const AVAILABLE_CONFIGURATIONS_ANDROID = [
-  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
 ];

+
 const DEFAULT_CONFIGURATION = HIGH_CONFIGURATION;

 async function run() {
@@ -67,8 +68,6 @@ async function run() {
  redis.disconnect();
 }

-if (require.main === module) {
-  run()
-    .then(() => logger.info('All done'))
-    .catch((err) => logger.error('Error:', err));
-}
+run()
+  .then(() => console.log('All done'))
+  .catch(err => console.error('Error:', err));
@@ -36,7 +36,7 @@ setup_local() {
  mkdir -p $WORKINGDIR
  echo "$WORKINGDIR directory created"

-  LINKS=("template-files" "package.json" "android" "expokit-npm-package" "packages" "client-builds" "cpp" "exponent-view-template" "ios" "shellAppBase-builds" "shellAppWorkspaces" "node_modules")
+  LINKS=("template-files" "package.json" "android" "expokit-npm-package" "packages" "client-builds" "cpp" "exponent-view-template" "ios" "shellAppBase-builds" "shellAppWorkspaces")

  for LINKNAME in ${LINKS[@]}; do
    ensure_link_exists "$EXPO_UNIVERSE_DIR/exponent/$LINKNAME" "$WORKINGDIR/$LINKNAME"
@@ -55,14 +55,6 @@ setup_remote() {
      $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
    fi
  fi
-  
-  for sdk in $ROOT_DIR/workingdir/android/* ; do
-    if [[ -f "$sdk/universe-package.json" ]]; then
-      mv $sdk/package.json $sdk/exponent-package.json
-      mv $sdk/universe-package.json $sdk/package.json
-      cd $sdk && yarn
-    fi
-  done
 }

 switch_local() {
@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz
+s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz
+s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz
+s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz
+s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz
+s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-89b2d24c86737d5a489c6a18467e31b2f9ce9005.tar.gz
+s3://exp-artifacts/android-shell-builder-5c339ff7bab6f2161d378cc70e1bf04d32ad98dd.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-0cab68670fc50ce1dc16b7d86ca7976870062c39.tar.gz
+s3://exp-artifacts/android-shell-builder-a4bd3bd26b1b31bdfa66c39b6b4d0d1d138c32fc.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-dc981c7110b7d508de8e9c352064dc3d745c9f72.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-d9cabffbcba20e074e91e4d7f8d862c98acfc680.tar.gz
@@ -6,7 +6,7 @@ import setup from 'turtle/bin/setup/setup';
 import { PLATFORMS } from 'turtle/constants';
 import logger from 'turtle/logger';

-const l = logger.child({ buildPhase: 'setting up environment' });
+const l = logger.withFields({ buildPhase: 'setting up environment' });

 function createSetupCommand(platform: string, os?: string) {
  return (program: any) => {
@@ -41,7 +41,7 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
  },
 ];
 const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
-const l = logger.child(LOGGER_FIELDS);
+const l = logger.withFields(LOGGER_FIELDS);

 export default async function setup(sdkVersion?: string) {
  await checkSystem(REQUIRED_TOOLS);
@@ -12,7 +12,7 @@ import logger from 'turtle/logger';
 const ANDROID_NDK_URL = `https://dl.google.com/android/repository/android-ndk-r10e-${os.platform()}-x86_64.zip`;

 const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
-const l = logger.child(LOGGER_FIELDS);
+const l = logger.withFields(LOGGER_FIELDS);

 export default async function ensureAndroidNDKIsPresent() {
  const androidNdkDir = path.join(config.directories.androidDependenciesDir, 'ndk');
@@ -13,7 +13,7 @@ import logger from 'turtle/logger';
 const ANDROID_SDK_URL = 'https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip';

 const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
-const l = logger.child(LOGGER_FIELDS);
+const l = logger.withFields(LOGGER_FIELDS);

 export default async function ensureAndroidSDKIsPresent() {
  const androidSdkDir = path.join(config.directories.androidDependenciesDir, 'sdk');
@@ -1,7 +1,4 @@
-import last from 'lodash/last';
-import trim from 'lodash/trim';
 import path from 'path';
-import semver from 'semver';

 import { ExponentTools } from 'xdl';

@@ -19,21 +16,6 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
  {
    command: 'fastlane',
    missingDescription: 'Please check https://docs.fastlane.tools/getting-started/ios/setup/',
-    versionCheckFn: async () => {
-      const MINIMAL_VERSION = '2.99.0';
-
-      const { stdout } = await ExponentTools.spawnAsyncThrowError(
-        'fastlane',
-        ['--version'],
-        { stdio: 'pipe', env: { ...process.env, FASTLANE_SKIP_UPDATE_CHECK: '1', LC_ALL: 'en_US.UTF-8' } },
-      );
-      const fastlaneVersion = parseFastlaneVersion(stdout);
-      if (fastlaneVersion && !semver.satisfies(fastlaneVersion, `>= ${MINIMAL_VERSION}`)) {
-        throw new Error(
-          `Your fastlane on version ${fastlaneVersion}. Please upgrade it to at least ${MINIMAL_VERSION}.`,
-        );
-      }
-    },
  },
  {
    command: 'xcode',
@@ -65,11 +47,3 @@ export default async function setup(sdkVersion?: string) {
 function formatShellAppTarballUriPath(sdkMajorVersion: string) {
  return path.join(config.directories.shellTarballsDir, PLATFORMS.IOS, `sdk${sdkMajorVersion}`);
 }
-
-function parseFastlaneVersion(stdout: string) {
-  const lastLine = last(trim(stdout).split('\n'));
-  if (!lastLine) {
-    return null;
-  }
-  return last(lastLine.split(' ')) || null;
-}
@@ -10,7 +10,7 @@ import { IShellAppDirectoryConfig } from 'turtle/builders/utils/workingdir';
 import config from 'turtle/config';
 import logger from 'turtle/logger';

-const l = logger.child({ buildPhase: 'setting up environment' });
+const l = logger.withFields({ buildPhase: 'setting up environment' });

 interface IShellAppFormaters {
  formatShellAppDirectory: (config: IShellAppDirectoryConfig) => string;
@@ -4,18 +4,17 @@ import _which from 'which';
 import logger from 'turtle/logger';

 const which = util.promisify(_which);
-const l = logger.child({ buildPhase: 'setting up environment' });
+const l = logger.withFields({ buildPhase: 'setting up environment' });

 export interface IToolDefinition {
  command: string;
  missingDescription: string;
  testFn?: () => Promise<boolean>;
-  versionCheckFn?: () => void;
 }

 export async function ensureToolsAreInstalled(tools: IToolDefinition[]) {
  let isAnyToolMissing = false;
-  for (const { command, missingDescription, testFn, versionCheckFn } of tools) {
+  for (const { command, missingDescription, testFn } of tools) {
    try {
      if (testFn) {
        if (!await testFn()) {
@@ -31,14 +30,6 @@ export async function ensureToolsAreInstalled(tools: IToolDefinition[]) {
      }
      l.error({ err }, missingDescription);
    }
-    if (versionCheckFn) {
-      try {
-        await versionCheckFn();
-      } catch (err) {
-        isAnyToolMissing = true;
-        l.error({ err }, `wrong version of ${command} installed`);
-      }
-    }
  }
  if (isAnyToolMissing) {
    throw new Error('Tools required to perform standalone app build are missing. Please install them.');
@@ -2,7 +2,6 @@ import path from 'path';

 import fs from 'fs-extra';
 import _ from 'lodash';
-import semver from 'semver';
 import uuidv4 from 'uuid/v4';
 import { AndroidShellApp, ImageUtils } from 'xdl';

@@ -10,7 +9,6 @@ import getOrCreateCredentials from 'turtle/builders/utils/android/credentials';
 import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdir';
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
-import { resolveNativeModules } from 'turtle/builders/utils/unimodules';
 import { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
 import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
@@ -68,11 +66,6 @@ async function runShellAppBuilder(
  const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
  const workingDir = formatShellAppDirectory({ sdkVersion });

-  logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
-  const enabledModules = semver.satisfies(sdkVersion, '>= 33.0.0')
-    ? await resolveNativeModules(workingDir, manifest.dependencies)
-    : null;
-
  try {
    await AndroidShellApp.createAndroidShellAppAsync({
      url: commonUtils.getExperienceUrl(jobData),
@@ -86,7 +79,6 @@ async function runShellAppBuilder(
      releaseChannel: jobConfig.releaseChannel,
      workingDir,
      outputFile: outputFilePath,
-      modules: enabledModules,
    });
  } catch (err) {
    commonUtils.logErrorOnce(err);
@@ -29,7 +29,7 @@ export default async function buildArchive(ctx: IContext, job: IJob) {
 }

 async function buildAndSignIPA(ctx: IContext, job: IJob, keychainPath: string, manifest: any) {
-  const l = logger.child({ buildPhase: 'building and signing IPA' });
+  const l = logger.withFields({ buildPhase: 'building and signing IPA' });
  l.info('building and signing IPA');

  const {
@@ -4,7 +4,7 @@ import { IJob } from 'turtle/job';
 import logger from 'turtle/logger';

 export default async function buildSimulator(ctx: IContext, job: IJob) {
-  const l = logger.child({ buildPhase: 'running simulator builder' });
+  const l = logger.withFields({ buildPhase: 'running simulator builder' });
  l.info('running simulator build');
  await runShellAppBuilder(ctx, job);
  l.info('build complete');
@@ -12,7 +12,7 @@ import { isOffline } from 'turtle/turtleContext';

 async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredentials> {
  if (!jobData.credentials) {
-    const l = logger.child({ buildPhase: 'generating keystore' });
+    const l = logger.withFields({ buildPhase: 'generating keystore' });
    const credentials: any = {};
    l.info('Creating keystore');
    const keystoreFilename = `/tmp/keystore-${jobData.id}.tmp.jks`;
@@ -9,7 +9,7 @@ interface IKeychain {
 }

 export async function create(ctx: IContext): Promise<IKeychain> {
-  const l = logger.child({ buildPhase: 'creating keychain' });
+  const l = logger.withFields({ buildPhase: 'creating keychain' });
  try {
    l.info('creating keychain...');
    const keychainInfo = await IosKeychain.createKeychain(ctx.appUUID, false);
@@ -22,7 +22,7 @@ export async function create(ctx: IContext): Promise<IKeychain> {
 }

 export async function remove(ctx: IContext, keychainPath: string) {
-  const l = logger.child({ buildPhase: 'deleting keychain' });
+  const l = logger.withFields({ buildPhase: 'deleting keychain' });
  try {
    l.info('delete keychain...');
    const keychainInfo = await IosKeychain.deleteKeychain({
@@ -49,7 +49,7 @@ export async function importCert(
    certPassword,
  }: { keychainPath: string; certP12: string; certPassword: string },
 ) {
-  const l = logger.child({ buildPhase: 'importing certificate into keychain' });
+  const l = logger.withFields({ buildPhase: 'importing certificate into keychain' });
  try {
    l.info('importing distribution certificate into keychain...');
    const { tempCertPath: certPath } = ctx;
@@ -1,167 +0,0 @@
-import fs from 'fs-extra';
-import filter from 'lodash/filter';
-import keys from 'lodash/keys';
-import merge from 'lodash/merge';
-import values from 'lodash/values';
-import path from 'path';
-import logger from 'turtle/logger';
-
-export interface IUnimoduleEntry {
-  name: string;
-  version: string;
-  dirname: string;
-}
-
-interface IPackageInfo {
-  name: string;
-  version: string;
-  dirname: string; // could be different than name
-  dependencies: string[];
-}
-
-export async function resolveNativeModules(workingdir: string, packages?: string[]): Promise<IUnimoduleEntry[]> {
-  const resolver = new Resolver(workingdir);
-  await resolver.init();
-
-  if (!packages) {
-    resolver.addAll();
-  } else {
-    const corePackages = await readCorePackages(workingdir);
-    for (const pkg of corePackages) {
-      if (resolver.isUnimodule(pkg)) {
-        resolver.addModule(pkg);
-      }
-    }
-    for (const pkg of packages) {
-      if (resolver.isUnimodule(pkg)) {
-        resolver.addModule(pkg);
-      }
-    }
-  }
-
-  return resolver.getModules();
-}
-
-async function readCorePackages(workingdir: string) {
-  const pkgJsonPath = path.join(workingdir, 'node_modules', 'react-native-unimodules', 'package.json');
-  if (await fs.pathExists(pkgJsonPath)) {
-    const packageJson = JSON.parse(await fs.readFile(pkgJsonPath, 'utf-8'));
-    return keys(packageJson.dependencies);
-  } else {
-    logger.warn('No core packages detected');
-    return [];
-  }
-}
-
-interface IDependencyInfo {
-  [key: string]: IPackageInfo;
-}
-
-class Resolver {
-  private workingdir: string;
-  private modulesMap: {[key: string]: IUnimoduleEntry};
-  private dependencyMap: IDependencyInfo;
-
-  constructor(workingdir: string) {
-    this.workingdir = workingdir;
-    this.modulesMap = {};
-    this.dependencyMap = {};
-  }
-
-  public async init() {
-    this.dependencyMap = await generateDependenciesInfo(this.workingdir);
-  }
-
-  public isUnimodule(moduleName: string): boolean {
-    return !!this.dependencyMap[moduleName];
-  }
-
-  public addAll() {
-    for (const moduleName of Object.keys(this.dependencyMap)) {
-      this.addModule(moduleName);
-    }
-  }
-
-  public addModule(moduleName: string) {
-    if (this.dependencyMap[moduleName]) {
-      this.resolveModule(moduleName);
-    } else {
-      throw new Error('Attempting to add unknown module');
-    }
-  }
-
-  public getModules(): IUnimoduleEntry[] {
-     return values(this.modulesMap);
-  }
-
-  private async resolveModule(moduleName: string) {
-    if (this.modulesMap[moduleName]) {
-      return;
-    }
-    const pkg = this.dependencyMap[moduleName];
-    logger.info(`Adding ${moduleName}:${pkg.version}`);
-    this.modulesMap[moduleName] = {
-      name: pkg.name,
-      dirname: pkg.dirname,
-      version: pkg.version,
-    };
-    for (const dep of pkg.dependencies) {
-      this.resolveModule(dep);
-    }
-  }
-}
-
-async function generateDependenciesInfo(workingdir: string): Promise<IDependencyInfo> {
-  const dir = await fs.readdir(path.join(workingdir, 'packages'));
-  const map: IDependencyInfo = {};
-
-  // scrap directory for package metadata
-  for (const pkgName of dir) {
-    const pkg = await getPackage(workingdir, pkgName);
-    if (pkg) {
-      map[pkg.name] = pkg;
-    }
-  }
-
-  // handle @unimodules directory
-  const unimodulesDir = await fs.readdir(path.join(workingdir, 'packages', '@unimodules'));
-  for (const pkgName of unimodulesDir) {
-    const pkg = await getPackage(workingdir, path.join('@unimodules', pkgName));
-    if (pkg) {
-      map[pkg.name] = pkg;
-    }
-  }
-
-  // remove non unimodule dependencies
-  for (const pkg of Object.keys(map)) {
-    map[pkg].dependencies = filter(map[pkg].dependencies, (dep) => !!map[dep]);
-  }
-  return map;
-}
-
-async function getPackage(workingdir: string, pkgName: string): Promise<IPackageInfo | null> {
-  const pkgPath = path.join(workingdir, 'packages', pkgName);
-  const isAndroid = await fs.pathExists(path.join(pkgPath, 'android'));
-  const isIos = await fs.pathExists(path.join(pkgPath, 'ios'));
-  const isUnimodule = await fs.pathExists(path.join(pkgPath, 'unimodule.json'));
-  const hasPackageJson = await fs.pathExists(path.join(pkgPath, 'package.json'));
-  if (!isUnimodule || !hasPackageJson || (!isAndroid && !isIos)) {
-    return null;
-  }
-
-  const packageJson = JSON.parse(await fs.readFile(path.join(pkgPath, 'package.json'), 'utf-8'));
-
-  const pkgDeps = merge({}, // reading everything to make sure
-    packageJson.dependencies,
-    packageJson.peerDependencies,
-    packageJson.unimodulePeerDependencies,
-  );
-  const info: IPackageInfo = {
-    name: packageJson.name,
-    version: packageJson.version,
-    dirname: pkgName,
-    dependencies: Object.keys(pkgDeps),
-  };
-
-  return info;
-}
@@ -12,14 +12,14 @@ interface IUploadCtx {

 export async function uploadBuildToS3(ctx: IUploadCtx) {
  if (config.builder.fakeUpload) {
-    const l = logger.child({ buildPhase: 'copying build artifact' });
+    const l = logger.withFields({ buildPhase: 'copying build artifact' });
    const { fakeUploadBuildPath, uploadPath } = ctx;
    l.info('copying build to fake upload directory');
    await fs.copy(uploadPath, fakeUploadBuildPath as string);
    l.info(`copied build to ${fakeUploadBuildPath}`);
    return fakeUploadBuildPath as string;
  } else {
-    const l = logger.child({ buildPhase: 'uploading to S3' });
+    const l = logger.withFields({ buildPhase: 'uploading to S3' });
    l.info('uploading build artifact to S3');
    const { Location: fileLocation } = await uploadFile({
      key: ctx.s3FileKey as string,
@@ -43,7 +43,10 @@ export default {
  },
  logger: {
    level: env('LOGGER_LEVEL', 'info'),
-    intervalMs: envNum('LOGGER_INTERVAL_MS', 5000),
+    interval: envNum('LOGGER_INTERVAL', 5),
+    client: {
+      level: env('CLIENT_LOGGER_LEVEL', 'info'),
+    },
  },
  google: {
    credentials: env('GOOGLE_APPLICATION_CREDENTIALS', ''),
@@ -121,7 +121,7 @@ function failAfterMaxJobTime(priority: string, receiptHandle: string, job: any)

 async function build(job: any) {
  const startTimestamp = Date.now();
-  const s3Url = await logger.initForJob(job);
+  const s3Url = await logger.init(job);
  const calculateBuildDuration = () => Math.ceil((Date.now() - startTimestamp) / 1000);

  try {
@@ -151,7 +151,7 @@ async function build(job: any) {
    });
    return false;
  } finally {
-    await logger.cleanup();
+    await logger.cleanup(job);
  }
 }

@@ -1,75 +1,92 @@
 import bunyan from 'bunyan';
+import bunyanDebugStream from 'bunyan-debug-stream';
+import { SentryStream } from 'bunyan-sentry-stream';
+import { Client as RavenClient } from 'raven';

 import config from 'turtle/config';
+import * as constants from 'turtle/constants/logger';
 import { IJob } from 'turtle/job';
-import streams from 'turtle/logger/streams';
+import S3Stream from 'turtle/logger/s3Stream';
+import { isOffline } from 'turtle/turtleContext';

-interface ILoggerFields {
-  [key: string]: string | number;
+// type error when using import
+// https://github.com/googleapis/nodejs-logging-bunyan/issues/241
+// tslint:disable-next-line:no-var-requires
+const { LoggingBunyan } = require('@google-cloud/logging-bunyan');
+
+interface IStream {
+  stream: any;
+  type?: string;
+  level?: string;
+  reemitErrorEvents?: boolean;
 }

-class Logger {
-  private parentLogger: any;
-  private currentLogger: any;
+export const s3logger = new S3Stream();

-  constructor(parentLogger?: any) {
-    this.parentLogger = parentLogger || bunyan.createLogger({
-      name: 'turtle',
-      level: config.logger.level,
-      platform: config.platform,
-      ...config.deploymentEnv && { environment: config.deploymentEnv },
-      streams: Object.values(streams),
-    });
-    this.currentLogger = this.parentLogger;
-  }
+const streams: IStream[] = [];

-  public async initForJob(job: IJob) {
-    this.currentLogger = this.parentLogger.child({
-      jobID: job.id,
-      experienceName: job.experienceName,
-    });
-    const s3Url = await streams.s3.stream.init(job);
-    return s3Url;
-  }
-
-  public async cleanup() {
-    this.currentLogger = this.parentLogger;
-    await streams.s3.stream.cleanup();
-  }
-
-  public trace(...all: any[]) {
-    this.currentLogger.trace(...all);
-  }
-
-  public debug(...all: any[]) {
-    this.currentLogger.debug(...all);
-  }
-
-  public info(...all: any[]) {
-    this.currentLogger.info(...all);
-  }
-
-  public warn(...all: any[]) {
-    this.currentLogger.warn(...all);
-  }
-
-  public error(...all: any[]) {
-    this.currentLogger.error(...all);
-  }
-
-  public fatal(...all: any[]) {
-    this.currentLogger.fatal(...all);
-  }
-
-  public child(fields: ILoggerFields) {
-    const newLogger = this.currentLogger.child(fields);
-    return new Logger(newLogger);
-  }
-
-  // only for backward compatibility
-  public withFields(fields: ILoggerFields) {
-    return this.child(fields);
-  }
+if (isOffline()) {
+  const prettyStdOut = new bunyanDebugStream({ forceColor: true });
+  streams.push({ stream: prettyStdOut, type: 'raw', level: config.logger.client.level });
+} else {
+  streams.push(
+    { stream: process.stdout },
+    {
+      type: 'raw',
+      stream: s3logger,
+      reemitErrorEvents: true,
+      level: config.logger.client.level,
+    },
+  );
 }

-export default new Logger();
+if (config.sentry.dsn && config.deploymentEnv !== 'development') {
+  const raven = new RavenClient();
+  raven.config(config.sentry.dsn, { environment: config.deploymentEnv });
+  streams.push({
+    level: 'error',
+    type: 'raw', // Mandatory type for SentryStream
+    stream: new SentryStream(raven),
+  });
+}
+
+if (config.google.credentials) {
+  const resource = {
+    type: 'generic_node',
+    labels: {
+      node_id: config.hostname,
+      location: '', // default value
+      namespace: '', // default value
+    },
+  };
+  streams.push(new LoggingBunyan({ name: 'turtle', resource }).stream('info'));
+}
+
+const logger = bunyan.createLogger({
+  name: 'turtle',
+  level: config.logger.level,
+  platform: config.platform,
+  environment: config.deploymentEnv,
+  streams,
+});
+
+logger.withFields = (extraFields: any) => withFields(logger, extraFields);
+
+logger.init = async (job: IJob) => {
+  return await s3logger.init(job);
+};
+
+logger.cleanup = async () => {
+  // a little hacky, but works
+  logger.info({ lastBuildLog: true }, 'this is the last log from this build');
+  await s3logger.waitForLogger();
+};
+
+export default logger;
+
+export function withFields(loggerObj: any, extraFields: any) {
+  return constants.LEVELS.reduce((obj, level) => {
+    obj[level] = (...args: any[]) => loggerObj[level](extraFields, ...args);
+    return obj;
+  }, {} as any);
+}
@@ -0,0 +1,111 @@
+
+import EventEmitter from 'events';
+import path from 'path';
+
+import fs from 'fs-extra';
+import _ from 'lodash';
+
+import { uploadFile } from 'turtle/aws/s3';
+import config from 'turtle/config';
+import * as constants from 'turtle/constants/logger';
+import { IJob } from 'turtle/job';
+
+export default class S3Stream extends EventEmitter {
+  private s3Url: string | null;
+  private lastFlush: number | null;
+  private filePath: string | null;
+  private fileHandle: number | null;
+  private finishedPromise: Promise<any> | null;
+  private finishedPromiseResolveFn: any;
+  private secrets: any;
+
+  constructor() {
+    super();
+    this.s3Url = null;
+    this.lastFlush = null;
+    this.filePath = null;
+    this.fileHandle = null;
+    this.finishedPromise = null;
+    this.finishedPromiseResolveFn = null;
+  }
+
+  public async init(job: IJob) {
+    this.s3Url = `logs/${job.experienceName}/${job.id}`;
+    const dir = config.directories.tempS3LogsDir;
+    const exists = await fs.pathExists(dir);
+    if (!exists) {
+      await fs.mkdir(dir);
+    }
+    this.filePath = path.join(dir, job.id);
+    this.fileHandle = await fs.open(this.filePath, 'w+', 0o660);
+    this.secrets = {};
+    this.finishedPromise = new Promise((resolveFn) => (this.finishedPromiseResolveFn = resolveFn));
+    const res = await this.flush() as any;
+    return res.Location;
+  }
+
+  public async cleanup() {
+    const res = this.finishedPromiseResolveFn;
+    try {
+      await this.flush(true);
+      await fs.close(this.fileHandle as number);
+      this.fileHandle = null;
+      this.lastFlush = null;
+      this.secrets = {};
+    } finally {
+      this.finishedPromise = null;
+      this.finishedPromiseResolveFn = null;
+      res();
+    }
+  }
+
+  public flush(force = false) {
+    if (force || !this.lastFlush) {
+      return this._flush();
+    }
+    const now = Date.now();
+    if (now - this.lastFlush > config.logger.interval) {
+      return this._flush();
+    }
+  }
+
+  public write(recRaw: any) {
+    if (this.fileHandle) {
+      const rec = JSON.stringify({
+        ...recRaw,
+        level: constants.LEVELS_MAPPING[recRaw.level].toLowerCase(),
+      });
+      if (recRaw.lastBuildLog) {
+        return this.cleanup();
+      }
+      const recSanitized = Object.keys(this.secrets).reduce(
+        (acc, secret) => acc.replace(new RegExp(secret, 'g'), this.secrets[secret]),
+        rec,
+      );
+      fs
+        .write(this.fileHandle as number, `${recSanitized}\n`)
+        .then(() => {
+          this.flush();
+        });
+    }
+  }
+
+  public addSecretsToFilter(secrets: any) {
+    const filteredSecrets = secrets.filter((i: any) => i !== undefined && i !== null);
+    const replacements = filteredSecrets.map((i: any) => 'X'.repeat(i.length));
+    const toAdd = _.zipObject(filteredSecrets, replacements);
+    this.secrets = Object.assign({}, this.secrets, toAdd);
+  }
+
+  public waitForLogger() {
+    return this.finishedPromise;
+  }
+
+  private _flush() {
+    this.lastFlush = Date.now();
+    return uploadFile({
+      srcPath: this.filePath as string,
+      key: this.s3Url as string,
+    });
+  }
+}
@@ -1,29 +0,0 @@
-import config from 'turtle/config';
-
-// type error when using import
-// https://github.com/googleapis/nodejs-logging-bunyan/issues/241
-// tslint:disable-next-line:no-var-requires
-const { LoggingBunyan } = require('@google-cloud/logging-bunyan');
-
-export default function create() {
-  if (!config.google.credentials) {
-    return null;
-  }
-
-  const gcloudStream = new LoggingBunyan({
-    name: 'turtle',
-    resource: {
-      type: 'generic_node',
-      labels: {
-        node_id: config.hostname,
-        location: '', // default value
-        namespace: '', // default value
-      },
-    },
-  });
-  return {
-    level: config.logger.level,
-    type: 'raw',
-    stream: gcloudStream,
-  };
-}
@@ -1,38 +0,0 @@
-import pickBy from 'lodash/pickBy';
-
-import createGCloudStream from 'turtle/logger/streams/gcloud';
-import createOfflineStream from 'turtle/logger/streams/offline';
-import createS3Stream from 'turtle/logger/streams/s3';
-import createSentryStream from 'turtle/logger/streams/sentry';
-import { isOffline } from 'turtle/turtleContext';
-
-interface IStream {
-  stream: any;
-  type?: string;
-  level?: string;
-  reemitErrorEvents?: boolean;
-}
-
-interface IStreamMap {
-  [key: string]: IStream;
-}
-
-function prepareStreams(): IStreamMap {
-  if (isOffline()) {
-    return {
-      stdout: createOfflineStream(),
-    };
-  } else {
-    const allStreams = {
-      stdout: { stream: process.stdout },
-      gcloud: createGCloudStream(),
-      s3: createS3Stream(),
-      sentry: createSentryStream(),
-    };
-    return pickBy(allStreams) as IStreamMap;
-  }
-}
-
-const streams = prepareStreams();
-
-export default streams;
@@ -1,11 +0,0 @@
-import bunyanDebugStream from 'bunyan-debug-stream';
-import config from 'turtle/config';
-
-export default function create() {
-  const prettyStdOut = new bunyanDebugStream({ forceColor: true });
-  return {
-    stream: prettyStdOut,
-    type: 'raw',
-    level: config.logger.level,
-  };
-}
@@ -1,106 +0,0 @@
-
-import EventEmitter from 'events';
-import path from 'path';
-
-import fs from 'fs-extra';
-import _ from 'lodash';
-
-import { uploadFile } from 'turtle/aws/s3';
-import config from 'turtle/config';
-import { IJob } from 'turtle/job';
-
-export default function create() {
-  const s3 = new S3Stream();
-  return {
-    type: 'raw',
-    stream: s3,
-    reemitErrorEvents: true,
-    level: config.logger.level,
-  };
-}
-
-class S3Stream extends EventEmitter {
-  private s3Url: string | null = null;
-  private lastFlush: number | null = null;
-  private filePath: string | null = null;
-  private fileHandle: number | null = null;
-  private uploadingPromise: Promise<void> | null = null;
-  private uploadingPromiseResolveFn: any;
-  private waitingOnPromise: boolean = false;
-
-  public async init(job: IJob) {
-    this.s3Url = `logs/${job.experienceName}/${job.id}`;
-    const dir = config.directories.tempS3LogsDir;
-    const exists = await fs.pathExists(dir);
-    if (!exists) {
-      await fs.mkdir(dir);
-    }
-    this.filePath = path.join(dir, job.id);
-    this.fileHandle = await fs.open(this.filePath, 'w+', 0o660);
-    this.lastFlush = null;
-
-    const res = await this.flush() as any;
-    return res.Location;
-  }
-
-  public async cleanup() {
-    await this.flush(true);
-    await fs.close(this.fileHandle as number);
-    this.fileHandle = null;
-    this.waitingOnPromise = false;
-  }
-
-  public flush(force = false) {
-    if (force || !this.lastFlush) {
-      return this.flushInternal();
-    }
-    const now = Date.now();
-    if (now - this.lastFlush > config.logger.intervalMs) {
-      return this.flushInternal();
-    }
-  }
-
-  public write(rec: any) {
-    if (!this.fileHandle) {
-      return;
-    }
-    fs
-      .write(this.fileHandle as number, `${JSON.stringify(rec)}\n`)
-      .then(() => {
-        this.flush();
-      });
-  }
-
-  private flushInternal(): any {
-    this.lastFlush = Date.now();
-    if (!this.uploadingPromise) {
-      this.uploadingPromise = new Promise((res) => {
-        this.uploadingPromiseResolveFn = res;
-      });
-      return this
-        .upload()
-        .then((result) => {
-          setTimeout(() => this.uploadingPromiseResolveFn(), 0);
-          return result;
-        });
-    } else {
-      if (this.waitingOnPromise) {
-        return;
-      }
-      this.waitingOnPromise = true;
-      return this.uploadingPromise
-        .then(() => {
-          this.waitingOnPromise = false;
-          this.uploadingPromise = null;
-          return this.flushInternal();
-        });
-    }
-  }
-
-  private upload() {
-    return uploadFile({
-      srcPath: this.filePath as string,
-      key: this.s3Url as string,
-    });
-  }
-}
@@ -1,18 +0,0 @@
-import { SentryStream } from 'bunyan-sentry-stream';
-import { Client as RavenClient } from 'raven';
-
-import config from 'turtle/config';
-
-export default function create() {
-  if (!config.sentry.dsn || config.deploymentEnv === 'development') {
-    return null;
-  }
-
-  const raven = new RavenClient();
-  raven.config(config.sentry.dsn, { environment: config.deploymentEnv });
-  return {
-    level: 'error',
-    type: 'raw', // Mandatory type for SentryStream
-    stream: new SentryStream(raven),
-  };
-}
@@ -10,7 +10,6 @@ export const HIGH = 'highPriority';

 export const NORMAL_CONFIGURATION = [NORMAL, HIGH];
 export const HIGH_CONFIGURATION = [HIGH, NORMAL];
-export const HIGH_ONLY_CONFIGURATION = [HIGH];

 const REDIS_GET_CONFIG = `
  local i = 0
@@ -20,7 +20,7 @@ const clientToUrl: IClientConfig = {
  [RedisClient.Configuration]: config.redis.configUrl,
 };

-export function connect(timeoutMs: number, type: string): Promise<any> {
+export function connect(timeoutMs: number, type: string) {
  return new Promise((resolve, reject) => {
    const redisClient = new Redis(clientToUrl[type], {
      maxRetriesPerRequest: 2,
@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+# This file was generated by nix-binstubs
+exec nix run -f "$(dirname "$0")/../../nix" nodejs-8_x --command node "$@"
@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+# This file was generated by nix-binstubs
+exec nix run -f "$(dirname "$0")/../../nix" nodejs-8_x --command npm "$@"
@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+# This file was generated by nix-binstubs
+exec nix run -f "$(dirname "$0")/../../nix" nodejs-8_x --command npx "$@"
@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+# This file was generated by nix-binstubs
+exec nix run -f "$(dirname "$0")/../../nix" yarn --command yarn "$@"
@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+# This file was generated by nix-binstubs
+exec nix run -f "$(dirname "$0")/../../nix" yarn --command yarnpkg "$@"
@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-# This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../../nix" nodejs-8_x --command node "$@"
@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-# This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../../nix" nodejs-8_x --command npm "$@"
@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-# This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../../nix" nodejs-8_x --command npx "$@"
@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-# This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../../nix" yarn --command yarn "$@"
@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-# This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../../nix" yarn --command yarnpkg "$@"
@@ -6,20 +6,17 @@
    "sourceMap": true,
    "inlineSources": true,
    "outDir": "./build",
+    "rootDir": "./src",
    "strict": true,
    "noUnusedLocals": true,
    "noUnusedParameters": true,
    "noFallthroughCasesInSwitch": true,
    "esModuleInterop": true,
-    "baseUrl": ".",
+    "baseUrl": "./",
    "paths": {
      "turtle/*": ["src/*"],
    },
-    "allowJs": true,
-    "plugins": [
-      { "transform": "ts-transformer-imports" }
-    ]
+    "allowJs": true
  },
-  "include": ["src"],
  "exclude": ["node_modules", "build", "workingdir"]
 }