Merge pull request #199 from nullstack/multi-env

Mortaro · web-flow · commit f9afa965634b · 2022-04-17T02:19:37.000-03:00
✨ add support for named environments
diff --git a/scripts/index.js b/scripts/index.js
@@ -50,20 +50,26 @@ function logTrace(stats, showCompiling) {
   lastTrace = '';
 }
 
-function start({ input, port }) {
+function start({ input, port, env }) {
   const environment = 'development';
   const compiler = getCompiler({ environment, input });
   if (port) {
     process.env['NULLSTACK_SERVER_PORT'] = port;
   }
+  if (env) {
+    process.env['NULLSTACK_ENVIRONMENT_NAME'] = env;
+  }
   console.log(` 🚀️ Starting your application in ${environment} mode...`);
   console.log();
   compiler.watch({}, (error, stats) => logTrace(stats, true));
 }
 
-function build({ input, output, cache, mode = 'ssr' }) {
+function build({ input, output, cache, env, mode = 'ssr' }) {
   const environment = 'production';
   const compiler = getCompiler({ environment, input, cache });
+  if (env) {
+    process.env['NULLSTACK_ENVIRONMENT_NAME'] = env;
+  }
   console.log(` 🚀️ Building your application in ${mode} mode...`);
   compiler.run((error, stats) => {
     logTrace(stats, false);
@@ -78,6 +84,7 @@ program
   .description('Start application in development environment')
   .option('-p, --port <port>', 'Port number to run the server')
   .option('-i, --input <input>', 'Path to project that will be started')
+  .option('-e, --env <name>', 'Name of the environment file that should be loaded')
   .helpOption('-h, --help', 'Learn more about this command')
   .action(start)
 
@@ -89,6 +96,7 @@ program
   .option('-i, --input <input>', 'Path to project that will be built')
   .option('-o, --output <output>', 'Path to build output folder')
   .option('-c, --cache', 'Cache build results in .production folder')
+  .option('-e, --env <name>', 'Name of the environment file that should be loaded')
   .helpOption('-h, --help', 'Learn more about this command')
   .action(build)
 
diff --git a/server/dotenv.js b/server/dotenv.js
@@ -0,0 +1,9 @@
+import dotenv from 'dotenv'
+
+let path = '.env'
+
+if (process.env.NULLSTACK_ENVIRONMENT_NAME) {
+    path += `.${process.env.NULLSTACK_ENVIRONMENT_NAME}`
+}
+
+dotenv.config({ path })
diff --git a/server/environment.js b/server/environment.js
@@ -9,6 +9,8 @@ environment.mode = process.env.NULLSTACK_ENVIRONMENT_MODE || 'ssr';
 
 environment.key = "{{NULLSTACK_ENVIRONMENT_KEY}}"
 
+environment.name = process.env.NULLSTACK_ENVIRONMENT_NAME || '';
+
 Object.freeze(environment);
 
 export default environment;
diff --git a/server/index.js b/server/index.js
@@ -1,4 +1,4 @@
-import 'dotenv/config';
+import './dotenv';
 import { normalize } from 'path';
 import element from '../shared/element';
 import fragment from '../shared/fragment';
diff --git a/tests/.env.test b/tests/.env.test
diff --git a/tests/package.json b/tests/package.json
@@ -14,9 +14,9 @@
     "purgecss-webpack-plugin": "^4.1.3"
   },
   "scripts": {
-    "start": "npx nullstack start --input=./tests --port=6969",
-    "build": "npx nullstack build --input=./tests --mode=ssr",
+    "start": "npx nullstack start --input=./tests --port=6969 --env=test",
+    "build": "npx nullstack build --input=./tests --mode=ssr --env=test",
     "test": "npm run build && jest",
     "script": "node src/scripts/run.js"
   }
-}
+}
diff --git a/tests/src/ContextEnvironment.njs b/tests/src/ContextEnvironment.njs
@@ -1,8 +1,8 @@
 import Nullstack from 'nullstack';
 
 class ContextEnvironment extends Nullstack {
-  
-  render({environment}) {
+
+  render({ environment }) {
     return (
       <div>
         <div data-environment={!!environment} />
@@ -11,6 +11,7 @@ class ContextEnvironment extends Nullstack {
         <div data-development={environment.development.toString()} />
         <div data-production={environment.production.toString()} />
         <div data-static={(environment.mode === 'ssg').toString()} />
+        <div data-name={environment.name} />
         <div data-key={environment.key} />
       </div>
     )
diff --git a/tests/src/ContextEnvironment.test.js b/tests/src/ContextEnvironment.test.js
@@ -41,4 +41,9 @@ describe('ContextEnvironment', () => {
     expect(element).toBeTruthy();
   });
 
+  test('has a key with the environment name', async () => {
+    const element = await page.$('[data-name="test"]');
+    expect(element).toBeTruthy();
+  });
+
 });
diff --git a/tests/src/scripts/run.js b/tests/src/scripts/run.js
@@ -1,3 +1,5 @@
+process.env.NULLSTACK_ENVIRONMENT_NAME = 'test'
+
 const { default: application } = require('../../.development/server.js');
 
 async function getProjectName() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import 'dotenv/config';`
	`1`	`+import './dotenv';`
`2`	`2`	`import { normalize } from 'path';`
`3`	`3`	`import element from '../shared/element';`
`4`	`4`	`import fragment from '../shared/fragment';`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+process.env.NULLSTACK_ENVIRONMENT_NAME = 'test'`
	`2`	`+`
`1`	`3`	`const { default: application } = require('../../.development/server.js');`
`2`	`4`
`3`	`5`	`async function getProjectName() {`