Skip to content

Commit

Permalink
fix(echo): Use dist for Echo artifacts (#5590)
Browse files Browse the repository at this point in the history
* fix(sdk): Use dist for sdk files

* chore(sdk): Revert package version

* chore(sdk): Remove dry-run flag

* chore(sdk): Move h3 to dev deps

* chore(sdk): Add more relevant tags

* chore(sdk): Fix comment for workaround

* chore(sdk): Bump prerelease version

* chore: Update pnpm-lock

* fix(api): Echo version dependency

* revert: lockfile

* refactor(echo): Rename directory to echo

* chore(deps): update workspace dependency versions

* test(api): Update import path for Echo serve function

* fix(echo.server): correct subpath import issue
  • Loading branch information
rifont committed May 20, 2024
1 parent 898ca79 commit e99beb3
Show file tree
Hide file tree
Showing 119 changed files with 500 additions and 7,958 deletions.
3 changes: 2 additions & 1 deletion apps/api/e2e/echo.server.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as http from 'http';
import * as express from 'express';
import { serve } from '@novu/echo/express';
// FIXME: subpath import not working with `workspace:` protocol. Currently we need to drill into the module instead of using the ES export.
import { serve } from '../../../packages/echo/dist/express';
import { Echo } from '@novu/echo';

class EchoServer {
Expand Down
24 changes: 12 additions & 12 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
"@nestjs/swagger": "^7.1.8",
"@nestjs/terminus": "^10.0.1",
"@nestjs/throttler": "^5.0.1",
"@novu/application-generic": "workspace:",
"@novu/dal": "workspace:",
"@novu/echo": "workspace:",
"@novu/node": "workspace:",
"@novu/shared": "workspace:",
"@novu/stateless": "workspace:",
"@novu/testing": "workspace:",
"@novu/application-generic": "workspace:*",
"@novu/dal": "workspace:*",
"@novu/echo": "workspace:*",
"@novu/node": "workspace:*",
"@novu/shared": "workspace:*",
"@novu/stateless": "workspace:*",
"@novu/testing": "workspace:*",
"@sendgrid/mail": "^8.1.0",
"@sentry/hub": "^7.40.0",
"@sentry/node": "^7.40.0",
Expand Down Expand Up @@ -119,11 +119,11 @@
"typescript": "4.9.5"
},
"optionalDependencies": {
"@novu/ee-auth": "workspace:",
"@novu/ee-billing": "workspace:",
"@novu/ee-echo-api": "workspace:",
"@novu/ee-shared-services": "workspace:",
"@novu/ee-translation": "workspace:"
"@novu/ee-auth": "workspace:*",
"@novu/ee-billing": "workspace:*",
"@novu/ee-echo-api": "workspace:*",
"@novu/ee-shared-services": "workspace:*",
"@novu/ee-translation": "workspace:*"
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
Expand Down
6 changes: 3 additions & 3 deletions apps/inbound-mail/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"test": "cross-env TS_NODE_COMPILER_OPTIONS='{\"strictNullChecks\": false}' TZ=UTC NODE_ENV=test E2E_RUNNER=true mocha --trace-warnings --timeout 10000 --require ts-node/register --exit --file e2e/setup.ts src/**/**/*.spec.ts"
},
"dependencies": {
"@novu/application-generic": "workspace:",
"@novu/shared": "workspace:",
"@novu/application-generic": "workspace:*",
"@novu/shared": "workspace:*",
"@sentry/node": "^7.12.1",
"bluebird": "^2.9.30",
"dotenv": "^8.6.0",
Expand All @@ -39,7 +39,7 @@
"winston": "^3.9.0"
},
"devDependencies": {
"@novu/testing": "workspace:",
"@novu/testing": "workspace:*",
"@types/chai": "^4.2.11",
"@types/express": "^4.17.8",
"@types/html-to-text": "^9.0.1",
Expand Down
20 changes: 10 additions & 10 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@
"@mantine/prism": "^5.7.1",
"@mantine/spotlight": "^5.7.1",
"@monaco-editor/react": "^4.6.0",
"@novu/design-system": "workspace:",
"@novu/notification-center": "workspace:",
"@novu/novui": "workspace:",
"@novu/shared": "workspace:",
"@novu/shared-web": "workspace:",
"@novu/design-system": "workspace:*",
"@novu/notification-center": "workspace:*",
"@novu/novui": "workspace:*",
"@novu/shared": "workspace:*",
"@novu/shared-web": "workspace:*",
"@rive-app/react-canvas": "^4.8.1",
"@segment/analytics-next": "^1.48.0",
"@sentry/react": "^7.40.0",
Expand Down Expand Up @@ -132,18 +132,18 @@
"zod": "^3.22.4"
},
"optionalDependencies": {
"@novu/ee-billing-web": "workspace:",
"@novu/ee-echo-web": "workspace:",
"@novu/ee-translation-web": "workspace:"
"@novu/ee-billing-web": "workspace:*",
"@novu/ee-echo-web": "workspace:*",
"@novu/ee-translation-web": "workspace:*"
},
"devDependencies": {
"@babel/polyfill": "^7.12.1",
"@babel/preset-env": "^7.23.2",
"@babel/preset-react": "^7.13.13",
"@babel/preset-typescript": "^7.13.0",
"@babel/runtime": "^7.20.13",
"@novu/dal": "workspace:",
"@novu/testing": "workspace:",
"@novu/dal": "workspace:*",
"@novu/testing": "workspace:*",
"@pandacss/dev": "^0.38.0",
"@pandacss/studio": "^0.38.0",
"@playwright/test": "^1.42.1",
Expand Down
10 changes: 5 additions & 5 deletions apps/webhook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
"@nestjs/core": "^10.2.2",
"@nestjs/platform-express": "^10.2.2",
"@nestjs/terminus": "^10.0.1",
"@novu/application-generic": "workspace:",
"@novu/dal": "workspace:",
"@novu/shared": "workspace:",
"@novu/stateless": "workspace:",
"@novu/testing": "workspace:",
"@novu/application-generic": "workspace:*",
"@novu/dal": "workspace:*",
"@novu/shared": "workspace:*",
"@novu/stateless": "workspace:*",
"@novu/testing": "workspace:*",
"@sentry/node": "^7.66.0",
"axios": "^1.6.2",
"class-transformer": "^0.5.1",
Expand Down
8 changes: 4 additions & 4 deletions apps/widget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"@emotion/styled": "^11.6.0",
"@mantine/core": "4.2.12",
"@mantine/hooks": "4.2.12",
"@novu/notification-center": "workspace:",
"@novu/shared": "workspace:",
"@novu/notification-center": "workspace:*",
"@novu/shared": "workspace:*",
"antd": "^4.10.0",
"babel-plugin-import": "^1.13.3",
"chroma-js": "^2.4.2",
Expand Down Expand Up @@ -63,8 +63,8 @@
"@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0",
"@faker-js/faker": "^6.0.0",
"@novu/dal": "workspace:",
"@novu/testing": "workspace:",
"@novu/dal": "workspace:*",
"@novu/testing": "workspace:*",
"@types/jest": "^29.5.0",
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
Expand Down
20 changes: 10 additions & 10 deletions apps/worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
"@nestjs/platform-express": "^10.2.2",
"@nestjs/swagger": "^7.1.9",
"@nestjs/terminus": "^10.0.1",
"@novu/application-generic": "workspace:",
"@novu/dal": "workspace:",
"@novu/shared": "workspace:",
"@novu/stateless": "workspace:",
"@novu/testing": "workspace:",
"@novu/application-generic": "workspace:*",
"@novu/dal": "workspace:*",
"@novu/shared": "workspace:*",
"@novu/stateless": "workspace:*",
"@novu/testing": "workspace:*",
"@sentry/node": "^7.40.0",
"@sentry/tracing": "^7.40.0",
"@types/newrelic": "^9.13.0",
Expand Down Expand Up @@ -84,11 +84,11 @@
"typescript": "4.9.5"
},
"optionalDependencies": {
"@novu/ee-auth": "workspace:",
"@novu/ee-billing": "workspace:",
"@novu/ee-echo-worker": "workspace:",
"@novu/ee-shared-services": "workspace:",
"@novu/ee-translation": "workspace:"
"@novu/ee-auth": "workspace:*",
"@novu/ee-billing": "workspace:*",
"@novu/ee-echo-worker": "workspace:*",
"@novu/ee-shared-services": "workspace:*",
"@novu/ee-translation": "workspace:*"
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
Expand Down
8 changes: 4 additions & 4 deletions apps/ws/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"@nestjs/swagger": "^7.1.9",
"@nestjs/terminus": "^10.0.1",
"@nestjs/websockets": "^10.2.2",
"@novu/application-generic": "workspace:",
"@novu/dal": "workspace:",
"@novu/shared": "workspace:",
"@novu/testing": "workspace:",
"@novu/application-generic": "workspace:*",
"@novu/dal": "workspace:*",
"@novu/shared": "workspace:*",
"@novu/testing": "workspace:*",
"@sentry/node": "^7.30.0",
"@socket.io/admin-ui": "^0.5.1",
"@socket.io/redis-adapter": "^7.2.0",
Expand Down
6 changes: 3 additions & 3 deletions enterprise/packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"test-ee": "cross-env TS_NODE_COMPILER_OPTIONS='{\"strictNullChecks\": false}' TZ=UTC NODE_ENV=test E2E_RUNNER=true mocha --timeout 10000 --require ts-node/register --exit --file tests/setup.ts src/**/**/*.spec.ts"
},
"dependencies": {
"@novu/application-generic": "workspace:",
"@novu/dal": "workspace:",
"@novu/shared": "workspace:",
"@novu/application-generic": "workspace:*",
"@novu/dal": "workspace:*",
"@novu/shared": "workspace:*",
"passport-google-oauth": "^2.0.0"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions enterprise/packages/billing-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"@emotion/styled": "^11.6.0",
"@mantine/core": "^5.7.1",
"@mantine/hooks": "^5.7.1",
"@novu/client": "workspace:",
"@novu/design-system": "workspace:",
"@novu/shared": "workspace:",
"@novu/shared-web": "workspace:",
"@novu/client": "workspace:*",
"@novu/design-system": "workspace:*",
"@novu/shared": "workspace:*",
"@novu/shared-web": "workspace:*",
"@rjsf/chakra-ui": "^5.17.1",
"@rjsf/core": "^5.17.1",
"@rjsf/utils": "^5.17.1",
Expand Down
8 changes: 4 additions & 4 deletions enterprise/packages/billing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"start:proxy": "ngrok http http://localhost:3000"
},
"dependencies": {
"@novu/application-generic": "workspace:",
"@novu/ee-dal": "workspace:",
"@novu/shared": "workspace:",
"@novu/application-generic": "workspace:*",
"@novu/ee-dal": "workspace:*",
"@novu/shared": "workspace:*",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
"date-fns": "^2.29.2",
Expand Down Expand Up @@ -46,6 +46,6 @@
"@nestjs/platform-express": "^10.2.2",
"@nestjs/swagger": "^7.1.8",
"@nestjs/throttler": "^5.0.1",
"@novu/dal": "workspace:"
"@novu/dal": "workspace:*"
}
}
12 changes: 6 additions & 6 deletions enterprise/packages/echo/echo-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"test-ee": "cross-env TS_NODE_COMPILER_OPTIONS='{\"strictNullChecks\": false}' TZ=UTC NODE_ENV=test E2E_RUNNER=true mocha --timeout 10000 --require ts-node/register --exit --file tests/setup.ts src/**/**/*.spec.ts"
},
"dependencies": {
"@novu/application-generic": "workspace:",
"@novu/dal": "workspace:",
"@novu/ee-dal": "workspace:",
"@novu/shared": "workspace:",
"@novu/stateless": "workspace:",
"@novu/testing": "workspace:",
"@novu/application-generic": "workspace:*",
"@novu/dal": "workspace:*",
"@novu/ee-dal": "workspace:*",
"@novu/shared": "workspace:*",
"@novu/stateless": "workspace:*",
"@novu/testing": "workspace:*",
"axios": "^1.6.2",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
Expand Down
4 changes: 2 additions & 2 deletions enterprise/packages/echo/echo-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"dependencies": {
"@mantine/core": "^5.7.1",
"@mantine/hooks": "^5.7.1",
"@novu/design-system": "workspace:",
"@novu/shared-web": "workspace:",
"@novu/design-system": "workspace:*",
"@novu/shared-web": "workspace:*",
"@rjsf/core": "^5.17.1",
"@rjsf/validator-ajv8": "^5.17.1",
"@tanstack/react-query": "^4.20.4",
Expand Down
10 changes: 5 additions & 5 deletions enterprise/packages/echo/echo-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"test-ee": "cross-env TS_NODE_COMPILER_OPTIONS='{\"strictNullChecks\": false}' TZ=UTC NODE_ENV=test E2E_RUNNER=true mocha --timeout 10000 --require ts-node/register --exit --file tests/setup.ts src/**/**/*.spec.ts"
},
"dependencies": {
"@novu/dal": "workspace:",
"@novu/ee-dal": "workspace:",
"@novu/shared": "workspace:",
"@novu/stateless": "workspace:",
"@novu/testing": "workspace:",
"@novu/dal": "workspace:*",
"@novu/ee-dal": "workspace:*",
"@novu/shared": "workspace:*",
"@novu/stateless": "workspace:*",
"@novu/testing": "workspace:*",
"axios": "^1.6.2",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
Expand Down
4 changes: 2 additions & 2 deletions enterprise/packages/libs/dal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"license": "ISC",
"main": "dist/index.js",
"dependencies": {
"@novu/dal": "workspace:",
"@novu/shared": "workspace:",
"@novu/dal": "workspace:*",
"@novu/shared": "workspace:*",
"mongoose": "^7.5.0",
"mongoose-delete": "^1.0.1",
"rimraf": "^3.0.2"
Expand Down
6 changes: 3 additions & 3 deletions enterprise/packages/shared-services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
},
"dependencies": {
"@handlebars/parser": "^2.1.0",
"@novu/ee-dal": "workspace:",
"@novu/shared": "workspace:"
"@novu/ee-dal": "workspace:*",
"@novu/shared": "workspace:*"
},
"devDependencies": {
"@types/node": "^14.6.0",
Expand All @@ -44,6 +44,6 @@
},
"peerDependencies": {
"@nestjs/common": "10.2.2",
"@novu/dal": "workspace:"
"@novu/dal": "workspace:*"
}
}
8 changes: 4 additions & 4 deletions enterprise/packages/translation-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"@mantine/hooks": "^5.7.1",
"@mantine/prism": "^5.7.1",
"@monaco-editor/react": "^4.6.0",
"@novu/client": "workspace:",
"@novu/design-system": "workspace:",
"@novu/shared": "workspace:",
"@novu/shared-web": "workspace:",
"@novu/client": "workspace:*",
"@novu/design-system": "workspace:*",
"@novu/shared": "workspace:*",
"@novu/shared-web": "workspace:*",
"@tanstack/react-query": "^4.20.4",
"axios": "^1.4.0",
"date-fns": "^2.29.2",
Expand Down
10 changes: 5 additions & 5 deletions enterprise/packages/translation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
},
"dependencies": {
"@handlebars/parser": "^2.1.0",
"@novu/application-generic": "workspace:",
"@novu/ee-dal": "workspace:",
"@novu/ee-shared-services": "workspace:",
"@novu/shared": "workspace:",
"@novu/application-generic": "workspace:*",
"@novu/ee-dal": "workspace:*",
"@novu/ee-shared-services": "workspace:*",
"@novu/shared": "workspace:*",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
"multer": "^1.4.5-lts.1",
Expand All @@ -42,6 +42,6 @@
"@nestjs/jwt": "10.2.0",
"@nestjs/swagger": "^7.1.8",
"@nestjs/platform-express": "^10.2.2",
"@novu/dal": "workspace:"
"@novu/dal": "workspace:*"
}
}
32 changes: 0 additions & 32 deletions libs/automation/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,6 @@
},
"tags": [],
"targets": {
"build": {
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/automation",
"main": "./src/index.ts",
"tsConfig": "./tsconfig.lib.json",
"assets": [
"*.md",
{
"input": "./src",
"glob": "**/!(*.ts)",
"output": "./src"
},
{
"input": "./src",
"glob": "**/*.d.ts",
"output": "./src"
},
{
"input": ".",
"glob": "generators.json",
"output": "."
},
{
"input": ".",
"glob": "executors.json",
"output": "."
}
]
}
},
"nx-release-publish": {
"options": {
"packageRoot": "dist/{projectRoot}"
Expand Down
Loading

0 comments on commit e99beb3

Please sign in to comment.