Revert "refactor(dirs) move shared code into consistent location"

This reverts commit 5b0d3bb.

create-react-app does not compile symlinked files:

facebook/create-react-app#3547

.codeclimate.yml

@@ -1,4 +1,4 @@
 ## other configuration excluded from example...
 exclude_patterns:
-- "functions/shared/service/api/"
+- "functions/service/api/"
 - "src/shared/service/api/"

functions/cli/load.ts

@@ -2,7 +2,7 @@
 import * as admin from 'firebase-admin';
 import jBinary = require('jbinary');
 
-import { Physique, Player, PlayerAbilities, PlayerMotion } from '../shared/service/api';
+import { Physique, Player, PlayerAbilities, PlayerMotion } from '../service/api';
 import { EditFile, Player as PlayerBinary } from '../typesets/edit-file';
 
 const serviceAccount = require(`${__dirname}/../../../config/service-account.json`);
@@ -12,9 +12,9 @@ const serviceAccount = require(`${__dirname}/../../../config/service-account.jso
  */
 export async function load(
   fileName: string,
-  limit = 100,
-  offset = 0,
-  batchSize = 500
+  limit: number = 100,
+  offset: number = 0,
+  batchSize: number = 500
 ) {
   if (batchSize > 500) {
     throw new Error('batch size cannot be > 500');

functions/index.ts

@@ -74,6 +74,7 @@ exports.search = functions.https.onRequest(async (req, res) => {
       const client = createClient(functions.config().es);
       const response = await search(client, query);
       console.log('[search] search complete', response);
+      console.log('updated with cors');
       return res.set(CORS_HEADERS).send(response);
     } catch (e) {
       console.warn('[search] search failed with', e);
@@ -102,6 +103,7 @@ exports.suggest = functions.https.onRequest(async (req, res) => {
       const client = createClient(functions.config().es);
       const response = await suggest(client, query);
       console.log('[suggest] suggest complete', response);
+      console.log('updated with cors');
       return res.set(CORS_HEADERS).send(response);
     } catch (e) {
       console.warn('[suggest] suggest failed with', e);

functions/package.json

@@ -14,9 +14,9 @@
     "test": "jest",
     "watch": "tsc --watch -p ./",
     "protos":
-      "pbjs -w commonjs -t static-module -o shared/service/api/index.js shared/service/api.proto shared/service/common.proto shared/service/player.proto",
+      "pbjs -w commonjs -t static-module -o service/api/index.js service/api.proto service/common.proto service/player.proto",
     "api":
-      "yarn run protos; pbts -o shared/service/api/index.d.ts shared/service/api/index.js",
+      "yarn run protos; pbts -o service/api/index.d.ts service/api/index.js",
     "deploy": "yarn build && firebase deploy --only functions",
     "cli": "yarn build && node build/cli/index.js"
   },

functions/search.test.ts

@@ -1,7 +1,7 @@
 import { Client } from 'elasticsearch';
 
 import * as search from './search';
-import { Country, Player } from './shared/service/api';
+import { Country, Player } from './service/api';
 
 describe('search', () => {
   // tslint:disable-next-line:variable-name

functions/search.ts

@@ -2,7 +2,7 @@ import * as AWS from 'aws-sdk';
 import * as elasticsearch from 'elasticsearch';
 import * as HttpAmazonESConnector from 'http-aws-es';
 
-import { Player } from './shared/service/api';
+import { Player } from './service/api';
 
 export interface ClientConfig {
   access_key_id?: string;

functions/typesets/edit-file-test.ts

@@ -1,6 +1,6 @@
 import jBinary = require('jbinary');
 
-import { Foot, PlayingStyle, Position, Skill } from '../shared/service/api';
+import { Foot, PlayingStyle, Position, Skill } from '../service/api';
 import { EditFile, Player } from './edit-file';
 
 const attrs64File = `${__dirname}/../test/player-attrs-64.bin`;

src/containers/Search/index.tsx

@@ -5,11 +5,11 @@ import { Helmet } from 'react-helmet';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 
+import { Player } from '../../../functions/service/api';
 import * as search from '../../actions/search';
 import { Loading } from '../../components/Loading';
 import { PlayerTable } from '../../components/PlayerTable';
 import * as fromRoot from '../../reducers';
-import { Player } from '../../shared/service/api';
 
 interface QueryParams {
   query?: string;

src/shared/service

@@ -0,0 +1 @@
+../../functions/service