Skip to content
Open
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
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- false
scenario:
- ember-lts-4.8
#- ember-lts-4.12 # fails due to bug: https://github.com/emberjs/ember.js/issues/20377
- ember-lts-4.12
- ember-lts-5.4
- ember-lts-5.8
- embroider-safe
Expand Down Expand Up @@ -95,6 +95,15 @@ jobs:
- scenario: ember-lts-5.8
browser: Firefox
bootstrap: 5
- scenario: ember-concurrency-v3
browser: Chrome
bootstrap: 3
- scenario: ember-modifier-v3
browser: Chrome
bootstrap: 3
- scenario: glimmer-component-v2
browser: Chrome
bootstrap: 4
- scenario: node-tests
steps:
- name: Checkout code
Expand Down
4 changes: 2 additions & 2 deletions addon/components/bs-modal.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{did-insert this.handleVisibilityChanges}}
{{did-update this.handleVisibilityChanges @open}}
{{did-insert-helper this.handleVisibilityChanges}}
{{did-update-helper this.handleVisibilityChanges @open}}

{{#if this.inDom}}
{{bs-on-window "resize" this.adjustDialog}}
Expand Down
2 changes: 1 addition & 1 deletion addon/components/bs-popover.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
</Element>
{{/let}}
{{/if}}
{{did-insert this.setup}}
{{did-insert-helper this.setup}}
2 changes: 1 addition & 1 deletion addon/components/bs-tooltip.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
</Element>
{{/let}}
{{/if}}
{{did-insert this.setup}}
{{did-insert-helper this.setup}}
34 changes: 31 additions & 3 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ module.exports = async function () {
bootstrap: bootstrapVersion,
},
},
env: {
FAIL_ON_DEPRECATION: false,
},
},
{
name: 'ember-lts-5.4',
Expand All @@ -47,6 +44,37 @@ module.exports = async function () {
},
},
},
{
name: 'ember-concurrency-v3',
npm: {
dependencies: {
'ember-concurrency': '^3.1.1',
},
devDependencies: {
bootstrap: bootstrapVersion,
},
},
},
{
name: 'ember-modifier-v3',
npm: {
devDependencies: {
'ember-modifier': '^3.2.7',
bootstrap: bootstrapVersion,
},
},
},
{
// @glimmer/component 2 imports @ember/owner, which needs Ember 4.10+
name: 'glimmer-component-v2',
npm: {
devDependencies: {
'@glimmer/component': '^2.0.0',
'ember-source': '~4.12.0',
bootstrap: bootstrapVersion,
},
},
},
{
name: 'ember-release',
npm: {
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
},
"resolutions": {
"ip-regex": "^2.1.0",
"ember-modifier": "^3.2.7",
"lodash": "^4.18.1",
"testem": "~3.18.0",
"@embroider/addon-shim": "1.10.2",
Expand All @@ -70,7 +69,9 @@
},
"dependencies": {
"@babel/core": "^7.29.0",
"@ember/render-modifiers": "^2.1.0",
"@ember-decorators/component": "^7.0.0",
"@ember-decorators/object": "^7.0.0",
"@ember/render-modifiers": "^4.0.0",
"@embroider/macros": ">=1.19.7 <1.21.0",
"@embroider/util": "Gaurav0/embroider-util#v1.13.5-scf.1",
"broccoli-debug": "^0.6.3",
Expand All @@ -82,13 +83,12 @@
"ember-cli-build-config-editor": "0.5.1",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-version-checker": "^5.1.2",
"ember-concurrency": "^2.1.2",
"ember-decorators": "^6.1.0",
"ember-concurrency": "^3.1.1 || ^4.0.0",
"ember-element-helper": "^0.8.7",
"ember-focus-trap": "^1.0.0",
"ember-popper-modifier": "^3.0.0",
"ember-render-helpers": "0.2.0",
"ember-style-modifier": "^0.7.0",
"ember-popper-modifier": "^4.1.1",
"ember-render-helpers": "^2.0.0",
"ember-style-modifier": "^4.6.0",
"findup-sync": "^4.0.0",
"fs-extra": "^9.1.0",
"handlebars": "^4.7.10",
Expand All @@ -97,7 +97,7 @@
"resolve": "^1.18.1",
"rsvp": "^4.0.1",
"silent-error": "^1.0.1",
"tracked-toolbox": "^1.2.3"
"tracked-toolbox": "^3.0.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.15",
Expand All @@ -115,7 +115,7 @@
"concurrently": "^8.2.2",
"ember-a11y-testing": "^4.0.7",
"ember-cli": "~3.28.6",
"ember-cli-app-version": "^4.0.0",
"ember-cli-app-version": "^6.0.1",
"ember-cli-blueprint-test-helpers": "^0.19.1",
"ember-cli-browserstack": "^1.1.0",
"ember-cli-content-security-policy": "^2.0.0-4",
Expand All @@ -127,10 +127,10 @@
"ember-cli-terser": "^4.0.2",
"ember-cli-test-loader": "^3.0.0",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^3.2.7",
"ember-modifier": "^4.3.0",
"ember-page-title": "^8.0.0",
"ember-qunit": "^6.2.0",
"ember-resolver": "^8.1.0",
"ember-resolver": "^11.0.1",
"ember-sinon": "^5.0.0",
"ember-sinon-qunit": "^5.0.0",
"ember-source": "~4.8.0",
Expand Down
7 changes: 1 addition & 6 deletions tests/helpers/setup-no-deprecations.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ let deprecations = new Set();
let expectedDeprecations = new Set();

// Ignore deprecations that are not caused by our own code, and which we cannot fix easily.
const ignoredDeprecations = [
// @todo remove when we can land https://github.com/emberjs/ember-render-modifiers/pull/33 here
/Versions of modifier manager capabilities prior to 3\.22 have been deprecated/,
/Usage of the Ember Global is deprecated./,
/import .* directly from/,
];
const ignoredDeprecations = [/Usage of the Ember Global is deprecated./, /import .* directly from/];

export default function setupNoDeprecations({ beforeEach, afterEach }) {
beforeEach(function () {
Expand Down
Loading
Loading