refactor logger - brings back jobID and experienceName to android logs

.circleci/config.yml

@@ -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 \

CHANGELOG.md

@@ -6,27 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [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).

Dockerfile

@@ -103,15 +103,11 @@ 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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.7.2",
+  "version": "0.6.1",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -130,9 +130,9 @@
     "tar": "^4.4.6",
     "uuid": "^3.2.1",
     "which": "^1.3.1",
-    "xdl": "53.5.4"
+    "xdl": "53.5.3"
   },
   "optionalDependencies": {
-    "@expo/traveling-fastlane-darwin": "1.9.4"
+    "@expo/traveling-fastlane-darwin": "^1.8.1"
   }
 }

scripts/setWorkingdirMode.sh

@@ -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() {

src/bin/setup/ios.ts

@@ -25,13 +25,11 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
       const { stdout } = await ExponentTools.spawnAsyncThrowError(
         'fastlane',
         ['--version'],
-        { stdio: 'pipe', env: { ...process.env, FASTLANE_SKIP_UPDATE_CHECK: '1', LC_ALL: 'en_US.UTF-8' } },
+        { stdio: 'pipe', env: { ...process.env, FASTLANE_SKIP_UPDATE_CHECK: '1' } },
       );
       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}.`,
-        );
+        throw new Error(`Please install newer version of fastlane (>= ${MINIMAL_VERSION})`);
       }
     },
   },

src/builders/android.ts

@@ -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);

src/builders/utils/unimodules.ts

@@ -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;
-}

src/config.ts

@@ -44,6 +44,9 @@ export default {
   logger: {
     level: env('LOGGER_LEVEL', 'info'),
     intervalMs: envNum('LOGGER_INTERVAL_MS', 5000),
+    client: {
+      level: env('CLIENT_LOGGER_LEVEL', 'info'),
+    },
   },
   google: {
     credentials: env('GOOGLE_APPLICATION_CREDENTIALS', ''),

src/logger/streams/gcloud.ts

@@ -22,7 +22,7 @@ export default function create() {
     },
   });
   return {
-    level: config.logger.level,
+    level: 'info',
     type: 'raw',
     stream: gcloudStream,
   };

src/logger/streams/offline.ts

@@ -6,6 +6,6 @@ export default function create() {
   return {
     stream: prettyStdOut,
     type: 'raw',
-    level: config.logger.level,
+    level: config.logger.client.level,
   };
 }

src/logger/streams/s3.ts

@@ -15,7 +15,7 @@ export default function create() {
     type: 'raw',
     stream: s3,
     reemitErrorEvents: true,
-    level: config.logger.level,
+    level: config.logger.client.level,
   };
 }
 

src/scripts/setConfigurations.ts

@@ -5,7 +5,7 @@ import {
   createConfigurationsKey,
   createDefaultConfigurationKey,
   HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
+  NORMAL_CONFIGURATION,
 } from 'turtle/utils/priorities';
 import { connect, RedisClient } from 'turtle/utils/redis';
 
@@ -27,31 +27,31 @@ const TIMEOUT = 3000;
 // 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;

src/utils/priorities.ts

@@ -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

yarn.lock

@@ -161,10 +161,10 @@
     mv "~2"
     safe-json-stringify "~1"
 
-"@expo/config@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@expo/config/-/config-1.0.3.tgz#7e99eae02f103aa9e2c0597ebef9e509a84ceb7d"
-  integrity sha512-eTX0PedX+x9jjYUlc/dO9lwsLt01V7zDiDsS4n02GVY1X+dLGuq7NiZ3nfazJ3EBE45fJn3lGNydOdRGZFC6lQ==
+"@expo/config@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@expo/config/-/config-1.0.2.tgz#1c2c4683895ecc5407f1a3a8868debeee22904bb"
+  integrity sha512-5xp1RLbIxxNw2MwT+zRKdGNMrsPj4OcmBM5T602yQNRc+kmzXAVAHcpVlSk1QfZ5GylTUmGlwcM5X/yhiTBsGw==
   dependencies:
     "@expo/json-file" "^8.1.2"
     fs-extra "^7.0.1"
@@ -304,15 +304,15 @@
     "@types/cross-spawn" "^6.0.0"
     cross-spawn "^6.0.5"
 
-"@expo/traveling-fastlane-darwin@1.9.4":
-  version "1.9.4"
-  resolved "https://registry.yarnpkg.com/@expo/traveling-fastlane-darwin/-/traveling-fastlane-darwin-1.9.4.tgz#29b370a6d6e115e69c4c4ea53003d679779b4592"
-  integrity sha512-bKw/sRPd0gXyzXhrvU9ewhav6FXstQC/g9P9ulf3x0Y2bxNYu7g1zv3hrNJxVbKx0DsFMzXqesV8HD8mU6jwrw==
+"@expo/traveling-fastlane-darwin@^1.8.1":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@expo/traveling-fastlane-darwin/-/traveling-fastlane-darwin-1.8.1.tgz#37c16a253e92d3ef6f543e7271b7239e6edbbb5f"
+  integrity sha512-Nt+579oBMrMEzVn0Esv7c8nIOwoDX/xS6CThoWPRFMVIeQ52aK1mf7wu91/+FCU/fvfUFZ/evERIDWS1lObRxA==
 
-"@expo/webpack-config@^0.5.3":
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/@expo/webpack-config/-/webpack-config-0.5.3.tgz#51b0d376b6404f1eeb61fbe6753868d68dcd6973"
-  integrity sha512-mltsA3jLK4gld7uzjWdzeEVvOQG9fuj1fTFC3zVH/AZrxi8NDWspZOGdtucew20RkqzZTNgLrMiZ+n56n6mGnw==
+"@expo/webpack-config@^0.5.2":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@expo/webpack-config/-/webpack-config-0.5.2.tgz#eafc7ac6ec6581629e40962eafe8d71f7c2eef20"
+  integrity sha512-YcySFO5O++UbBJbP1FNHCQJ+RoIvBkUZ8fVcQ/46mdMSULsZoiNouUG4bJUhFiAdzwbzwIv8psOdp7hhLcCKMQ==
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/polyfill" "^7.2.5"
@@ -13069,19 +13069,19 @@ xdg-basedir@^3.0.0:
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
   integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
 
-[email protected].4:
-  version "53.5.4"
-  resolved "https://registry.yarnpkg.com/xdl/-/xdl-53.5.4.tgz#50e300bb89cd2703f7a458227eba5e4aa3a16863"
-  integrity sha512-1H4xYzm51zQD9KaifOf2ike3DByHGpdIjYM2TRjCBwPbi82mVbeXUiGL+0azYcHCWqE07LnRzMvlcCD9+WhBUg==
+[email protected].3:
+  version "53.5.3"
+  resolved "https://registry.yarnpkg.com/xdl/-/xdl-53.5.3.tgz#2aa96cd67772372d9d4abfc54a026a390b0d631b"
+  integrity sha512-zN4/Urah/VyLBA8bdAlDVgsp2EaxMklVx0TMAU86ftuzmgeUBvvLMd5/wVuiVhlNg8sKsav4T/cWTPgk8ukE/Q==
   dependencies:
     "@expo/bunyan" "3.0.2"
-    "@expo/config" "^1.0.3"
+    "@expo/config" "^1.0.2"
     "@expo/json-file" "^8.1.2"
     "@expo/ngrok" "2.4.3"
     "@expo/osascript" "^1.9.2"
     "@expo/schemer" "^1.2.4"
     "@expo/spawn-async" "1.4.2"
-    "@expo/webpack-config" "^0.5.3"
+    "@expo/webpack-config" "^0.5.2"
     analytics-node "^2.1.0"
     axios v0.19.0-beta.1
     chalk "2.4.1"