Merge pull request #69 from fleetbase/dev-v0.2.28

import leaflet assets direct to vendor
fleetbase · Sep 16, 2024 · b093761 · b093761
2 parents 3378cd0 + 844fc38
commit b093761
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/index.js b/index.js
@@ -57,37 +57,25 @@ module.exports = {
         app.options = app.options || {};
         app.options.postcssOptions = postcssOptions;
 
+        if (!app.__leafletIncluded) {
+            app.__leafletIncluded = true;
+            this.import('node_modules/leaflet/dist/leaflet-src.js');
+            this.import('node_modules/leaflet/dist/leaflet.css');
+        }
+
         // Import the `intlTelInput.min.css` file and append it to the parent application's `vendor.css`
         this.import('node_modules/intl-tel-input/build/css/intlTelInput.min.css');
     },
 
     treeForLeaflet: function () {
-        const trees = [];
         const leafletImagesPath = path.join(this.pathBase('leaflet'), 'dist', 'images');
-        const alwaysExclude = ['LICENSE', 'package.json', 'example.html'];
-        const leafletAddons = [{ package: 'leaflet', include: ['leaflet-src.js'], exclude: [...alwaysExclude], path: ['dist'] }];
-
-        for (let i = 0; i < leafletAddons.length; i++) {
-            const leafletAdddon = leafletAddons[i];
-            const leafletAddonDist = path.join(this.pathBase(leafletAdddon.package), ...leafletAdddon.path);
-
-            trees.push(
-                new Funnel(leafletAddonDist, {
-                    destDir: 'leaflet',
-                    include: leafletAdddon.include,
-                    exclude: leafletAdddon.exclude,
-                    getDestinationPath: leafletAdddon.getDestinationPath,
-                })
-            );
-        }
-
-        trees.push(
+        const trees = [
             new Funnel(leafletImagesPath, {
                 srcDir: '/',
                 destDir: '/leaflet-images',
                 allowEmpty: true,
-            })
-        );
+            }),
+        ];
 
         return trees;
     },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/ember-ui",
-    "version": "0.2.27",
+    "version": "0.2.28",
     "description": "Fleetbase UI provides all the interface components, helpers, services and utilities for building a Fleetbase extension into the Console.",
     "keywords": [
         "fleetbase-ui",