Skip to content

Commit

Permalink
Merge pull request #132 from ember-engines/update-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
rwjblue committed May 9, 2022
2 parents 4293388 + 04609dd commit ee4e40c
Show file tree
Hide file tree
Showing 4 changed files with 1,349 additions and 24 deletions.
10 changes: 5 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-env node */
'use strict';

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

module.exports = {
name: 'ember-asset-loader',
Expand All @@ -14,11 +14,11 @@ module.exports = {
* @override
*/
treeForApp: function() {
var tree = this._super.treeForApp.apply(this, arguments);
var app = findHost(this);
let tree = this._super.treeForApp.apply(this, arguments);
const app = findHost(this);

if (app && app.options && app.options.assetLoader && app.options.assetLoader.noManifest) {
tree = new Funnel(tree, {
tree = funnel(tree, {
exclude: [
'config/asset-manifest.js',
'instance-initializers/load-asset-manifest.js'
Expand Down
3 changes: 1 addition & 2 deletions lib/manifest-generator.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var Addon = require('ember-cli/lib/models/addon');
var objectAssign = require('object-assign');
var findHost = require('./utils/find-host');

/**
Expand Down Expand Up @@ -40,7 +39,7 @@ var ManifestGenerator = Addon.extend({

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

var manifestOptions = objectAssign({
var manifestOptions = Object.assign({
appName: app.name
}, this.manifestOptions, assetLoaderOptions, { filesToIgnore });

Expand Down
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,11 @@
},
"dependencies": {
"broccoli-caching-writer": "^3.0.3",
"broccoli-funnel": "^2.0.2",
"broccoli-merge-trees": "^3.0.2",
"ember-cli-babel": "^7.7.3",
"fs-extra": "^7.0.1",
"object-assign": "^4.1.0",
"walk-sync": "^1.1.3"
"broccoli-funnel": "^3.0.8",
"broccoli-merge-trees": "^4.2.0",
"ember-cli-babel": "^7.26.11",
"fs-extra": "^10.1.0",
"walk-sync": "^3.0.0"
},
"engines": {
"node": "14.* || 16.* || >= 17"
Expand Down
Loading

0 comments on commit ee4e40c

Please sign in to comment.