@fishawack/lab-env 4.42.0 → 4.43.0

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 ## Changelog
 
+### 4.43.0 (2025-08-10)
+
+#### Features
+
+* --up flag on exec to up all containers related to project ([b0dd56e](https://bitbucket.org/fishawackdigital/lab-env/commits/b0dd56e50d13ea57c75f866b3d105b97325d5ccc))
+* browsers now auto detect based on config ([01ce9da](https://bitbucket.org/fishawackdigital/lab-env/commits/01ce9daf6d7f3c391d79188122c01c8c5a6b0ac6))
+* chrome browser now default when core runs, firefox & edge can be abled through env flags ([b7b16f0](https://bitbucket.org/fishawackdigital/lab-env/commits/b7b16f07e2b42ac7aaefe4d11647255965b63eaf))
+* **core@1:** bump to 1.8.0 ([1232342](https://bitbucket.org/fishawackdigital/lab-env/commits/12323424e0ea5223eca96703a0d60c969f2479b0))
+* fwConfig now merged and available ([098098f](https://bitbucket.org/fishawackdigital/lab-env/commits/098098f3808d81407fd5989d6c3bfb8b8e08f65a))
+
+#### Bug Fixes
+
+* only read and write .ftppass in legacy mode ([76902ac](https://bitbucket.org/fishawackdigital/lab-env/commits/76902acfb33e7919b63b071005b6cd73f2557272))
+* safe check browsers too ([dd7322a](https://bitbucket.org/fishawackdigital/lab-env/commits/dd7322a52dc444a4f08568c1ba587f2858db359b))
+
+#### Build Updates
+
+* added selenium browser docker compise files ([e7fbf3d](https://bitbucket.org/fishawackdigital/lab-env/commits/e7fbf3dd3c0f94375f0dd3a54fbbf7dbba2eddf9))
+
+### 4.43.0-beta.1 (2025-08-10)
+
+#### Features
+
+* --up flag on exec to up all containers related to project ([b0dd56e](https://bitbucket.org/fishawackdigital/lab-env/commits/b0dd56e50d13ea57c75f866b3d105b97325d5ccc))
+* browsers now auto detect based on config ([01ce9da](https://bitbucket.org/fishawackdigital/lab-env/commits/01ce9daf6d7f3c391d79188122c01c8c5a6b0ac6))
+* chrome browser now default when core runs, firefox & edge can be abled through env flags ([b7b16f0](https://bitbucket.org/fishawackdigital/lab-env/commits/b7b16f07e2b42ac7aaefe4d11647255965b63eaf))
+* **core@1:** bump to 1.8.0 ([1232342](https://bitbucket.org/fishawackdigital/lab-env/commits/12323424e0ea5223eca96703a0d60c969f2479b0))
+* fwConfig now merged and available ([098098f](https://bitbucket.org/fishawackdigital/lab-env/commits/098098f3808d81407fd5989d6c3bfb8b8e08f65a))
+
+#### Bug Fixes
+
+* only read and write .ftppass in legacy mode ([76902ac](https://bitbucket.org/fishawackdigital/lab-env/commits/76902acfb33e7919b63b071005b6cd73f2557272))
+* safe check browsers too ([dd7322a](https://bitbucket.org/fishawackdigital/lab-env/commits/dd7322a52dc444a4f08568c1ba587f2858db359b))
+
+#### Build Updates
+
+* added selenium browser docker compise files ([e7fbf3d](https://bitbucket.org/fishawackdigital/lab-env/commits/e7fbf3dd3c0f94375f0dd3a54fbbf7dbba2eddf9))
+
 ### 4.42.0 (2025-08-08)
 
 #### Features

package/browsers/chrome/docker-compose.yml

@@ -0,0 +1,6 @@
+services:
+  chrome:
+    image: selenium/standalone-chromium:138.0.7204.183
+    shm_size: 2gb
+    environment:
+      - SE_NODE_MAX_SESSIONS=10

package/browsers/edge/docker-compose.yml

@@ -0,0 +1,6 @@
+services:
+  edge:
+    image: selenium/standalone-edge:131.0-20250727
+    shm_size: 2gb
+    environment:
+      - SE_NODE_MAX_SESSIONS=10

package/browsers/firefox/docker-compose.yml

@@ -0,0 +1,6 @@
+services:
+  firefox:
+    image: selenium/standalone-firefox:130.0-20250727
+    shm_size: 2gb
+    environment:
+      - SE_NODE_MAX_SESSIONS=10

package/commands/create/services/guide.js

@@ -189,7 +189,7 @@ module.exports.ftppass = async ({ confirm }) => {
     }
 };
 
-module.exports.egnyte = async ({ confirm }) => {
+module.exports.egnyte = async ({ confirm, legacy }) => {
     let inputs = confirm
         ? { confirm }
         : await inquirer.prompt([
@@ -242,19 +242,26 @@ module.exports.egnyte = async ({ confirm }) => {
             },
         ]);
 
-        let file = JSON.parse(
-            readFileSync(`${homedir()}/targets/.ftppass`, { encoding: "utf8" }),
-        );
+        let file = legacy
+            ? JSON.parse(
+                  readFileSync(`${homedir()}/targets/.ftppass`, {
+                      encoding: "utf8",
+                  }),
+              )
+            : "";
 
         creds.egnyte =
             credsFtppass["ftp-fishawack.egnyte.com"] =
             file["ftp-fishawack.egnyte.com"] =
                 { ...inputs };
 
-        writeFileSync(
-            `${homedir()}/targets/.ftppass`,
-            JSON.stringify(file, null, 4),
-        );
+        if (legacy) {
+            writeFileSync(
+                `${homedir()}/targets/.ftppass`,
+                JSON.stringify(file, null, 4),
+            );
+        }
+
         writeFileSync(
             `${homedir()}/targets/${creds.egnyte.host}.json`,
             JSON.stringify({ ...creds.egnyte, passphrase: "" }, null, 4),

package/commands/execute.js

@@ -28,15 +28,25 @@ module.exports = [
             describe: "container to connect to",
             default: "core",
         });
+
+        yargs.option("up", {
+            alias: "u",
+            type: "boolean",
+            default: false,
+            describe: "up all containers",
+        });
     },
     (argv) => {
         const prep = argv.g
             ? "npx grunt --gruntfile node_modules/@fishawack/core/Gruntfile.js "
             : " ";
 
-        _.command(
-            argv.container,
-            `${argv.d ? "xvfb-run " : ""}${prep}${argv.command.join(" ")}`,
-        );
+        const command = `${argv.d ? "xvfb-run " : ""}${prep}${argv.command.join(" ")}`;
+
+        if (argv.up) {
+            _.up(() => _.command(argv.container, command));
+        } else {
+            _.command(argv.container, command);
+        }
     },
 ];

package/core/1/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Changelog
 
+### 1.8.0 (2025-08-10)
+
+#### Features
+
+* new env flag for remote browsers ([f313be6](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/f313be6cde14e05ac832b43127b6c5639fd62015))
+
+### 1.8.0-beta.1 (2025-08-10)
+
+#### Features
+
+* new env flag for remote browsers ([f313be6](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/f313be6cde14e05ac832b43127b6c5639fd62015))
+
 ### 1.7.2 (2025-05-15)
 
 #### Bug Fixes

package/core/1/bitbucket-pipelines.yml

@@ -27,10 +27,10 @@ pipelines:
             # Publish docker image
             - docker login $DOCKER_CREDENTIALS && docker buildx create --use && npm run image
             # Sync beta after publish
-            - git fetch origin "+refs/heads/*:refs/remotes/origin/*" && git checkout beta && git merge master && git push origin beta
-            # Commit and create pull request for new version on lab-env repo
             - git config --global user.email "digital@fishawack.com"
             - git config --global user.name "Digital Fishawack"
+            - git fetch origin "+refs/heads/*:refs/remotes/origin/*" && git checkout beta && git merge master && git push origin beta
+            # Commit and create pull request for new version on lab-env repo
             - git clone https://$GIT_CREDENTIALS@bitbucket.org/fishawackdigital/lab-env
             - cd lab-env
             - git checkout -b "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT" origin/beta

package/core/1/docker-compose.yml

@@ -31,6 +31,7 @@ services:
       - FW_ROOT=${FW_ROOT:-}
       - BRANCH=${BRANCH:-}
       - CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME:-}
+      - REMOTE_BROWSERS=${REMOTE_BROWSERS:-chrome}
 volumes:
   node_modules:
     driver: "local"

package/core/1/package.json

@@ -1,6 +1,6 @@
 {
     "name": "core",
-    "version": "1.7.2",
+    "version": "1.8.0",
     "description": "lab-env docker config for the @fishawack/core/1 npm module",
     "scripts": {
         "setup": "ln -sfn ../../.commitlintrc.json .commitlintrc.json && ln -sfn ../../.editorconfig .editorconfig && ln -sfn ../../.prettierignore .prettierignore && ln -sfn ../../.husky/ .husky && husky &>/dev/null || true",

package/globals.js

@@ -1,5 +1,7 @@
 const execSync = require("child_process").execSync;
 const path = require("path");
+const glob = require("glob");
+const _ = require("lodash");
 const {
     lstatSync,
     readdirSync,
@@ -35,6 +37,81 @@ const getDirectories = (source) =>
         .map((name) => path.join(source, name))
         .filter(isDirectory);
 
+const getCoreMergedConfigs = () => {
+    const globPatterns = [
+        "./fw.json",
+        "./fw.*.json",
+        "./content.json",
+        "./level-*.json",
+        "_Build/config/*.json",
+        "_Build/*.json",
+    ];
+
+    let json = {};
+    let loaded = [];
+
+    globPatterns.forEach((pattern) => {
+        try {
+            const files = glob.sync(pattern, { cwd });
+
+            files.forEach((file) => {
+                // Only load config types once, lower configs override higher ones
+                if (loaded.indexOf(path.basename(file)) === -1) {
+                    try {
+                        const filePath = path.resolve(cwd, file);
+                        if (existsSync(filePath)) {
+                            const fileContent = readFileSync(filePath, {
+                                encoding: "utf8",
+                            });
+                            const jsonData = JSON.parse(fileContent);
+
+                            loaded.push(path.basename(file));
+
+                            // Deep merge with array concatenation (matching core behavior)
+                            _.mergeWith(json, jsonData, function (obj, src) {
+                                if (_.isArray(obj)) {
+                                    return obj.concat(src);
+                                }
+                            });
+                        }
+                    } catch (error) {
+                        if (args.find((d) => d === "--debug")) {
+                            console.log(
+                                utilities.colorize(
+                                    `Failed to parse ${file}: ${error.message}`,
+                                    "warning",
+                                ),
+                            );
+                        }
+                    }
+                }
+            });
+        } catch (error) {
+            if (args.find((d) => d === "--debug")) {
+                console.log(
+                    utilities.colorize(
+                        `Glob pattern failed ${pattern}: ${error.message}`,
+                        "warning",
+                    ),
+                );
+            }
+        }
+    });
+
+    // Merge branch-specific targets (matching core behavior)
+    _.mergeWith(
+        json.attributes,
+        json?.attributes?.targets?.[branch] || {},
+        function (obj, src) {
+            if (_.isArray(obj)) {
+                return obj.concat(src);
+            }
+        },
+    );
+
+    return json;
+};
+
 var config;
 var repo;
 var platform;
@@ -70,6 +147,8 @@ try {
     branch = "unknown";
 }
 
+const coreConfig = getCoreMergedConfigs();
+
 try {
     repo =
         execSync('basename "$(git rev-parse --show-toplevel)"', {
@@ -286,6 +365,21 @@ process.env.FW_ADONIS_0_NODE_IMAGE = process.env.FW_ADONIS_0_NODE_IMAGE || ``;
 
 var core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml`;
 
+// Append chrome container as required in core image as of v9
+core += ` -f ${__dirname}/browsers/chrome/docker-compose.yml`;
+
+process.env.REMOTE_BROWSERS =
+    process.env.REMOTE_BROWSERS ||
+    coreConfig?.attributes?.capture?.browsers?.join(",");
+
+if (process.env.REMOTE_BROWSERS?.includes("firefox")) {
+    core += ` -f ${__dirname}/browsers/firefox/docker-compose.yml`;
+}
+
+if (process.env.REMOTE_BROWSERS?.includes("edge")) {
+    core += ` -f ${__dirname}/browsers/edge/docker-compose.yml`;
+}
+
 // Map versions of images
 process.env.FW_CORE_0_VERSION =
     process.env.FW_CORE_0_VERSION || require("./core/0/package.json").version;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fishawack/lab-env",
-    "version": "4.42.0",
+    "version": "4.43.0",
     "description": "Docker manager for FW",
     "main": "cli.js",
     "scripts": {