From 4c1e1213d091631759634e3e2f1727a7d488f7ba Mon Sep 17 00:00:00 2001 From: raikasdev Date: Tue, 22 Aug 2023 17:54:20 +0300 Subject: [PATCH 1/7] chore: update to node 18 lts --- .devcontainer/Dockerfile | 5 +---- .devcontainer/docker-compose.yml | 2 +- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/actions/setup-project/action.yml | 2 +- .github/workflows/community-label.yml | 2 +- .github/workflows/issue-label.yml | 2 +- .github/workflows/milestone-assign.yml | 2 +- .github/workflows/tag-images.yml | 3 +-- .nvmrc | 2 +- CONTRIBUTING.md | 2 +- _templates/provider/new/package.ejs.t | 2 +- apps/api/Dockerfile | 2 +- apps/inbound-mail/Dockerfile | 2 +- apps/web/Dockerfile | 4 ++-- apps/webhook/Dockerfile | 2 +- apps/widget/Dockerfile | 2 +- apps/worker/Dockerfile | 2 +- apps/ws/Dockerfile | 2 +- docs/docs/community/create-provider.md | 2 +- docs/docs/community/faq.md | 2 +- docs/docs/community/run-locally.md | 2 +- libs/embed/Dockerfile | 2 +- package.json | 2 +- providers/africas-talking/package.json | 2 +- providers/forty-six-elks/package.json | 2 +- providers/maqsam/package.json | 2 +- providers/mattermost/package.json | 2 +- providers/one-signal/package.json | 2 +- providers/plunk/package.json | 2 +- providers/push-webhook/package.json | 2 +- providers/sendchamp/package.json | 2 +- providers/sms-central/package.json | 2 +- scripts/dev-environment-setup.sh | 3 +-- 33 files changed, 34 insertions(+), 39 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 73ca2ecbca2..cc46bcd477c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster -ARG VARIANT=16-bullseye +ARG VARIANT=18-bullseye FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) @@ -23,6 +23,3 @@ RUN . /etc/os-release \ # [Optional] Uncomment if you want to install more global node modules RUN su node -c "npm install -g pnpm@7.33.4" - - - diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 30c8a74bae2..8ecbfd6112d 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 16, 14, 12. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 16-bullseye + VARIANT: 18-bullseye volumes: - ..:/workspace:cached diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index a5ea37cd2e3..83a71d70d52 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -64,7 +64,7 @@ body: attributes: label: node version description: In case of self-hosting or local installation mention the node version. If using our cloud-managed solution, mention NA. - placeholder: 16.0.0 + placeholder: 18.0.0 - type: textarea id: additional-context validations: diff --git a/.github/actions/setup-project/action.yml b/.github/actions/setup-project/action.yml index f336296f986..3f37634402b 100644 --- a/.github/actions/setup-project/action.yml +++ b/.github/actions/setup-project/action.yml @@ -28,7 +28,7 @@ runs: - uses: actions/setup-node@v3 name: ⚙️ Setup Node Version with: - node-version: '16.15.1' + node-version: '18.17.1' cache: 'pnpm' - name: 💵 Start Redis diff --git a/.github/workflows/community-label.yml b/.github/workflows/community-label.yml index c317dfe0c80..a7b9f508300 100644 --- a/.github/workflows/community-label.yml +++ b/.github/workflows/community-label.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Install Octokit run: npm --prefix .github/workflows/scripts install @octokit/action diff --git a/.github/workflows/issue-label.yml b/.github/workflows/issue-label.yml index a5b107db6f3..fd783bfcf15 100644 --- a/.github/workflows/issue-label.yml +++ b/.github/workflows/issue-label.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Install Octokit run: npm --prefix .github/workflows/scripts install @octokit/action diff --git a/.github/workflows/milestone-assign.yml b/.github/workflows/milestone-assign.yml index e1e48065dab..8dee14fb807 100644 --- a/.github/workflows/milestone-assign.yml +++ b/.github/workflows/milestone-assign.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Install Octokit run: npm --prefix .github/workflows/scripts install @octokit/action diff --git a/.github/workflows/tag-images.yml b/.github/workflows/tag-images.yml index 5ff1258b229..8cc14d0e822 100644 --- a/.github/workflows/tag-images.yml +++ b/.github/workflows/tag-images.yml @@ -26,7 +26,7 @@ jobs: run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p - uses: actions/setup-node@v3 with: - node-version: '16.15.1' + node-version: '18.17.1' - name: Login to docker env: @@ -125,4 +125,3 @@ jobs: docker pull ghcr.io/$REGISTRY_OWNER/$DOCKER_NAME:prod docker tag ghcr.io/$REGISTRY_OWNER/$DOCKER_NAME:prod ghcr.io/$REGISTRY_OWNER/$DOCKER_NAME:$DOCKER_VERSION docker push ghcr.io/$REGISTRY_OWNER/$DOCKER_NAME:$DOCKER_VERSION - diff --git a/.nvmrc b/.nvmrc index d9289897d30..4a1f488b6c3 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.15.1 +18.17.1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 258093d9004..7092c88b030 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,7 @@ You can open a new issue with this [issue form](https://github.com/novuhq/novu/i ### Requirements -- Node.js version v14.19.3 +- Node.js version v18.17.1 (LTS) - MongoDB - Redis. To install Redis on your O.S, please follow the below guides - [To install Redis on Windows](https://redis.io/docs/getting-started/installation/install-redis-on-windows/) diff --git a/_templates/provider/new/package.ejs.t b/_templates/provider/new/package.ejs.t index 2929f4d7a08..7cd4ae98d5c 100644 --- a/_templates/provider/new/package.ejs.t +++ b/_templates/provider/new/package.ejs.t @@ -34,7 +34,7 @@ "access": "public" }, "engines": { - "node": ">=13.0.0 <17.0.0", + "node": ">=18.17.1 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile index 05b4170e517..6547280e46b 100644 --- a/apps/api/Dockerfile +++ b/apps/api/Dockerfile @@ -1,4 +1,4 @@ -FROM nikolaik/python-nodejs:python3.10-nodejs16-alpine as dev_base +FROM nikolaik/python-nodejs:python3.10-nodejs18-alpine as dev_base ARG BULL_MQ_PRO_TOKEN ENV BULL_MQ_PRO_NPM_TOKEN=$BULL_MQ_PRO_TOKEN diff --git a/apps/inbound-mail/Dockerfile b/apps/inbound-mail/Dockerfile index 6592c77d7aa..a9bfd435c16 100644 --- a/apps/inbound-mail/Dockerfile +++ b/apps/inbound-mail/Dockerfile @@ -1,4 +1,4 @@ -FROM nikolaik/python-nodejs:python3.10-nodejs16-alpine as dev_base +FROM nikolaik/python-nodejs:python3.10-nodejs18-alpine as dev_base ARG BULL_MQ_PRO_TOKEN ENV BULL_MQ_PRO_NPM_TOKEN=$BULL_MQ_PRO_TOKEN diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index ab2f64095a8..d515f5f52a6 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -1,5 +1,5 @@ # start build stage -FROM nikolaik/python-nodejs:python3.10-nodejs16-alpine as builder +FROM nikolaik/python-nodejs:python3.10-nodejs18-alpine as builder ENV NX_DAEMON=false WORKDIR /usr/src/app @@ -37,7 +37,7 @@ RUN NX_DAEMON=false pnpm build:web # end build stage # start production stage -FROM node:16-alpine +FROM node:18-alpine WORKDIR /app diff --git a/apps/webhook/Dockerfile b/apps/webhook/Dockerfile index a3bde25c75c..cb1d67fd3bf 100644 --- a/apps/webhook/Dockerfile +++ b/apps/webhook/Dockerfile @@ -1,4 +1,4 @@ -FROM nikolaik/python-nodejs:python3.10-nodejs16-alpine as dev_base +FROM nikolaik/python-nodejs:python3.10-nodejs18-alpine as dev_base ENV NX_DAEMON=false RUN npm i pm2 -g diff --git a/apps/widget/Dockerfile b/apps/widget/Dockerfile index 6f36836b2be..e52270634af 100644 --- a/apps/widget/Dockerfile +++ b/apps/widget/Dockerfile @@ -1,4 +1,4 @@ -FROM nikolaik/python-nodejs:python3.10-nodejs16-alpine +FROM nikolaik/python-nodejs:python3.10-nodejs18-alpine ENV NX_DAEMON=false WORKDIR /usr/src/app diff --git a/apps/worker/Dockerfile b/apps/worker/Dockerfile index a0ee51501fc..045c6bf127c 100644 --- a/apps/worker/Dockerfile +++ b/apps/worker/Dockerfile @@ -1,4 +1,4 @@ -FROM nikolaik/python-nodejs:python3.10-nodejs16-alpine as dev_base +FROM nikolaik/python-nodejs:python3.10-nodejs18-alpine as dev_base RUN apk --update --no-cache add curl ENV NX_DAEMON=false diff --git a/apps/ws/Dockerfile b/apps/ws/Dockerfile index 95097cdb8dc..61e035b3363 100644 --- a/apps/ws/Dockerfile +++ b/apps/ws/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-alpine3.16 +FROM node:18-alpine3.16 ARG BULL_MQ_PRO_TOKEN ENV BULL_MQ_PRO_NPM_TOKEN=$BULL_MQ_PRO_TOKEN diff --git a/docs/docs/community/create-provider.md b/docs/docs/community/create-provider.md index 57aa65c604f..20e8581cf71 100644 --- a/docs/docs/community/create-provider.md +++ b/docs/docs/community/create-provider.md @@ -13,7 +13,7 @@ Providers allow us to handle message delivery over multiple channels. We have mu ## Requirements -- Node.js version v16.15.1 +- Node.js version v18.17.1 - MongoDB - Redis - **(Optional)** pnpm - Needed if you want to install new packages diff --git a/docs/docs/community/faq.md b/docs/docs/community/faq.md index 58db30b601f..d38476c395b 100644 --- a/docs/docs/community/faq.md +++ b/docs/docs/community/faq.md @@ -10,7 +10,7 @@ Here we will outline some of the most common questions we get asked about the pr Novu consists of multiple services written in Node.js and Typescript. The following are the dependencies required to run the project fully: -- Node.js version v16.15.1 +- Node.js version v18.17.1 - MongoDB - Redis - File storage (S3/GCP/Azure) - Optional diff --git a/docs/docs/community/run-locally.md b/docs/docs/community/run-locally.md index 6d55d353b5c..a023a6199d4 100644 --- a/docs/docs/community/run-locally.md +++ b/docs/docs/community/run-locally.md @@ -13,7 +13,7 @@ import FAQItem from '@site/src/components/FAQItem'; ## Requirements -- Node.js version v16.15.1 +- Node.js version v18.17.1 - MongoDB - Redis - **(Optional)** pnpm - Needed if you want to install new packages diff --git a/libs/embed/Dockerfile b/libs/embed/Dockerfile index ae1df77321e..d729d3b8fab 100644 --- a/libs/embed/Dockerfile +++ b/libs/embed/Dockerfile @@ -1,4 +1,4 @@ -FROM nikolaik/python-nodejs:python3.10-nodejs16-alpine +FROM nikolaik/python-nodejs:python3.10-nodejs18-alpine WORKDIR /usr/src/app diff --git a/package.json b/package.json index 6cbca769ffd..aeb6fca28a2 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ } }, "engines": { - "node": ">=13.0.0 <17.0.0", + "node": ">=18.17.1 <19", "pnpm": "^7.33.4" }, "dependencies": { diff --git a/providers/africas-talking/package.json b/providers/africas-talking/package.json index 9155709b49c..82b1c2a6711 100644 --- a/providers/africas-talking/package.json +++ b/providers/africas-talking/package.json @@ -30,7 +30,7 @@ "access": "public" }, "engines": { - "node": ">=13.0.0 <17.0.0", + "node": ">=18.17.1 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/forty-six-elks/package.json b/providers/forty-six-elks/package.json index f4fc2aa140c..dfc0c40b876 100644 --- a/providers/forty-six-elks/package.json +++ b/providers/forty-six-elks/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=13.0.0 <17.0.0", + "node": ">=18.17.1 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/maqsam/package.json b/providers/maqsam/package.json index 6b1789e433f..6f4ee95ca36 100644 --- a/providers/maqsam/package.json +++ b/providers/maqsam/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=13.0.0 <17.0.0", + "node": ">=18.17.1 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/mattermost/package.json b/providers/mattermost/package.json index f84afbe4e49..b9d72d4f957 100644 --- a/providers/mattermost/package.json +++ b/providers/mattermost/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=13.0.0 <17.0.0", + "node": ">=18.17.1 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/one-signal/package.json b/providers/one-signal/package.json index 74698003a0e..3ecb323561e 100644 --- a/providers/one-signal/package.json +++ b/providers/one-signal/package.json @@ -30,7 +30,7 @@ "access": "public" }, "engines": { - "node": ">=13.0.0 <17.0.0", + "node": ">=18.17.1 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/plunk/package.json b/providers/plunk/package.json index bea661cc126..3016ddb2a94 100644 --- a/providers/plunk/package.json +++ b/providers/plunk/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=13.0.0 <17.0.0", + "node": ">=18.17.1 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/push-webhook/package.json b/providers/push-webhook/package.json index 7acbcaffa18..e3158845c16 100644 --- a/providers/push-webhook/package.json +++ b/providers/push-webhook/package.json @@ -30,7 +30,7 @@ "access": "public" }, "engines": { - "node": ">=13.0.0 <17.0.0", + "node": ">=18.17.1 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/sendchamp/package.json b/providers/sendchamp/package.json index c83040344be..236d3ab9c32 100644 --- a/providers/sendchamp/package.json +++ b/providers/sendchamp/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=13.0.0 <17.0.0", + "node": ">=18.17.1 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/sms-central/package.json b/providers/sms-central/package.json index 75c4ff5eb4e..6c1c17ff2ab 100644 --- a/providers/sms-central/package.json +++ b/providers/sms-central/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=13.0.0 <17.0.0", + "node": ">=18.17.1 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/scripts/dev-environment-setup.sh b/scripts/dev-environment-setup.sh index e5bf357159c..61bca96688e 100755 --- a/scripts/dev-environment-setup.sh +++ b/scripts/dev-environment-setup.sh @@ -261,7 +261,7 @@ check_nvm () { } install_node () { - NODE_JS_VERSION="v16.15.1" + NODE_JS_VERSION="v18.17.1" SKIP="$(check_nvm)" @@ -512,4 +512,3 @@ install_os_dependencies () { install_os_dependencies clone_monorepo refresh_shell - From 0af6d8441a49c7ca2f406ac6fb493ce20d695ea6 Mon Sep 17 00:00:00 2001 From: raikasdev Date: Tue, 29 Aug 2023 18:14:41 +0300 Subject: [PATCH 2/7] fix: add words to .cspell.json --- .cspell.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.cspell.json b/.cspell.json index e5eb242e1ae..641b0d70889 100644 --- a/.cspell.json +++ b/.cspell.json @@ -499,7 +499,9 @@ "nextjs", "vanillajs", "quckstart", - "errmsg" + "errmsg", + "devcontainer", + "INITDB" ], "flagWords": [], "patterns": [ From a1625e0cc725f4e1bc74189f447f413aacb39882 Mon Sep 17 00:00:00 2001 From: Dima Grossman Date: Thu, 28 Sep 2023 22:55:01 +0300 Subject: [PATCH 3/7] fix: replace tcp port --- .github/workflows/reusable-web-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-web-e2e.yml b/.github/workflows/reusable-web-e2e.yml index 4cbc5f16302..651e0db92e2 100644 --- a/.github/workflows/reusable-web-e2e.yml +++ b/.github/workflows/reusable-web-e2e.yml @@ -90,7 +90,7 @@ jobs: cd apps/ws && pnpm start:test & - name: Wait on Services - run: wait-on --timeout=180000 http://localhost:1340/v1/health-check http://localhost:4200 + run: wait-on --timeout=180000 http://localhost:1340/v1/health-check tcp:4200 # run cypress install only when cache was not hit - name: Cypress install From 09c53c7c59ab79b3a88fbee9cda9cebc4671fb2c Mon Sep 17 00:00:00 2001 From: Dima Grossman Date: Thu, 28 Sep 2023 23:03:49 +0300 Subject: [PATCH 4/7] fix: update tcp on wait-on --- .github/workflows/reusable-widget-e2e.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-widget-e2e.yml b/.github/workflows/reusable-widget-e2e.yml index 2e786ce7ed2..fc8cbb6a9c9 100644 --- a/.github/workflows/reusable-widget-e2e.yml +++ b/.github/workflows/reusable-widget-e2e.yml @@ -93,7 +93,7 @@ jobs: cd apps/ws && pnpm start:prod & - name: Wait on Widget and WS Services - run: wait-on --timeout=180000 http://localhost:1340/v1/health-check http://localhost:3500 + run: wait-on --timeout=180000 http://localhost:1340/v1/health-check tcp:3500 - name: Cypress install if: steps.setup-project.outputs.cypress_cache_hit != 'true' @@ -108,7 +108,7 @@ jobs: CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_WIDGET_KEY }} with: working-directory: apps/widget - wait-on: http://localhost:3500 + wait-on: tcp:3500 browser: chrome install: false record: true From 6a70cf58e9020f86d980fbd07d126f2b1b53ffb0 Mon Sep 17 00:00:00 2001 From: Dima Grossman Date: Thu, 28 Sep 2023 23:08:13 +0300 Subject: [PATCH 5/7] refactor: more restrictive node engine permission --- _templates/provider/new/package.ejs.t | 2 +- package.json | 2 +- providers/africas-talking/package.json | 2 +- providers/forty-six-elks/package.json | 2 +- providers/maqsam/package.json | 2 +- providers/mattermost/package.json | 2 +- providers/one-signal/package.json | 2 +- providers/plunk/package.json | 2 +- providers/push-webhook/package.json | 2 +- providers/sendchamp/package.json | 2 +- providers/sms-central/package.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/_templates/provider/new/package.ejs.t b/_templates/provider/new/package.ejs.t index 57392fa3635..076b3cd9fd2 100644 --- a/_templates/provider/new/package.ejs.t +++ b/_templates/provider/new/package.ejs.t @@ -34,7 +34,7 @@ "access": "public" }, "engines": { - "node": ">=18.17.1 <19", + "node": ">=18 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/package.json b/package.json index 6818bf1aad3..036a73f1796 100644 --- a/package.json +++ b/package.json @@ -180,7 +180,7 @@ } }, "engines": { - "node": ">=18.17.1 <19", + "node": ">=18 <19", "pnpm": "^7.33.4" }, "dependencies": { diff --git a/providers/africas-talking/package.json b/providers/africas-talking/package.json index 40805cb1451..8faf150d53d 100644 --- a/providers/africas-talking/package.json +++ b/providers/africas-talking/package.json @@ -30,7 +30,7 @@ "access": "public" }, "engines": { - "node": ">=18.17.1 <19", + "node": ">=18 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/forty-six-elks/package.json b/providers/forty-six-elks/package.json index 8ec361641ad..8e0afa9323c 100644 --- a/providers/forty-six-elks/package.json +++ b/providers/forty-six-elks/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=18.17.1 <19", + "node": ">=18 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/maqsam/package.json b/providers/maqsam/package.json index bdd8cfeea19..892c0d4de3d 100644 --- a/providers/maqsam/package.json +++ b/providers/maqsam/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=18.17.1 <19", + "node": ">=18 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/mattermost/package.json b/providers/mattermost/package.json index 198213c09be..c4b03d5e0ca 100644 --- a/providers/mattermost/package.json +++ b/providers/mattermost/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=18.17.1 <19", + "node": ">=18 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/one-signal/package.json b/providers/one-signal/package.json index 7cf5f0e9f7b..056d87b5800 100644 --- a/providers/one-signal/package.json +++ b/providers/one-signal/package.json @@ -30,7 +30,7 @@ "access": "public" }, "engines": { - "node": ">=18.17.1 <19", + "node": ">=18 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/plunk/package.json b/providers/plunk/package.json index 4ca74af6f3a..9cb5f6b30ea 100644 --- a/providers/plunk/package.json +++ b/providers/plunk/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=18.17.1 <19", + "node": ">=18 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/push-webhook/package.json b/providers/push-webhook/package.json index f755a79581b..5c1466d3902 100644 --- a/providers/push-webhook/package.json +++ b/providers/push-webhook/package.json @@ -30,7 +30,7 @@ "access": "public" }, "engines": { - "node": ">=18.17.1 <19", + "node": ">=18 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/sendchamp/package.json b/providers/sendchamp/package.json index 942b397abe3..db79ea28073 100644 --- a/providers/sendchamp/package.json +++ b/providers/sendchamp/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=18.17.1 <19", + "node": ">=18 <19", "pnpm": "^7.26.0" }, "dependencies": { diff --git a/providers/sms-central/package.json b/providers/sms-central/package.json index 12ed3cb541d..6c9e7d0d5d1 100644 --- a/providers/sms-central/package.json +++ b/providers/sms-central/package.json @@ -29,7 +29,7 @@ "access": "public" }, "engines": { - "node": ">=18.17.1 <19", + "node": ">=18 <19", "pnpm": "^7.26.0" }, "dependencies": { From 892af64cd0b702fc400bbf99ba50e7c563309747 Mon Sep 17 00:00:00 2001 From: Dima Grossman Date: Fri, 29 Sep 2023 12:22:58 +0300 Subject: [PATCH 6/7] fix: wait-on check --- .github/workflows/reusable-web-e2e.yml | 2 +- .github/workflows/reusable-widget-e2e.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable-web-e2e.yml b/.github/workflows/reusable-web-e2e.yml index 651e0db92e2..7c53f19e90b 100644 --- a/.github/workflows/reusable-web-e2e.yml +++ b/.github/workflows/reusable-web-e2e.yml @@ -90,7 +90,7 @@ jobs: cd apps/ws && pnpm start:test & - name: Wait on Services - run: wait-on --timeout=180000 http://localhost:1340/v1/health-check tcp:4200 + run: wait-on --timeout=180000 http://localhost:1340/v1/health-check http://0.0.0.0:4200/ # run cypress install only when cache was not hit - name: Cypress install diff --git a/.github/workflows/reusable-widget-e2e.yml b/.github/workflows/reusable-widget-e2e.yml index fc8cbb6a9c9..dd437b1ba7b 100644 --- a/.github/workflows/reusable-widget-e2e.yml +++ b/.github/workflows/reusable-widget-e2e.yml @@ -93,7 +93,7 @@ jobs: cd apps/ws && pnpm start:prod & - name: Wait on Widget and WS Services - run: wait-on --timeout=180000 http://localhost:1340/v1/health-check tcp:3500 + run: wait-on --timeout=180000 http://localhost:1340/v1/health-check http://0.0.0.0:3500/ - name: Cypress install if: steps.setup-project.outputs.cypress_cache_hit != 'true' @@ -108,7 +108,7 @@ jobs: CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_WIDGET_KEY }} with: working-directory: apps/widget - wait-on: tcp:3500 + wait-on: http://0.0.0.0:3500/ browser: chrome install: false record: true From 55d926570e0cf910de74be2753fd6347abf1ea6b Mon Sep 17 00:00:00 2001 From: Dima Grossman Date: Fri, 29 Sep 2023 12:53:21 +0300 Subject: [PATCH 7/7] chore: test cypress --- apps/web/cypress.config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/cypress.config.ts b/apps/web/cypress.config.ts index ba218888be9..534714d6bb3 100644 --- a/apps/web/cypress.config.ts +++ b/apps/web/cypress.config.ts @@ -34,13 +34,13 @@ export default defineConfig({ // eslint-disable-next-line import/extensions return require('./cypress/plugins/index.ts')(on, config); }, - baseUrl: 'http://localhost:4200', + baseUrl: 'http://127.0.0.1:4200', specPattern: 'cypress/tests/**/*.{js,jsx,ts,tsx}', }, env: { NODE_ENV: 'test', - apiUrl: 'http://localhost:1336', + apiUrl: 'http://127.0.0.1:1336', GITHUB_USER_EMAIL: '', GITHUB_USER_PASSWORD: '', BLUEPRINT_CREATOR: '645b648b36dd6d25f8650d37',