Skip to content

Commit ee4e40c

Browse files
authored
Merge pull request #132 from ember-engines/update-dependencies
2 parents 4293388 + 04609dd commit ee4e40c

File tree

4 files changed

+1349
-24
lines changed

4 files changed

+1349
-24
lines changed

index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* eslint-env node */
22
'use strict';
33

4-
var Funnel = require('broccoli-funnel');
5-
var findHost = require('./lib/utils/find-host');
4+
const funnel = require('broccoli-funnel');
5+
const findHost = require('./lib/utils/find-host');
66

77
module.exports = {
88
name: 'ember-asset-loader',
@@ -14,11 +14,11 @@ module.exports = {
1414
* @override
1515
*/
1616
treeForApp: function() {
17-
var tree = this._super.treeForApp.apply(this, arguments);
18-
var app = findHost(this);
17+
let tree = this._super.treeForApp.apply(this, arguments);
18+
const app = findHost(this);
1919

2020
if (app && app.options && app.options.assetLoader && app.options.assetLoader.noManifest) {
21-
tree = new Funnel(tree, {
21+
tree = funnel(tree, {
2222
exclude: [
2323
'config/asset-manifest.js',
2424
'instance-initializers/load-asset-manifest.js'

lib/manifest-generator.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
var Addon = require('ember-cli/lib/models/addon');
2-
var objectAssign = require('object-assign');
32
var findHost = require('./utils/find-host');
43

54
/**
@@ -40,7 +39,7 @@ var ManifestGenerator = Addon.extend({
4039

4140
var filesToIgnore = (this.manifestOptions && this.manifestOptions.filesToIgnore || []).concat(assetLoaderOptions.filesToIgnore || []);
4241

43-
var manifestOptions = objectAssign({
42+
var manifestOptions = Object.assign({
4443
appName: app.name
4544
}, this.manifestOptions, assetLoaderOptions, { filesToIgnore });
4645

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,11 @@
4646
},
4747
"dependencies": {
4848
"broccoli-caching-writer": "^3.0.3",
49-
"broccoli-funnel": "^2.0.2",
50-
"broccoli-merge-trees": "^3.0.2",
51-
"ember-cli-babel": "^7.7.3",
52-
"fs-extra": "^7.0.1",
53-
"object-assign": "^4.1.0",
54-
"walk-sync": "^1.1.3"
49+
"broccoli-funnel": "^3.0.8",
50+
"broccoli-merge-trees": "^4.2.0",
51+
"ember-cli-babel": "^7.26.11",
52+
"fs-extra": "^10.1.0",
53+
"walk-sync": "^3.0.0"
5554
},
5655
"engines": {
5756
"node": "14.* || 16.* || >= 17"

0 commit comments

Comments
 (0)