Skip to content

Commit 9162337

Browse files
committed
Updated core dependencies, and removed redundant ember-ui styles filter hook
1 parent b68cc9a commit 9162337

3 files changed

Lines changed: 1848 additions & 3514 deletions

File tree

index.js

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,10 @@
11
'use strict';
22
const { buildEngine } = require('ember-engines/lib/engine-addon');
33
const { name } = require('./package');
4-
const Funnel = require('broccoli-funnel');
5-
6-
function isDevServe() {
7-
// env checks
8-
const env = process.env.EMBER_ENV || process.env.NODE_ENV || 'development';
9-
const isProd = env === 'production' || process.env.CI === 'true';
10-
11-
// command-line checks (serve/watch only)
12-
const argv = process.argv.join(' ');
13-
const isServeCmd = /\b(ember|node).* (serve|server)\b/.test(argv) || process.argv.includes('serve') || process.argv.includes('server');
14-
const isWatch = process.argv.includes('--watch') || process.env.BROCCOLI_WATCHER;
15-
16-
return !isProd && (isServeCmd || isWatch);
17-
}
184

195
module.exports = buildEngine({
206
name,
217

22-
init() {
23-
if (this._super.init) this._super.init.apply(this, arguments);
24-
25-
if (isDevServe()) {
26-
for (let addon of this.addons || []) {
27-
if (['@fleetbase/ember-core', '@fleetbase/ember-ui'].includes(addon.name)) {
28-
let origTreeFor = addon.treeFor?.bind(addon);
29-
addon.treeFor = function (type) {
30-
if (type === 'styles') {
31-
return undefined;
32-
}
33-
return origTreeFor ? origTreeFor(type) : undefined;
34-
};
35-
}
36-
}
37-
38-
const origNonDup = this.nonDuplicatedAddonInvoke?.bind(this);
39-
this.nonDuplicatedAddonInvoke = (hook, args = []) => {
40-
if (hook === 'treeFor' && args[0] === 'styles') {
41-
return []; // prevents dependency style relocation funnel (dev-only)
42-
}
43-
return origNonDup ? origNonDup(hook, args) : [];
44-
};
45-
}
46-
},
47-
48-
postprocessTree(type, tree) {
49-
if (type === 'css') {
50-
tree = new Funnel(tree, {
51-
exclude: ['**/@fleetbase/ember-ui/**/*.css'],
52-
});
53-
}
54-
55-
return tree;
56-
},
57-
588
lazyLoading: {
599
enabled: true,
6010
},

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fleetbase/dev-engine",
3-
"version": "0.2.11",
3+
"version": "0.2.12",
44
"description": "Fleetbase Developers extension provides a module for managing developer resources such as API keys, webhooks, sockets, events and logs.",
55
"fleetbase": {
66
"route": "developers"
@@ -42,8 +42,8 @@
4242
},
4343
"dependencies": {
4444
"@babel/core": "^7.23.2",
45-
"@fleetbase/ember-core": "^0.3.7",
46-
"@fleetbase/ember-ui": "^0.3.12",
45+
"@fleetbase/ember-core": "^0.3.8",
46+
"@fleetbase/ember-ui": "^0.3.13",
4747
"@fortawesome/ember-fontawesome": "^2.0.0",
4848
"@fortawesome/fontawesome-svg-core": "6.4.0",
4949
"@fortawesome/free-brands-svg-icons": "6.4.0",

0 commit comments

Comments
 (0)