Correct name of Azure implementation to match original name. (#1926)

apollographql · Nov 6, 2018 · 6c87cbc · 6c87cbc
1 parent 79fe6bf
commit 6c87cbc
Show file tree

Hide file tree

Showing 14 changed files with 142 additions and 147 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Allow an optional function to resolve the `rootValue`, passing the `DocumentNode` AST to determine the value. [PR #1555](https://github.com/apollographql/apollo-server/pull/1555)
 - Follow-up on the work in [PR #1516](https://github.com/apollographql/apollo-server/pull/1516) to also fix missing insertion cursor/caret when a custom GraphQL configuration is specified which doesn't specify its own `cursorShape` property. [PR #1607](https://github.com/apollographql/apollo-server/pull/1607)
 - Azure functions support [Issue #1752](https://github.com/apollographql/apollo-server/issue/1752) [PR #1753](https://github.com/apollographql/apollo-server/pull/1753)
+- Make Azure Functions support naming consistent with original [npm package](https://www.npmjs.com/package/apollo-server-azure-functions)
 - Allow JSON parsing in `RESTDataSource` of Content Type `application/hal+json`. [PR ##185](https://github.com/apollographql/apollo-server/pull/1853)
 - Add support for a `requestAgent` configuration parameter within the `engine` configuration.  This can be utilized when a proxy is necessary to transmit tracing and metrics data to Apollo Engine.  It accepts either an [`http.Agent`](https://nodejs.org/docs/latest-v8.x/api/http.html#http_class_http_agent) or [`https.Agent`](https://nodejs.org/docs/latest-v8.x/api/https.html#https_class_https_agent) and behaves the same as the `agent` parameter to Node.js' [`http.request`](https://nodejs.org/docs/latest-v8.x/api/http.html#http_http_request_options_callback). [PR #1879](https://github.com/apollographql/apollo-server/pull/1879)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,136 +1,136 @@
 {
-  "name": "apollo-server-monorepo",
-  "private": true,
-  "license": "MIT",
-  "repository": "github:apollographql/apollo-server",
-  "scripts": {
-    "clean": "git clean -dfqX -- ./node_modules **/{dist,node_modules}/",
-    "compile": "tsc --build tsconfig.build.json",
-    "compile:clean": "tsc --build tsconfig.build.json --clean",
-    "watch": "tsc --build tsconfig.build.json --watch",
-    "release": "npm run clean && npm ci && lerna publish --exact",
-    "postinstall": "lerna run prepare && npm run compile",
-    "lint": "prettier-check '**/*.{js,ts}'",
-    "lint-fix": "prettier '**/*.{js,ts}' --write",
-    "test": "jest --verbose",
-    "test:clean": "jest --clearCache",
-    "test:watch": "jest --verbose --watchAll",
-    "testonly": "npm test",
-    "test:ci": "npm run coverage -- --ci --maxWorkers=2  --reporters=default --reporters=jest-junit",
-    "coverage": "npm test -- --coverage",
-    "coverage:upload": "codecov"
-  },
-  "lint-staged": {
-    "*.ts": [
-      "prettier --write",
-      "git add"
-    ],
-    "*.js": [
-      "prettier --write",
-      "git add"
-    ]
-  },
-  "engines": {
-    "node": ">=6"
-  },
-  "dependencies": {
-    "apollo-cache-control": "file:packages/apollo-cache-control",
-    "apollo-datasource": "file:packages/apollo-datasource",
-    "apollo-datasource-rest": "file:packages/apollo-datasource-rest",
-    "apollo-engine-reporting": "file:packages/apollo-engine-reporting",
-    "apollo-engine-reporting-protobuf": "file:packages/apollo-engine-reporting-protobuf",
-    "apollo-server": "file:packages/apollo-server",
-    "apollo-server-azure-function": "file:packages/apollo-server-azure-function",
-    "apollo-server-cache-memcached": "file:packages/apollo-server-cache-memcached",
-    "apollo-server-cache-redis": "file:packages/apollo-server-cache-redis",
-    "apollo-server-caching": "file:packages/apollo-server-caching",
-    "apollo-server-cloudflare": "file:packages/apollo-server-cloudflare",
-    "apollo-server-core": "file:packages/apollo-server-core",
-    "apollo-server-env": "file:packages/apollo-server-env",
-    "apollo-server-errors": "file:packages/apollo-server-errors",
-    "apollo-server-express": "file:packages/apollo-server-express",
-    "apollo-server-hapi": "file:packages/apollo-server-hapi",
-    "apollo-server-integration-testsuite": "file:packages/apollo-server-integration-testsuite",
-    "apollo-server-koa": "file:packages/apollo-server-koa",
-    "apollo-server-lambda": "file:packages/apollo-server-lambda",
-    "apollo-server-micro": "file:packages/apollo-server-micro",
-    "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base",
-    "apollo-server-testing": "file:packages/apollo-server-testing",
-    "apollo-tracing": "file:packages/apollo-tracing",
-    "graphql-extensions": "file:packages/graphql-extensions"
-  },
-  "devDependencies": {
-    "@types/async-retry": "1.2.1",
-    "@types/aws-lambda": "8.10.15",
-    "@types/body-parser": "1.17.0",
-    "@types/connect": "3.4.32",
-    "@types/fibers": "0.0.30",
-    "@types/graphql": "14.0.3",
-    "@types/hapi": "17.6.2",
-    "@types/jest": "23.3.9",
-    "@types/json-stable-stringify": "1.0.32",
-    "@types/koa-multer": "1.0.0",
-    "@types/koa-router": "7.0.33",
-    "@types/lodash": "4.14.118",
-    "@types/lru-cache": "4.1.1",
-    "@types/memcached": "2.2.5",
-    "@types/micro": "7.3.3",
-    "@types/multer": "1.3.7",
-    "@types/node": "10.12.2",
-    "@types/node-fetch": "2.1.2",
-    "@types/redis": "2.8.7",
-    "@types/request": "2.48.1",
-    "@types/request-promise": "4.1.42",
-    "@types/test-listen": "1.1.0",
-    "@types/type-is": "1.6.2",
-    "@types/ws": "6.0.1",
-    "apollo-fetch": "0.7.0",
-    "apollo-link": "1.2.3",
-    "apollo-link-http": "1.5.5",
-    "apollo-link-persisted-queries": "0.2.1",
-    "body-parser": "1.18.3",
-    "codecov": "3.1.0",
-    "connect": "3.6.6",
-    "express": "4.16.4",
-    "fibers": "3.0.0",
-    "form-data": "2.3.3",
-    "graphql": "14.0.2",
-    "graphql-subscriptions": "1.0.0",
-    "graphql-tag": "2.10.0",
-    "graphql-tools": "4.0.3",
-    "hapi": "17.7.0",
-    "husky": "1.1.3",
-    "jest": "23.6.0",
-    "jest-junit": "5.2.0",
-    "jest-matcher-utils": "23.6.0",
-    "js-sha256": "0.9.0",
-    "koa": "2.6.1",
-    "koa-multer": "1.0.2",
-    "lerna": "3.4.3",
-    "lint-staged": "7.2.2",
-    "memcached-mock": "0.1.0",
-    "meteor-promise": "0.8.6",
-    "mock-req": "0.2.0",
-    "multer": "1.4.1",
-    "node-fetch": "2.2.1",
-    "prettier": "1.14.3",
-    "prettier-check": "2.0.0",
-    "qs-middleware": "1.0.3",
-    "redis-mock": "0.37.0",
-    "request": "2.88.0",
-    "request-promise": "4.2.2",
-    "subscriptions-transport-ws": "0.9.15",
-    "supertest": "3.3.0",
-    "test-listen": "1.1.0",
-    "ts-jest": "23.10.4",
-    "tslint": "5.11.0",
-    "typescript": "next",
-    "ws": "6.1.0",
-    "yup": "0.26.5"
-  },
-  "jest": {
-    "projects": [
-      "<rootDir>/packages/*"
-    ]
-  }
+	"name": "apollo-server-monorepo",
+	"private": true,
+	"license": "MIT",
+	"repository": "github:apollographql/apollo-server",
+	"scripts": {
+		"clean": "git clean -dfqX -- ./node_modules **/{dist,node_modules}/",
+		"compile": "tsc --build tsconfig.build.json",
+		"compile:clean": "tsc --build tsconfig.build.json --clean",
+		"watch": "tsc --build tsconfig.build.json --watch",
+		"release": "npm run clean && npm ci && lerna publish --exact",
+		"postinstall": "lerna run prepare && npm run compile",
+		"lint": "prettier-check '**/*.{js,ts}'",
+		"lint-fix": "prettier '**/*.{js,ts}' --write",
+		"test": "jest --verbose",
+		"test:clean": "jest --clearCache",
+		"test:watch": "jest --verbose --watchAll",
+		"testonly": "npm test",
+		"test:ci": "npm run coverage -- --ci --maxWorkers=2  --reporters=default --reporters=jest-junit",
+		"coverage": "npm test -- --coverage",
+		"coverage:upload": "codecov"
+	},
+	"lint-staged": {
+		"*.ts": [
+			"prettier --write",
+			"git add"
+		],
+		"*.js": [
+			"prettier --write",
+			"git add"
+		]
+	},
+	"engines": {
+		"node": ">=6"
+	},
+	"dependencies": {
+		"apollo-cache-control": "file:packages/apollo-cache-control",
+		"apollo-datasource": "file:packages/apollo-datasource",
+		"apollo-datasource-rest": "file:packages/apollo-datasource-rest",
+		"apollo-engine-reporting": "file:packages/apollo-engine-reporting",
+		"apollo-engine-reporting-protobuf": "file:packages/apollo-engine-reporting-protobuf",
+		"apollo-server": "file:packages/apollo-server",
+		"apollo-server-azure-functions": "file:packages/apollo-server-azure-functions",
+		"apollo-server-cache-memcached": "file:packages/apollo-server-cache-memcached",
+		"apollo-server-cache-redis": "file:packages/apollo-server-cache-redis",
+		"apollo-server-caching": "file:packages/apollo-server-caching",
+		"apollo-server-cloudflare": "file:packages/apollo-server-cloudflare",
+		"apollo-server-core": "file:packages/apollo-server-core",
+		"apollo-server-env": "file:packages/apollo-server-env",
+		"apollo-server-errors": "file:packages/apollo-server-errors",
+		"apollo-server-express": "file:packages/apollo-server-express",
+		"apollo-server-hapi": "file:packages/apollo-server-hapi",
+		"apollo-server-integration-testsuite": "file:packages/apollo-server-integration-testsuite",
+		"apollo-server-koa": "file:packages/apollo-server-koa",
+		"apollo-server-lambda": "file:packages/apollo-server-lambda",
+		"apollo-server-micro": "file:packages/apollo-server-micro",
+		"apollo-server-plugin-base": "file:packages/apollo-server-plugin-base",
+		"apollo-server-testing": "file:packages/apollo-server-testing",
+		"apollo-tracing": "file:packages/apollo-tracing",
+		"graphql-extensions": "file:packages/graphql-extensions"
+	},
+	"devDependencies": {
+		"@types/async-retry": "1.2.1",
+		"@types/aws-lambda": "8.10.15",
+		"@types/body-parser": "1.17.0",
+		"@types/connect": "3.4.32",
+		"@types/fibers": "0.0.30",
+		"@types/graphql": "14.0.3",
+		"@types/hapi": "17.6.2",
+		"@types/jest": "23.3.9",
+		"@types/json-stable-stringify": "1.0.32",
+		"@types/koa-multer": "1.0.0",
+		"@types/koa-router": "7.0.33",
+		"@types/lodash": "4.14.118",
+		"@types/lru-cache": "4.1.1",
+		"@types/memcached": "2.2.5",
+		"@types/micro": "7.3.3",
+		"@types/multer": "1.3.7",
+		"@types/node": "10.12.2",
+		"@types/node-fetch": "2.1.2",
+		"@types/redis": "2.8.7",
+		"@types/request": "2.48.1",
+		"@types/request-promise": "4.1.42",
+		"@types/test-listen": "1.1.0",
+		"@types/type-is": "1.6.2",
+		"@types/ws": "6.0.1",
+		"apollo-fetch": "0.7.0",
+		"apollo-link": "1.2.3",
+		"apollo-link-http": "1.5.5",
+		"apollo-link-persisted-queries": "0.2.1",
+		"body-parser": "1.18.3",
+		"codecov": "3.1.0",
+		"connect": "3.6.6",
+		"express": "4.16.4",
+		"fibers": "3.0.0",
+		"form-data": "2.3.3",
+		"graphql": "14.0.2",
+		"graphql-subscriptions": "1.0.0",
+		"graphql-tag": "2.10.0",
+		"graphql-tools": "4.0.3",
+		"hapi": "17.7.0",
+		"husky": "1.1.3",
+		"jest": "23.6.0",
+		"jest-junit": "5.2.0",
+		"jest-matcher-utils": "23.6.0",
+		"js-sha256": "0.9.0",
+		"koa": "2.6.1",
+		"koa-multer": "1.0.2",
+		"lerna": "3.4.3",
+		"lint-staged": "7.2.2",
+		"memcached-mock": "0.1.0",
+		"meteor-promise": "0.8.6",
+		"mock-req": "0.2.0",
+		"multer": "1.4.1",
+		"node-fetch": "2.2.1",
+		"prettier": "1.14.3",
+		"prettier-check": "2.0.0",
+		"qs-middleware": "1.0.3",
+		"redis-mock": "0.37.0",
+		"request": "2.88.0",
+		"request-promise": "4.2.2",
+		"subscriptions-transport-ws": "0.9.15",
+		"supertest": "3.3.0",
+		"test-listen": "1.1.0",
+		"ts-jest": "23.10.4",
+		"tslint": "5.11.0",
+		"typescript": "next",
+		"ws": "6.1.0",
+		"yup": "0.26.5"
+	},
+	"jest": {
+		"projects": [
+			"<rootDir>/packages/*"
+		]
+	}
 }
diff --git a/...s/apollo-server-azure-function/.npmignore → .../apollo-server-azure-functions/.npmignore b/...s/apollo-server-azure-function/.npmignore → .../apollo-server-azure-functions/.npmignore
diff --git a/...es/apollo-server-azure-function/README.md → ...s/apollo-server-azure-functions/README.md b/...es/apollo-server-azure-function/README.md → ...s/apollo-server-azure-functions/README.md
diff --git a/...apollo-server-azure-function/package.json → ...pollo-server-azure-functions/package.json b/...apollo-server-azure-function/package.json → ...pollo-server-azure-functions/package.json
@@ -1,19 +1,13 @@
 {
-	"name": "apollo-server-azure-function",
+	"name": "apollo-server-azure-functions",
 	"version": "2.2.0-alpha.4",
 	"description": "Production-ready Node.js GraphQL server for Azure Functions",
-	"keywords": [
-		"GraphQL",
-		"Apollo",
-		"Server",
-		"Azure",
-		"Javascript"
-	],
+	"keywords": [ "GraphQL", "Apollo", "Server", "Azure", "Javascript" ],
 	"author": "[email protected]",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-azure-function"
+		"url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-azure-functions"
 	},
 	"homepage": "https://github.com/apollographql/apollo-server#readme",
 	"bugs": {

diff --git a/...server-azure-function/src/ApolloServer.ts → ...erver-azure-functions/src/ApolloServer.ts b/...server-azure-function/src/ApolloServer.ts → ...erver-azure-functions/src/ApolloServer.ts
diff --git a/...src/__tests__/azureFunctionApollo.test.ts → ...src/__tests__/azureFunctionApollo.test.ts b/...src/__tests__/azureFunctionApollo.test.ts → ...src/__tests__/azureFunctionApollo.test.ts
diff --git a/...azure-function/src/azureFunctionApollo.ts → ...zure-functions/src/azureFunctionApollo.ts b/...azure-function/src/azureFunctionApollo.ts → ...zure-functions/src/azureFunctionApollo.ts
diff --git a/...er-azure-function/src/azureFunctions.d.ts → ...r-azure-functions/src/azureFunctions.d.ts b/...er-azure-function/src/azureFunctions.d.ts → ...r-azure-functions/src/azureFunctions.d.ts
diff --git a/...apollo-server-azure-function/src/index.ts → ...pollo-server-azure-functions/src/index.ts b/...apollo-server-azure-function/src/index.ts → ...pollo-server-azure-functions/src/index.ts
diff --git a/...pollo-server-azure-function/tsconfig.json → ...ollo-server-azure-functions/tsconfig.json b/...pollo-server-azure-function/tsconfig.json → ...ollo-server-azure-functions/tsconfig.json
diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -10,7 +10,7 @@
     { "path": "./packages/apollo-datasource-rest" },
     { "path": "./packages/apollo-engine-reporting" },
     { "path": "./packages/apollo-server" },
-    { "path": "./packages/apollo-server-azure-function" },
+    { "path": "./packages/apollo-server-azure-functions" },
     { "path": "./packages/apollo-server-cache-memcached" },
     { "path": "./packages/apollo-server-cache-redis" },
     { "path": "./packages/apollo-server-caching" },

diff --git a/tsconfig.test.json b/tsconfig.test.json
@@ -9,7 +9,7 @@
     { "path": "./packages/apollo-datasource-rest/src/__tests__/" },
     { "path": "./packages/apollo-engine-reporting/src/__tests__/" },
     { "path": "./packages/apollo-server/src/__tests__/" },
-    { "path": "./packages/apollo-server-azure-function/src/__tests__/" },
+    { "path": "./packages/apollo-server-azure-functions/src/__tests__/" },
     { "path": "./packages/apollo-server-cache-memcached/src/__tests__/" },
     { "path": "./packages/apollo-server-cache-redis/src/__tests__/" },
     { "path": "./packages/apollo-server-caching/src/__tests__/" },