@fishawack/lab-env 4.39.1 → 4.40.0

package/.prettierignore

@@ -27,4 +27,35 @@ resources/symbol
 _Test/**/*fixture*/**
 _Test/**/*expected*/**
 _Test/**/_Build-syntax-error/**
-_Tasks/helpers/htmlEmail/**/*
+_Tasks/helpers/htmlEmail/**/*
+
+# Wordpress specific ignores
+wp-content/plugins/**/*
+!wp-content/plugins/avalere-*/
+!wp-content/plugins/avalere-*/**
+
+wp-content/themes/**/*
+!wp-content/themes/fishawack/
+!wp-content/themes/fishawack/**
+!wp-content/themes/avalerehealth/
+!wp-content/themes/avalerehealth/**
+!wp-content/themes/avalerehealth-*/
+!wp-content/themes/avalerehealth-*/**
+
+# Laravel specific
+resources/content
+public/
+
+# Drupal specific ignores
+themes/custom/**/*
+!themes/custom/fishawack/
+!themes/custom/fishawack/**
+!themes/custom/avalerehealth/
+!themes/custom/avalerehealth/**
+!themes/custom/avalerehealth-*/
+!themes/custom/avalerehealth-*/**
+
+# Craftcms specific
+templates/content
+web/
+storage/

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 ## Changelog
 
+### 4.40.0 (2025-07-15)
+
+#### Features
+
+* can now customize the image platform with a config setting in the image override directory ([07cf41c](https://bitbucket.org/fishawackdigital/lab-env/commits/07cf41ce369af1002bf1ea88d74dba805262fe55))
+* can now override laravel 9 php image ([4c89362](https://bitbucket.org/fishawackdigital/lab-env/commits/4c89362a1ccb8135c3b460dbd6ff23e27509ba4c))
+
+#### Bug Fixes
+
+* added craftcms specific ignores to lint files ([e40cecd](https://bitbucket.org/fishawackdigital/lab-env/commits/e40cecdbc0f145b1a65f7c8bdfa39d96b3b2f97f))
+* added drupal specific ignores to lint files ([f73eb18](https://bitbucket.org/fishawackdigital/lab-env/commits/f73eb182d906c8894456197ae29edd8c89118ea8))
+* added laravel specific ignores to lint files ([476cc75](https://bitbucket.org/fishawackdigital/lab-env/commits/476cc75a094722a4506d99308fd53db73224491c))
+* ignore _App directory for stream specific builds ([edf9cec](https://bitbucket.org/fishawackdigital/lab-env/commits/edf9cec1cb3cc56baffd5a9e2604bc4d41ce764a))
+* wordpress specific ignores ([78f7cc9](https://bitbucket.org/fishawackdigital/lab-env/commits/78f7cc91b3e3967842aae362c5e465acf09616ff))
+
+#### Build Updates
+
+* auto open a pr against beta on master publish ([88b7123](https://bitbucket.org/fishawackdigital/lab-env/commits/88b71237be90d7f7490f9447a815b1235071aa86))
+
+### 4.40.0-beta.1 (2025-07-15)
+
+#### Features
+
+* can now customize the image platform with a config setting in the image override directory ([07cf41c](https://bitbucket.org/fishawackdigital/lab-env/commits/07cf41ce369af1002bf1ea88d74dba805262fe55))
+* can now override laravel 9 php image ([4c89362](https://bitbucket.org/fishawackdigital/lab-env/commits/4c89362a1ccb8135c3b460dbd6ff23e27509ba4c))
+
+#### Bug Fixes
+
+* added craftcms specific ignores to lint files ([e40cecd](https://bitbucket.org/fishawackdigital/lab-env/commits/e40cecdbc0f145b1a65f7c8bdfa39d96b3b2f97f))
+* added drupal specific ignores to lint files ([f73eb18](https://bitbucket.org/fishawackdigital/lab-env/commits/f73eb182d906c8894456197ae29edd8c89118ea8))
+* added laravel specific ignores to lint files ([476cc75](https://bitbucket.org/fishawackdigital/lab-env/commits/476cc75a094722a4506d99308fd53db73224491c))
+* ignore _App directory for stream specific builds ([edf9cec](https://bitbucket.org/fishawackdigital/lab-env/commits/edf9cec1cb3cc56baffd5a9e2604bc4d41ce764a))
+* wordpress specific ignores ([78f7cc9](https://bitbucket.org/fishawackdigital/lab-env/commits/78f7cc91b3e3967842aae362c5e465acf09616ff))
+
+#### Build Updates
+
+* auto open a pr against beta on master publish ([88b7123](https://bitbucket.org/fishawackdigital/lab-env/commits/88b71237be90d7f7490f9447a815b1235071aa86))
+
 ### 4.39.1 (2025-06-26)
 
 #### Bug Fixes

package/bitbucket-pipelines.yml

@@ -61,8 +61,29 @@ pipelines:
             # Release version via node so can exit out when no release made
             - |
               node -e "const spawn = require('child_process').spawn('semantic-release', ['--repositoryUrl', 'https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME'], { env: { ...process.env, FORCE_COLOR: true } }); spawn.stderr.on('data', d => process.stderr.write(d.toString())); spawn.stdout.on('data', d => {process.stdout.write(d.toString()); if(d.toString().includes('There are no relevant changes, so no new version is released.') || d.toString().includes('therefore a new version won\'t be published.')){process.exit(1);}})" || exit 0
-            # Sync development after publish
-            - git fetch origin "+refs/heads/*:refs/remotes/origin/*" && git checkout -b development origin/development && git merge master && git push origin development
+            # Open PR to re-sync beta after release
+            - |
+              curl https://api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/pullrequests \
+                -u $GIT_CREDENTIALS \
+                --header 'Content-Type: application/json' \
+                --data "{
+                  \"title\": \"fw-auto: sync beta after release\",
+                  \"source\": {
+                    \"branch\": {
+                      \"name\": \"master\"
+                    }
+                  },
+                  \"destination\": {
+                    \"branch\": {
+                      \"name\": \"beta\"
+                    }
+                  },
+                  \"reviewers\": [
+                      {
+                          \"uuid\": \"{2518e4c3-fc1d-4653-b355-c00be099ce6c}\"
+                      }
+                  ]
+                }"
             # Commit and create pull request for new version on aws-runner repo
             - git config --global user.email "digital@fishawack.com"
             - git config --global user.name "Digital Fishawack"

package/eslint.config.js

@@ -29,6 +29,7 @@ module.exports = defineConfig([
         "android",
         "_Output",
         "_Packages",
+        "_App",
         ".cache",
         ".husky",
         "**/generated/**/*",
