Skip to content
This repository has been archived by the owner on Nov 23, 2024. It is now read-only.

Upgrade to ember cli 3.4 via ember-cli-update #251

Merged
merged 15 commits into from
Oct 23, 2018

Conversation

Gaurav0
Copy link
Contributor

@Gaurav0 Gaurav0 commented Oct 12, 2018

Update: will rebase once #254 , #255 , and #256 are merged.

Update: rebased.

@Turbo87
Copy link
Member

Turbo87 commented Oct 13, 2018

@Gaurav0 what are the breaking changes that this contains?

@Gaurav0
Copy link
Contributor Author

Gaurav0 commented Oct 13, 2018

@Turbo87 The only possible breaking change I can see is the drop in support for node 4 via ember-cli, but since that is a devDependency it is quite likely that isn't a breaking change. Once we update broccoli-lint-eslint, that part will break anyway.

package.json Outdated
"testdouble": "^3.1.0"
},
"engines": {
"node": ">= 4.0"
"node": "6.* || 8.* || >= 10.*"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is also a breaking change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the same breaking change to me.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe, but breaking changes should be deliberate, not side effects of other changes that dont even mention the breaking change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, will break out.

package.json Outdated
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-qunit": "^4.3.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need that? we don't have any templates

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's in the new add-on blueprint for ember-cli-update 3.4

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that does not answer my question. the thing we're building here is a build time addon without any templates. I don't see a reason why we would need this extra dependency if we're not going to use it anyway

package.json Outdated
@@ -41,33 +44,40 @@
"walk-sync": "^0.3.0"
},
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"@ember/optional-features": "^0.6.3",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's in the new add-on blueprint for ember-cli-update 3.4

