Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to a fork of apollo-upload-server to fix missing core-js dependency. #1556

Merged
merged 3 commits into from
Aug 20, 2018
Merged

Switch to a fork of apollo-upload-server to fix missing core-js dependency. #1556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a91936
Switch to a fork of `apollo-upload-server` to fix missing `core-js` d…
abernix Aug 20, 2018
9e8312c
[squash] Update to `@apollographql/[email protected]`.
abernix Aug 20, 2018
5a73d87
[squash] Update to `@apollographql/[email protected]`.
abernix Aug 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 69 additions & 17 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/apollo-server-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"apollo-server-env": "file:../apollo-server-env",
"apollo-server-errors": "file:../apollo-server-errors",
"apollo-tracing": "file:../apollo-tracing",
"apollo-upload-server": "^5.0.0",
"@apollographql/apollo-upload-server": "^5.0.3",
"graphql-extensions": "file:../graphql-extensions",
"graphql-subscriptions": "^0.5.8",
"graphql-tag": "^2.9.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-core/src/ApolloServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { GraphQLExtension } from 'graphql-extensions';
import { EngineReportingAgent } from 'apollo-engine-reporting';
import { InMemoryLRUCache } from 'apollo-server-caching';

import { GraphQLUpload } from 'apollo-upload-server';
import { GraphQLUpload } from '@apollographql/apollo-upload-server';

import {
SubscriptionServer,
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-core/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ export const gql: (
) => DocumentNode = gqlTag;

import { GraphQLScalarType } from 'graphql';
import { GraphQLUpload as UploadScalar } from 'apollo-upload-server';
import { GraphQLUpload as UploadScalar } from '@apollographql/apollo-upload-server';
export const GraphQLUpload = UploadScalar as GraphQLScalarType;
2 changes: 1 addition & 1 deletion packages/apollo-server-core/src/types/apollo-upload-server.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
declare module 'apollo-upload-server' {
declare module '@apollographql/apollo-upload-server' {
import { GraphQLScalarType } from 'graphql';

export const GraphQLUpload: GraphQLScalarType;
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@types/express": "4.16.0",
"accepts": "^1.3.5",
"apollo-server-core": "file:../apollo-server-core",
"apollo-upload-server": "^5.0.0",
"@apollographql/apollo-upload-server": "^5.0.3",
"body-parser": "^1.18.3",
"cors": "^2.8.4",
"graphql-subscriptions": "^0.5.8",
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-express/src/ApolloServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import * as typeis from 'type-is';

import { graphqlExpress } from './expressApollo';

import { processRequest as processFileUploads } from 'apollo-upload-server';
import { processRequest as processFileUploads } from '@apollographql/apollo-upload-server';

export { GraphQLOptions, GraphQLExtension } from 'apollo-server-core';

Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-hapi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@apollographql/graphql-playground-html": "^1.6.0",
"accept": "^3.0.2",
"apollo-server-core": "file:../apollo-server-core",
"apollo-upload-server": "^5.0.0",
"@apollographql/apollo-upload-server": "^5.0.3",
"boom": "^7.1.0",
"graphql-subscriptions": "^0.5.8",
"graphql-tools": "^3.0.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-hapi/src/ApolloServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
renderPlaygroundPage,
RenderPageOptions as PlaygroundRenderPageOptions,
} from '@apollographql/graphql-playground-html';
import { processRequest as processFileUploads } from 'apollo-upload-server';
import { processRequest as processFileUploads } from '@apollographql/apollo-upload-server';

import { graphqlHapi } from './hapiApollo';

Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-koa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@types/koa__cors": "^2.2.1",
"accepts": "^1.3.5",
"apollo-server-core": "file:../apollo-server-core",
"apollo-upload-server": "^5.0.0",
"@apollographql/apollo-upload-server": "^5.0.3",
"graphql-subscriptions": "^0.5.8",
"graphql-tools": "^3.0.4",
"koa": "2.5.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-koa/src/ApolloServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import * as typeis from 'type-is';

import { graphqlKoa } from './koaApollo';

import { processRequest as processFileUploads } from 'apollo-upload-server';
import { processRequest as processFileUploads } from '@apollographql/apollo-upload-server';

export { GraphQLOptions, GraphQLExtension } from 'apollo-server-core';
import { GraphQLOptions, FileUploadOptions } from 'apollo-server-core';
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-micro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@apollographql/graphql-playground-html": "^1.6.0",
"accept": "^3.0.2",
"apollo-server-core": "file:../apollo-server-core",
"apollo-upload-server": "^5.0.0",
"@apollographql/apollo-upload-server": "^5.0.3",
"micro": "^9.3.2"
}
}
2 changes: 1 addition & 1 deletion packages/apollo-server-micro/src/ApolloServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ApolloServerBase, GraphQLOptions } from 'apollo-server-core';
import { processRequest as processFileUploads } from 'apollo-upload-server';
import { processRequest as processFileUploads } from '@apollographql/apollo-upload-server';
import { ServerResponse } from 'http';
import { send } from 'micro';
import { renderPlaygroundPage } from '@apollographql/graphql-playground-html';
Expand Down