Merge branch 'next' into fix-5490

.cspell.json

@@ -639,7 +639,16 @@
     "websockets",
     "whatsapp",
     "whatsappbusiness",
-    "parens"
+    "parens",
+    "Webpush",
+    "webpush",
+    "xkeysib",
+    "firestore",
+    "firsttris",
+    "esbenp",
+    "npmjs",
+    "maxage",
+    "unpublish"
   ],
   "flagWords": [],
   "patterns": [
@@ -730,6 +739,6 @@
     ".env.development",
     ".env.local",
     ".env.production",
-    ".env.test",
+    ".env.test"
   ]
 }

.github/actions/run-worker/action.yml

@@ -8,19 +8,25 @@ inputs:
     description: 'The Launch Darkly SDK key to use'
     required: false
     default: ''
+  ee:
+    description: 'Whether to run the EE version of the tests'
+    required: false
+    default: false
+    type: boolean
 
 runs:
   using: composite
 
   steps:
     - name: Build worker
       shell: bash
-      run: CI='' pnpm build:worker
+      run: CI='' pnpm build:worker --skip-nx-cache
 
     - name: Start worker
       shell: bash
       env:
         LAUNCH_DARKLY_SDK_KEY: ${{ inputs.launch_darkly_sdk_key }}
+        NOVU_ENTERPRISE: ${{ inputs.ee }}
       run: cd apps/worker && pnpm start:test &
 
     - name: Wait on worker

.github/workflows/reusable-api-e2e.yml

@@ -88,6 +88,7 @@ jobs:
         name: Run worker
         with:
           launch_darkly_sdk_key: ${{ secrets.LAUNCH_DARKLY_SDK_KEY }}
+          ee: ${{ needs.check_submodule_token.outputs.has_token == 'true' && inputs.ee }}
 
         # Runs a single command using the runners shell
       - name: Build API

.github/workflows/reusable-webhook-e2e.yml

@@ -28,4 +28,3 @@ jobs:
     - name: Run a test
       run: |
         cd apps/webhook && pnpm test:e2e
-        pnpm test

.gitignore

@@ -109,3 +109,4 @@ docker/.env
 # EE Symlinked folders - we need these for the EE build
 # @TODO - find a way to remove the symlinks without breaking the build
 !enterprise/packages/**/src
+/.idea/jsLinters/eslint.xml

README.md

@@ -262,7 +262,6 @@ We are more than happy to help you. If you are getting any errors or facing prob
 Novu is licensed under the MIT License - see the [LICENSE](https://github.com/novuhq/novu/blob/main/LICENSE) file for details.
 
 ## 💪 Thanks To All Contributors
-
 Thanks a lot for spending your time helping Novu grow. Keep rocking 🥂
 
 <a href="https://novu.co/contributors?utm_source=github">

apps/api/e2e/echo.server.ts

@@ -0,0 +1,29 @@
+import * as http from 'http';
+import * as express from 'express';
+import { serve } from '@novu/echo/express';
+import { Echo } from '@novu/echo';
+
+class EchoServer {
+  private server: express.Express;
+  private app: http.Server;
+  private port = 9999;
+  public echo = new Echo({ devModeBypassAuthentication: true });
+
+  get serverPath() {
+    return `http://localhost:${this.port}`;
+  }
+
+  async start() {
+    this.server = express();
+    this.server.use(express.json());
+    this.server.use(serve({ client: this.echo }));
+
+    this.app = await this.server.listen(this.port);
+  }
+
+  async stop() {
+    await this.app.close();
+  }
+}
+
+export const echoServer = new EchoServer();

apps/api/e2e/setup.ts

@@ -4,6 +4,7 @@ import * as sinon from 'sinon';
 import * as chai from 'chai';
 
 import { bootstrap } from '../src/bootstrap';
+import { echoServer } from './echo.server';
 
 const dalService = new DalService();
 
@@ -13,11 +14,14 @@ before(async () => {
    */
   chai.config.truncateThreshold = 0;
   await testServer.create(await bootstrap());
+  await echoServer.start();
+
   await dalService.connect(process.env.MONGO_URL);
 });
 
 after(async () => {
   await testServer.teardown();
+  await echoServer.stop();
 
   try {
     await dalService.destroy();