From d2b38f6e5d6651e1afac7a749b568035c187d8a5 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 19 Apr 2016 18:52:51 -0400 Subject: [PATCH] Safely require babel-polyfill (https://github.com/shakacode/bootstrap-loader/pull/29/files) --- src/ParseServer.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ParseServer.js b/src/ParseServer.js index e835a25146..6db13cffbe 100644 --- a/src/ParseServer.js +++ b/src/ParseServer.js @@ -1,7 +1,5 @@ // ParseServer - open-source compatible API Server for Parse apps -import 'babel-polyfill'; - var batch = require('./batch'), bodyParser = require('body-parser'), DatabaseAdapter = require('./DatabaseAdapter'), @@ -11,6 +9,10 @@ var batch = require('./batch'), Parse = require('parse/node').Parse, path = require('path'), authDataManager = require('./authDataManager'); + +if (!global._babelPolyfill) { + require('babel-polyfill'); +} import { logger, configureLogger } from './logger';