refactor how types and resolvers are merged

Author: tlivings

.dockerignore

@@ -7,4 +7,5 @@ azure-pipelines.yml
 .eslintrc
 .github
 .nycrc
-.dockerignore
+.dockerignore
+__tests__.js

.npmignore

@@ -2,22 +2,22 @@ version: "3"
 services:
   property_service:
     build: 
-      context: ../../..
-      dockerfile: ./test/examples/federation/property-service/Dockerfile
+      context: ../..
+      dockerfile: ./examples/federation/property-service/Dockerfile
     hostname: property
     ports:
       - "4000"
   reviews_service:
     build: 
-      context: ../../..
-      dockerfile: ./test/examples/federation/reviews-service/Dockerfile
+      context: ../..
+      dockerfile: ./examples/federation/reviews-service/Dockerfile
     hostname: reviews
     ports:
       - "4000"
   gateway:
     build: 
-      context: ../../..
-      dockerfile: ./test/examples/federation/gateway/Dockerfile
+      context: ../..
+      dockerfile: ./examples/federation/gateway/Dockerfile
     ports:
       - "4000:4000"
     links: 

CHANGELOG.md

@@ -2,7 +2,7 @@ FROM node:12.13.0-alpine as stage
 
 WORKDIR /app
 
-COPY ./test/examples/federation/gateway/package.json .
+COPY ./examples/federation/gateway/package.json .
 
 RUN npm set progress=false && npm config set depth 0
 RUN npm install --only=production
@@ -11,6 +11,6 @@ RUN cp -R node_modules prod_node_modules
 FROM stage
 
 COPY --from=stage /app/prod_node_modules ./node_modules
-COPY ./test/examples/federation/gateway .
+COPY ./examples/federation/gateway .
 
 CMD ["node", "index.js"]

test/examples/composition/listing-component/index.js examples/composition/listing-component/index.js

@@ -2,7 +2,7 @@ FROM node:12.13.0-alpine as stage
 
 WORKDIR /app
 
-COPY ./test/examples/federation/reviews-service/package.json .
+COPY ./examples/federation/property-service/package.json .
 
 RUN npm set progress=false && npm config set depth 0
 RUN npm install --only=production
@@ -12,6 +12,6 @@ FROM stage
 
 COPY --from=stage /app/prod_node_modules ./node_modules
 COPY ./lib ./lib
-COPY ./test/examples/federation/reviews-service .
+COPY ./examples/federation/property-service .
 
 CMD ["node", "index.js"]

test/examples/composition/listing-component/mocks.js examples/composition/listing-component/mocks.js

@@ -2,7 +2,7 @@ FROM node:12.13.0-alpine as stage
 
 WORKDIR /app
 
-COPY ./test/examples/federation/property-service/package.json .
+COPY ./examples/federation/reviews-service/package.json .
 
 RUN npm set progress=false && npm config set depth 0
 RUN npm install --only=production
@@ -12,6 +12,6 @@ FROM stage
 
 COPY --from=stage /app/prod_node_modules ./node_modules
 COPY ./lib ./lib
-COPY ./test/examples/federation/property-service .
+COPY ./examples/federation/reviews-service .
 
 CMD ["node", "index.js"]