Merge pull request #939 from ember-fastboot/embroider

Fix embroider-optimised
ember-fastboot · May 2, 2024 · f8ee13a · f8ee13a
2 parents ae9302d + c8748a7
commit f8ee13a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/packages/ember-cli-fastboot/vendor/experimental-render-mode-rehydrate.js b/packages/ember-cli-fastboot/vendor/experimental-render-mode-rehydrate.js
@@ -2,7 +2,14 @@
 (function() {
   if (typeof FastBoot === 'undefined') {
     var current = document.getElementById('fastboot-body-start');
-    var _Ember = require.has('ember') ? require('ember').default : Ember;
+
+    var _Ember = require.has('ember') ? require('ember').default : window.Ember;
+
+    if (current && !_Ember) {
+      console.error(`Experimental render mode rehydrate isn't working because it couldn't find Ember via AMD or global.
+See https://github.com/ember-fastboot/ember-cli-fastboot/issues/938 for the current state of the fix.`);
+      return;
+    }
 
     if (
       current &&