From a79ebda392f55fa0dc822cbaf2009661ecf018eb Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Fri, 6 Feb 2026 10:04:32 +0800 Subject: [PATCH] Upgrades fleetops to v0.6.35 --- .github/workflows/cd.yml | 3 +++ RELEASE.md | 14 +++----------- api/composer.json | 2 +- api/composer.lock | 14 +++++++------- console/package.json | 4 ++-- console/pnpm-lock.yaml | 10 +++++----- docker/Dockerfile | 2 +- packages/dev-engine | 2 +- packages/ember-core | 2 +- packages/ember-ui | 2 +- packages/fleetops-data | 2 +- packages/iam-engine | 2 +- packages/registry-bridge | 2 +- packages/storefront | 2 +- 14 files changed, 29 insertions(+), 34 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 1949b317..0241227a 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -210,6 +210,9 @@ jobs: - name: Set Env Variables run: | + # ensure file ends with a newline + printf '\n' >> ./environments/.env.production + echo "EXTENSIONS=${{ secrets.EXTENSIONS }}" >> ./environments/.env.production echo "LOGROCKET_APP_ID=${{ secrets.LOGROCKET_APP_ID }}" >> ./environments/.env.production echo "STRIPE_KEY=${{ secrets.STRIPE_KEY }}" >> ./environments/.env.production diff --git a/RELEASE.md b/RELEASE.md index 9b2e6250..7bac1120 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,19 +1,11 @@ -# 🚀 Fleetbase v0.7.27 — 2026-02-05 +# 🚀 Fleetbase v0.7.28 — 2026-02-05 -> "Improvements and patches" +> "Critical patch: eager load driver and vehicle in consumable orders query API" --- ## ✨ Highlights -- Core now supports disabling cache in runtime for `HasApiModelCache` x `HasApiModelBehavior` -- Added new `FileResolverService` to support file resolution from file resources, URL's, base64, and file uploads [190c03d](https://github.com/fleetbase/core-api/pull/187/commits/190c03d484648319f3d890439f74e45820f352fc) -- `VerificationCode` model in core always throws SMS exceptions -- FleetOps: Patched proof of delivery component in order details -- FleetOps: Improved and patched service rate `getServicableForPlaces` which improved service quote performance -- FleetOps: Fix location GeoJSON Point casting for `location` properties - using the new `Utils::castPoint` utility [208151f](https://github.com/fleetbase/fleetops/pull/202/commits/208151f37ece54bb23cfeeebdbb6fde1142908f7) -- Storefront: Critical patch for QPay checkout workflow [storefront#66](https://github.com/fleetbase/storefront/pull/66) -- Storefront: Added new phone number verification endpoints for customers (`request-phone-verification` and `verify-phone-number`) -- Storefront: Fixed cart based service quotes +- Critical patch which fixes eager loading relationship when querying orders via the consumable API, this is done to handle the new `whenLoaded` resource conditional methods. [fleetbase/fleetops#203](https://github.com/fleetbase/fleetops/pull/203) --- diff --git a/api/composer.json b/api/composer.json index 6d980cbb..33b0bde0 100644 --- a/api/composer.json +++ b/api/composer.json @@ -21,7 +21,7 @@ "php": ">=8.0 <=8.2.30", "appstract/laravel-opcache": "^4.0", "fleetbase/core-api": "^1.6.35", - "fleetbase/fleetops-api": "^0.6.34", + "fleetbase/fleetops-api": "^0.6.35", "fleetbase/registry-bridge": "^0.1.5", "fleetbase/storefront-api": "^0.4.13", "guzzlehttp/guzzle": "^7.0.1", diff --git a/api/composer.lock b/api/composer.lock index 8b5bb8e8..f59ae370 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e1a0396811a349ab03f8782119c89e5b", + "content-hash": "240f5916db1171e37d4f4548cd9f1373", "packages": [ { "name": "appstract/laravel-opcache", @@ -2323,16 +2323,16 @@ }, { "name": "fleetbase/fleetops-api", - "version": "0.6.34", + "version": "0.6.35", "source": { "type": "git", "url": "https://github.com/fleetbase/fleetops.git", - "reference": "05503cee9f55f5e4e1bad2210615e4f67bb165ab" + "reference": "c89d1f3e81564cb5009293001a67cd4e59051a69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fleetbase/fleetops/zipball/05503cee9f55f5e4e1bad2210615e4f67bb165ab", - "reference": "05503cee9f55f5e4e1bad2210615e4f67bb165ab", + "url": "https://api.github.com/repos/fleetbase/fleetops/zipball/c89d1f3e81564cb5009293001a67cd4e59051a69", + "reference": "c89d1f3e81564cb5009293001a67cd4e59051a69", "shasum": "" }, "require": { @@ -2407,9 +2407,9 @@ ], "support": { "issues": "https://github.com/fleetbase/fleetops/issues", - "source": "https://github.com/fleetbase/fleetops/tree/v0.6.34" + "source": "https://github.com/fleetbase/fleetops/tree/v0.6.35" }, - "time": "2026-02-05T00:08:14+00:00" + "time": "2026-02-06T00:58:53+00:00" }, { "name": "fleetbase/laravel-mysql-spatial", diff --git a/console/package.json b/console/package.json index f4a3e896..21f43927 100644 --- a/console/package.json +++ b/console/package.json @@ -1,6 +1,6 @@ { "name": "@fleetbase/console", - "version": "0.7.27", + "version": "0.7.28", "private": true, "description": "Modular logistics and supply chain operating system (LSOS)", "repository": "https://github.com/fleetbase/fleetbase", @@ -37,7 +37,7 @@ "@fleetbase/ember-core": "^0.3.10", "@fleetbase/ember-ui": "^0.3.18", "@fleetbase/fleetops-data": "^0.1.25", - "@fleetbase/fleetops-engine": "^0.6.34", + "@fleetbase/fleetops-engine": "^0.6.35", "@fleetbase/iam-engine": "^0.1.6", "@fleetbase/leaflet-routing-machine": "^3.2.17", "@fleetbase/registry-bridge-engine": "^0.1.5", diff --git a/console/pnpm-lock.yaml b/console/pnpm-lock.yaml index 64e8e776..943d9e80 100644 --- a/console/pnpm-lock.yaml +++ b/console/pnpm-lock.yaml @@ -29,8 +29,8 @@ importers: specifier: ^0.1.25 version: 0.1.25(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(webpack@5.105.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(eslint@8.57.1)(webpack@5.105.0) '@fleetbase/fleetops-engine': - specifier: ^0.6.34 - version: 0.6.34(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(webpack@5.105.0))(@glimmer/component@1.1.2(@babel/core@7.29.0))(@glimmer/tracking@1.1.2)(ember-engines@0.9.0(@ember/legacy-built-in-components@0.4.2(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(eslint@8.57.1)(postcss@8.5.6)(rollup@2.79.2)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.105.0) + specifier: ^0.6.35 + version: 0.6.35(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(webpack@5.105.0))(@glimmer/component@1.1.2(@babel/core@7.29.0))(@glimmer/tracking@1.1.2)(ember-engines@0.9.0(@ember/legacy-built-in-components@0.4.2(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(eslint@8.57.1)(postcss@8.5.6)(rollup@2.79.2)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.105.0) '@fleetbase/iam-engine': specifier: ^0.1.6 version: 0.1.6(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(webpack@5.105.0))(@glimmer/component@1.1.2(@babel/core@7.29.0))(@glimmer/tracking@1.1.2)(ember-engines@0.9.0(@ember/legacy-built-in-components@0.4.2(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(eslint@8.57.1)(postcss@8.5.6)(rollup@2.79.2)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.105.0) @@ -1544,8 +1544,8 @@ packages: resolution: {integrity: sha512-uCX/qB4ANDGNN+EM1vdsVc4inprGEwj1dT0G5OTYKsFaHL3CWOeXsOg8qSa5EDClqxIodadx6stB+dSwrhYowg==} engines: {node: '>= 18'} - '@fleetbase/fleetops-engine@0.6.34': - resolution: {integrity: sha512-1xDoJl8fUldGC0VorxcfAfxw6nG1BQrGL9AY1y8go4rosvhoufuZ/F+Ve5tDvZuXNhN5UzsdtoKBgt32ZwJKwQ==} + '@fleetbase/fleetops-engine@0.6.35': + resolution: {integrity: sha512-UYSLnnoV3we4dn/FXjnpmsS+b5/BhnzpIz/3Kg8y9tUAdz6FHRT/PnhOi9Iav99BGFMEiVOyQTJwDs4VDnDgfg==} engines: {node: '>= 18'} peerDependencies: ember-engines: ^0.9.0 @@ -10757,7 +10757,7 @@ snapshots: - utf-8-validate - webpack - '@fleetbase/fleetops-engine@0.6.34(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(webpack@5.105.0))(@glimmer/component@1.1.2(@babel/core@7.29.0))(@glimmer/tracking@1.1.2)(ember-engines@0.9.0(@ember/legacy-built-in-components@0.4.2(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(eslint@8.57.1)(postcss@8.5.6)(rollup@2.79.2)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.105.0)': + '@fleetbase/fleetops-engine@0.6.35(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(webpack@5.105.0))(@glimmer/component@1.1.2(@babel/core@7.29.0))(@glimmer/tracking@1.1.2)(ember-engines@0.9.0(@ember/legacy-built-in-components@0.4.2(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(eslint@8.57.1)(postcss@8.5.6)(rollup@2.79.2)(tracked-built-ins@3.4.0(@babel/core@7.29.0))(webpack@5.105.0)': dependencies: '@babel/core': 7.29.0 '@fleetbase/ember-core': 0.3.10(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.29.0)(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(webpack@5.105.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0)))(ember-source@5.4.1(@babel/core@7.29.0)(@glimmer/component@1.1.2(@babel/core@7.29.0))(rsvp@4.8.5)(webpack@5.105.0))(eslint@8.57.1)(webpack@5.105.0) diff --git a/docker/Dockerfile b/docker/Dockerfile index 376e273f..be4218f0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -75,7 +75,7 @@ ENV QUEUE_CONNECTION=redis ENV CADDYFILE_PATH=/fleetbase/Caddyfile ENV CONSOLE_PATH=/fleetbase/console ENV OCTANE_SERVER=frankenphp -ENV FLEETBASE_VERSION=0.7.27 +ENV FLEETBASE_VERSION=0.7.28 # Set environment ARG ENVIRONMENT=production diff --git a/packages/dev-engine b/packages/dev-engine index f11d032c..e1ee297b 160000 --- a/packages/dev-engine +++ b/packages/dev-engine @@ -1 +1 @@ -Subproject commit f11d032cb8fb8ed4ddd935fb6481215eada5794b +Subproject commit e1ee297bf6a32c1b292ba8321fd47fea5f7a6b12 diff --git a/packages/ember-core b/packages/ember-core index f7d8e3a7..fae4a4f4 160000 --- a/packages/ember-core +++ b/packages/ember-core @@ -1 +1 @@ -Subproject commit f7d8e3a754822f39d07388edfc4549964af5dd62 +Subproject commit fae4a4f41db5b368ca12d1ecd413665e935963fd diff --git a/packages/ember-ui b/packages/ember-ui index ddabb466..33b06980 160000 --- a/packages/ember-ui +++ b/packages/ember-ui @@ -1 +1 @@ -Subproject commit ddabb466c288b2f4c2200d89e3e9f79da5b730ce +Subproject commit 33b06980ebfd2cc72f8916875f7280cf1abf0695 diff --git a/packages/fleetops-data b/packages/fleetops-data index 332dc428..f20408d6 160000 --- a/packages/fleetops-data +++ b/packages/fleetops-data @@ -1 +1 @@ -Subproject commit 332dc428def1dbb41a7599ac69746366325b575f +Subproject commit f20408d663163905624740833ed3ff37b093bd56 diff --git a/packages/iam-engine b/packages/iam-engine index 5b12288f..2ea0d0d9 160000 --- a/packages/iam-engine +++ b/packages/iam-engine @@ -1 +1 @@ -Subproject commit 5b12288f5b9a207d592d02572142793bf69c5e0c +Subproject commit 2ea0d0d97efdb7112c2eea56b132de1c84430e61 diff --git a/packages/registry-bridge b/packages/registry-bridge index c54b945d..2d7ef2bf 160000 --- a/packages/registry-bridge +++ b/packages/registry-bridge @@ -1 +1 @@ -Subproject commit c54b945dc1d8fac9c3be34e9166111ff6bd659e2 +Subproject commit 2d7ef2bf3e4bab6299e2311b9e67338e647c0f96 diff --git a/packages/storefront b/packages/storefront index aa2a2bc0..d6226e89 160000 --- a/packages/storefront +++ b/packages/storefront @@ -1 +1 @@ -Subproject commit aa2a2bc0bdbc78108bf3d60f8e4cd19064b6697a +Subproject commit d6226e89b0cb47ba82f20f0086cb111410e92bc8