Merge pull request #4352 from storybooks/dependabot/npm_and_yarn/embe…

…r-resolver-5.0.1

Bump ember-resolver from 4.5.6 to 5.0.1

examples/ember-cli/package.json

@@ -36,7 +36,7 @@
  "ember-cli-sri": "^2.1.0",
  "ember-cli-uglify": "^2.0.0",
  "ember-load-initializers": "^1.1.0",
- "ember-resolver": "^4.0.0",
+ "ember-resolver": "^5.0.1",
  "ember-source": "~3.5.0",
  "loader.js": "^4.2.3",
  "webpack": "^4.17.1",

yarn.lock

@@ -5023,7 +5023,7 @@ broccoli-funnel-reducer@^1.0.0:
  resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
  integrity sha1-ETZbKnha7JsXlyo234fu8kxcwOo=
 
-broccoli-funnel@^1.0.0, broccoli-funnel@^1.1.0:
+broccoli-funnel@^1.0.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
  integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
@@ -8297,15 +8297,15 @@ ember-load-initializers@^1.1.0:
  dependencies:
  ember-cli-babel "^6.6.0"
 
-ember-resolver@^4.0.0:
- version "4.5.6"
- resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-4.5.6.tgz#61cecc683fbe3464d759e6d0c2bab97b3914ee4b"
- integrity sha512-v+VfQKkYCzdI49cGhPAWlvkjnyYEk1x7/CBKH9xakd8qyByNh6996/EgN0Wzew7B2Gj+cFXii0cEGI8iFAxj6g==
+ember-resolver@5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-5.0.1.tgz#21740b92e1e4a65f94018de22aa1c73434dc3b2f"
+ integrity sha512-Svhs/eseIVQ6Yik+4mFpixT639FREZW2UkIYo7197bRuSL63tofKDMfE+gOXUSSudQlQSaFHFeKDr9oD+0C2GQ==
  dependencies:
  "@glimmer/resolver" "^0.4.1"
  babel-plugin-debug-macros "^0.1.10"
- broccoli-funnel "^1.1.0"
- broccoli-merge-trees "^2.0.0"
+ broccoli-funnel "^2.0.1"
+ broccoli-merge-trees "^3.0.0"
  ember-cli-babel "^6.8.1"
  ember-cli-version-checker "^2.0.0"
  resolve "^1.3.3"