testem.js Outdated
"PhantomJS"
],
"launch_in_dev": [
"PhantomJS",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks like a major change to me that IMHO deserves it's own dedicated PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you say so. Again, the new add-on blueprint makes this change as well.


module.exports = {
browsers: [
'ie 9',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removing IE9 support from the test suite is a breaking change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, if you say so. ember-cli-update blueprint change again.

@Gaurav0
Copy link
Contributor Author

Gaurav0 commented Oct 14, 2018

All of the changes you mentioned as breaking were performed automatically as part of ember-cli-update. Please let me know how you would prefer to proceed.

@Gaurav0
Copy link
Contributor Author

Gaurav0 commented Oct 15, 2018

Update: will rebase once #254 , #255 , and #256 are merged.

@Gaurav0 Gaurav0 force-pushed the upgrade_to_ember_cli_3_4 branch 2 times, most recently from cb87057 to 07be9b5 Compare October 15, 2018 21:14
.travis.yml Outdated
- yarn test

cache:
yarn: true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a duplicate

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

.travis.yml Outdated
name: "Tests"
script:
- yarn lint:js
- yarn test
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does this do? why the extra stage?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the ember-cli-update transformed things to use ember-try. I tried to revert all those changes and must have missed this. Thanks!

README.md Outdated
@@ -108,7 +107,6 @@ module.exports = function(defaults) {

</details>


Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No reason. This probably happened during the automatic update or the merge or the rebasing. It just removes an extra line anyway.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the sections in the README were intentionally divided by two blank lines to give them some padding

Copy link
Contributor Author

@Gaurav0 Gaurav0 Oct 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok I'll add it back.

return string;
}

exports.resultString = resultString;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this new code? this seems unrelated to the Ember CLI update 🤔

Copy link
Contributor Author

@Gaurav0 Gaurav0 Oct 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the new code is a copy of tap-reporter.js and its dependencies from testem.js (version 1.x) so that I didn't have to get the tests to match the latest version (which now includes time it takes a test to run).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can move it to a vendor directory if you would prefer.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to not fork any reporters. we should instead probably update the assertions here to use regex or something like that 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer not to either. Is there a chai assertion library that takes an array and checks if any of its elements matches (and does not match) a regex?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found one. chai-things

@Gaurav0
Copy link
Contributor Author

Gaurav0 commented Oct 16, 2018

@Turbo87 Thanks again for the timely review. I appreciate all the feedback.

@Gaurav0 Gaurav0 force-pushed the upgrade_to_ember_cli_3_4 branch 2 times, most recently from f21e191 to f805a3f Compare October 16, 2018 14:58
@Gaurav0
Copy link
Contributor Author

Gaurav0 commented Oct 16, 2018

@Turbo87 @rwjblue Can you rereview?

node-tests/.eslintrc.js Outdated Show resolved Hide resolved
node-tests/test.js Outdated Show resolved Hide resolved
node-tests/test.js Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
.eslintrc.js Outdated Show resolved Hide resolved
Copy link
Member

@Turbo87 Turbo87 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rwjblue I think this is good to go. Can you do a final sanity check?

@Gaurav0
Copy link
Contributor Author

Gaurav0 commented Oct 23, 2018

@rwjblue Can you please look at this?

@rwjblue rwjblue merged commit 92d4394 into ember-cli:master Oct 23, 2018
@Gaurav0 Gaurav0 deleted the upgrade_to_ember_cli_3_4 branch October 23, 2018 13:31
bors bot added a commit to danmcclain/ember-deferred-content that referenced this pull request Nov 9, 2018
53: Update ember-cli-eslint to the latest version 🚀 r=danmcclain a=greenkeeper[bot]


## The devDependency [ember-cli-eslint](https://github.com/ember-cli/ember-cli-eslint) was updated from `4.2.3` to `5.0.0`.
This version is **not covered** by your **current version range**.

If you don’t accept this pull request, your project will work just like it did before. However, you might be missing out on a bunch of new features, fixes and/or performance improvements from the dependency update.

---

<details>
<summary>Release Notes for v5.0.0</summary>

<h4><g-emoji class="g-emoji" alias="boom" fallback-src="https://assets-cdn.github.com/images/icons/emoji/unicode/1f4a5.png">💥</g-emoji> Breaking Change</h4>
<ul>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/pull/284" data-hovercard-type="pull_request" data-hovercard-url="/ember-cli/ember-cli-eslint/pull/284/hovercard">#284</a> Upgrade <code>broccoli-lint-eslint</code> to v5.0.0 (<a href="https://urls.greenkeeper.io/Gaurav0">@Gaurav0</a>)</li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/pull/256" data-hovercard-type="pull_request" data-hovercard-url="/ember-cli/ember-cli-eslint/pull/256/hovercard">#256</a> Drop support for IE9 and IE10 (<a href="https://urls.greenkeeper.io/Gaurav0">@Gaurav0</a>)</li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/pull/254" data-hovercard-type="pull_request" data-hovercard-url="/ember-cli/ember-cli-eslint/pull/254/hovercard">#254</a> Drop support for Node.js 4 (<a href="https://urls.greenkeeper.io/Gaurav0">@Gaurav0</a>)</li>
</ul>
<h4><g-emoji class="g-emoji" alias="house" fallback-src="https://assets-cdn.github.com/images/icons/emoji/unicode/1f3e0.png">🏠</g-emoji> Internal</h4>
<ul>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/pull/251" data-hovercard-type="pull_request" data-hovercard-url="/ember-cli/ember-cli-eslint/pull/251/hovercard">#251</a> Upgrade to ember cli 3.4 via ember-cli-update (<a href="https://urls.greenkeeper.io/Gaurav0">@Gaurav0</a>)</li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/pull/255" data-hovercard-type="pull_request" data-hovercard-url="/ember-cli/ember-cli-eslint/pull/255/hovercard">#255</a> Use Chrome instead of PhantomJS to run tests (<a href="https://urls.greenkeeper.io/Gaurav0">@Gaurav0</a>)</li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/pull/263" data-hovercard-type="pull_request" data-hovercard-url="/ember-cli/ember-cli-eslint/pull/263/hovercard">#263</a> Remove obsolete <code>es6-promise</code> dev dependency (<a href="https://urls.greenkeeper.io/Turbo87">@Turbo87</a>)</li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/pull/262" data-hovercard-type="pull_request" data-hovercard-url="/ember-cli/ember-cli-eslint/pull/262/hovercard">#262</a> yarn: Add <code>integrity</code> hashes (<a href="https://urls.greenkeeper.io/Turbo87">@Turbo87</a>)</li>
</ul>
<h4>Committers: 2</h4>
<ul>
<li>Gaurav Munjal (<a href="https://urls.greenkeeper.io/Gaurav0">@Gaurav0</a>)</li>
<li>Tobias Bieniek (<a href="https://urls.greenkeeper.io/Turbo87">@Turbo87</a>)</li>
</ul>
</details>

<details>
<summary>Commits</summary>
<p>The new version differs by 68 commits.</p>
<ul>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/3b7f29605a727c3f84d6f7652ded7ff97e83604c"><code>3b7f296</code></a> <code>v5.0.0</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/0beb1151e51af3864b5beef3e69ded4932d7181f"><code>0beb115</code></a> <code>Update Changelog</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/5c23ac0bb4782d227e1e59dadbbff66e732238c9"><code>5c23ac0</code></a> <code>Add <code>lerna-changelog</code> dev dependency</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/5657eecc4ae9395029be54db0b7eb96d05c0ea67"><code>5657eec</code></a> <code>Merge pull request #284 from Gaurav0/eslint_5</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/0d484e6d64248499d0007ae7881e9a690ece1025"><code>0d484e6</code></a> <code>Upgrade to broccoli-lint-eslint 5</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/4f88dbc23f0d8fe20e113fb05c3aa08d3e361885"><code>4f88dbc</code></a> <code>Bump qunit-dom from 0.7.1 to 0.8.0 (#287)</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/6da2ee24d74575df66a65c27351b1090b442ef18"><code>6da2ee2</code></a> <code>Merge pull request #286 from ember-cli/dependabot/npm_and_yarn/lodash-4.17.11</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/50645c3ef0248f225f07863ac72f06becd8b0d0c"><code>50645c3</code></a> <code>[Security] Bump lodash from 4.17.4 to 4.17.11</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/d48f347c7bf338081919d370005dc5b257a95cf9"><code>d48f347</code></a> <code>Merge pull request #285 from ember-cli/dependabot/npm_and_yarn/debug-2.6.9</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/89101ac2596aa9ad0778152ee6eb7099f0b4c69e"><code>89101ac</code></a> <code>[Security] Bump debug from 2.6.3 to 2.6.9</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/92d4394c3667b3e38f1a18e234d4de11b073e13b"><code>92d4394</code></a> <code>Merge pull request #251 from Gaurav0/upgrade_to_ember_cli_3_4</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/7b01707044da0653db32a9900c46559d7cbf9659"><code>7b01707</code></a> <code>fix typo</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/293abba13f91f8376e6c862b9fe6b78d8b7ddc16"><code>293abba</code></a> <code>remove chai-things</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/1810da28a4a96928f3307e134b086d76ae13fed3"><code>1810da2</code></a> <code>address comments</code></li>
<li><a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/commit/3948b782e05e0b693fedfae70346d6ae7ec6c342"><code>3948b78</code></a> <code>Do not fork tap reporter / match regexes</code></li>
</ul>
<p>There are 68 commits in total.</p>
<p>See the <a href="https://urls.greenkeeper.io/ember-cli/ember-cli-eslint/compare/a0e0ac2f48ae338ee085f2fd0a5813cacdad3c6d...3b7f29605a727c3f84d6f7652ded7ff97e83604c">full diff</a></p>
</details>

<details>
  <summary>FAQ and help</summary>

  There is a collection of [frequently asked questions](https://greenkeeper.io/faq.html). If those don’t help, you can always [ask the humans behind Greenkeeper](https://github.com/greenkeeperio/greenkeeper/issues/new).
</details>

---


Your [Greenkeeper](https://greenkeeper.io) bot 🌴



Co-authored-by: greenkeeper[bot] <greenkeeper[bot]@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants