Merge branch 'master' into application-mode-session

Author: ahmedetefy

packages/nextjs/src/index.client.ts

@@ -9,6 +9,7 @@ export * from '@sentry/react';
 export function init(options: NextjsOptions): void {
   const metadataBuilder = new MetadataBuilder(options, ['nextjs', 'react']);
   metadataBuilder.addSdkMetadata();
+  options.environment = options.environment || process.env.NODE_ENV;
   reactInit(options);
   configureScope(scope => {
     scope.setTag('runtime', 'browser');

packages/nextjs/src/index.server.ts

@@ -15,6 +15,7 @@ export { ErrorBoundary, withErrorBoundary } from '@sentry/react';
 export function init(options: NextjsOptions): void {
   const metadataBuilder = new MetadataBuilder(options, ['nextjs', 'node']);
   metadataBuilder.addSdkMetadata();
+  options.environment = options.environment || process.env.NODE_ENV;
   if (options.integrations) {
     options.integrations = getFinalServerIntegrations(options.integrations);
   } else {