From d06072c6bb53f0f41af7dad35a6f6310bb81607c Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 27 Jan 2021 16:57:58 +0100 Subject: [PATCH 1/5] services/link-manager: Adjust `isRouterInitialized` to Ember 3.24 compatibility --- addon/services/link-manager.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addon/services/link-manager.ts b/addon/services/link-manager.ts index a1d78ffd..4c736e29 100644 --- a/addon/services/link-manager.ts +++ b/addon/services/link-manager.ts @@ -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; } /** From 52d275036f731125abb47607006b6b8bb0a0511d Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 27 Jan 2021 17:52:11 +0100 Subject: [PATCH 2/5] test-support/setup-link: Remove "integration test" assertion This assertion is no longer valid because https://github.com/emberjs/ember.js/pull/19080 changed the behavior in Ember.js so that rendering tests can have routing enabled too --- addon-test-support/setup-link.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/addon-test-support/setup-link.ts b/addon-test-support/setup-link.ts index 273af598..53796c00 100644 --- a/addon-test-support/setup-link.ts +++ b/addon-test-support/setup-link.ts @@ -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') || From 1684c1297478766a6d8f32e6b70cc5f3d587cdad Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 27 Jan 2021 16:03:32 +0000 Subject: [PATCH 3/5] chore(deps-dev): bump ember-source from 3.23.0-beta.5 to 3.24.1 Bumps [ember-source](https://github.com/emberjs/ember.js) from 3.23.0-beta.5 to 3.24.1. - [Release notes](https://github.com/emberjs/ember.js/releases) - [Changelog](https://github.com/emberjs/ember.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/emberjs/ember.js/compare/v3.23.0-beta.5...v3.24.1) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c48c9379..defea595 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/yarn.lock b/yarn.lock index 571fc62c..2528a97f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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" From 7ae43ba1990d5196dd3bd421ca341ed206297a26 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 27 Jan 2021 17:56:37 +0100 Subject: [PATCH 4/5] CI: Enable temporarily disabled scenarios again `canary` stays disabled for now, because the `LinkTo` tests appear to be broken there --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f617703..88dcf506 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,8 +69,8 @@ jobs: - ember-3.15 - ember-3.16 - ember-3.20 -# - ember-release -# - ember-beta + - ember-release + - ember-beta # - ember-canary steps: - name: Checkout Code From df1e7b8430ab4fe27ebefb9359e97bcd5b7b3314 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 27 Jan 2021 17:57:15 +0100 Subject: [PATCH 5/5] CI: Add dedicated Ember.js 3.24 LTS job --- .github/workflows/ci.yml | 1 + config/ember-try.js | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88dcf506..4fa362ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,6 +69,7 @@ jobs: - ember-3.15 - ember-3.16 - ember-3.20 + - ember-3.24 - ember-release - ember-beta # - ember-canary diff --git a/config/ember-try.js b/config/ember-try.js index 5183aa35..d06aedaa 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -35,6 +35,14 @@ module.exports = function () { } } }, + { + name: 'ember-3.24', + npm: { + devDependencies: { + 'ember-source': '~3.24.0' + } + } + }, { name: 'ember-release', npm: {