Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fleetbase/valhalla-api",
"version": "0.0.2",
"version": "0.0.3",
"description": "Valhalla routing engine extension for Fleetbase",
"keywords": [
"fleetbase",
Expand Down
2 changes: 1 addition & 1 deletion extension.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "valhalla",
"version": "0.0.2",
"version": "0.0.3",
"description": "Valhalla routing engine integration extension",
"repository": "https://github.com/fleetbase/valhalla",
"license": "AGPL-3.0-or-later",
Expand Down
50 changes: 0 additions & 50 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,60 +1,10 @@
'use strict';
const { buildEngine } = require('ember-engines/lib/engine-addon');
const { name } = require('./package');
const Funnel = require('broccoli-funnel');

function isDevServe() {
// env checks
const env = process.env.EMBER_ENV || process.env.NODE_ENV || 'development';
const isProd = env === 'production' || process.env.CI === 'true';

// command-line checks (serve/watch only)
const argv = process.argv.join(' ');
const isServeCmd = /\b(ember|node).* (serve|server)\b/.test(argv) || process.argv.includes('serve') || process.argv.includes('server');
const isWatch = process.argv.includes('--watch') || process.env.BROCCOLI_WATCHER;

return !isProd && (isServeCmd || isWatch);
}

module.exports = buildEngine({
name,

init() {
if (this._super.init) this._super.init.apply(this, arguments);

if (isDevServe()) {
for (let addon of this.addons || []) {
if (['@fleetbase/ember-core', '@fleetbase/ember-ui'].includes(addon.name)) {
let origTreeFor = addon.treeFor?.bind(addon);
addon.treeFor = function (type) {
if (type === 'styles') {
return undefined;
}
return origTreeFor ? origTreeFor(type) : undefined;
};
}
}

const origNonDup = this.nonDuplicatedAddonInvoke?.bind(this);
this.nonDuplicatedAddonInvoke = (hook, args = []) => {
if (hook === 'treeFor' && args[0] === 'styles') {
return []; // prevents dependency style relocation funnel (dev-only)
}
return origNonDup ? origNonDup(hook, args) : [];
};
}
},

postprocessTree(type, tree) {
if (type === 'css') {
tree = new Funnel(tree, {
exclude: ['**/@fleetbase/ember-ui/**/*.css'],
});
}

return tree;
},

lazyLoading: {
enabled: true,
},
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fleetbase/valhalla-engine",
"version": "0.0.2",
"version": "0.0.3",
"description": "Valhalla routing engine extension for Fleetbase",
"keywords": [
"fleetbase-extension",
Expand Down Expand Up @@ -42,8 +42,8 @@
},
"dependencies": {
"@babel/core": "^7.23.2",
"@fleetbase/ember-core": "^0.3.7",
"@fleetbase/ember-ui": "^0.3.12",
"@fleetbase/ember-core": "^0.3.8",
"@fleetbase/ember-ui": "^0.3.14",
"@fleetbase/leaflet-routing-machine": "^3.2.17",
"@fortawesome/ember-fontawesome": "^2.0.0",
"@fortawesome/fontawesome-svg-core": "6.4.0",
Expand Down
Loading
Loading