Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade broccoli-merge-trees #9790

Merged
merged 1 commit into from Feb 24, 2022
Merged

Upgrade broccoli-merge-trees #9790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/broccoli/ember-app.js
View file
Open in desktop
Expand Up @@ -20,9 +20,9 @@ const concat = require('broccoli-concat');
const BroccoliDebug = require('broccoli-debug');
const AmdFunnel = require('broccoli-amd-funnel');
const mergeTrees = require('./merge-trees');
const broccoliMergeTrees = require('broccoli-merge-trees');
const WatchedDir = require('broccoli-source').WatchedDir;
const UnwatchedDir = require('broccoli-source').UnwatchedDir;
const BroccoliMergeTrees = require('broccoli-merge-trees');

const merge = require('ember-cli-lodash-subset').merge;
const defaultsDeep = require('ember-cli-lodash-subset').defaultsDeep;
Expand Down Expand Up @@ -1727,7 +1727,7 @@ class EmberApp {
}

let trees = [].concat(packagedTree, additionalTrees).filter(Boolean);
let combinedPackageTree = new BroccoliMergeTrees(trees);
let combinedPackageTree = broccoliMergeTrees(trees);

return this.addonPostprocessTree('all', combinedPackageTree);
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@
"broccoli-debug": "^0.6.5",
"broccoli-funnel": "^3.0.8",
"broccoli-funnel-reducer": "^1.0.0",
"broccoli-merge-trees": "^3.0.2",
"broccoli-merge-trees": "^4.2.0",
"broccoli-middleware": "^2.1.1",
"broccoli-slow-trees": "^3.1.0",
"broccoli-source": "^3.0.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/broccoli/ember-app-test.js
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ const createTempDir = broccoliTestHelper.createTempDir;
const MockCLI = require('../../helpers/mock-cli');
const { isExperimentEnabled } = require('../../../lib/experiments');
const mergeTrees = require('../../../lib/broccoli/merge-trees');
const BroccoliMergeTrees = require('broccoli-merge-trees');
const BroccoliMergeTrees = require('broccoli-merge-trees').MergeTrees;

let EmberApp = require('../../../lib/broccoli/ember-app');
const Addon = require('../../../lib/models/addon');
Expand Down
8 changes: 8 additions & 0 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -1393,6 +1393,14 @@ broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
broccoli-plugin "^1.3.0"
merge-trees "^2.0.0"

broccoli-merge-trees@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c"
integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==
dependencies:
broccoli-plugin "^4.0.2"
merge-trees "^2.0.0"

broccoli-middleware@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"
Expand Down