Bump ember-cli from 3.15.0 to 3.15.1 #2022

dependabot-preview · 2019-12-20T16:36:37Z

Bumps ember-cli from 3.15.0 to 3.15.1.

Release notes

v3.15.1

Blueprint Changes

ember new diff

ember addon diff

Changelog

#8977 Fix invalid syntax with ember-classic ember-try scenario. @rwjblue

Changelog

Sourced from ember-cli's changelog.

v3.15.1

Blueprint Changes

ember new diff

ember addon diff

Changelog

#8977 Fix invalid syntax with ember-classic ember-try scenario. @rwjblue

Thank you to all who took the time to contribute!

Blueprint Changes

ember new diff

ember addon diff

Changelog

#8963 Remove app/templates/components @chancancode

#8964 Add support for ember new @scope-here/name-here. @rwjblue

#8965 Update ember-resolver to v7.0.0. @rwjblue

#8971 Add an ember-try scenario for Ember "classic" (pre-octane). @rwjblue

#8972 Update ember-data to 3.15.0. @rwjblue

#8933 Remove app/resolver.js in favor of importing in app/app.js @rwjblue

#8945 Fix issue with addon .travis.yml configuration when using npm @kellyselden

#8946 Drop testing of ember-source@3.4 in the addon blueprints ember-try config @kellyselden

#8946 Add testing of ember-source@3.12 in the addon blueprints ember-try config @kellyselden

#8959 Fix issue with addon discovery when npm/yarn leave empty directories in resolvable locations @stefanpenner

#8961 Prepare for Octane release in 3.15 @rwjblue

Adds ember property to package.json to implement emberjs/rfcs#558

Adds @glimmer/component@1.0.0 as a development dependency for both apps and addons

