Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: adopted-ember-addons/ember-cli-dependency-checker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: be93b39d17bc6c74aa0b34d7927486e9e894390b
Choose a base ref
...
head repository: adopted-ember-addons/ember-cli-dependency-checker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 76ebe58cff710b04da5705a71a1ee48772865313
Choose a head ref
  • 8 commits
  • 2 files changed
  • 4 contributors

Commits on Apr 8, 2022

  1. Copy the full SHA
    cd88962 View commit details
  2. Copy the full SHA
    7480485 View commit details
  3. Merge pull request quaertym#129 from SergeAstapov/avoid-bower-depreca…

    …tion
    
    Avoid bower deprecations in ember-cli 4.3+
    quaertym authored Apr 8, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a6ee22d View commit details
  4. Merge pull request quaertym#131 from SergeAstapov/peerDeps-v4

    Allow ember-cli@4 in `peerDependencies`
    quaertym authored Apr 8, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    32cec60 View commit details

Commits on Apr 9, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    518790c View commit details

Commits on Apr 12, 2022

  1. Update package.json

    NullVoxPopuli authored Apr 12, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    90ca2db View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ba8e765 View commit details
  3. 3.3.1

    quaertym committed Apr 12, 2022
    Copy the full SHA
    76ebe58 View commit details
Showing with 17 additions and 9 deletions.
  1. +15 −7 lib/dependency-checker.js
  2. +2 −2 package.json
22 changes: 15 additions & 7 deletions lib/dependency-checker.js
Original file line number Diff line number Diff line change
@@ -134,13 +134,21 @@ class EmberCLIDependencyChecker {
}

normalizedBowerDependencies() {
const npmDependencies = this.project.dependencies();
const bowerDependencies = this.project.bowerDependencies();
Object.keys(bowerDependencies).forEach((pkg) => {
if(npmDependencies.hasOwnProperty(`@bower_components/${pkg}`)) {
delete bowerDependencies[pkg];
}
});
let bowerDependencies = {};

const bowerPath = path.join(this.project.root, 'bower.json');

if (fs.existsSync(bowerPath)) {
const npmDependencies = this.project.dependencies();
bowerDependencies = this.project.bowerDependencies();

Object.keys(bowerDependencies).forEach((pkg) => {
if(npmDependencies.hasOwnProperty(`@bower_components/${pkg}`)) {
delete bowerDependencies[pkg];
}
});
}

return bowerDependencies;
}

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-cli-dependency-checker",
"version": "3.3.0",
"version": "3.3.1",
"description": "Ember CLI addon for detecting missing npm and bower dependencies before executing ember commands",
"keywords": [
"bower",
@@ -54,7 +54,7 @@
"sinon": "^13.0.0"
},
"peerDependencies": {
"ember-cli": "~3.2.0"
"ember-cli": "^3.2.0 || ^4.0.0"
},
"engines": {
"node": ">= 6"