diff --git a/packages/engine/src/Engine.js b/packages/engine/src/Engine.js
index 7b58e2d..0d9c9b4 100644
--- a/packages/engine/src/Engine.js
+++ b/packages/engine/src/Engine.js
@@ -112,6 +112,9 @@ export class Engine {
         const result = await this.renderFile({ sourceFilePath, rocketHeader });
         await pageTree.add(result.sourceRelativeFilePath);
         await cleanupAutoGeneratedFiles(result);
+        if (result.passOnError) {
+          throw result.passOnError;
+        }
       }
       await pageTree.save();
 
@@ -431,10 +434,15 @@ export class Engine {
       inputDir: this.docsDir,
       outputDir: this.outputDir,
       renderMode: this.options.renderMode || 'development',
-      needsLoader: rocketHeader ? rocketHeader.needsLoader : false,
       throwOnError,
     };
     let result = await renderViaWorker(renderOptions);
+    if (result.passOnError) {
+      if (throwOnError) {
+        throw result.passOnError;
+      }
+      return result;
+    }
 
     if (rocketHeader) {
       const { needsAnotherRenderingPass } = await rocketHeader.syncComponents({
@@ -444,7 +452,6 @@ export class Engine {
         openGraphHtml: result.openGraphHtml,
       });
       if (needsAnotherRenderingPass) {
-        renderOptions.needsLoader = rocketHeader.needsLoader;
         renderOptions.throwOnError = true;
         result = await renderViaWorker(renderOptions);
       } else if (result.passOnError) {
diff --git a/packages/engine/src/file-header/RocketHeader.js b/packages/engine/src/file-header/RocketHeader.js
index fced382..7cdcf4a 100644
--- a/packages/engine/src/file-header/RocketHeader.js
+++ b/packages/engine/src/file-header/RocketHeader.js
@@ -81,7 +81,6 @@ export class RocketHeader {
   /** @type {String[]} */
   componentDefinitions = [];
   sourceFileContent = '';
-  needsLoader = false;
 
   /**
    *
@@ -123,12 +122,6 @@ export class RocketHeader {
         dataCascade.push(line);
       }
       if (captureComponents === true) {
-        if (
-          line.trim() === '// hydrate-able components' ||
-          line.trim() === '// client-only components'
-        ) {
-          this.needsLoader = true;
-        }
         componentDefinitions.push(line);
       }
 
@@ -483,6 +476,9 @@ export class RocketHeader {
       clientComponents.unshift('  // client-only components');
     }
 
+    const needsLoader = hydrateAbleComponents.length > 0 || clientComponents.length > 0;
+    const needsLoaderExport = needsLoader ? ['export const needsLoader = true;'] : [];
+
     if (
       serverOnlyComponents.length > 0 ||
       serverOnlyOpenGraphOnlyComponents.length > 0 ||
@@ -496,6 +492,7 @@ export class RocketHeader {
         ...hydrateAbleComponents,
         ...clientComponents,
         '}',
+        ...needsLoaderExport,
       ];
     } else {
       this.componentDefinitions = [];
@@ -503,12 +500,11 @@ export class RocketHeader {
 
     await this.set();
     const result = await this.save();
-    if (hydrateAbleComponents.length > 0 || clientComponents.length > 0) {
-      this.needsLoader = true;
+
+    if (needsLoader) {
       await this.saveHydrationFile({ outputFilePath, componentsWithStrategy });
-    } else {
-      this.needsLoader = false;
     }
+
     return result;
   }
 
diff --git a/packages/engine/src/worker/renderViaWorker.js b/packages/engine/src/worker/renderViaWorker.js
index 9d815f7..49044d6 100644
--- a/packages/engine/src/worker/renderViaWorker.js
+++ b/packages/engine/src/worker/renderViaWorker.js
@@ -35,7 +35,6 @@ let isRendering = '';
  * @param {string} options.outputDir
  * @param {string} options.inputDir
  * @param {string} options.renderMode
- * @param {boolean} options.needsLoader
  * @param {boolean} options.throwOnError
  * @returns {Promise<import('../../types/main.js').renderWorkerResult>}
  */
@@ -44,7 +43,6 @@ export function renderViaWorker({
   inputDir,
   outputDir,
   renderMode = 'development',
-  needsLoader = false,
   throwOnError = false,
 }) {
   return new Promise((resolve, reject) => {
@@ -92,7 +90,6 @@ export function renderViaWorker({
         outputDir,
         inputDir,
         renderMode,
-        needsLoader,
         throwOnError,
       });
     });
diff --git a/packages/engine/src/worker/renderWorker.js b/packages/engine/src/worker/renderWorker.js
index 7948548..d19720a 100644
--- a/packages/engine/src/worker/renderWorker.js
+++ b/packages/engine/src/worker/renderWorker.js
@@ -24,7 +24,6 @@ import { validateComponentImportString } from '../file-header/validateComponentI
  * @param {string} options.sourceFilePath
  * @param {string} options.outputDir
  * @param {string} options.inputDir
- * @param {Boolean} options.needsLoader
  * @param {Boolean} options.throwOnError
  * @param {'development'|'production'} options.renderMode
  */
@@ -33,7 +32,6 @@ async function renderFile({
   outputDir,
   inputDir,
   renderMode = 'development',
-  needsLoader = false,
   throwOnError = false,
 }) {
   let fileContent = '';
@@ -144,7 +142,7 @@ async function renderFile({
         sourceRelativeFilePath,
         outputRelativeFilePath,
         url,
-        needsLoader,
+        needsLoader: !!data.needsLoader,
       });
 
       fileContent = fileContent.trim();
@@ -181,7 +179,7 @@ async function renderFile({
         sourceRelativeFilePath,
         outputRelativeFilePath: layoutData.openGraphOutputRelativeFilePath,
         url: layoutData.openGraphUrl,
-        needsLoader,
+        needsLoader: false, // open graph is always only server side rendered
       });
 
       openGraphHtml = openGraphHtml.trim();
@@ -223,7 +221,7 @@ async function renderFile({
 
 parentPort?.on('message', message => {
   if (message.action === 'renderFile') {
-    const { sourceFilePath, outputDir, renderMode, inputDir, needsLoader, throwOnError } = message;
-    renderFile({ sourceFilePath, outputDir, renderMode, inputDir, needsLoader, throwOnError });
+    const { sourceFilePath, outputDir, renderMode, inputDir, throwOnError } = message;
+    renderFile({ sourceFilePath, outputDir, renderMode, inputDir, throwOnError });
   }
 });
diff --git a/packages/engine/test-node/14b-components-files.test.js b/packages/engine/test-node/14b-components-files.test.js
index b35c152..f88598d 100644
--- a/packages/engine/test-node/14b-components-files.test.js
+++ b/packages/engine/test-node/14b-components-files.test.js
@@ -54,6 +54,7 @@ describe('Components', () => {
         '  // hydrate-able components',
         "  customElements.define('my-el', await import('@test/components').then(m => m.MyEl));",
         '}',
+        'export const needsLoader = true;',
         '/* END - Rocket auto generated - do not touch */',
         '',
         'export default () => html`<my-el loading="hydrate"></my-el>`;',
@@ -102,6 +103,7 @@ describe('Components', () => {
         '  // client-only components',
         "  // 'my-el2': () => import('@test/components').then(m => m.MyEl2),",
         '}',
+        'export const needsLoader = true;',
         '/* END - Rocket auto generated - do not touch */',
         '',
         'export default () => html`<my-el2 loading="client"></my-el2>`;',
@@ -303,6 +305,7 @@ describe('Components', () => {
         '  // hydrate-able components',
         "  customElements.define('my-el', await import('@test/components').then(m => m.MyEl));",
         '}',
+        'export const needsLoader = true;',
         '/* END - Rocket auto generated - do not touch */',
         '',
         'export default () => html`<my-el loading="hydrate:onClick"></my-el>`;',
@@ -484,4 +487,112 @@ describe('Components', () => {
       ].join('\n'),
     );
   });
+
+  it('13: during start it handles errors in components', async () => {
+    const {
+      writeSource,
+      cleanup,
+      engine,
+      anEngineEvent,
+      readOutput,
+      adjustSource,
+      setAsOpenedInBrowser,
+      readSource,
+    } = await setupTestEngine('fixtures/14-components/13-start-error-in-component/docs');
+
+    // working component
+    await writeSource(
+      '../src/MyEl.js',
+      [
+        "import { LitElement, html } from 'lit';",
+        '',
+        'export class MyEl extends LitElement {',
+        '  render() {',
+        '    return html`<p>Hello World</p>`;',
+        '  }',
+        '}',
+      ].join('\n'),
+    );
+    await adjustSource(
+      'index.rocket.js',
+      /<my-el loading="hydrate:onVisible">.*?<\/my-el>/,
+      '<my-el loading="hydrate:onVisible">0</my-el>',
+    );
+    await engine.start();
+    setAsOpenedInBrowser('index.rocket.js');
+
+    // trigger render
+    await adjustSource(
+      'index.rocket.js',
+      /<my-el loading="hydrate:onVisible">.*?<\/my-el>/,
+      '<my-el loading="hydrate:onVisible">1</my-el>',
+    );
+    await anEngineEvent('rocketUpdated');
+    expect(readOutput('index.html')).to.equal(
+      [
+        '<my-el loading="hydrate:onVisible"',
+        '  ><template shadowroot="open"><p>Hello World</p></template>1</my-el',
+        '>',
+        '<script type="module" src="index-loader-generated.js"></script>',
+      ].join('\n'),
+    );
+    expect(readSource('index.rocket.js')).to.equal(
+      [
+        '/* START - Rocket auto generated - do not touch */',
+        "export const sourceRelativeFilePath = 'index.rocket.js';",
+        "import { html, components } from './recursive.data.js';",
+        'export { html, components };',
+        'export async function registerCustomElements() {',
+        '  // hydrate-able components',
+        "  customElements.define('my-el', await import('@test/components').then(m => m.MyEl));",
+        '}',
+        'export const needsLoader = true;',
+        '/* END - Rocket auto generated - do not touch */',
+        '',
+        'export default () => html`<my-el loading="hydrate:onVisible">1</my-el>`;',
+      ].join('\n'),
+    );
+
+    // introduce error in component
+    await writeSource(
+      '../src/MyEl.js',
+      [
+        "import { LitElement, html } from 'lit';",
+        '',
+        'export class MyEl extends LitElement {',
+        '  render() {',
+        '    let foo = this.does.not.exist;', // <-- this is the error
+        '    return html`<p>Hello World</p>`;',
+        '  }',
+        '}',
+      ].join('\n'),
+    );
+    await anEngineEvent('rocketUpdated');
+    expect(readOutput('index.html')).to.include('<p>🛑 Server Error 🛑</p>');
+
+    // correct error
+    await writeSource(
+      '../src/MyEl.js',
+      [
+        "import { LitElement, html } from 'lit';",
+        '',
+        'export class MyEl extends LitElement {',
+        '  render() {',
+        '    return html`<p>Hello World</p>`;',
+        '  }',
+        '}',
+      ].join('\n'),
+    );
+    await anEngineEvent('rocketUpdated');
+    expect(readOutput('index.html')).to.equal(
+      [
+        '<my-el loading="hydrate:onVisible"',
+        '  ><template shadowroot="open"><p>Hello World</p></template>1</my-el',
+        '>',
+        '<script type="module" src="index-loader-generated.js"></script>',
+      ].join('\n'),
+    );
+
+    await cleanup();
+  });
 });
diff --git a/packages/engine/test-node/fixtures/09b-watch-error-handling/02-import/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/09b-watch-error-handling/02-import/docs/pageTreeData.rocketGenerated.json
index 929b8fc..71629c9 100644
--- a/packages/engine/test-node/fixtures/09b-watch-error-handling/02-import/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/09b-watch-error-handling/02-import/docs/pageTreeData.rocketGenerated.json
@@ -4,5 +4,7 @@
   "url": "/",
   "outputRelativeFilePath": "index.html",
   "sourceRelativeFilePath": "index.rocket.js",
-  "level": 0
+  "level": 0,
+  "title": "Unexpected identifier",
+  "h1": "Unexpected identifier"
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/02-register-hydrate/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/02-register-hydrate/docs/index.rocket.js
index 8178fb1..24451ee 100644
--- a/packages/engine/test-node/fixtures/14-components/02-register-hydrate/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/02-register-hydrate/docs/index.rocket.js
@@ -6,6 +6,7 @@ export async function registerCustomElements() {
   // hydrate-able components
   customElements.define('my-el', await import('@test/components').then(m => m.MyEl));
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html`<my-el loading="hydrate"></my-el>`;
diff --git a/packages/engine/test-node/fixtures/14-components/02-register-hydrate/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/02-register-hydrate/docs/pageTreeData.rocketGenerated.json
index 929b8fc..5e1a0c1 100644
--- a/packages/engine/test-node/fixtures/14-components/02-register-hydrate/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/02-register-hydrate/docs/pageTreeData.rocketGenerated.json
@@ -4,5 +4,6 @@
   "url": "/",
   "outputRelativeFilePath": "index.html",
   "sourceRelativeFilePath": "index.rocket.js",
-  "level": 0
+  "level": 0,
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/03-register-client/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/03-register-client/docs/index.rocket.js
index 27a92b8..063657c 100644
--- a/packages/engine/test-node/fixtures/14-components/03-register-client/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/03-register-client/docs/index.rocket.js
@@ -6,6 +6,7 @@ export async function registerCustomElements() {
   // client-only components
   // 'my-el2': () => import('@test/components').then(m => m.MyEl2),
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html`<my-el2 loading="client"></my-el2>`;
diff --git a/packages/engine/test-node/fixtures/14-components/03-register-client/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/03-register-client/docs/pageTreeData.rocketGenerated.json
index 929b8fc..5e1a0c1 100644
--- a/packages/engine/test-node/fixtures/14-components/03-register-client/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/03-register-client/docs/pageTreeData.rocketGenerated.json
@@ -4,5 +4,6 @@
   "url": "/",
   "outputRelativeFilePath": "index.html",
   "sourceRelativeFilePath": "index.rocket.js",
-  "level": 0
+  "level": 0,
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/04-hydration-and-client/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/04-hydration-and-client/docs/index.rocket.js
index 5ab1454..08edac0 100644
--- a/packages/engine/test-node/fixtures/14-components/04-hydration-and-client/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/04-hydration-and-client/docs/index.rocket.js
@@ -8,6 +8,7 @@ export async function registerCustomElements() {
   // client-only components
   // 'my-only': () => import('@test/components/MyOnly').then(m => m.MyOnly),
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html`
diff --git a/packages/engine/test-node/fixtures/14-components/04-hydration-and-client/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/04-hydration-and-client/docs/pageTreeData.rocketGenerated.json
index 929b8fc..5e1a0c1 100644
--- a/packages/engine/test-node/fixtures/14-components/04-hydration-and-client/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/04-hydration-and-client/docs/pageTreeData.rocketGenerated.json
@@ -4,5 +4,6 @@
   "url": "/",
   "outputRelativeFilePath": "index.html",
   "sourceRelativeFilePath": "index.rocket.js",
-  "level": 0
+  "level": 0,
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/08-open-graph-no-loader-injection/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/08-open-graph-no-loader-injection/docs/index.rocket.js
index 42748d0..25713e7 100644
--- a/packages/engine/test-node/fixtures/14-components/08-open-graph-no-loader-injection/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/08-open-graph-no-loader-injection/docs/index.rocket.js
@@ -6,6 +6,7 @@ export async function registerCustomElements() {
   // hydrate-able components
   customElements.define('my-el', await import('@test/components').then(m => m.MyEl));
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html`<my-el loading="hydrate:onClick"></my-el>`;
diff --git a/packages/engine/test-node/fixtures/14-components/08-open-graph-no-loader-injection/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/08-open-graph-no-loader-injection/docs/pageTreeData.rocketGenerated.json
index 929b8fc..5e1a0c1 100644
--- a/packages/engine/test-node/fixtures/14-components/08-open-graph-no-loader-injection/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/08-open-graph-no-loader-injection/docs/pageTreeData.rocketGenerated.json
@@ -4,5 +4,6 @@
   "url": "/",
   "outputRelativeFilePath": "index.html",
   "sourceRelativeFilePath": "index.rocket.js",
-  "level": 0
+  "level": 0,
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/10-start-inject-remove-loader/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/10-start-inject-remove-loader/docs/pageTreeData.rocketGenerated.json
index 929b8fc..5e1a0c1 100644
--- a/packages/engine/test-node/fixtures/14-components/10-start-inject-remove-loader/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/10-start-inject-remove-loader/docs/pageTreeData.rocketGenerated.json
@@ -4,5 +4,6 @@
   "url": "/",
   "outputRelativeFilePath": "index.html",
   "sourceRelativeFilePath": "index.rocket.js",
-  "level": 0
+  "level": 0,
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/docs/index.rocket.js
new file mode 100644
index 0000000..da755d6
--- /dev/null
+++ b/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/docs/index.rocket.js
@@ -0,0 +1,12 @@
+/* START - Rocket auto generated - do not touch */
+export const sourceRelativeFilePath = 'index.rocket.js';
+import { html, components } from './recursive.data.js';
+export { html, components };
+export async function registerCustomElements() {
+  // hydrate-able components
+  customElements.define('my-el', await import('@test/components').then(m => m.MyEl));
+}
+export const needsLoader = true;
+/* END - Rocket auto generated - do not touch */
+
+export default () => html`<my-el loading="hydrate:onVisible">1</my-el>`;
diff --git a/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/docs/pageTreeData.rocketGenerated.json
new file mode 100644
index 0000000..c6482b8
--- /dev/null
+++ b/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/docs/pageTreeData.rocketGenerated.json
@@ -0,0 +1,11 @@
+{
+  "name": "index.rocket.js",
+  "menuLinkText": "index.rocket.js",
+  "url": "/",
+  "outputRelativeFilePath": "index.html",
+  "sourceRelativeFilePath": "index.rocket.js",
+  "level": 0,
+  "title": "Cannot read properties of undefined (reading 'not')",
+  "h1": "Cannot read properties of undefined (reading 'not')",
+  "needsLoader": true
+}
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/docs/recursive.data.js b/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/docs/recursive.data.js
new file mode 100644
index 0000000..8762e03
--- /dev/null
+++ b/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/docs/recursive.data.js
@@ -0,0 +1,5 @@
+export { html } from 'lit';
+
+export const components = {
+  'my-el': '@test/components::MyEl',
+};
diff --git a/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/package.json b/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/package.json
new file mode 100644
index 0000000..158febe
--- /dev/null
+++ b/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@test/components",
+  "type": "module",
+  "exports": {
+    ".": "./src/MyEl.js"
+  }
+}
diff --git a/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/src/MyEl.js b/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/src/MyEl.js
new file mode 100644
index 0000000..d2cb42f
--- /dev/null
+++ b/packages/engine/test-node/fixtures/14-components/13-start-error-in-component/src/MyEl.js
@@ -0,0 +1,7 @@
+import { LitElement, html } from 'lit';
+
+export class MyEl extends LitElement {
+  render() {
+    return html`<p>Hello World</p>`;
+  }
+}
diff --git a/packages/engine/test-node/fixtures/14-components/50-hydration-onClientLoad/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/50-hydration-onClientLoad/docs/index.rocket.js
index b98fb27..08bcf3f 100644
--- a/packages/engine/test-node/fixtures/14-components/50-hydration-onClientLoad/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/50-hydration-onClientLoad/docs/index.rocket.js
@@ -6,6 +6,7 @@ export async function registerCustomElements() {
   // hydrate-able components
   customElements.define('my-el', await import('@test/components').then(m => m.MyEl));
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html`<my-el loading="hydrate:onClientLoad"></my-el>`;
diff --git a/packages/engine/test-node/fixtures/14-components/50-hydration-onClientLoad/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/50-hydration-onClientLoad/docs/pageTreeData.rocketGenerated.json
index 39006ed..1f1a0eb 100644
--- a/packages/engine/test-node/fixtures/14-components/50-hydration-onClientLoad/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/50-hydration-onClientLoad/docs/pageTreeData.rocketGenerated.json
@@ -7,5 +7,6 @@
   "level": 0,
   "components": {
     "my-el": "() => import('@test/components').then(m => m.MyEl)"
-  }
+  },
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/50b-hydration-onClientLoad-multiple/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/50b-hydration-onClientLoad-multiple/docs/index.rocket.js
index 2191e74..e5c7e90 100644
--- a/packages/engine/test-node/fixtures/14-components/50b-hydration-onClientLoad-multiple/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/50b-hydration-onClientLoad-multiple/docs/index.rocket.js
@@ -6,6 +6,7 @@ export async function registerCustomElements() {
   // hydrate-able components
   customElements.define('my-el', await import('@test/components').then(m => m.MyEl));
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html`
diff --git a/packages/engine/test-node/fixtures/14-components/50b-hydration-onClientLoad-multiple/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/50b-hydration-onClientLoad-multiple/docs/pageTreeData.rocketGenerated.json
index 39006ed..1f1a0eb 100644
--- a/packages/engine/test-node/fixtures/14-components/50b-hydration-onClientLoad-multiple/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/50b-hydration-onClientLoad-multiple/docs/pageTreeData.rocketGenerated.json
@@ -7,5 +7,6 @@
   "level": 0,
   "components": {
     "my-el": "() => import('@test/components').then(m => m.MyEl)"
-  }
+  },
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/51-hydration-onClick/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/51-hydration-onClick/docs/index.rocket.js
index a025f80..f8ebc1a 100644
--- a/packages/engine/test-node/fixtures/14-components/51-hydration-onClick/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/51-hydration-onClick/docs/index.rocket.js
@@ -6,6 +6,7 @@ export async function registerCustomElements() {
   // hydrate-able components
   customElements.define('my-el', await import('@test/components').then(m => m.MyEl));
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html`<my-el loading="hydrate:onClick"></my-el>`;
diff --git a/packages/engine/test-node/fixtures/14-components/51-hydration-onClick/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/51-hydration-onClick/docs/pageTreeData.rocketGenerated.json
index 39006ed..1f1a0eb 100644
--- a/packages/engine/test-node/fixtures/14-components/51-hydration-onClick/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/51-hydration-onClick/docs/pageTreeData.rocketGenerated.json
@@ -7,5 +7,6 @@
   "level": 0,
   "components": {
     "my-el": "() => import('@test/components').then(m => m.MyEl)"
-  }
+  },
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/52-hydration-onVisible/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/52-hydration-onVisible/docs/index.rocket.js
index 8cab8db..13303ef 100644
--- a/packages/engine/test-node/fixtures/14-components/52-hydration-onVisible/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/52-hydration-onVisible/docs/index.rocket.js
@@ -6,6 +6,7 @@ export async function registerCustomElements() {
   // hydrate-able components
   customElements.define('my-el', await import('@test/components').then(m => m.MyEl));
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html`
diff --git a/packages/engine/test-node/fixtures/14-components/52-hydration-onVisible/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/52-hydration-onVisible/docs/pageTreeData.rocketGenerated.json
index 39006ed..1f1a0eb 100644
--- a/packages/engine/test-node/fixtures/14-components/52-hydration-onVisible/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/52-hydration-onVisible/docs/pageTreeData.rocketGenerated.json
@@ -7,5 +7,6 @@
   "level": 0,
   "components": {
     "my-el": "() => import('@test/components').then(m => m.MyEl)"
-  }
+  },
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/53-hydration-onMedia/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/53-hydration-onMedia/docs/index.rocket.js
index 4d0fee6..1192241 100644
--- a/packages/engine/test-node/fixtures/14-components/53-hydration-onMedia/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/53-hydration-onMedia/docs/index.rocket.js
@@ -6,6 +6,7 @@ export async function registerCustomElements() {
   // hydrate-able components
   customElements.define('my-el', await import('@test/components').then(m => m.MyEl));
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html` <my-el loading="hydrate:onMedia('(max-width: 320px)')"></my-el> `;
diff --git a/packages/engine/test-node/fixtures/14-components/53-hydration-onMedia/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/53-hydration-onMedia/docs/pageTreeData.rocketGenerated.json
index 39006ed..1f1a0eb 100644
--- a/packages/engine/test-node/fixtures/14-components/53-hydration-onMedia/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/53-hydration-onMedia/docs/pageTreeData.rocketGenerated.json
@@ -7,5 +7,6 @@
   "level": 0,
   "components": {
     "my-el": "() => import('@test/components').then(m => m.MyEl)"
-  }
+  },
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/54-hydration-onMedia-onClick/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/54-hydration-onMedia-onClick/docs/index.rocket.js
index a1a571f..e11181d 100644
--- a/packages/engine/test-node/fixtures/14-components/54-hydration-onMedia-onClick/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/54-hydration-onMedia-onClick/docs/index.rocket.js
@@ -6,6 +6,7 @@ export async function registerCustomElements() {
   // hydrate-able components
   customElements.define('my-el', await import('@test/components').then(m => m.MyEl));
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html`
diff --git a/packages/engine/test-node/fixtures/14-components/54-hydration-onMedia-onClick/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/54-hydration-onMedia-onClick/docs/pageTreeData.rocketGenerated.json
index 39006ed..1f1a0eb 100644
--- a/packages/engine/test-node/fixtures/14-components/54-hydration-onMedia-onClick/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/54-hydration-onMedia-onClick/docs/pageTreeData.rocketGenerated.json
@@ -7,5 +7,6 @@
   "level": 0,
   "components": {
     "my-el": "() => import('@test/components').then(m => m.MyEl)"
-  }
+  },
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/55-hydration-onMedia-or-onClick/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/55-hydration-onMedia-or-onClick/docs/index.rocket.js
index 6f7b882..ec17716 100644
--- a/packages/engine/test-node/fixtures/14-components/55-hydration-onMedia-or-onClick/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/55-hydration-onMedia-or-onClick/docs/index.rocket.js
@@ -6,6 +6,7 @@ export async function registerCustomElements() {
   // hydrate-able components
   customElements.define('my-el', await import('@test/components').then(m => m.MyEl));
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html`
diff --git a/packages/engine/test-node/fixtures/14-components/55-hydration-onMedia-or-onClick/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/55-hydration-onMedia-or-onClick/docs/pageTreeData.rocketGenerated.json
index 39006ed..1f1a0eb 100644
--- a/packages/engine/test-node/fixtures/14-components/55-hydration-onMedia-or-onClick/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/55-hydration-onMedia-or-onClick/docs/pageTreeData.rocketGenerated.json
@@ -7,5 +7,6 @@
   "level": 0,
   "components": {
     "my-el": "() => import('@test/components').then(m => m.MyEl)"
-  }
+  },
+  "needsLoader": true
 }
\ No newline at end of file
diff --git a/packages/engine/test-node/fixtures/14-components/56-hydration-onFocus/docs/index.rocket.js b/packages/engine/test-node/fixtures/14-components/56-hydration-onFocus/docs/index.rocket.js
index afda19e..7757e71 100644
--- a/packages/engine/test-node/fixtures/14-components/56-hydration-onFocus/docs/index.rocket.js
+++ b/packages/engine/test-node/fixtures/14-components/56-hydration-onFocus/docs/index.rocket.js
@@ -6,6 +6,7 @@ export async function registerCustomElements() {
   // hydrate-able components
   customElements.define('my-el', await import('@test/components').then(m => m.MyEl));
 }
+export const needsLoader = true;
 /* END - Rocket auto generated - do not touch */
 
 export default () => html` <my-el loading="hydrate:onFocus"></my-el> `;
diff --git a/packages/engine/test-node/fixtures/14-components/56-hydration-onFocus/docs/pageTreeData.rocketGenerated.json b/packages/engine/test-node/fixtures/14-components/56-hydration-onFocus/docs/pageTreeData.rocketGenerated.json
index 39006ed..1f1a0eb 100644
--- a/packages/engine/test-node/fixtures/14-components/56-hydration-onFocus/docs/pageTreeData.rocketGenerated.json
+++ b/packages/engine/test-node/fixtures/14-components/56-hydration-onFocus/docs/pageTreeData.rocketGenerated.json
@@ -7,5 +7,6 @@
   "level": 0,
   "components": {
     "my-el": "() => import('@test/components').then(m => m.MyEl)"
-  }
+  },
+  "needsLoader": true
 }
\ No newline at end of file