@@ -39,7 +40,23 @@ module.exports = defineConfig([
         "_Test/**/*fixture*/**",
         "_Test/**/*expected*/**",
         "_Test/**/_Build-syntax-error/**",
-        "**/js/level-*/**/libs/**", // STREAM specific to ignore non-authored files
+        // STREAM specific to ignore non-authored files
+        "**/js/level-*/**/libs/**",
+        // Wordpress specific ignores
+        "wp-content/plugins/**/*",
+        "wp-content/themes/**/*",
+        // Laravel specific
+        "resources/content",
+        "resources/handlebars/**/*.js",
+        "public/",
+        // Drupal specific ignores
+        "themes/**/*",
+        "modules/**/*",
+        // Craftcms specific
+        "templates/content",
+        "templates/handlebars/**/*.js",
+        "web/",
+        "storage/",
     ]),
     {
         plugins: {

package/globals.js

@@ -262,6 +262,8 @@ process.env.FW_CORE_1_IMAGE =
 
 process.env.FW_LARAVEL_8_NGINX_IMAGE =
     process.env.FW_LARAVEL_8_NGINX_IMAGE || `fishawack/lab-env-laravel-8-nginx`;
+process.env.FW_LARAVEL_9_PHP_IMAGE =
+    process.env.FW_LARAVEL_9_PHP_IMAGE || `fishawack/lab-env-laravel-9-php`;
 process.env.FW_ADONIS_0_NGINX_IMAGE =
     process.env.FW_ADONIS_0_NGINX_IMAGE || `fishawack/lab-env-adonis-0-nginx`;
 process.env.FW_ADONIS_0_NODE_IMAGE = process.env.FW_ADONIS_0_NODE_IMAGE || ``;
@@ -319,6 +321,7 @@ if (existsSync(path.join(contextOverride, "Dockerfile"))) {
     process.env.FW_CORE_1_IMAGE += `-${repoSafe}`;
 }
 
+// Laravel
 process.env.FW_LARAVEL_8_NGINX_CONTEXT =
     process.env.FW_LARAVEL_8_NGINX_CONTEXT || `${__dirname}/laravel/8/nginx/`;
 
@@ -331,6 +334,20 @@ if (existsSync(path.join(contextOverride, "Dockerfile"))) {
     ).version;
 }
 
+process.env.FW_LARAVEL_9_PHP_CONTEXT =
+    process.env.FW_LARAVEL_9_PHP_CONTEXT || `${__dirname}/laravel/9/php/`;
+
+contextOverride = path.join(cwd, "_Docker/laravel/9/php");
+if (existsSync(path.join(contextOverride, "Dockerfile"))) {
+    process.env.FW_LARAVEL_9_PHP_CONTEXT = contextOverride;
+    process.env.FW_LARAVEL_9_PHP_IMAGE += `-${repoSafe}`;
+    process.env.FW_LARAVEL_9_PHP_VERSION = require(
+        `${contextOverride}/package.json`,
+    ).version;
+    process.env.FW_LARAVEL_9_PHP_PLATFORM =
+        require(`${contextOverride}/package.json`).platform || "";
+}
+
 // ADONIS
 process.env.FW_ADONIS_0_NGINX_CONTEXT =
     process.env.FW_ADONIS_0_NGINX_CONTEXT || `${__dirname}/adonis/0/nginx/`;

package/laravel/9/docker-compose.yml

@@ -25,9 +25,10 @@ services:
       - "${PORT_WEB:-8000}:80"
   php:
     build:
-      context: $DIRNAME/laravel/9/php/
+      context: $FW_LARAVEL_9_PHP_CONTEXT
       target: development
-    image: fishawack/lab-env-laravel-9-php:${FW_LARAVEL_9_PHP_VERSION:-latest}
+    image: $FW_LARAVEL_9_PHP_IMAGE:${FW_LARAVEL_9_PHP_VERSION:-latest}
+    platform: ${FW_LARAVEL_9_PHP_PLATFORM:-}
     init: true
     working_dir: /app
     networks:

package/package.json

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

package/stylelint.config.js

@@ -30,6 +30,7 @@ module.exports = {
         "android/**/*",
         "_Output/**/*",
         "_Packages/**/*",
+        "_App/**/*",
         ".cache/**/*",
         ".husky/**/*",
         ".**/generated/**/*",
@@ -39,5 +40,19 @@ module.exports = {
         "_Test/**/*fixture*/**",
         "_Test/**/*expected*/**",
         "_Test/**/_Build-syntax-error/**",
+        // Wordpress specific ignores
+        "wp-content/plugins/**/*",
+        "wp-content/themes/**/*",
+        // Laravel specific
+        "resources/content/**/*",
+        "public/**/*",
+        // Drupal specific ignores
+        "themes/**/*",
+        "modules/**/*",
+        // Craftcms specific
+        "templates/content/**/*",
+        "templates/handlebars/**/*.js",
+        "web/**/*",
+        "storage/**/*",
     ],
 };