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
13 changes: 0 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,10 @@ jobs:
allow-failure:
- false
scenario:
- ember-lts-3.28
- ember-lts-4.4
- ember-lts-4.8
#- ember-lts-4.12 # fails due to bug: https://github.com/emberjs/ember.js/issues/20377
- ember-lts-5.4
- ember-lts-5.8
- ember-default-with-jquery
- ember-classic
- embroider-safe
- embroider-optimized
bootstrap:
Expand All @@ -81,15 +77,6 @@ jobs:
browser:
- Chrome
include:
- scenario: ember-lts-3.28
browser: Firefox
bootstrap: 3
- scenario: ember-lts-3.28
browser: Firefox
bootstrap: 4
- scenario: ember-lts-3.28
browser: Firefox
bootstrap: 5
- scenario: ember-lts-4.8
browser: Firefox
bootstrap: 3
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ To switch Bootstrap version or preprocessor, see the [setup documentation](http:

Ember Bootstrap works and is fully [tested](https://github.com/kaliber5/ember-bootstrap/actions?query=workflow%3ACI+branch%3Amaster) with

* Ember.js 3.28+ (including all optional features)
* Ember CLI 3.15+
* Ember.js 4.8 or above
* Ember CLI 4.8 or above
* Bootstrap 3-5
* all modern evergreen browsers (Chrome, Firefox, Safari, Edge)
* node.js 16+
* node.js 18+
* FastBoot 4.0+
* Embroider: we strive (and test) for maximum compatibility with Embroider, including the most aggressive setting
(`staticComponents`) for tree shaking and code splitting. However as Embroider itself is still considered beta software,
Expand Down
3 changes: 2 additions & 1 deletion blueprints/ember-bootstrap/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ module.exports = {
let bootstrapVersion = this.bootstrapVersion;
let preprocessor = this.preprocessor;
let dependencies = this.project.dependencies();
let bowerDependencies = this.project.bowerDependencies();
// ember-cli 5 removed bower support, including project.bowerDependencies()
let bowerDependencies = this.project.bowerDependencies ? this.project.bowerDependencies() : {};
let promises = [];

if ('bootstrap' in bowerDependencies) {
Expand Down
52 changes: 0 additions & 52 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,6 @@ module.exports = async function () {
return {
useYarn: true,
scenarios: [
{
name: 'ember-lts-3.28',
npm: {
devDependencies: {
'ember-source': '~3.28.0',
bootstrap: bootstrapVersion,
},
},
},
{
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~4.4.0',
bootstrap: bootstrapVersion,
},
},
},
{
name: 'ember-lts-4.8',
npm: {
Expand Down Expand Up @@ -98,40 +80,6 @@ module.exports = async function () {
// FAIL_ON_DEPRECATION: true,
},
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true,
}),
},
npm: {
devDependencies: {
'@ember/jquery': '^1.1.0',
bootstrap: bootstrapVersion,
},
},
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
// TODO: tests fail if optional feature application-template-wrapper is enabled
// 'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false,
}),
},
npm: {
devDependencies: {
bootstrap: bootstrapVersion,
'ember-source': '~3.28.0',
},
ember: {
edition: 'classic',
},
},
},
{
name: 'node-tests',
command: 'yarn run nodetest',
Expand Down
19 changes: 12 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-bootstrap",
"version": "4.10.3",
"version": "5.0.0",
"description": "Bootstrap components for Ember.js",
"keywords": [
"ember-addon",
Expand Down Expand Up @@ -73,8 +73,6 @@
"@ember/string": "^3.1.1",
"@embroider/macros": "^1.8.3",
"@embroider/util": "^1.13.3",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"broccoli-debug": "^0.6.3",
"broccoli-funnel": "^3.0.6",
"broccoli-merge-trees": "^4.2.0",
Expand All @@ -89,7 +87,6 @@
"ember-element-helper": "^0.7.1",
"ember-focus-trap": "^1.0.0",
"ember-in-element-polyfill": "^1.0.1",
"ember-modifier": "^3.2.7",
"ember-named-blocks-polyfill": "^0.2.4",
"ember-on-helper": "^0.1.0",
"ember-popper-modifier": "^3.0.0",
Expand All @@ -111,6 +108,8 @@
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/test-setup": "^0.48.1",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"bootstrap": "^4.6.0",
"bootstrap-sass": "^3.3.7",
Expand All @@ -130,15 +129,15 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-cli-test-loader": "^3.0.0",
"ember-compatibility-helpers": "^1.2.1",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^3.2.7",
"ember-page-title": "^6.2.2",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-sinon": "^5.0.0",
"ember-sinon-qunit": "^5.0.0",
"ember-source": "~3.28.8",
"ember-source": "~4.8.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.15.0",
"ember-try": "^1.4.0",
Expand All @@ -162,6 +161,12 @@
"qunit-dom": "^1.6.0",
"webpack": "^5.56.1"
},
"peerDependencies": {
"@glimmer/component": "^1.0.4 || ^2.0.0",
"@glimmer/tracking": "^1.0.4",
"ember-modifier": "^3.2.7 || ^4.0.0",
"ember-source": ">=4.8.0"
},
"engines": {
"node": ">= 18"
},
Expand All @@ -174,7 +179,7 @@
"ember-addon": {
"configPath": "tests/dummy/config",
"versionCompatibility": {
"ember": ">=2.3.0"
"ember": ">=4.8.0"
},
"demoURL": "https://www.ember-bootstrap.com"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = function (environment) {
modulePrefix: 'dummy',
environment,
rootURL: '/',
locationType: 'auto',
locationType: 'history',
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
Expand Down
7 changes: 2 additions & 5 deletions tests/integration/components/bs-button-test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { run } from '@ember/runloop';
import { defer, reject, resolve } from 'rsvp';
import { module, skip } from 'qunit';
import { module } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { find, render, click, settled, waitUntil } from '@ember/test-helpers';
import { test, testNotBS3, defaultButtonClass } from '../../helpers/bootstrap';
import { gte } from 'ember-compatibility-helpers';
import hbs from 'htmlbars-inline-precompile';
import setupNoDeprecations from '../../helpers/setup-no-deprecations';
import a11yAudit from 'ember-a11y-testing/test-support/audit';
Expand Down Expand Up @@ -232,9 +231,7 @@ module('Integration | Component | bs-button', function (hooks) {
await settled();
});

(gte('3.4.0')
? test
: skip)('setting disabled HTML attribute to false prevents button from being disabled while in pending state', async function (assert) {
test('setting disabled HTML attribute to false prevents button from being disabled while in pending state', async function (assert) {
let deferredClickAction = defer();
this.set('clickAction', () => {
return deferredClickAction.promise;
Expand Down
7 changes: 2 additions & 5 deletions tests/integration/components/bs-dropdown/menu-test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { module, test, skip } from 'qunit';
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render } from '@ember/test-helpers';
import { testBS3, testNotBS3 } from '../../../helpers/bootstrap';
import hbs from 'htmlbars-inline-precompile';
import setupNoDeprecations from '../../../helpers/setup-no-deprecations';
import { gte } from 'ember-compatibility-helpers';

module('Integration | Component | bs-dropdown/menu', function (hooks) {
setupRenderingTest(hooks);
Expand Down Expand Up @@ -78,9 +77,7 @@ module('Integration | Component | bs-dropdown/menu', function (hooks) {
assert.dom('.dropdown-menu').hasClass('custom-class-2', 'menu has custom-class-2 class');
});

(gte('3.4.0')
? test
: skip)('dropdown menu supports arbitrary attributes w/ angle brackets', async function (assert) {
test('dropdown menu supports arbitrary attributes w/ angle brackets', async function (assert) {
await render(
hbs`<BsDropdown as |dd|><dd.menu @isOpen={{true}} @toggleElement={{this.element}} class="custom-class-1" data-test-menu>Something</dd.menu></BsDropdown>`
);
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/components/bs-popover-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
import { setupForPositioning, assertPositioning } from '../../helpers/contextual-help';
import setupStylesheetSupport from '../../helpers/setup-stylesheet-support';
import setupNoDeprecations from '../../helpers/setup-no-deprecations';
import { gte } from 'ember-compatibility-helpers';
import a11yAudit from 'ember-a11y-testing/test-support/audit';
import sinon from 'sinon';

Expand Down Expand Up @@ -217,7 +216,7 @@ module('Integration | Component | bs-popover', function (hooks) {
assert.dom('.popover').hasClass('wide');
});

(gte('3.4.0') ? test : skip)('it passes all HTML attribute', async function (assert) {
test('it passes all HTML attribute', async function (assert) {
await render(
hbs`<div id="target"><BsPopover @title="Dummy" class="wide" data-test role="foo">test</BsPopover></div>`
);
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/components/bs-tooltip-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
import { setupForPositioning, assertPositioning } from '../../helpers/contextual-help';
import setupStylesheetSupport from '../../helpers/setup-stylesheet-support';
import setupNoDeprecations from '../../helpers/setup-no-deprecations';
import { gte } from 'ember-compatibility-helpers';
import a11yAudit from 'ember-a11y-testing/test-support/audit';
import sinon from 'sinon';

Expand Down Expand Up @@ -488,7 +487,7 @@ module('Integration | Component | bs-tooltip', function (hooks) {
assert.dom('.tooltip').hasClass('wide');
});

(gte('3.4.0') ? test : skip)('it passes all HTML attribute', async function (assert) {
test('it passes all HTML attribute', async function (assert) {
await render(hbs`<div id="target"><BsTooltip @title="Dummy" class="wide" data-test role="foo" /></div>`);
await triggerEvent('#target', 'mouseenter');
assert.dom('.tooltip').hasClass('wide');
Expand Down
Loading
Loading