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.

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

[2.0] Remove Node dependencies for edge environments #1387

Merged
merged 5 commits into from
Sep 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions packages/apollo-server-cloudflare/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
export * from 'graphql-tools';

export { ApolloServer } from './ApolloServer';

export {
GraphQLUpload,
GraphQLOptions,
Expand All @@ -21,3 +17,7 @@ export {
PlaygroundConfig,
PlaygroundRenderPageOptions,
} from 'apollo-server-core';

export { ApolloServer } from './ApolloServer';

export * from 'graphql-tools';
3 changes: 1 addition & 2 deletions packages/apollo-server-core/src/ApolloServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import { GraphQLExtension } from 'graphql-extensions';
import { EngineReportingAgent } from 'apollo-engine-reporting';
import { InMemoryLRUCache } from 'apollo-server-caching';

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

import {
SubscriptionServer,
ExecutionParams,
Expand Down Expand Up @@ -151,6 +149,7 @@ export class ApolloServerBase {

//Add upload resolver
if (this.uploadsConfig) {
const { GraphQLUpload } = require('@apollographql/apollo-upload-server');
if (resolvers && !resolvers.Upload) {
resolvers.Upload = GraphQLUpload;
}
Expand Down
22 changes: 22 additions & 0 deletions packages/apollo-server-core/src/types/apollo-upload-server.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,26 @@ declare module '@apollographql/apollo-upload-server' {
import { GraphQLScalarType } from 'graphql';

export const GraphQLUpload: GraphQLScalarType;

export interface ApolloUploadOptions {
/**
* Max allowed non-file multipart form field size in bytes; enough for your queries (default: 1 MB)
*/
maxFieldSize?: number;
/**
* Max allowed file size in bytes (default: Infinity)
*/
maxFileSize?: number;
/**
* Max allowed number of files (default: Infinity)
*/
maxFiles?: number;
}

export type Request = any;

export function processRequest(
request: Request,
options?: ApolloUploadOptions,
): Promise<any>;
}
1 change: 1 addition & 0 deletions packages/apollo-server-env/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"prepare": "npm run clean && npm run compile"
},
"main": "dist/index.js",
"browser": "dist/index.browser.js",
"types": "dist/index.d.ts",
"engines": {
"node": ">=6"
Expand Down
45 changes: 45 additions & 0 deletions packages/apollo-server-env/src/index.browser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
if (!global) {
global = self;
}

let { fetch, Request, Response, Headers, URL, URLSearchParams } = global;
fetch = fetch.bind(global);
export { fetch, Request, Response, Headers, URL, URLSearchParams };

if (!global.process) {
global.process = {};
}

if (!global.process.env) {
global.process.env = {
// app is a global available on fly.io
NODE_ENV: app ? app.env : 'production',
};
}

if (!global.process.version) {
global.process.version = '';
}

if (!global.process.hrtime) {
// Adapted from https://github.com/kumavis/browser-process-hrtime
global.process.hrtime = function hrtime(previousTimestamp) {
var clocktime = Date.now() * 1e-3;
var seconds = Math.floor(clocktime);
var nanoseconds = Math.floor((clocktime % 1) * 1e9);
if (previousTimestamp) {
seconds = seconds - previousTimestamp[0];
nanoseconds = nanoseconds - previousTimestamp[1];
if (nanoseconds < 0) {
seconds--;
nanoseconds += 1e9;
}
}
return [seconds, nanoseconds];
};
}

if (!global.os) {
// FIXME: Add some sensible values
global.os = {};
}