Skip to content

Move to Ember 6.12.1 and ember-cli 6.12.0 #295

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.

Sign up for GitHub

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

Merged
phndiaye merged 1 commit into from
Nov 2, 2026
Merged

Move to Ember 6.12.1 and ember-cli 6.12.0 #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
"dependencies": {
"@babel/core": "^7.25.2",
"@ember/string": "^4.0.1",
"@embroider/macros": "^1.7.1",
"@embroider/util": "^0.50.0",
"ember-auto-import": "^2.8.1",
"@embroider/macros": "^1.20.6",
"@embroider/util": "^1.9.0",
"ember-auto-import": "^2.13.1",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-typescript": "^4.2.1",
Expand All @@ -56,22 +56,22 @@
"devDependencies": {
"@ember/jquery": "^2.0.0",
"@ember/optional-features": "^2.1.0",
"@ember/test-helpers": "^3.3.1",
"@ember/test-helpers": "^5.4.1",
"@embroider/test-setup": "^4.0.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@glint/template": "^1.2.1",
"@trivago/prettier-plugin-sort-imports": "^6.0.2",
"@types/htmlbars-inline-precompile": "^3.0.0",
"@types/jquery": "^3.5.11",
"@types/qunit": "^2.19.11",
"@types/qunit": "^2.19.14",
"@types/rsvp": "^4.0.4",
"@types/sinon": "^10.0.6",
"@types/tether": "^1.4.6",
"@upfluence/oss-components": "git+ssh://git@github.com/upfluence/oss-components.git#f17cca146b1af1c59cc197f5136d3b85ab48b10a",
"@upfluence/oss-components": "github:upfluence/oss-components#feature/ember-upgrade-4-to-7",
"@upfluence/w-conf": "^0.4.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~5.12.0",
"ember-cli": "~6.12.0",
"ember-cli-code-coverage": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-inject-live-reload": "^2.1.0",
Expand All @@ -81,13 +81,13 @@
"ember-cli-typescript-blueprints": "^3.0.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-intl": "^6.4.0",
"ember-load-initializers": "^2.1.2",
"ember-load-initializers": "^3.0.1",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-page-title": "^8.0.0",
"ember-qunit": "^8.1.0",
"ember-resolver": "^12.0.1",
"ember-qunit": "^9.0.4",
"ember-resolver": "^13.2.0",
"ember-sinon-qunit": "^6.0.0",
"ember-source": "~5.12.0",
"ember-source": "~6.12.1",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.15.0",
"ember-try": "^4.0.0",
Expand Down
4,883 changes: 2,928 additions & 1,955 deletions pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions ...s/integration/components/hyper-table-v2/filtering-renderers/common/column-actions-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { render, type TestContext } from '@ember/test-helpers';
import click from '@ember/test-helpers/dom/click';
import { render, click, type TestContext } from '@ember/test-helpers';

import { setupIntl } from 'ember-intl/test-support';
import { setupRenderingTest } from 'ember-qunit';
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/components/hyper-table-v2/filtering-renderers/common/search-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { click, fillIn, render, triggerKeyEvent, type TestContext } from '@ember/test-helpers';
import settled from '@ember/test-helpers/settled';
import { click, fillIn, render, settled, triggerKeyEvent, type TestContext } from '@ember/test-helpers';

import { setupIntl } from 'ember-intl/test-support';
import { setupRenderingTest } from 'ember-qunit';
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/components/hyper-table-v2/filtering-renderers/date-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { render, click, type TestContext } from '@ember/test-helpers';
import findAll from '@ember/test-helpers/dom/find-all';
import { render, click, findAll, type TestContext } from '@ember/test-helpers';

import { setupIntl } from 'ember-intl/test-support';
import { setupRenderingTest } from 'ember-qunit';
Expand Down
5 changes: 4 additions & 1 deletion tests/test-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ import Application from 'dummy/app';
import config from 'dummy/config/environment';
// @ts-expect-error - required due to legacy typing missing type definitions
import { forceModulesToBeLoaded, sendCoverage } from 'ember-cli-code-coverage/test-support';
import { start } from 'ember-qunit';
import { setupEmberOnerrorValidation, start } from 'ember-qunit';
import { loadTests } from 'ember-qunit/test-loader';
import QUnit from 'qunit';
import { setup } from 'qunit-dom';

setup(QUnit.assert);
registerAssertions(QUnit.assert);
setupEmberOnerrorValidation();
loadTests();

QUnit.done(async function () {
forceModulesToBeLoaded();
Expand Down
11 changes: 7 additions & 4 deletions tests/unit/core/rendering-resolver-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import BaseHeaderRenderer from '@upfluence/hypertable/components/hyper-table-v2/
import BaseRenderingResolver from '@upfluence/hypertable/core/rendering-resolver';
import { buildColumnDefinition } from '@upfluence/hypertable/test-support/table-manager';

// @embroider/util types expect a Glint component signature, which the renderer classes do not declare
const safeComponent = (component: unknown) => ensureSafeComponent(component as string, getContext());

module('Unit | core/rendering-resolver', function (hooks) {
setupApplicationTest(hooks);
setContext(hooks);
Expand All @@ -22,27 +25,27 @@ module('Unit | core/rendering-resolver', function (hooks) {
test('it returns the right header rendering component', async function (assert: Assert) {
const renderingResolver = new BaseRenderingResolver(getContext());
const resolved = await renderingResolver.lookupHeaderComponent(buildColumnDefinition('foo'));
assert.deepEqual(resolved.component, ensureSafeComponent(BaseHeaderRenderer, getContext()));
assert.deepEqual(resolved.component, safeComponent(BaseHeaderRenderer));
assert.strictEqual(resolved.args, undefined);
});

test('it returns the amount cell rendering component for a money column', async function (assert: Assert) {
const renderingResolver = new BaseRenderingResolver(getContext());
const resolved = await renderingResolver.lookupCellComponent(buildColumnDefinition('amount', { type: 'money' }));
assert.deepEqual(resolved.component, ensureSafeComponent(AmountCellRenderer, getContext()));
assert.deepEqual(resolved.component, safeComponent(AmountCellRenderer));
});

test('it returns the numeric filtering component for a money column', async function (assert: Assert) {
const renderingResolver = new BaseRenderingResolver(getContext());
const resolved = await renderingResolver.lookupFilteringComponent(
buildColumnDefinition('amount', { type: 'money' })
);
assert.deepEqual(resolved.component, ensureSafeComponent(NumericFilteringRenderer, getContext()));
assert.deepEqual(resolved.component, safeComponent(NumericFilteringRenderer));
});

test('it returns the base header rendering component for a money column', async function (assert: Assert) {
const renderingResolver = new BaseRenderingResolver(getContext());
const resolved = await renderingResolver.lookupHeaderComponent(buildColumnDefinition('amount', { type: 'money' }));
assert.deepEqual(resolved.component, ensureSafeComponent(BaseHeaderRenderer, getContext()));
assert.deepEqual(resolved.component, safeComponent(BaseHeaderRenderer));
});
});
Loading