Skip to content

Fix Vercel #542

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix Vercel #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f1cd3d
use default api path
asilluron Jun 22, 2021
5319be2
Add rewrite as prescribed by vercel guide
asilluron Jun 22, 2021
2aed293
try routes only
asilluron Jun 22, 2021
d0dfc08
add hapi-qs
asilluron Jun 22, 2021
ae97d3c
whoops, wrong verson of hapi-qs
asilluron Jun 22, 2021
a36f709
Merge branch 'master' into feature/vercel-node
mathiasbynens Jun 23, 2021
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
0 config.js → api/config.js
View file
Open in desktop
File renamed without changes.
9 changes: 8 additions & 1 deletion server.js → api/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
var composer = require('./index');
var Glue = require('glue');
var Manifest = require('./manifest');

var composeOptions = {
relativeTo: __dirname
};

const composer = Glue.compose.bind(Glue, Manifest.get('/'), composeOptions);

composer(function (err, server) {
if (err) {
Expand Down
58 changes: 29 additions & 29 deletions manifest.js → api/manifest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ var manifest = {
hbs: 'handlebars'
},
relativeTo: __dirname,
path: './server/web',
path: '../server/web',
layout: true,
helpersPath: 'templates/helpers',
partialsPath: 'templates/partials',
Expand Down Expand Up @@ -109,7 +109,7 @@ var manifest = {
{ plugin: 'hapi-auth-cookie' },
{
plugin: {
register: './server/web/auth/strategies',
register: '../server/web/auth/strategies',
options: {
session: {
password: config.get('/auth/session/pass'),
Expand All @@ -128,7 +128,7 @@ var manifest = {
},
{
plugin: {
register: './server/lib/db',
register: '../server/lib/db',
options: {
host: config.get('/mysql/host'),
port: config.get('/mysql/port'),
Expand All @@ -141,7 +141,7 @@ var manifest = {
},
{
plugin: {
register: './server/repositories/browserscope',
register: '../server/repositories/browserscope',
options: {
api_key: config.get('/browserscope'),
scheme: config.get('/scheme'),
Expand All @@ -151,7 +151,7 @@ var manifest = {
},
{
plugin: {
register: './server/lib/cache',
register: '../server/lib/cache',
options: {
host: config.get('/cache/host'),
port: config.get('/cache/port'),
Expand All @@ -160,30 +160,30 @@ var manifest = {
}
}
},
{ plugin: './server/repositories/comments' },
{ plugin: './server/repositories/pages' },
{ plugin: './server/repositories/tests' },
{ plugin: './server/services/comments' },
{ plugin: './server/services/pages' },
{ plugin: './server/api/json' },
{ plugin: './server/web/auth/github' },
{ plugin: './server/web/browse' },
{ plugin: './server/web/comment' },
{ plugin: './server/web/contributors' },
{ plugin: './server/web/errors' },
{ plugin: './server/web/faq' },
{ plugin: './server/web/health' },
{ plugin: './server/web/home' },
{ plugin: './server/web/popular' },
{ plugin: './server/web/public' },
{ plugin: './server/web/redirects' },
{ plugin: './server/web/search' },
{ plugin: './server/web/sitemap/xml' },
{ plugin: './server/web/sponsor' },
{ plugin: './server/web/test' },
{ plugin: './server/web/testimonials' },
{ plugin: './server/web/edit' },
{ plugin: './server/web/delete' }
{ plugin: '../server/repositories/comments' },
{ plugin: '../server/repositories/pages' },
{ plugin: '../server/repositories/tests' },
{ plugin: '../server/services/comments' },
{ plugin: '../server/services/pages' },
{ plugin: '../server/api/json' },
{ plugin: '../server/web/auth/github' },
{ plugin: '../server/web/browse' },
{ plugin: '../server/web/comment' },
{ plugin: '../server/web/contributors' },
{ plugin: '../server/web/errors' },
{ plugin: '../server/web/faq' },
{ plugin: '../server/web/health' },
{ plugin: '../server/web/home' },
{ plugin: '../server/web/popular' },
{ plugin: '../server/web/public' },
{ plugin: '../server/web/redirects' },
{ plugin: '../server/web/search' },
{ plugin: '../server/web/sitemap/xml' },
{ plugin: '../server/web/sponsor' },
{ plugin: '../server/web/test' },
{ plugin: '../server/web/testimonials' },
{ plugin: '../server/web/edit' },
{ plugin: '../server/web/delete' }
]
};

Expand Down
8 changes: 0 additions & 8 deletions index.js
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"scripts": {
"build": "gulp",
"lint": "lab -d -L",
"start": "node server.js",
"start": "node ./api/index.js",
"test": "lab -I __core-js_shared__,__grim__ -t 100 -c -L -r lcov -o lcov.info -r console -o stdout -r html -o coverage.html test/unit",
"test-e2e": "lab -L -m 30000 -M 10000 test/e2e",
"watch": "nodemon -e js,hbs server.js"
"watch": "nodemon -e js,hbs ./api/index.js"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -48,7 +48,7 @@
"handlebars": "^4.0.12",
"hapi": "^16.6.2",
"hapi-auth-cookie": "7.0.0",
"hapi-qs": "^1.1.2",
"hapi-qs": "1.1.3",
"highlight.js": "^9.8.0",
"hoek": "^5.0.4",
"inert": "^4.2.1",
Expand Down
4 changes: 2 additions & 2 deletions vercel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"public": true,
"builds": [
{
"src": "./server.js",
"src": "api/index.js",
"use": "@vercel/node"
}
],
"routes": [
{
"src": "/(.*)",
"dest": "server.js"
"dest": "api/index.js"
}
],
"alias": ["jsperf.com"],
Expand Down