-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
[CLEANUP] Cleanup "octane edition" code #20863
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.
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Octane has been the default for multiple major versions, so we can remove and simplify the code.
7b0511f
to
faffa24
Compare
Windvis
commented
Mar 3, 2025
Comment on lines
-92
to
-121
let message = []; | ||
|
||
if (optionalFeaturesMissing) { | ||
message.push( | ||
`* the @ember/optional-features addon is missing, run \`ember install @ember/optional-features\` to install it` | ||
); | ||
} | ||
|
||
if (message.length > 0) { | ||
message.unshift( | ||
`You have configured your application to indicate that it is using the 'octane' edition (via \`setEdition('octane')\`), but the appropriate Octane features were not enabled:\n` | ||
); | ||
|
||
throw new SilentError(message.join('\n\t')); | ||
} | ||
} else { | ||
throw new SilentError( | ||
'The Ember Classic edition has been removed. Specifying "classic" in your package.json, or not specifying a value at all, is no longer supported. You must explicitly set the "ember.edition" property to "octane". You can also run `npx @ember/octanify` to do this. \n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_editions-classic' | ||
); | ||
} | ||
|
||
if ( | ||
!optionalFeaturesMissing && | ||
optionalFeatures.isFeatureEnabled('jquery-integration') && | ||
typeof optionalFeatures.isFeatureExplicitlySet === 'function' && | ||
optionalFeatures.isFeatureExplicitlySet('jquery-integration') | ||
) { | ||
throw new SilentError( | ||
'Setting the `jquery-integration` optional feature flag to `true` was deprecated in Ember 3.x and removed in Ember 4.0.0. You must add the `@ember/optional-features` addon and set this feature to `false`.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-jquery-integration' | ||
); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure about this change. I think we can simply remove these errors, but we could also keep them around (without the octane check).
NullVoxPopuli
approved these changes
Mar 3, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Octane has been the default for multiple major versions, so we can remove and simplify the code.