Skip to content

Commit 79a3747

Browse files
committed
Make it Hapi 17 compatible
1 parent d77c40e commit 79a3747

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

hapi-plugin-graphiql.js

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var nunjucks = require("nunjucks")
3636
var Package = require("./package.json")
3737

3838
/* the HAPI plugin register function */
39-
var register = function (server, options, next) {
39+
var register = function (server, options) {
4040
/* determine options */
4141
options = Object.assign({}, {
4242
graphiqlSource: "downstream",
@@ -82,16 +82,16 @@ var register = function (server, options, next) {
8282
server.route({
8383
method: "GET",
8484
path: options.graphiqlURL,
85-
handler: function (request, reply) {
86-
reply.redirect(options.graphiqlURL + "/")
85+
handler: function (request, h) {
86+
return h.redirect(options.graphiqlURL + "/")
8787
}
8888
})
8989

9090
/* static delivery of GraphiQL tool */
9191
server.route({
9292
method: "GET",
9393
path: options.graphiqlURL + "/{name*}",
94-
handler: co.wrap(function * (request, reply) {
94+
handler: co.wrap(function * (request, h) {
9595
var name = request.params.name
9696
var files, content
9797
var loadFiles = co.wrap(function * (files) {
@@ -131,7 +131,9 @@ var register = function (server, options, next) {
131131
"graphiql.html"
132132
]
133133
content = yield (loadFiles(files))
134-
return reply(content).type("text/html")
134+
var response = h.response(content)
135+
response.type("text/html")
136+
return response
135137
}
136138
else if (name === "graphiql.js") {
137139
/* deliver JS */
@@ -145,7 +147,9 @@ var register = function (server, options, next) {
145147
"%graphiql.js"
146148
]
147149
content = yield (loadFiles(files))
148-
return reply(content).type("text/javascript")
150+
var response = h.response(content)
151+
response.type("text/javascript")
152+
return response
149153
}
150154
else if (name === "graphiql.css") {
151155
/* deliver CSS */
@@ -154,10 +158,12 @@ var register = function (server, options, next) {
154158
"graphiql.css"
155159
]
156160
content = yield (loadFiles(files))
157-
return reply(content).type("text/css")
161+
var response = h.response(content)
162+
response.type("text/css")
163+
return response
158164
}
159165
else
160-
return reply(Boom.badRequest("invalid path"))
166+
return Boom.badRequest("invalid path")
161167
})
162168
})
163169

@@ -166,19 +172,16 @@ var register = function (server, options, next) {
166172
server.route({
167173
method: "GET",
168174
path: options.documentationURL,
169-
handler: co.wrap(function * (request, reply) {
170-
reply.file(options.documentationFile, { confine: false })
175+
handler: co.wrap(function * (request, h) {
176+
return h.file(options.documentationFile, { confine: false })
171177
})
172178
})
173179
}
174-
175-
/* continue processing */
176-
next()
177180
}
178181

179-
/* provide meta-information as expected by HAPI */
180-
register.attributes = { pkg: Package }
181-
182182
/* export register function, wrapped in a plugin object */
183-
module.exports = { register: register }
184183

184+
exports.plugin = {
185+
pkg: Package,
186+
register,
187+
};

0 commit comments

Comments
 (0)