Updates ember-try to at least 1.4.0 in order to support config/ember-try.js scenarios with ember package.json property (mentioned in emberjs/rfcs#558)

Enables Octane related optional features

Updates ember-template-lint configuration to use octane preset

Update to ember-source@3.15 stable

Updates all packages in the application blueprint to their latest version

#8827 Remove module-unification blueprints @dcyriller

#8878 Adds flag to throw an error for invalid addon locations @tmquinn

#8906 Enable broccoli memoization by default in Ember-CLI @SparshithNR

#8917 Update CI configuration for applications using npm to run a "floating dependencies" test. @kellyselden

#8926 Add application to invalid names @kennethlarsen

Thank you to all who took the time to contribute!

v3.14.0

Blueprint Changes
... (truncated)

Commits

fa8cdb1 Release v3.15.1
e5b10f8 Add v3.15.1 to CHANGELOG.md.
baa4d66 Fix invalid syntax with ember-classic ember-try scenario. (#8977)
6afe0a9 Fix invalid syntax with ember-classic ember-try scenario.
See full diff in compare view

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 commands and options

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)

rust-highfive · 2019-12-20T16:36:48Z

r? @carols10cents

(rust_highfive has picked a reviewer for you, use r? to override)

Turbo87 · 2019-12-20T16:47:43Z

@bors r+

bors · 2019-12-20T16:47:44Z

📌 Commit af53e7d has been approved by Turbo87

locks · 2019-12-20T22:21:25Z

@bors r+

bors · 2019-12-20T22:21:26Z

📌 Commit 1de0cd6 has been approved by locks

Turbo87 · 2019-12-21T05:51:34Z

@bors r+

bors · 2019-12-21T05:51:35Z

📌 Commit 43dee92 has been approved by Turbo87

bors · 2019-12-21T07:18:48Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout dependabot/npm_and_yarn/ember-cli-3.15.1 (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self dependabot/npm_and_yarn/ember-cli-3.15.1 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging package-lock.json
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-12-21T07:20:08Z

☔ The latest upstream changes (presumably #2021) made this pull request unmergeable. Please resolve the merge conflicts.

Bumps [ember-cli](https://github.com/ember-cli/ember-cli) from 3.15.0 to 3.15.1. - [Release notes](https://github.com/ember-cli/ember-cli/releases) - [Changelog](https://github.com/ember-cli/ember-cli/blob/v3.15.1/CHANGELOG.md) - [Commits](ember-cli/ember-cli@v3.15.0...v3.15.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Turbo87 · 2019-12-21T10:30:42Z

@bors r+

bors · 2019-12-21T10:30:44Z

📌 Commit 7c547ac has been approved by Turbo87

…5.1, r=Turbo87 Bump ember-cli from 3.15.0 to 3.15.1 Bumps [ember-cli](https://github.com/ember-cli/ember-cli) from 3.15.0 to 3.15.1. <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.1</h2> <h4>Blueprint Changes</h4> <ul> <li><a href="https://github.com/ember-cli/ember-new-output/compare/v3.15.0...v3.15.1"><code>ember new</code> diff</a></li> <li><a href="https://github.com/ember-cli/ember-addon-output/compare/v3.15.0...v3.15.1"><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/8977">#8977</a> Fix invalid syntax with ember-classic ember-try scenario. <a href="https://github.com/rwjblue">@rwjblue</a></li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/ember-cli/ember-cli/blob/v3.15.1/CHANGELOG.md">ember-cli's changelog</a>.</em></p> <blockquote> <h2>v3.15.1</h2> <h4>Blueprint Changes</h4> <ul> <li><a href="https://github.com/ember-cli/ember-new-output/compare/v3.15.0...v3.15.1"><code>ember new</code> diff</a></li> <li><a href="https://github.com/ember-cli/ember-addon-output/compare/v3.15.0...v3.15.1"><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/8977">#8977</a> Fix invalid syntax with ember-classic ember-try scenario. <a href="https://github.com/rwjblue">@rwjblue</a></li> </ul> <p>Thank you to all who took the time to contribute!</p> <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 "classic" (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 ember-source@3.4 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 ember-source@3.12 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/component@1.0.0</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 ember-source@3.15 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 "floating dependencies" 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.14.0</h2> <h4>Blueprint Changes</h4> </tr></table> ... (truncated) </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/ember-cli/ember-cli/commit/fa8cdb1431090cfb0c1f3a371e5785cbee9474c0"><code>fa8cdb1</code></a> Release v3.15.1</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/e5b10f8dbe0e62818fbf8451574e07481810a867"><code>e5b10f8</code></a> Add v3.15.1 to CHANGELOG.md.</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/baa4d66e9a6e2b3f3373d3a6e039dbe829704a69"><code>baa4d66</code></a> Fix invalid syntax with ember-classic ember-try scenario. (<a href="https://github-redirect.dependabot.com/ember-cli/ember-cli/issues/8977">#8977</a>)</li> <li><a href="https://github.com/ember-cli/ember-cli/commit/6afe0a9b08c91d93b3bc84cdf002bc3110843b1f"><code>6afe0a9</code></a> Fix invalid syntax with ember-classic ember-try scenario.</li> <li>See full diff in <a href="https://github.com/ember-cli/ember-cli/compare/v3.15.0...v3.15.1">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.15.0&new-version=3.15.1)](https://dependabot.com/compatibility-score.html?dependency-name=ember-cli&package-manager=npm_and_yarn&previous-version=3.15.0&new-version=3.15.1) 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>

bors · 2019-12-21T10:30:51Z

⌛ Testing commit 7c547ac with merge 8932df2...

bors · 2019-12-21T10:36:52Z

☀️ Test successful - checks-travis
Approved by: Turbo87
Pushing 8932df2 to master...

dependabot-preview bot added the dependencies label Dec 20, 2019

rust-highfive assigned carols10cents Dec 20, 2019

rust-highfive added the S-waiting-on-review label Dec 20, 2019

dependabot-preview bot force-pushed the dependabot/npm_and_yarn/ember-cli-3.15.1 branch 3 times, most recently from 273276f to 1de0cd6 Compare December 20, 2019 21:59

dependabot-preview bot force-pushed the dependabot/npm_and_yarn/ember-cli-3.15.1 branch from 1de0cd6 to 43dee92 Compare December 20, 2019 22:31

dependabot-preview bot force-pushed the dependabot/npm_and_yarn/ember-cli-3.15.1 branch from 43dee92 to 7c547ac Compare December 21, 2019 07:21

bors merged commit 7c547ac into master Dec 21, 2019

dependabot-preview bot deleted the dependabot/npm_and_yarn/ember-cli-3.15.1 branch December 21, 2019 10:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Bump ember-cli from 3.15.0 to 3.15.1 #2022

Bump ember-cli from 3.15.0 to 3.15.1 #2022

Uh oh!

dependabot-preview bot commented Dec 20, 2019 •

edited

Loading

Uh oh!

rust-highfive commented Dec 20, 2019

Uh oh!

Turbo87 commented Dec 20, 2019

Uh oh!

bors commented Dec 20, 2019

Uh oh!

locks commented Dec 20, 2019

Uh oh!

bors commented Dec 20, 2019

Uh oh!

Turbo87 commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

Turbo87 commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

Uh oh!

Bump ember-cli from 3.15.0 to 3.15.1 #2022

Bump ember-cli from 3.15.0 to 3.15.1 #2022

Uh oh!

Conversation

dependabot-preview bot commented Dec 20, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

v3.15.1

Blueprint Changes

Changelog

v3.15.1

Blueprint Changes

Changelog

Blueprint Changes

Changelog

v3.14.0

Blueprint Changes

Uh oh!

rust-highfive commented Dec 20, 2019

Uh oh!

Turbo87 commented Dec 20, 2019

Uh oh!

bors commented Dec 20, 2019

Uh oh!

locks commented Dec 20, 2019

Uh oh!

bors commented Dec 20, 2019

Uh oh!

Turbo87 commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

Turbo87 commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

Uh oh!

dependabot-preview bot commented Dec 20, 2019 •

edited

Loading