From 834cb1190e7b173f5157e8eeb628bd5f876de084 Mon Sep 17 00:00:00 2001
From: Lesha Koss <regiusprod@gmail.com>
Date: Fri, 27 Oct 2017 18:38:23 +0600
Subject: [PATCH] Use proxy

---
 bin/tessereact-ci.js    | 11 ++++++++---
 bin/tessereact-start.js | 13 +++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/bin/tessereact-ci.js b/bin/tessereact-ci.js
index 0e4cff8..8823eab 100644
--- a/bin/tessereact-ci.js
+++ b/bin/tessereact-ci.js
@@ -71,10 +71,16 @@ choosePorts(HOST, DEFAULT_PORT)
     }
     const protocol = process.env.HTTPS === 'true' ? 'https' : 'http'
     const urls = prepareUrls(protocol, HOST, webpackPort)
+    const tessereactServerUrls = prepareUrls(protocol, HOST, serverPort)
     // Create a webpack compiler
     const compiler = createCompiler(webpack, config, false)
     // Load proxy config
-    const proxySetting = require(paths.appPackageJson).proxy
+    const proxySetting = {
+      '/api': {
+        target: tessereactServerUrls.localUrlForBrowser,
+        secure: false
+      }
+    }
     const proxyConfig = prepareProxy(proxySetting, paths.appPublic)
     // Serve webpack assets generated by the compiler over a web sever.
     const serverConfig = createDevServerConfig(
@@ -90,7 +96,6 @@ choosePorts(HOST, DEFAULT_PORT)
       console.log(chalk.cyan('Starting Tessereact...\n'))
 
       const appName = require(paths.appPackageJson).name
-      const tessereactServerUrls = prepareUrls(protocol, HOST, serverPort)
 
       // Configure webpack compiler with custom messages
       printInstructionsWhenReady(compiler, appName, tessereactServerUrls, false)
@@ -98,7 +103,7 @@ choosePorts(HOST, DEFAULT_PORT)
       const tessereactConfig = Object.assign({}, {
         port: serverPort,
         snapshotsPath: 'snapshots',
-        entryURL: url.resolve(urls.localUrlForBrowser, 'static/js/tessereact.js')
+        appURL: urls.localUrlForBrowser
       }, userConfig)
 
       tessereactServer(process.cwd(), tessereactConfig)
diff --git a/bin/tessereact-start.js b/bin/tessereact-start.js
index c613d6c..55a7cea 100644
--- a/bin/tessereact-start.js
+++ b/bin/tessereact-start.js
@@ -73,10 +73,16 @@ choosePorts(HOST, DEFAULT_PORT)
     }
     const protocol = process.env.HTTPS === 'true' ? 'https' : 'http'
     const urls = prepareUrls(protocol, HOST, webpackPort)
+    const tessereactServerUrls = prepareUrls(protocol, HOST, serverPort)
     // Create a webpack compiler
     const compiler = createCompiler(webpack, config, isInteractive)
     // Load proxy config
-    const proxySetting = require(paths.appPackageJson).proxy
+    const proxySetting = {
+      '/api': {
+        target: tessereactServerUrls.localUrlForBrowser,
+        secure: false
+      }
+    }
     const proxyConfig = prepareProxy(proxySetting, paths.appPublic)
     // Serve webpack assets generated by the compiler over a web sever.
     const serverConfig = createDevServerConfig(
@@ -95,7 +101,6 @@ choosePorts(HOST, DEFAULT_PORT)
       console.log(chalk.cyan('Starting Tessereact...\n'))
 
       const appName = require(paths.appPackageJson).name
-      const tessereactServerUrls = prepareUrls(protocol, HOST, serverPort)
 
       // Configure webpack compiler with custom messages
       printInstructionsWhenReady(compiler, appName, tessereactServerUrls, isInteractive)
@@ -103,11 +108,11 @@ choosePorts(HOST, DEFAULT_PORT)
       const tessereactConfig = Object.assign({}, {
         port: serverPort,
         snapshotsPath: 'snapshots',
-        entryURL: url.resolve(urls.localUrlForBrowser, 'static/js/tessereact.js')
+        appURL: urls.localUrlForBrowser
       }, userConfig)
 
       tessereactServer(process.cwd(), tessereactConfig, () => {
-        openBrowser(`http://localhost:${serverPort}`)
+        openBrowser(`http://localhost:${webpackPort}`)
       })
     })