Skip to content

Commit 7dbb61a

Browse files
committed
Merge remote-tracking branch 'origin/master' into refactor-to-template-only-components
2 parents 939590d + 27db24d commit 7dbb61a

File tree

4 files changed

+14
-35
lines changed

4 files changed

+14
-35
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup node.js
2323
uses: actions/setup-node@v3
2424
with:
25-
node-version: 12
25+
node-version: 14
2626
- name: Install dependencies
2727
uses: bahmutov/npm-install@v1
2828
- name: Lint
@@ -41,7 +41,7 @@ jobs:
4141
- name: Setup node.js
4242
uses: actions/setup-node@v3
4343
with:
44-
node-version: 12
44+
node-version: 14
4545
- name: Install dependencies
4646
uses: bahmutov/npm-install@v1
4747
with:
@@ -58,24 +58,22 @@ jobs:
5858
fail-fast: false
5959
matrix:
6060
scenario:
61-
- ember-lts-3.16
62-
- ember-lts-3.20
63-
- ember-lts-3.24
6461
- ember-lts-3.28
62+
- ember-lts-4.4
63+
- ember-lts-4.8
6564
- ember-release
6665
- ember-beta
6766
- ember-canary
6867
- ember-default-with-jquery
6968
- ember-classic
70-
- ember-bootstrap-v4
7169
- ember-power-select-v4
7270
steps:
7371
- name: Checkout code
7472
uses: actions/checkout@v3
7573
- name: Setup node.js
7674
uses: actions/setup-node@v3
7775
with:
78-
node-version: 12
76+
node-version: 14
7977
- name: Install dependencies
8078
uses: bahmutov/npm-install@v1
8179
- name: Test

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Compatibility
1111
------------------------------------------------------------------------------
1212

1313
* Ember Power Select v4 or above
14-
* Ember Bootstrap v4 or above
15-
* Ember.js v3.16 or above
14+
* Ember Bootstrap v5 or above
15+
* Ember.js v3.28 or above
1616
* Ember CLI v3.16 or above
1717
* Node.js v12 or above
1818

config/ember-try.js

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,26 @@ module.exports = async function () {
88
useYarn: true,
99
scenarios: [
1010
{
11-
name: 'ember-lts-3.16',
11+
name: 'ember-lts-3.28',
1212
npm: {
1313
devDependencies: {
14-
'ember-source': '~3.16.0',
14+
'ember-source': '~3.28.0',
1515
},
1616
},
1717
},
1818
{
19-
name: 'ember-lts-3.20',
19+
name: 'ember-lts-4.4',
2020
npm: {
2121
devDependencies: {
22-
'ember-source': '~3.20.0',
22+
'ember-source': '~4.4.0',
2323
},
2424
},
2525
},
2626
{
27-
name: 'ember-lts-3.24',
27+
name: 'ember-lts-4.8',
2828
npm: {
2929
devDependencies: {
30-
'ember-source': '~3.24.3',
31-
},
32-
},
33-
},
34-
{
35-
name: 'ember-lts-3.28',
36-
npm: {
37-
devDependencies: {
38-
'ember-source': '~3.28.0',
30+
'ember-source': '~4.8.0',
3931
},
4032
},
4133
},
@@ -106,17 +98,6 @@ module.exports = async function () {
10698
},
10799
embroiderSafe(),
108100
embroiderOptimized(),
109-
{
110-
name: 'ember-bootstrap-v4',
111-
npm: {
112-
devDependencies: {
113-
'ember-bootstrap': '^4.9.0',
114-
},
115-
resolutions: {
116-
'@embroider/macros': '^0.50.2',
117-
},
118-
},
119-
},
120101
{
121102
name: 'ember-power-select-v4',
122103
npm: {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"webpack": "5.74.0"
8080
},
8181
"engines": {
82-
"node": "12.* || 14.* || >= 16"
82+
"node": "14.* || 16.* || >= 18"
8383
},
8484
"publishConfig": {
8585
"registry": "https://registry.npmjs.org"

0 commit comments

Comments
 (0)