[BUGFIX release] Remove requirement for jquery in Octane (#18500)

[BUGFIX release] Remove requirement for jquery in Octane
emberjs · Oct 24, 2019 · 722a5bc · 722a5bc
2 parents ac5a305 + 7a25c08
commit 722a5bc
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -79,9 +79,22 @@ module.exports = {
         );
       }
 
-      if (optionalFeaturesMissing || optionalFeatures.isFeatureEnabled('jquery-integration')) {
+      if (
+        optionalFeaturesMissing ||
+        typeof optionalFeatures.isFeatureExplicitlySet !== 'function'
+      ) {
+        message.push(
+          '* Unable to detect if jquery-integration is explicitly set to a value, please update `@ember/optional-features` to the latest version'
+        );
+      }
+
+      if (
+        optionalFeaturesMissing ||
+        (typeof optionalFeatures.isFeatureExplicitlySet === 'function' &&
+          !optionalFeatures.isFeatureExplicitlySet('jquery-integration'))
+      ) {
         message.push(
-          `* The jquery-integration optional feature should be disabled under Octane, run \`ember feature:disable jquery-integration\` to disable it`
+          `* The jquery-integration optional feature should be explicitly set to a value under Octane, run \`ember feature:disable jquery-integration\` to disable it, or \`ember feature:enable jquery-integration\` to explicitly enable it`
         );
       }