From 553bcecfc55ef98113046b3467867c6f961d6f7f Mon Sep 17 00:00:00 2001 From: Lesha Koss Date: Wed, 25 Oct 2017 12:30:49 +0600 Subject: [PATCH 1/2] Add staticURL config option --- bin/tessereact-ci.js | 3 ++- bin/tessereact-start.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/tessereact-ci.js b/bin/tessereact-ci.js index 0e4cff8..355fa23 100644 --- a/bin/tessereact-ci.js +++ b/bin/tessereact-ci.js @@ -98,7 +98,8 @@ choosePorts(HOST, DEFAULT_PORT) const tessereactConfig = Object.assign({}, { port: serverPort, snapshotsPath: 'snapshots', - entryURL: url.resolve(urls.localUrlForBrowser, 'static/js/tessereact.js') + entryURL: url.resolve(urls.localUrlForBrowser, 'static/js/tessereact.js'), + staticURL: urls.localUrlForBrowser }, userConfig) tessereactServer(process.cwd(), tessereactConfig) diff --git a/bin/tessereact-start.js b/bin/tessereact-start.js index c613d6c..bf6cf2c 100644 --- a/bin/tessereact-start.js +++ b/bin/tessereact-start.js @@ -103,7 +103,8 @@ choosePorts(HOST, DEFAULT_PORT) const tessereactConfig = Object.assign({}, { port: serverPort, snapshotsPath: 'snapshots', - entryURL: url.resolve(urls.localUrlForBrowser, 'static/js/tessereact.js') + entryURL: url.resolve(urls.localUrlForBrowser, 'static/js/tessereact.js'), + staticURL: urls.localUrlForBrowser }, userConfig) tessereactServer(process.cwd(), tessereactConfig, () => { From 57465283dd17b968fccec26ff9e380acdf9e7ab3 Mon Sep 17 00:00:00 2001 From: Lesha Koss Date: Wed, 25 Oct 2017 12:47:58 +0600 Subject: [PATCH 2/2] Allow CORS for webpack-dev-server --- bin/tessereact-ci.js | 16 +++++++++++++--- bin/tessereact-start.js | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/bin/tessereact-ci.js b/bin/tessereact-ci.js index 355fa23..0d89e21 100644 --- a/bin/tessereact-ci.js +++ b/bin/tessereact-ci.js @@ -76,11 +76,21 @@ choosePorts(HOST, DEFAULT_PORT) // Load proxy config const proxySetting = require(paths.appPackageJson).proxy const proxyConfig = prepareProxy(proxySetting, paths.appPublic) + // Serve webpack assets generated by the compiler over a web sever. - const serverConfig = createDevServerConfig( - proxyConfig, - urls.lanUrlForConfig + const serverConfig = Object.assign( + {}, + createDevServerConfig( + proxyConfig, + urls.lanUrlForConfig + ), + { + headers: { + 'Access-Control-Allow-Origin': '*' + } + } ) + const devServer = new WebpackDevServer(compiler, serverConfig) // Launch WebpackDevServer. devServer.listen(webpackPort, HOST, err => { diff --git a/bin/tessereact-start.js b/bin/tessereact-start.js index bf6cf2c..ffaa743 100644 --- a/bin/tessereact-start.js +++ b/bin/tessereact-start.js @@ -78,11 +78,21 @@ choosePorts(HOST, DEFAULT_PORT) // Load proxy config const proxySetting = require(paths.appPackageJson).proxy const proxyConfig = prepareProxy(proxySetting, paths.appPublic) + // Serve webpack assets generated by the compiler over a web sever. - const serverConfig = createDevServerConfig( - proxyConfig, - urls.lanUrlForConfig + const serverConfig = Object.assign( + {}, + createDevServerConfig( + proxyConfig, + urls.lanUrlForConfig + ), + { + headers: { + 'Access-Control-Allow-Origin': '*' + } + } ) + const devServer = new WebpackDevServer(compiler, serverConfig) // Launch WebpackDevServer. devServer.listen(webpackPort, HOST, err => {