Skip to content
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
39 changes: 33 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ env:
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}

jobs:
test:
name: Lint & Test
lint:
name: Lint
runs-on: ubuntu-24.04
if: (!contains(github.ref, 'refs/heads/master') || contains(github.ref, 'refs/tags/v'))
timeout-minutes: 10
Expand All @@ -37,14 +37,41 @@ jobs:
run: pnpm lint:js
- name: Lint HBS
run: pnpm prettier **/*.hbs -c
- name: Run Tests
run: pnpm test:ember
tests:
name: Tests
runs-on: ubuntu-24.04
if: (!contains(github.ref, 'refs/heads/master') || contains(github.ref, 'refs/tags/v'))
timeout-minutes: 10
strategy:
fail-fast: false
matrix:
include:
- name: current
command: pnpm test:ember
- name: next
command: pnpm ember try:one ember-4.12
steps:
- uses: webfactory/ssh-agent@v0.5.0
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v4
with:
version: '${{ vars.PNPM_VERSION }}'
- uses: actions/setup-node@v3
with:
node-version: '${{ env.NODE_VERSION }}'
cache: 'pnpm'
- name: Install Dependencies
run: pnpm install
- name: Run ${{ matrix.name }} scenario
run: ${{ matrix.command }}

release:
name: Release Package
runs-on: ubuntu-24.04
if: contains(github.ref, 'refs/tags/v')
needs: [test]
needs: [lint, tests]
timeout-minutes: 10
steps:
- uses: webfactory/ssh-agent@v0.5.0
Expand Down Expand Up @@ -80,7 +107,7 @@ jobs:
deploy:
name: Deploy preview app
runs-on: ubuntu-24.04
needs: [test]
needs: [lint, tests]
if: ${{ github.ref == 'refs/heads/master' }}
timeout-minutes: 10
steps:
Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/compatibility-checks.yml

This file was deleted.

17 changes: 2 additions & 15 deletions addon/types/table.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import EmberObject, { computed } from '@ember/object';
import EmberObject from '@ember/object';
import { or } from '@ember/object/computed';
import { scheduleOnce } from '@ember/runloop';
import { dasherize } from '@ember/string';
import { isEmpty, typeOf } from '@ember/utils';
import { typeOf } from '@ember/utils';

import Tether from 'tether';

Expand Down Expand Up @@ -78,19 +78,6 @@ export default EmberObject.extend({
}
},

// eslint-disable-next-line ember/no-deeply-nested-dependent-keys-with-each
appliedFilters: computed('columns.@each.filters.[]', function () {
return this.columns
.map((column) => {
if (!isEmpty(column.filters)) {
let _c = {};
_c[column.key] = column.filters;
return _c;
}
})
.compact();
}),
Comment on lines -81 to -92

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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


updateFields(fields) {
this.set('fields', fields);
},
Expand Down
5 changes: 5 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ module.exports = async function () {
},
{
name: 'ember-4.12',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': false // Disable per https://deprecations.emberjs.com/id/optional-feature-jquery-integration
})
},
npm: {
devDependencies: {
'ember-source': '~4.12.3',
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"remove-pre-push-hook": "rm -rf ./.git/hooks/pre-push"
},
"dependencies": {
"@ember/string": "^4.0.1",

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Was used in the codebase without being declared a dependency. Ember 4.12 is less forgiving about it

"@embroider/macros": "^1.7.1",
"@embroider/util": "^0.50.0",
"ember-auto-import": "^2.2.4",
Expand Down Expand Up @@ -85,7 +86,7 @@
"@types/sinon": "^10.0.6",
"@types/tether": "^1.4.6",
"@typescript-eslint/parser": "^5.32.0",
"@upfluence/oss-components": "^3.81.1",
"@upfluence/oss-components": "^3.97.4",
"@upfluence/w-conf": "^0.2.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.28.6",
Expand Down
47 changes: 36 additions & 11 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions tests/test-helper.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// @ts-ignore
import Application from '../app';
// @ts-ignore
import config from '../config/environment';
import { setApplication } from '@ember/test-helpers';

import registerAssertions from '@upfluence/oss-components/test-support/register-assertions';
// @ts-ignore
import Application from 'dummy/app';
import config from 'dummy/config/environment';
// @ts-ignore
import { forceModulesToBeLoaded, sendCoverage } from 'ember-cli-code-coverage/test-support';
import { start } from 'ember-qunit';
import QUnit from 'qunit';
import { setup } from 'qunit-dom';
// @ts-ignore
import { forceModulesToBeLoaded, sendCoverage } from 'ember-cli-code-coverage/test-support';
import registerAssertions from '@upfluence/oss-components/test-support/register-assertions';

setup(QUnit.assert);
registerAssertions(QUnit.assert);
Expand Down
Loading