From 61b8928f847337dddc3cb3914010797d85e49fd6 Mon Sep 17 00:00:00 2001 From: Jakob Anderson Date: Tue, 16 Jul 2019 10:40:28 -0600 Subject: [PATCH 1/2] removed REMOTE_TARGET from setupProxy, remove fs-config dep, since strategy has changed to process/env --- packages/react-scripts/package-lock.json | 12 ++++------ packages/react-scripts/package.json | 3 +-- packages/react-scripts/proxy/setupProxy.js | 22 ++----------------- .../template/.storybook/middleware.js | 2 +- 4 files changed, 8 insertions(+), 31 deletions(-) diff --git a/packages/react-scripts/package-lock.json b/packages/react-scripts/package-lock.json index 8cee1127d6b..8d63c251d45 100644 --- a/packages/react-scripts/package-lock.json +++ b/packages/react-scripts/package-lock.json @@ -1,6 +1,6 @@ { "name": "@fs/react-scripts", - "version": "3.0.0-RC.2", + "version": "3.0.0-RC.6", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6052,10 +6052,6 @@ "chalk": "^2.4.1" } }, - "fs-config": { - "version": "github:fs-webdev/fs-config#d1601dd97b852a7f60cfd50355c18d38df229a14", - "from": "github:fs-webdev/fs-config" - }, "fs-extra": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", @@ -6167,9 +6163,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.6.tgz", - "integrity": "sha512-vfmKZp3XPM36DNF0qhW+Cdxk7xm7gTEHY1clv1Xq1arwRQuKZgAhw+NZNWbJBtuaNxzNXwhfdPYRrvIbjfS33A==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz", + "integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==", "optional": true }, "function-bind": { diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 80ce30d025b..a93e2db0f1b 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -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": { @@ -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", diff --git a/packages/react-scripts/proxy/setupProxy.js b/packages/react-scripts/proxy/setupProxy.js index 6448e58e214..1da14bf111a 100644 --- a/packages/react-scripts/proxy/setupProxy.js +++ b/packages/react-scripts/proxy/setupProxy.js @@ -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') @@ -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( diff --git a/packages/react-scripts/template/.storybook/middleware.js b/packages/react-scripts/template/.storybook/middleware.js index 8db99f6953b..445216652e7 100644 --- a/packages/react-scripts/template/.storybook/middleware.js +++ b/packages/react-scripts/template/.storybook/middleware.js @@ -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 || 'beta' }) }) } From c359c77d29a705ad0228534dd852b077a675322a Mon Sep 17 00:00:00 2001 From: Jakob Anderson Date: Tue, 16 Jul 2019 10:48:45 -0600 Subject: [PATCH 2/2] updating storybook route to remove REMOTE_ENV --- packages/react-scripts/template/.storybook/middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/template/.storybook/middleware.js b/packages/react-scripts/template/.storybook/middleware.js index 445216652e7..1b39ade399e 100644 --- a/packages/react-scripts/template/.storybook/middleware.js +++ b/packages/react-scripts/template/.storybook/middleware.js @@ -5,6 +5,6 @@ module.exports = router => { setupProxy(router) router.get('/dev-env', (req, res) => { - res.status(200).send({ environment: process.env.TARGET_ENV || 'beta' }) + res.status(200).send({ environment: process.env.TARGET_ENV || 'local' }) }) }