jandres/Fleetbase-Mirror-Repo
1
0
Fork 0
mirror of https://github.com/fleetbase/fleetbase.git synced 2026-01-08 07:16:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Hotfix release

Browse Source
This commit is contained in:
Ronald A. Richardson
2024-10-03 14:58:39 +08:00
parent e8ac2a3796
commit 3dc562987a
3 changed files with 66 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
console/package.json
View File

@@ -28,16 +28,17 @@
"test:ember": "ember test"
},
"dependencies": {
"@ember/legacy-built-in-components": "^0.4.2",
"@fleetbase/customer-portal-engine": "^0.0.1",
"@fleetbase/dev-engine": "^0.2.7",
"@fleetbase/ember-core": "^0.2.19",
"@fleetbase/ember-ui": "^0.2.32",
"@fleetbase/fleetops-engine": "^0.5.8",
"@fleetbase/storefront-engine": "^0.3.15",
"@fleetbase/dev-engine": "^0.2.7",
"@fleetbase/iam-engine": "^0.1.1",
"@fleetbase/registry-bridge-engine": "^0.0.14",
"@fleetbase/fleetops-data": "^0.1.18",
"@fleetbase/fleetops-engine": "^0.5.8",
"@fleetbase/iam-engine": "^0.1.1",
"@fleetbase/leaflet-routing-machine": "^3.2.16",
"@ember/legacy-built-in-components": "^0.4.2",
"@fleetbase/registry-bridge-engine": "^0.0.14",
"@fleetbase/storefront-engine": "^0.3.15",
"@fortawesome/ember-fontawesome": "^2.0.0",
"ember-changeset": "^4.1.2",
"ember-changeset-validations": "^4.1.1",
@@ -140,9 +141,6 @@
"@fleetbase/ember-core": "^0.2.19",
"@fleetbase/ember-ui": "^0.2.32",
"@fleetbase/fleetops-data": "^0.1.18"
},
"patchedDependencies": {
"ember-leaflet@5.1.3": "patches/ember-leaflet@5.1.3.patch"
}
},
"prettier": {

95
console/patches/ember-leaflet@5.1.3.patch
View File

@@ -1,95 +0,0 @@
diff --git a/index.js b/index.js
index 7361871adfe0b79c70a3699e38cc435f3741cb33..e02f7e6d61605d8b770ed5c0454b6c905d538ff9 100644
--- a/index.js
+++ b/index.js
@@ -1,87 +1,5 @@
-'use strict';
-const resolve = require('resolve');
-const path = require('path');
-const mergeTrees = require('broccoli-merge-trees');
-const Funnel = require('broccoli-funnel');
-const fastbootTransform = require('fastboot-transform');
+'use strict'
module.exports = {
- name: require('./package').name,
-
- treeForVendor() {
- let dist = path.join(this.pathBase('leaflet'), 'dist');
-
- let leafletJs = fastbootTransform(
- new Funnel(dist, {
- files: ['leaflet-src.js'],
- destDir: 'leaflet'
- })
- );
-
- let leafletFiles = new Funnel(dist, {
- exclude: ['leaflet.js', 'leaflet-src.js', '*.html'],
- destDir: 'leaflet'
- });
-
- return mergeTrees([leafletJs, leafletFiles]);
- },
-
- included(app) {
- this._super.included.apply(this, arguments);
-
- // Addon options from the apps ember-cli-build.js
- let options = app.options[this.name] || {};
-
- // If the addon has the _findHost() method (in ember-cli >= 2.7.0), we'll just
- // use that.
- // if (typeof this._findHost === 'function') {
- // app = this._findHost();
- // }
-
- // Otherwise, we'll use this implementation borrowed from the _findHost()
- // method in ember-cli.
- // Keep iterating upward until we don't have a grandparent.
- // Has to do this grandparent check because at some point we hit the project.
- let current = this;
- do {
- if (current.lazyLoading === true || (current.lazyLoading && current.lazyLoading.enabled === true)) {
- app = current;
- break;
- }
- app = current.app || app;
- } while (current.parent.parent && (current = current.parent));
-
- if (!options.excludeJS) {
- app.import('vendor/leaflet/leaflet-src.js');
- }
-
- // Import leaflet css
- if (!options.excludeCSS) {
- app.import('vendor/leaflet/leaflet.css');
- }
-
- // Import leaflet images
- if (!options.excludeImages) {
- let imagesDestDir = '/assets/images';
- app.import('vendor/leaflet/images/layers-2x.png', {
- destDir: imagesDestDir
- });
- app.import('vendor/leaflet/images/layers.png', {
- destDir: imagesDestDir
- });
- app.import('vendor/leaflet/images/marker-icon-2x.png', {
- destDir: imagesDestDir
- });
- app.import('vendor/leaflet/images/marker-icon.png', {
- destDir: imagesDestDir
- });
- app.import('vendor/leaflet/images/marker-shadow.png', {
- destDir: imagesDestDir
- });
- }
- },
-
- pathBase(packageName) {
- return path.dirname(resolve.sync(packageName + '/package.json', { basedir: __dirname }));
- }
-};
+ name: require('./package').name
+}

66
console/pnpm-lock.yaml generated
View File

