diff --git a/README.md b/README.md index 901902965..b371f6a4b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ However, if you want to use a pre-compiled file, you can fetch it from [npmcdn]( ### Using Parse on Different Platforms -The JavaScript ecosystem is wide and incorporates a large number of platforms and execution environments. To handle this, the Parse npm module contains special versions of the SDK tailored to use in Node.js and [React Native](https://facebook.github.io/react-native/) environments. Not all features make sense in all environments, so using the appropriate package will ensure that items like local storage, user sessions, and HTTP requests use appropriate dependencies. +The JavaScript ecosystem is wide and incorporates a large number of platforms and execution environments. To handle this, the Parse npm module contains special versions of the SDK tailored to use in Node.js and [React Native](https://facebook.github.io/react-native/) environments. Not all features make sense in all environments, so using the appropriate package will ensure that items like local storage, user sessions, and HTTP requests use appropriate dependencies. For server side rendered applications, you may set the `SERVER_RENDERING` variable to prevent warnings at runtime. To use the npm modules for a browser based application, include it as you normally would: @@ -41,7 +41,7 @@ Copyright (c) 2015-present, Parse, LLC. All rights reserved. This source code is licensed under the BSD-style license found in the -LICENSE file in the root directory of this source tree. An additional grant +LICENSE file in the root directory of this source tree. An additional grant of patent rights can be found in the PATENTS file in the same directory. ``` diff --git a/src/Parse.js b/src/Parse.js index df2e2d357..fc22006a6 100644 --- a/src/Parse.js +++ b/src/Parse.js @@ -30,7 +30,7 @@ var Parse = { * @static */ initialize(applicationId: string, javaScriptKey: string) { - if (process.env.PARSE_BUILD === 'browser' && CoreManager.get('IS_NODE')) { + if (process.env.PARSE_BUILD === 'browser' && CoreManager.get('IS_NODE') && !process.env.SERVER_RENDERING) { console.log( 'It looks like you\'re using the browser version of the SDK in a ' + 'node.js environment. You should require(\'parse/node\') instead.'