Skip to content

Commit 28a30d2

Browse files
committed
Auto merge of #2011 - rust-lang:dependabot/npm_and_yarn/ember-cli-3.15.0, r=Turbo87
Bump ember-cli from 3.14.0 to 3.15.0 Bumps [ember-cli](https://github.com/ember-cli/ember-cli) from 3.14.0 to 3.15.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/ember-cli/ember-cli/releases">ember-cli's releases</a>.</em></p> <blockquote> <h2>v3.15.0</h2> <h4>Blueprint Changes</h4> <ul> <li><a href="https://github.com/ember-cli/ember-new-output/compare/v3.14.0...v3.15.0"><code>ember new</code> diff</a></li> <li><a href="https://github.com/ember-cli/ember-addon-output/compare/v3.14.0...v3.15.0"><code>ember addon</code> diff</a></li> </ul> <h4>Changelog</h4> <ul> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8963">#8963</a> Remove <code>app/templates/components</code> <a href="https://github.com/chancancode">@​chancancode</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8964">#8964</a> Add support for <code>ember new @scope-here/name-here</code>. <a href="https://github.com/rwjblue">@​rwjblue</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8965">#8965</a> Update ember-resolver to v7.0.0. <a href="https://github.com/rwjblue">@​rwjblue</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8971">#8971</a> Add an ember-try scenario for Ember &quot;classic&quot; (pre-octane). <a href="https://github.com/rwjblue">@​rwjblue</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8972">#8972</a> Update ember-data to 3.15.0. <a href="https://github.com/rwjblue">@​rwjblue</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8933">#8933</a> Remove <code>app/resolver.js</code> in favor of importing in <code>app/app.js</code> <a href="https://github.com/rwjblue">@​rwjblue</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8945">#8945</a> Fix issue with addon <code>.travis.yml</code> configuration when using <code>npm</code> <a href="https://github.com/kellyselden">@​kellyselden</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8946">#8946</a> Drop testing of [email protected] in the addon blueprints ember-try config <a href="https://github.com/kellyselden">@​kellyselden</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8946">#8946</a> Add testing of [email protected] in the addon blueprints ember-try config <a href="https://github.com/kellyselden">@​kellyselden</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8959">#8959</a> Fix issue with addon discovery when npm/yarn leave empty directories in resolvable locations <a href="https://github.com/stefanpenner">@​stefanpenner</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8961">#8961</a> Prepare for Octane release in 3.15 <a href="https://github.com/rwjblue">@​rwjblue</a> <ul> <li>Adds <code>ember</code> property to <code>package.json</code> to implement <a href="https://github-redirect.dependabot.com/emberjs/rfcs/pull/558">emberjs/rfcs#558</a></li> <li>Adds <code>@glimmer/[email protected]</code> as a development dependency for both apps and addons</li> <li>Updates <code>ember-try</code> to at least 1.4.0 in order to support <code>config/ember-try.js</code> scenarios with <code>ember</code> <code>package.json</code> property (mentioned in <a href="https://github-redirect.dependabot.com/emberjs/rfcs/issues/558">emberjs/rfcs#558</a>)</li> <li>Enables Octane related optional features</li> <li>Updates ember-template-lint configuration to use <code>octane</code> preset</li> <li>Update to [email protected] stable</li> <li>Updates all packages in the application blueprint to their latest version</li> </ul> </li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8827">#8827</a> Remove module-unification blueprints <a href="https://github.com/dcyriller">@​dcyriller</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8878">#8878</a> Adds flag to throw an error for invalid addon locations <a href="https://github.com/tmquinn">@​tmquinn</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8906">#8906</a> Enable broccoli memoization by default in Ember-CLI <a href="https://github.com/SparshithNR">@​SparshithNR</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8917">#8917</a> Update CI configuration for applications using <code>npm</code> to run a &quot;floating dependencies&quot; test. <a href="https://github.com/kellyselden">@​kellyselden</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8926">#8926</a> Add <code>application</code> to invalid names <a href="https://github.com/kennethlarsen">@​kennethlarsen</a></li> </ul> <p>Thank you to all who took the time to contribute!</p> <h2>v3.15.0-beta.3</h2> <h4>Blueprint Changes</h4> <ul> <li><a href="https://github.com/ember-cli/ember-new-output/compare/v3.15.0-beta.1...v3.15.0-beta.3"><code>ember new</code> diff</a></li> <li><a href="https://github.com/ember-cli/ember-addon-output/compare/v3.15.0-beta.1...v3.15.0-beta.3"><code>ember addon</code> diff</a></li> </ul> <h4>Changelog</h4> <ul> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8933">#8933</a> Remove <code>app/resolver.js</code> in favor of importing in <code>app/app.js</code> <a href="https://github.com/rwjblue">@​rwjblue</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8945">#8945</a> Fix issue with addon <code>.travis.yml</code> configuration when using <code>npm</code> <a href="https://github.com/kellyselden">@​kellyselden</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8946">#8946</a> Drop testing of [email protected] in the addon blueprints ember-try config <a href="https://github.com/kellyselden">@​kellyselden</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8946">#8946</a> Add testing of [email protected] in the addon blueprints ember-try config <a href="https://github.com/kellyselden">@​kellyselden</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8959">#8959</a> Fix issue with addon discovery when npm/yarn leave empty directories in resolvable locations <a href="https://github.com/stefanpenner">@​stefanpenner</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8949">#8949</a> Add GitHub Actions for CI <a href="https://github.com/Turbo87">@​Turbo87</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8961">#8961</a> Prepare for Octane release in 3.15 <a href="https://github.com/rwjblue">@​rwjblue</a> <ul> <li>Adds <code>ember</code> property to <code>package.json</code> to implement <a href="https://github-redirect.dependabot.com/emberjs/rfcs/pull/558">emberjs/rfcs#558</a></li> </ul> </li> </ul> </tr></table> ... (truncated) </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/ember-cli/ember-cli/blob/master/CHANGELOG.md">ember-cli's changelog</a>.</em></p> <blockquote> <h1>ember-cli Changelog</h1> <h4>Blueprint Changes</h4> <ul> <li><a href="https://github.com/ember-cli/ember-new-output/compare/v3.14.0...v3.15.0"><code>ember new</code> diff</a></li> <li><a href="https://github.com/ember-cli/ember-addon-output/compare/v3.14.0...v3.15.0"><code>ember addon</code> diff</a></li> </ul> <h4>Changelog</h4> <ul> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8963">#8963</a> Remove <code>app/templates/components</code> <a href="https://github.com/chancancode">@​chancancode</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8964">#8964</a> Add support for <code>ember new @scope-here/name-here</code>. <a href="https://github.com/rwjblue">@​rwjblue</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8965">#8965</a> Update ember-resolver to v7.0.0. <a href="https://github.com/rwjblue">@​rwjblue</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8971">#8971</a> Add an ember-try scenario for Ember &quot;classic&quot; (pre-octane). <a href="https://github.com/rwjblue">@​rwjblue</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8972">#8972</a> Update ember-data to 3.15.0. <a href="https://github.com/rwjblue">@​rwjblue</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8933">#8933</a> Remove <code>app/resolver.js</code> in favor of importing in <code>app/app.js</code> <a href="https://github.com/rwjblue">@​rwjblue</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8945">#8945</a> Fix issue with addon <code>.travis.yml</code> configuration when using <code>npm</code> <a href="https://github.com/kellyselden">@​kellyselden</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8946">#8946</a> Drop testing of [email protected] in the addon blueprints ember-try config <a href="https://github.com/kellyselden">@​kellyselden</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8946">#8946</a> Add testing of [email protected] in the addon blueprints ember-try config <a href="https://github.com/kellyselden">@​kellyselden</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8959">#8959</a> Fix issue with addon discovery when npm/yarn leave empty directories in resolvable locations <a href="https://github.com/stefanpenner">@​stefanpenner</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8961">#8961</a> Prepare for Octane release in 3.15 <a href="https://github.com/rwjblue">@​rwjblue</a> <ul> <li>Adds <code>ember</code> property to <code>package.json</code> to implement <a href="https://github-redirect.dependabot.com/emberjs/rfcs/pull/558">emberjs/rfcs#558</a></li> <li>Adds <code>@glimmer/[email protected]</code> as a development dependency for both apps and addons</li> <li>Updates <code>ember-try</code> to at least 1.4.0 in order to support <code>config/ember-try.js</code> scenarios with <code>ember</code> <code>package.json</code> property (mentioned in <a href="https://github-redirect.dependabot.com/emberjs/rfcs/issues/558">emberjs/rfcs#558</a>)</li> <li>Enables Octane related optional features</li> <li>Updates ember-template-lint configuration to use <code>octane</code> preset</li> <li>Update to [email protected] stable</li> <li>Updates all packages in the application blueprint to their latest version</li> </ul> </li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8827">#8827</a> Remove module-unification blueprints <a href="https://github.com/dcyriller">@​dcyriller</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8878">#8878</a> Adds flag to throw an error for invalid addon locations <a href="https://github.com/tmquinn">@​tmquinn</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8906">#8906</a> Enable broccoli memoization by default in Ember-CLI <a href="https://github.com/SparshithNR">@​SparshithNR</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8917">#8917</a> Update CI configuration for applications using <code>npm</code> to run a &quot;floating dependencies&quot; test. <a href="https://github.com/kellyselden">@​kellyselden</a></li> <li><a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/pull/8926">#8926</a> Add <code>application</code> to invalid names <a href="https://github.com/kennethlarsen">@​kennethlarsen</a></li> </ul> <p>Thank you to all who took the time to contribute!</p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/ember-cli/ember-cli/commit/85a695e0f4ec031f50f7331e1139305cacfe5789"><code>85a695e</code></a> Release v3.15.0</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/59d39d371231a92ff0839cea791326b5ce5d232a"><code>59d39d3</code></a> Update final CHANGELOG for 3.15.0.</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/ec40e5ac93e2d480d9a93a6da4d5852bea81b156"><code>ec40e5a</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/issues/8972">#8972</a> from rwjblue/update-ember-data</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/3c1bacc5a998b70e27e00de5511b4e50a460bda2"><code>3c1bacc</code></a> Update ember-data to 3.15.0.</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/570644388b1edf2db38c3a0c0adf4a3860ea5890"><code>5706443</code></a> Add support for <code>ember new @scope-here/name-here</code>. (<a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/issues/8964">#8964</a>)</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/638f5f16fd8498d3a410f7eb114945f8d43f0248"><code>638f5f1</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/issues/8971">#8971</a> from rwjblue/add-ember-classic-try-scenario</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/f000dee8d3c502987bde31b2d15092f7eb1cd4f1"><code>f000dee</code></a> Add an ember-try scenario for Ember &quot;classic&quot; (pre-octane).</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/95939c5cd324475aad2be5fd68bbdad0cafc1274"><code>95939c5</code></a> Support <code>ember new @scope-here/name-here</code>.</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/4f831441e9995d08291844ab0237986c147de062"><code>4f83144</code></a> Update ember-resolver to v7.0.0. (<a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/issues/8965">#8965</a>)</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/2d12f9f532ccd403c835a629a7c8b151bc22031a"><code>2d12f9f</code></a> Update ember-resolver to v7.0.0.</li> <li>Additional commits viewable in <a href="https://github.com/ember-cli/ember-cli/compare/v3.14.0...v3.15.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=ember-cli&package-manager=npm_and_yarn&previous-version=3.14.0&new-version=3.15.0)](https://dependabot.com/compatibility-score.html?dependency-name=ember-cli&package-manager=npm_and_yarn&previous-version=3.14.0&new-version=3.15.0) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in the `.dependabot/config.yml` file in this repo: - Update frequency - Automerge options (never/patch/minor, and dev/runtime dependencies) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details>
2 parents 655d883 + 5b8cbe6 commit 28a30d2

File tree

2 files changed

+27
-41
lines changed

2 files changed

+27
-41
lines changed

package-lock.json

Lines changed: 26 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"broccoli-asset-rev": "^3.0.0",
3535
"ember-a11y-testing": "^2.0.0",
3636
"ember-auto-import": "^1.5.3",
37-
"ember-cli": "~3.14.0",
37+
"ember-cli": "~3.15.0",
3838
"ember-cli-app-version": "^3.1.3",
3939
"ember-cli-babel": "^7.13.2",
4040
"ember-cli-clipboard": "^0.9.0",

0 commit comments

Comments
 (0)