@@ -9,11 +9,6 @@ overrides:
'@fleetbase/ember-ui': ^0.2.32
'@fleetbase/fleetops-data': ^0.1.18
patchedDependencies:
ember-leaflet@5.1.3:
hash: 2hdi7ajimhpivctwjmqkqnthem
path: patches/ember-leaflet@5.1.3.patch
importers:
.:
@@ -21,6 +16,9 @@ importers:
'@ember/legacy-built-in-components':
specifier: ^0.4.2
version: 0.4.2(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))
'@fleetbase/customer-portal-engine':
specifier: ^0.0.1
version: 0.0.1(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@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.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(eslint@8.57.1)(postcss@8.4.47)(rollup@2.79.2)(tracked-built-ins@3.3.0)(webpack@5.95.0)
'@fleetbase/dev-engine':
specifier: ^0.2.7
version: 0.2.7(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@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.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(eslint@8.57.1)(postcss@8.4.47)(rollup@2.79.2)(tracked-built-ins@3.3.0)(webpack@5.95.0)
@@ -1542,6 +1540,12 @@ packages:
resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
'@fleetbase/customer-portal-engine@0.0.1':
resolution: {integrity: sha512-QIBuzHoowHQc/wXc1/yF8vAa1EuxWfg3gHgvZ+OFHYbBU3d1zx3YhFf0EuluhC5tdFGAOCJfgKiZSS4VHcYpoQ==}
engines: {node: '>= 18'}
peerDependencies:
ember-engines: ^0.9.0
'@fleetbase/dev-engine@0.2.7':
resolution: {integrity: sha512-+XQqJQ97y4WPC3iRgdEjo/9DXHPfSXQf/+2grzZzZ3JNzsMgeKu/0yet0oD4ESdHTK5ymp5WoyOuumnkq4L6Jw==}
engines: {node: '>= 18'}
@@ -10421,6 +10425,54 @@ snapshots:
'@eslint/js@8.57.1': {}
'@fleetbase/customer-portal-engine@0.0.1(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@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.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(eslint@8.57.1)(postcss@8.4.47)(rollup@2.79.2)(tracked-built-ins@3.3.0)(webpack@5.95.0)':
dependencies:
'@babel/core': 7.25.2
'@fleetbase/ember-core': 0.2.19(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(eslint@8.57.1)(webpack@5.95.0)
'@fleetbase/ember-ui': 0.2.32(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(postcss@8.4.47)(rollup@2.79.2)(tracked-built-ins@3.3.0)(webpack@5.95.0)
'@fleetbase/leaflet-routing-machine': 3.2.16
'@fortawesome/ember-fontawesome': 2.0.0(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(rollup@2.79.2)(webpack@5.95.0)
'@fortawesome/fontawesome-svg-core': 6.4.0
'@fortawesome/free-brands-svg-icons': 6.4.0
'@fortawesome/free-solid-svg-icons': 6.4.0
'@stripe/connect-js': 3.3.13
broccoli-funnel: 3.0.8
broccoli-merge-trees: 4.2.0
ember-auto-import: 2.8.1(webpack@5.95.0)
ember-cli-babel: 8.2.0(@babel/core@7.25.2)
ember-cli-htmlbars: 6.3.0
ember-drag-sort: 3.0.1
ember-engines: 0.9.0(@ember/legacy-built-in-components@0.4.2(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))
ember-intl: 6.3.2(@babel/core@7.25.2)(webpack@5.95.0)
ember-radio-button: 3.0.0-beta.1
ember-wormhole: 0.6.0
transitivePeerDependencies:
- '@ember/string'
- '@ember/test-helpers'
- '@glimmer/component'
- '@glimmer/tracking'
- '@glint/environment-ember-loose'
- '@glint/template'
- '@swc/core'
- bufferutil
- ember-cli-mirage
- ember-resolver
- ember-source
- esbuild
- eslint
- miragejs
- postcss
- rollup
- supports-color
- tracked-built-ins
- ts-node
- typescript
- uglify-js
- utf-8-validate
- webpack
- webpack-cli
- webpack-command
'@fleetbase/dev-engine@0.2.7(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@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.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(eslint@8.57.1)(postcss@8.4.47)(rollup@2.79.2)(tracked-built-ins@3.3.0)(webpack@5.95.0)':
dependencies:
'@babel/core': 7.25.2
@@ -10564,7 +10616,7 @@ snapshots:
ember-get-config: 2.1.1
ember-gridstack: 4.0.0(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0)
ember-inflector: 4.0.3(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))
ember-leaflet: 5.1.3(patch_hash=2hdi7ajimhpivctwjmqkqnthem)(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(leaflet@1.9.4)(webpack@5.95.0)
ember-leaflet: 5.1.3(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(leaflet@1.9.4)(webpack@5.95.0)
ember-loading: 2.0.0(@babel/core@7.25.2)
ember-math-helpers: 4.0.0(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))
ember-modifier: 4.2.0(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))
@@ -14843,7 +14895,7 @@ snapshots:
- supports-color
- webpack
ember-leaflet@5.1.3(patch_hash=2hdi7ajimhpivctwjmqkqnthem)(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(leaflet@1.9.4)(webpack@5.95.0):
ember-leaflet@5.1.3(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.95.0))(leaflet@1.9.4)(webpack@5.95.0):
dependencies:
'@glimmer/component': 1.1.2(@babel/core@7.25.2)
'@glimmer/tracking': 1.1.2