Browse Source

Revert "fix(dev): Pass host arg from devserver command to dev webpack server" (#18410)

* Revert "fix(dev): Pass host arg from devserver command to dev webpack server (#18309)"

Co-authored-by: Michal Kuffa <michal.kuffa@sentry.io>
Michal Kuffa 4 years ago
parent
commit
19c4070672
2 changed files with 1 additions and 10 deletions
  1. 0 4
      src/sentry/runner/commands/devserver.py
  2. 1 6
      webpack.config.js

+ 0 - 4
src/sentry/runner/commands/devserver.py

@@ -161,13 +161,9 @@ def devserver(
         uwsgi_overrides["protocol"] = "http"
 
         os.environ["FORCE_WEBPACK_DEV_SERVER"] = "1"
-
         os.environ["SENTRY_WEBPACK_PROXY_PORT"] = "%s" % proxy_port
         os.environ["SENTRY_BACKEND_PORT"] = "%s" % port
 
-        os.environ["SENTRY_BACKEND_HOST"] = host
-        os.environ["SENTRY_WEBPACK_PROXY_HOST"] = host
-
         # webpack and/or typescript is causing memory issues
         os.environ["NODE_OPTIONS"] = (
             (os.environ.get("NODE_OPTIONS", "") + " --max-old-space-size=4096")

+ 1 - 6
webpack.config.js

@@ -38,10 +38,6 @@ const WEBPACK_MODE = IS_PRODUCTION ? 'production' : 'development';
 // Ports used by webpack dev server to proxy to backend and webpack
 const SENTRY_BACKEND_PORT = env.SENTRY_BACKEND_PORT;
 const SENTRY_WEBPACK_PROXY_PORT = env.SENTRY_WEBPACK_PROXY_PORT;
-// Host to bind the webpack dev server to and host location of backend
-const SENTRY_BACKEND_HOST = env.SENTRY_BACKEND_HOST;
-const SENTRY_WEBPACK_PROXY_HOST = env.SENTRY_WEBPACK_PROXY_HOST;
-
 // Used by sentry devserver runner to force using webpack-dev-server
 const FORCE_WEBPACK_DEV_SERVER = !!env.FORCE_WEBPACK_DEV_SERVER;
 const HAS_WEBPACK_DEV_SERVER_CONFIG = SENTRY_BACKEND_PORT && SENTRY_WEBPACK_PROXY_PORT;
@@ -411,7 +407,7 @@ if (!IS_PRODUCTION) {
 
 // Dev only! Hot module reloading
 if (FORCE_WEBPACK_DEV_SERVER || (HAS_WEBPACK_DEV_SERVER_CONFIG && !NO_DEV_SERVER)) {
-  const backendAddress = `http://${SENTRY_BACKEND_HOST}:${SENTRY_BACKEND_PORT}/`;
+  const backendAddress = `http://localhost:${SENTRY_BACKEND_PORT}/`;
 
   if (SHOULD_HOT_MODULE_RELOAD) {
     // Hot reload react components on save
@@ -432,7 +428,6 @@ if (FORCE_WEBPACK_DEV_SERVER || (HAS_WEBPACK_DEV_SERVER_CONFIG && !NO_DEV_SERVER
     hot: true,
     // If below is false, will reload on errors
     hotOnly: true,
-    host: SENTRY_WEBPACK_PROXY_HOST,
     port: SENTRY_WEBPACK_PROXY_PORT,
     stats: 'errors-only',
     overlay: false,