Skip to content
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

Jump to bottom

[ENHANCEMENT] Add v4.8 LTS to addon blueprint - Remove v3.28 LTS and ember-classic scenario #10189

Merged
merged 1 commit into from Feb 23, 2023
Merged

[ENHANCEMENT] Add v4.8 LTS to addon blueprint - Remove v3.28 LTS and ember-classic scenario #10189

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion blueprints/addon/additional-package.json
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
"ember-try": "^2.0.0"
},
"peerDependencies": {
"ember-source": "^3.28.0 || ^4.0.0"
"ember-source": "^4.0.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
3 changes: 1 addition & 2 deletions blueprints/addon/files/.github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -57,12 +57,11 @@ jobs:
fail-fast: false
matrix:
try-scenario:
- ember-lts-3.28
- ember-lts-4.4
- ember-lts-4.8
- ember-release
- ember-beta
- ember-canary
- ember-classic
- embroider-safe
- embroider-optimized

Expand Down
3 changes: 1 addition & 2 deletions blueprints/addon/files/.travis.yml
View file
Open in desktop
Expand Up @@ -51,12 +51,11 @@ jobs:

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- env: EMBER_TRY_SCENARIO=ember-lts-3.28
- env: EMBER_TRY_SCENARIO=ember-lts-4.4
- env: EMBER_TRY_SCENARIO=ember-lts-4.8
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-classic
- env: EMBER_TRY_SCENARIO=embroider-safe
- env: EMBER_TRY_SCENARIO=embroider-optimized
<% if (yarn) { %>
Expand Down
4 changes: 2 additions & 2 deletions blueprints/addon/files/README.md
View file
Open in desktop
Expand Up @@ -5,8 +5,8 @@

## Compatibility

* Ember.js v3.28 or above
* Ember CLI v3.28 or above
* Ember.js v4.4 or above
* Ember CLI v4.4 or above
* Node.js v14 or above


Expand Down
26 changes: 4 additions & 22 deletions blueprints/addon/files/addon-config/ember-try.js
View file
Open in desktop
Expand Up @@ -8,18 +8,18 @@ module.exports = async function () {
<% if (yarn) { %>useYarn: true,
<% } %>scenarios: [
{
name: 'ember-lts-3.28',
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~3.28.0',
'ember-source': '~4.4.0',
},
},
},
{
name: 'ember-lts-4.4',
name: 'ember-lts-4.8',
npm: {
devDependencies: {
'ember-source': '~4.4.0',
'ember-source': '~4.8.0',
},
},
},
Expand Down Expand Up @@ -47,24 +47,6 @@ module.exports = async function () {
},
},
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false,
}),
},
npm: {
devDependencies: {
'ember-source': '~3.28.0',
},
ember: {
edition: 'classic',
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
Expand Down
3 changes: 1 addition & 2 deletions tests/fixtures/addon/defaults-travis/.travis.yml
View file
Open in desktop
Expand Up @@ -47,12 +47,11 @@ jobs:

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- env: EMBER_TRY_SCENARIO=ember-lts-3.28
- env: EMBER_TRY_SCENARIO=ember-lts-4.4
- env: EMBER_TRY_SCENARIO=ember-lts-4.8
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-classic
- env: EMBER_TRY_SCENARIO=embroider-safe
- env: EMBER_TRY_SCENARIO=embroider-optimized

Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/addon/defaults-travis/README.md
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@ foo
Compatibility
------------------------------------------------------------------------------

* Ember.js v3.28 or above
* Ember CLI v3.28 or above
* Ember.js v4.4 or above
* Ember CLI v4.4 or above
* Node.js v14 or above


Expand Down
23 changes: 4 additions & 19 deletions tests/fixtures/addon/defaults-travis/tests/dummy/config/ember-try.js
View file
Open in desktop
Expand Up @@ -7,18 +7,18 @@ module.exports = async function () {
return {
scenarios: [
{
name: 'ember-lts-3.28',
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~3.28.0',
'ember-source': '~4.4.0',
},
},
},
{
name: 'ember-lts-4.4',
name: 'ember-lts-4.8',
npm: {
devDependencies: {
'ember-source': '~4.4.0',
'ember-source': '~4.8.0',
},
},
},
Expand Down Expand Up @@ -46,21 +46,6 @@ module.exports = async function () {
},
},
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false,
}),
},
npm: {
ember: {
edition: 'classic',
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
Expand Down
3 changes: 1 addition & 2 deletions tests/fixtures/addon/defaults/.github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -57,12 +57,11 @@ jobs:
fail-fast: false
matrix:
try-scenario:
- ember-lts-3.28
- ember-lts-4.4
- ember-lts-4.8
- ember-release
- ember-beta
- ember-canary
- ember-classic
- embroider-safe
- embroider-optimized

Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/addon/defaults/README.md
View file
Open in desktop
Expand Up @@ -5,8 +5,8 @@

## Compatibility

* Ember.js v3.28 or above
* Ember CLI v3.28 or above
* Ember.js v4.4 or above
* Ember CLI v4.4 or above
* Node.js v14 or above


Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/addon/defaults/package.json
View file
Open in desktop
Expand Up @@ -73,7 +73,7 @@
"webpack": "^5.75.0"
},
"peerDependencies": {
"ember-source": "^3.28.0 || ^4.0.0"
"ember-source": "^4.0.0"
},
"engines": {
"node": "14.* || 16.* || >= 18"
Expand Down
26 changes: 4 additions & 22 deletions tests/fixtures/addon/defaults/tests/dummy/config/ember-try.js
View file
Open in desktop
Expand Up @@ -7,18 +7,18 @@ module.exports = async function () {
return {
scenarios: [
{
name: 'ember-lts-3.28',
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~3.28.0',
'ember-source': '~4.4.0',
},
},
},
{
name: 'ember-lts-4.4',
name: 'ember-lts-4.8',
npm: {
devDependencies: {
'ember-source': '~4.4.0',
'ember-source': '~4.8.0',
},
},
},
Expand Down Expand Up @@ -46,24 +46,6 @@ module.exports = async function () {
},
},
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false,
}),
},
npm: {
devDependencies: {
'ember-source': '~3.28.0',
},
ember: {
edition: 'classic',
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
Expand Down
3 changes: 1 addition & 2 deletions tests/fixtures/addon/yarn/.github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -57,12 +57,11 @@ jobs:
fail-fast: false
matrix:
try-scenario:
- ember-lts-3.28
- ember-lts-4.4
- ember-lts-4.8
- ember-release
- ember-beta
- ember-canary
- ember-classic
- embroider-safe
- embroider-optimized

Expand Down
3 changes: 1 addition & 2 deletions tests/fixtures/addon/yarn/.travis.yml
View file
Open in desktop
Expand Up @@ -46,12 +46,11 @@ jobs:

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- env: EMBER_TRY_SCENARIO=ember-lts-3.28
- env: EMBER_TRY_SCENARIO=ember-lts-4.4
- env: EMBER_TRY_SCENARIO=ember-lts-4.8
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-classic
- env: EMBER_TRY_SCENARIO=embroider-safe
- env: EMBER_TRY_SCENARIO=embroider-optimized

Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/addon/yarn/README.md
View file
Open in desktop
Expand Up @@ -5,8 +5,8 @@

## Compatibility

* Ember.js v3.28 or above
* Ember CLI v3.28 or above
* Ember.js v4.4 or above
* Ember CLI v4.4 or above
* Node.js v14 or above


Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/addon/yarn/package.json
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@
"webpack": "^5.75.0"
},
"peerDependencies": {
"ember-source": "^3.28.0 || ^4.0.0"
"ember-source": "^4.0.0"
},
"engines": {
"node": "14.* || 16.* || >= 18"
Expand Down
26 changes: 4 additions & 22 deletions tests/fixtures/addon/yarn/tests/dummy/config/ember-try.js
View file
Open in desktop
Expand Up @@ -8,18 +8,18 @@ module.exports = async function () {
useYarn: true,
scenarios: [
{
name: 'ember-lts-3.28',
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~3.28.0',
'ember-source': '~4.4.0',
},
},
},
{
name: 'ember-lts-4.4',
name: 'ember-lts-4.8',
npm: {
devDependencies: {
'ember-source': '~4.4.0',
'ember-source': '~4.8.0',
},
},
},
Expand Down Expand Up @@ -47,24 +47,6 @@ module.exports = async function () {
},
},
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false,
}),
},
npm: {
devDependencies: {
'ember-source': '~3.28.0',
},
ember: {
edition: 'classic',
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/blueprints/addon-test.js
View file
Open in desktop
Expand Up @@ -183,7 +183,7 @@ describe('blueprint - addon', function () {
let json = JSON.parse(output);

expect(json.peerDependencies).to.deep.equal({
'ember-source': '^3.28.0 || ^4.0.0',
'ember-source': '^4.0.0',
'foo-bar': '^1.0.0',
});
});
Expand Down