Merge branch 'master' into jwks_validation_error_control

This commit is contained in:
Hossein Shafagh 2019-05-08 07:29:37 -07:00 committed by GitHub
commit 1de85dbcf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions

View File

@ -6,9 +6,9 @@ var browserSync = require('browser-sync');
var httpProxy = require('http-proxy'); var httpProxy = require('http-proxy');
/* This configuration allow you to configure browser sync to proxy your backend */ /* This configuration allow you to configure browser sync to proxy your backend */
/*
var proxyTarget = 'http://localhost/context/'; // The location of your backend var proxyTarget = 'http://localhost:8000/'; // The location of your backend
var proxyApiPrefix = 'api'; // The element in the URL which differentiate between API request and static file request var proxyApiPrefix = '/api/'; // The element in the URL which differentiate between API request and static file request
var proxy = httpProxy.createProxyServer({ var proxy = httpProxy.createProxyServer({
target: proxyTarget target: proxyTarget
}); });
@ -19,7 +19,6 @@ var httpProxy = require('http-proxy');
next(); next();
} }
} }
*/
function browserSyncInit(baseDir, files, browser) { function browserSyncInit(baseDir, files, browser) {
browser = browser === undefined ? 'default' : browser; browser = browser === undefined ? 'default' : browser;
@ -27,6 +26,7 @@ function browserSyncInit(baseDir, files, browser) {
browserSync.instance = browserSync.init(files, { browserSync.instance = browserSync.init(files, {
startPath: '/index.html', startPath: '/index.html',
server: { server: {
middleware: [proxyMiddleware],
baseDir: baseDir, baseDir: baseDir,
routes: { routes: {
'/bower_components': './bower_components' '/bower_components': './bower_components'