Skip to content

Fix REMOTE_ENV issues for experiments #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 17, 2019
Merged

Fix REMOTE_ENV issues for experiments #163

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0edcc2b
RC.5 version bump
joeycozza Jul 12, 2019
6785836
Merge branch 'develop' of https://github.com/fs-webdev/create-react-a…
joeycozza Jul 12, 2019
def1781
Merge branch 'frontierMaster' into develop
joeycozza Jul 12, 2019
df7c0bf
updating fsevents dep
joeycozza Jul 12, 2019
61b8928
removed REMOTE_TARGET from setupProxy, remove fs-config dep, since st…
spacerockzero Jul 16, 2019
c359c77
updating storybook route to remove REMOTE_ENV
spacerockzero Jul 16, 2019
4172319
Merge pull request #162 from fs-webdev/remote-env
tylergraf Jul 17, 2019
c7c3659
Merge branch 'frontierMaster' into develop
redbugz Jul 17, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions packages/react-scripts/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions packages/react-scripts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/react-scripts",
"version": "3.0.0-RC.5",
"version": "3.0.0-RC.6",
"upstreamVersion": "3.0.0",
"description": "Configuration and scripts for Create React App.",
"repository": {
Expand Down Expand Up @@ -66,7 +66,6 @@
"file-loader": "3.0.1",
"fork-ts-checker-webpack-plugin-alt": "0.4.14",
"fs-cli-goodies": "github:fs-webdev/fs-cli-goodies",
"fs-config": "github:fs-webdev/fs-config",
"fs-extra": "7.0.1",
"html-webpack-plugin": "4.0.0-beta.5",
"http-proxy-middleware": "^0.19.1",
Expand Down Expand Up @@ -111,7 +110,7 @@
"react-i18next": "^10.11.0"
},
"optionalDependencies": {
"fsevents": "2.0.6"
"fsevents": "2.0.7"
},
"browserslist": {
"production": [
Expand Down
22 changes: 2 additions & 20 deletions packages/react-scripts/proxy/setupProxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,11 @@
const proxy = require('http-proxy-middleware')
const fsconfig = require('fs-config/config/default')

/* eslint-disable-next-line import/no-extraneous-dependencies */
require('dotenv').config()

const setProxies = (app, customProxies = []) => {
// detect env
const env = process.env.REMOTE_ENV || 'beta'
// backwards compat for auth-middleware env implicit dependency
if (process.env.TARGET_ENV === 'local') {
process.env.TARGET_ENV = env
}

// set keys directly from fs-config for the current env
function getFromEnv(thisEnv, key) {
return fsconfig[thisEnv][key] || fsconfig.default[key]
}

const keys = ['FS_KEY', 'CIS_WEB']
keys.forEach(key => {
process.env[key] = getFromEnv(env, key)
})

// dev key is only in default
process.env.FS_DEV_KEY = fsconfig.default.FS_DEV_KEY
const env = process.env.TARGET_ENV || 'local'

// bring in auth middleware once required keys are set
const cookieParser = require('cookie-parser')
Expand All @@ -45,7 +27,7 @@ const setProxies = (app, customProxies = []) => {

// set default env target
// prod auth keys don't exist in fs-config for security reasons, so only other alt-envs for now
const target = getFromEnv(env, 'BASE_URL')
const target = process.env.BASE_URL

const setProxy = proxyConfig => {
app.use(
Expand Down
2 changes: 1 addition & 1 deletion packages/react-scripts/template/.storybook/middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ module.exports = router => {
setupProxy(router)

router.get('/dev-env', (req, res) => {
res.status(200).send({ environment: process.env.REMOTE_ENV || 'beta' })
res.status(200).send({ environment: process.env.TARGET_ENV || 'local' })
})
}