Commit5f1707a

authored

Merge pull requestcoderoad#169 from ShMcK/feature/env

use single .env

2 parentsf662a63 +a24adca commit5f1707aCopy full SHA for 5f1707a

File tree

+12

-10

lines changed

+12

-10

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,19 @@`
`1`	`1`	`require('dotenv').config({`
`2`		`-path:'./.env',`
	`2`	`+path:'./web-app/.env',`
`3`	`3`	`})`
`4`	`4`
`5`	`5`	`interfaceEnvironment{`
`6`	`6`	`VERSION:string`
`7`	`7`	`NODE_ENV:string`
`8`	`8`	`LOG:boolean`
	`9`	`+API_URL:string`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`constenvironment:Environment={`
`12`	`13`	`VERSION:process.env.VERSION\|\|'unknown',`
`13`	`14`	`NODE_ENV:process.env.NODE_ENV\|\|'production',`
`14`	`15`	`LOG:(process.env.LOG\|\|'').toLowerCase()==='true',`
	`16`	`+API_URL:process.env.REACT_APP_GQL_URI\|\|'',`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`exportdefaultenvironment`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import { JSDOM } from 'jsdom'`
`2`	`2`	`import*aspathfrom'path'`
`3`	`3`	`import*asvscodefrom'vscode'`
`4`	`4`	`importonErrorfrom'../services/sentry/onError'`
	`5`	`+importenvironmentfrom'../environment'`
`5`	`6`
`6`	`7`	`constgetNonce=():string=>{`
`7`	`8`	`lettext=''`
`@@ -72,7 +73,7 @@ async function render(panel: vscode.WebviewPanel, rootPath: string) {`
`72`	`73`	`cspMeta.content=`
`73`	`74`	`[`
`74`	`75`	`default-src 'self'`,
`75`		-`connect-src https: http:`,
	`76`	+`connect-src https: http:${environment.API_URL}`,
`76`	`77`	`//@ts-ignore`
`77`	`78`	`font-src${panel.webview.cspSource} http: https: data:`,
`78`	`79`	`//@ts-ignore`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,12 @@`
`1`	`1`	`// validate .env`
`2`		`-//const requiredKeys = ['REACT_APP_GQL_URI']`
`3`		`-//for (const required of requiredKeys) {`
`4`		`-// if (!process.env[required]) {`
`5`		-// throw new Error(`Missing Environmental Variables: ${required}`)
`6`		`-// }`
`7`		`-//}`
	`2`	`+constrequiredKeys=['REACT_APP_GQL_URI']`
	`3`	`+for(constrequiredofrequiredKeys){`
	`4`	`+if(!process.env[required]){`
	`5`	+thrownewError(`Missing Environmental Variables:${required}`)
	`6`	`+}`
	`7`	`+}`
`8`	`8`
`9`		`-exportconstGQL_URI:string=`
`10`		`-process.env.REACT_APP_GQL_URI\|\|'https://33mf420q4m.execute-api.us-west-2.amazonaws.com/stage/api-stage'`
	`9`	`+exportconstGQL_URI:string=process.env.REACT_APP_GQL_URI\|\|'NO API URI PROVIDED'`
`11`	`10`	`exportconstDEBUG:boolean=(process.env.REACT_APP_DEBUG\|\|'').toLowerCase()==='true'`
`12`	`11`	`exportconstVERSION:string=process.env.VERSION\|\|'unknown'`
`13`	`12`	`exportconstNODE_ENV:string=process.env.NODE_ENV\|\|'production'`

Comments

(0)