@nginstack/engine-node 88.0.12 → 89.0.21

package/lib/Engine.js

@@ -485,9 +485,7 @@ class Engine {
   static newUsingWorkspaceConfig(options) {
     options = options || {};
     const workspacePath = getWorkspacePath();
-    dotenv.config({
-      path: path.resolve(workspacePath, '.env')
-    });
+    loadWorkspaceEnv(workspacePath);
 
     if (!('jazSearchPath' in options)) {
       let jazSearchPath = path.resolve(workspacePath, '.build');
@@ -532,4 +530,28 @@ function getWorkspacePath() {
   return path.dirname(workspacePath);
 }
 
+/**
+ * Loads the environment variables from the ".env" files on the workspace root. The files are
+ * read in the order ".env.local", ".env.windows" or ".env.linux" (according to the platform) and
+ * ".env". The first value found for a variable prevails, and variables already defined in the
+ * process environment are not overwritten.
+ * @param {string} workspacePath Workspace root path.
+ */
+function loadWorkspaceEnv(workspacePath) {
+  const candidates = ['.env.local'];
+  if (os.platform() === 'win32') {
+    candidates.push('.env.windows');
+  } else if (os.platform() === 'linux') {
+    candidates.push('.env.linux');
+  }
+  candidates.push('.env');
+
+  const envPaths = candidates
+    .map((name) => path.resolve(workspacePath, name))
+    .filter((envPath) => fs.existsSync(envPath));
+  if (envPaths.length > 0) {
+    dotenv.config({ path: envPaths });
+  }
+}
+
 module.exports = Engine;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nginstack/engine-node",
-  "version": "88.0.12",
+  "version": "89.0.21",
   "publishConfig": {
     "access": "public"
   },
@@ -24,5 +24,5 @@
     "thread-sleep": "^2.2.0",
     "tmp": "^0.2.1"
   },
-  "gitHead": "be1cea80a8d8c2134b3373f755d92991e9f2987a"
+  "gitHead": "aa02f033fabf8bf695bca1571358f7d4c26d3f51"
 }