@fleetbase/fleetops-engine 0.0.1 → 0.0.2

package/addon/components/leaflet-draw-control.js

@@ -1,4 +1,3 @@
-import 'leaflet-draw-src';
 import BaseLayer from 'ember-leaflet/components/base-layer';
 import { getProperties, computed } from '@ember/object';
 import { run } from '@ember/runloop';

package/addon/components/leaflet-rotated-marker.js

@@ -1,5 +1,4 @@
 import MarkerLayer from 'ember-leaflet/components/marker-layer';
-import 'leaflet-rotatedmarker';
 
 export default class LeafletRotatedMarkerComponent extends MarkerLayer {
     leafletOptions = [

package/addon/components/live-map.js

@@ -1,4 +1,3 @@
-import 'leaflet-contextmenu';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
@@ -132,6 +131,7 @@ export default class LiveMapComponent extends Component {
         }
 
         const { contextmenu } = map;
+        console.log('map.contextmenu', contextmenu);
         const contextMenuItems = this.buildContextMenuItems();
 
         contextMenuItems.forEach((options) => contextmenu.addItem(options));

package/index.js

@@ -3,9 +3,7 @@ const Funnel = require('broccoli-funnel');
 const MergeTrees = require('broccoli-merge-trees');
 const { buildEngine } = require('ember-engines/lib/engine-addon');
 const { name } = require('./package');
-const packagePrefix = `node_modules/${name}/node_modules`;
-// const fs = require('fs-extra');
-// const path = require('path');
+const path = require('path');
 
 module.exports = buildEngine({
     name,
@@ -14,42 +12,35 @@ module.exports = buildEngine({
         enabled: true,
     },
 
-    _concatStyles: () => {},
-
     included: function (app) {
         this._super.included.apply(this, arguments);
 
-        // leaflet-rotatedmarker js
-        this.import(`${packagePrefix}/leaflet-rotatedmarker/leaflet.rotatedMarker.js`, {
-            using: [{ transformation: 'es6', as: 'leaflet-rotatedmarker' }],
-        });
-
-        // leaflet-contextmenu js
-        this.import(`${packagePrefix}/leaflet-contextmenu/dist/leaflet.contextmenu.js`, {
-            using: [{ transformation: 'es6', as: 'leaflet-contextmenu' }],
-        });
+        const importJs = (module, file, options) => {
+            const modulePath = path.dirname(require.resolve(module));
+            this.import(`${modulePath}/${file}`, options);
+        };
 
-        // leaflet-contextmenu css
-        this.import(`${packagePrefix}/leaflet-contextmenu/dist/leaflet.contextmenu.css`);
+        importJs('leaflet-rotatedmarker', 'leaflet.rotatedMarker.js');
+        importJs('leaflet-draw', 'leaflet.draw-src.js');
+        importJs('leaflet-contextmenu', 'leaflet.contextmenu.js');
 
-        // leaflet-draw js
-        this.import(`${packagePrefix}/leaflet-draw/dist/leaflet.draw-src.js`, {
-            using: [{ transformation: 'es6', as: 'leaflet-draw-src' }],
-        });
-
-        // leaflet-draw css
-        this.import(`${packagePrefix}/leaflet-draw/dist/leaflet.draw.css`);
+        // import stylesheets
+        this.import('node_modules/leaflet-contextmenu/dist/leaflet.contextmenu.css');
+        this.import('node_modules/leaflet-draw/dist/leaflet.draw.css');
     },
 
     treeForPublic: function () {
         const publicTree = this._super.treeForPublic.apply(this, arguments);
 
         // Use a Funnel assets
+        const leafletPath = path.dirname(require.resolve('leaflet'));
+        const leafletImagesPath = path.join(leafletPath, 'images');
         const addonTree = [
             new Funnel(`node_modules/${name}/assets`, {
                 destDir: '/',
             }),
-            new Funnel(`${packagePrefix}/leaflet/dist/images`, {
+            new Funnel(leafletImagesPath, {
+                srcDir: '/',
                 destDir: '/leaflet-images',
             }),
         ];
@@ -58,14 +49,7 @@ module.exports = buildEngine({
         return publicTree ? new MergeTrees([publicTree, ...addonTree], { overwrite: true }) : new MergeTrees([...addonTree], { overwrite: true });
     },
 
-    // postBuild: function (result) {
-    //     const src = path.join(result.directory, 'assets', 'leaflet-images');
-    //     const dest = path.join(result.directory, '..', '..', 'public', 'fleet-ops', 'assets', 'images');
-
-    //     if (fs.existsSync(src)) {
-    //         fs.copySync(src, dest);
-    //     }
-    // },
+    _concatStyles: () => {},
 
     isDevelopingAddon() {
         return true;

package/package.json

@@ -2,7 +2,7 @@
     "name": "@fleetbase/fleetops-engine",
     "extension": "Fleet Ops",
     "icon": "route",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "priority": 0,
     "description": "Fleetbase Fleet-Ops extension provides a fleet management and last mile delivery operations system module.",
     "keywords": [