Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Ember 3.24 compatibility #507

Merged
merged 5 commits into from
Jan 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ jobs:
- ember-3.15
- ember-3.16
- ember-3.20
# - ember-release
# - ember-beta
- ember-3.24
- ember-release
- ember-beta
# - ember-canary
steps:
- name: Checkout Code
Expand Down
7 changes: 0 additions & 7 deletions addon-test-support/setup-link.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ import TestInstrumentedLinkManagerService from './-private/services/test-instrum

export default function setupLink(hooks: NestedHooks) {
hooks.beforeEach(function (this: TestContext) {
const router = this.owner.lookup('service:router');

assert(
'ember-link.setupLink: Test helpers can only be used in integration tests',
!router._router._routerMicrolib
);

assert(
'ember-link.setupLink: You have already called `setupLink` once',
!this.owner.hasRegistration('service:link-manager') ||
Expand Down
3 changes: 1 addition & 2 deletions addon/services/link-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ export default class LinkManagerService extends Service {
* @see https://github.com/buschtoens/ember-link/issues/126
*/
get isRouterInitialized() {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
return Boolean((this.router as any)._router._routerMicrolib);
return this.router.currentURL !== null;
}

/**
Expand Down
8 changes: 8 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ module.exports = function () {
}
}
},
{
name: 'ember-3.24',
npm: {
devDependencies: {
'ember-source': '~3.24.0'
}
}
},
{
name: 'ember-release',
npm: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"ember-on-modifier": "^1.0.1",
"ember-qunit": "^4.6.0",
"ember-resolver": "^8.0.2",
"ember-source": "~3.23.0-beta.5",
"ember-source": "~3.24.1",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^2.17.0",
"ember-try": "^1.4.0",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6229,10 +6229,10 @@ ember-source-channel-url@^3.0.0:
dependencies:
node-fetch "^2.6.0"

ember-source@~3.23.0-beta.5:
version "3.23.0-beta.5"
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.23.0-beta.5.tgz#bd729fdc924d7721bcee311d0060c14f03622366"
integrity sha512-UJ96yV23gOOjt/9JWd+7/SuoA6m80IaWhgbs9aOrXJeswOfS5gcj/LanENBa1yD5zxSKm7SGAxFVIlyk1gd35g==
ember-source@~3.24.1:
version "3.24.1"
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.24.1.tgz#183cf2f556921726406c05f86224091133c33790"
integrity sha512-kP1sGTl64dPoHLSlmEMp2wAl+0hhuRnUsIm7sm3RI7aJ6QutN4pddVQacaMZMWfEtoR4N9Mmw+Wv6UI17AidRA==
dependencies:
"@babel/helper-module-imports" "^7.8.3"
"@babel/plugin-transform-block-scoping" "^7.8.3"
Expand All @@ -6245,7 +6245,7 @@ ember-source@~3.23.0-beta.5:
broccoli-funnel "^2.0.2"
broccoli-merge-trees "^4.2.0"
chalk "^4.0.0"
ember-cli-babel "^7.19.0"
ember-cli-babel "^7.23.0"
ember-cli-get-component-path-option "^1.0.0"
ember-cli-is-package-missing "^1.0.0"
ember-cli-normalize-entity-name "^1.0.0"
Expand Down