Skip to content

Commit

Permalink
Merge branch 'next' into fix/Switch-Style-Alignment-Issue-with-Long-D…
Browse files Browse the repository at this point in the history
…escriptions
  • Loading branch information
scopsy authored Nov 6, 2023
2 parents d5cbe52 + 40393b7 commit d0cf9a8
Show file tree
Hide file tree
Showing 1,264 changed files with 32,213 additions and 18,958 deletions.
2 changes: 1 addition & 1 deletion .commitlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"subject-case": [
2,
"always",
["sentence-case", "start-case", "pascal-case", "upper-case", "lower-case"]
["sentence-case", "start-case", "pascal-case", "upper-case", "lower-case", "camel-case"]
],
"type-enum": [
2,
Expand Down
22 changes: 21 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@
"plivo",
"Plivo",
"prettierignore",
"Pushpad",
"Pushwoosh",
"sandboxed",
"sendgrid",
Expand Down Expand Up @@ -508,7 +509,26 @@
"autodocs",
"stackalt",
"mediumdark",
"Docgen"
"Docgen",
"clicksend",
"Clicksend",
"Kamil",
"Myśliwiec",
"nestframework",
"ryver",
"idempotency",
"IDEMPOTENCY",
"Idempotency",
"messagebird",
"Datetime",
"pubid",
"simpletexting",
"Simpletexting",
"Zulip",
"zulip",
"tspan",
"maildata",
"brevo"
],
"flagWords": [],
"patterns": [
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN . /etc/os-release \
# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"

# [Optional] Uncomment if you want to install more global node modules
RUN su node -c "npm install -g pnpm@7.33.4"
RUN su node -c "npm install -g pnpm@8.9.0"



2 changes: 2 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
- apps/webhook/**/*
'@novu/dal':
- libs/dal/**/*
'@novu/design-system':
- libs/design-system/**/*
'@novu/shared':
- libs/shared/**/*
'@novu/notification-center':
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/dev-deploy-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ jobs:
steps:
- run: echo ${{ matrix.projectName }}
- uses: actions/checkout@v3
- uses: ./.github/actions/checkout-submodules
with:
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: "next"
- uses: ./.github/actions/setup-project
- uses: ./.github/actions/setup-redis-cluster
- uses: mansagroup/nrwl-nx-action@v3
Expand Down Expand Up @@ -88,11 +84,6 @@ jobs:
name: ['novu/api-ee', 'novu/api']
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/checkout-submodules
with:
enabled: ${{ contains (matrix.name,'ee') }}
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: "next"
- uses: ./.github/actions/setup-project
- uses: ./.github/actions/docker/build-api
id: docker_build
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/dev-deploy-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@ jobs:
name: ['novu/worker-ee', 'novu/worker']
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/checkout-submodules
with:
enabled: ${{ contains (matrix.name,'ee') }}
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: "next"
- uses: ./.github/actions/setup-project
- uses: ./.github/actions/docker/build-worker
id: docker_build
Expand Down
17 changes: 11 additions & 6 deletions .github/workflows/pr-labeler.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
name: "Pull Request Labeller"
name: "Pull Request Labeler"

on:
- pull_request_target

jobs:
triage:
on_pr:
permissions:
contents: read
pull-requests: write
statuses: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/checkout@v4

- name: PR Labels
uses: actions/labeler@v4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- uses: microsoft/PR-Metrics@v1.5.4
name: PR Metrics
- name: PR Metrics
uses: microsoft/PR-Metrics@v1.5.7
env:
PR_METRICS_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/prod-deploy-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ jobs:
steps:
- run: echo ${{ matrix.projectName }}
- uses: actions/checkout@v3
- uses: ./.github/actions/checkout-submodules
with:
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: "next"
- uses: ./.github/actions/setup-project
- uses: ./.github/actions/setup-redis-cluster
- uses: mansagroup/nrwl-nx-action@v3
Expand Down Expand Up @@ -79,11 +75,6 @@ jobs:
id-token: write
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/checkout-submodules
with:
enabled: ${{ contains (matrix.name,'ee') }}
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: "main"
- uses: ./.github/actions/setup-project

- name: build api
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/prod-deploy-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ jobs:
id-token: write
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/checkout-submodules
with:
enabled: ${{ contains (matrix.name,'ee') }}
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: "main"
- uses: ./.github/actions/setup-project

- name: build worker
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/prod-deploy-ws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 80
environment: Production
needs:
- test_ws
strategy:
matrix:
name: [ 'novu/ws-ee', 'novu/ws' ]
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/reusable-api-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ jobs:
fi
- uses: actions/checkout@v3
# checkout with submodules if token is provided
- uses: ./.github/actions/checkout-submodules
with:
enabled: ${{ steps.setup.outputs.has_token == 'true' }}
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: ${{ inputs.submodule_branch }}
- uses: ./.github/actions/setup-project
- uses: ./.github/actions/setup-redis-cluster
- uses: mansagroup/nrwl-nx-action@v3
Expand All @@ -61,12 +56,16 @@ jobs:
- uses: ./.github/actions/start-localstack

- uses: ./.github/actions/run-worker
with:
launch_darkly_sdk_key: ${{ secrets.LAUNCH_DARKLY_SDK_KEY }}

# Runs a single command using the runners shell
- name: Build API
run: CI='' pnpm build:api

- name: Run E2E tests
env:
LAUNCH_DARKLY_SDK_KEY: ${{ secrets.LAUNCH_DARKLY_SDK_KEY }}
run: |
cd apps/api && pnpm test:e2e
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/reusable-inbound-mail-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ jobs:
steps:
# checkout with submodules if token is provided
- uses: actions/checkout@v3
- uses: ./.github/actions/checkout-submodules
with:
enabled: ${{ steps.setup.outputs.has_token == 'true' }}
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: ${{ inputs.submodule_branch }}
- uses: ./.github/actions/setup-project
- uses: ./.github/actions/setup-redis-cluster
- uses: mansagroup/nrwl-nx-action@v3
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/reusable-web-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ jobs:
- uses: actions/checkout@v3
# checkout with submodules if token is provided
- uses: ./.github/actions/checkout-submodules
with:
enabled: ${{ steps.setup.outputs.has_token == 'true' }}
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: ${{ inputs.submodule_branch }}
- uses: ./.github/actions/setup-project
id: setup-project
with:
Expand Down Expand Up @@ -105,7 +100,7 @@ jobs:
echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV
- name: Cypress run e2e
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
NODE_ENV: test
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -116,7 +111,7 @@ jobs:
with:
working-directory: apps/web
browser: "${{ env.BROWSER_PATH }}"
record: true
record: false
parallel: false
install: false
config-file: cypress.config.ts
Expand Down Expand Up @@ -153,7 +148,7 @@ jobs:
run: pnpm cypress install

- name: Run Component tests 🧪
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
NODE_ENV: test
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/reusable-widget-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ jobs:
fi
- uses: actions/checkout@v3
# checkout with submodules if token is provided
- uses: ./.github/actions/checkout-submodules
with:
enabled: ${{ steps.setup.outputs.has_token == 'true' }}
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: ${{ inputs.submodule_branch }}

- uses: ./.github/actions/setup-project
id: setup-project
with:
Expand Down Expand Up @@ -101,7 +95,7 @@ jobs:
run: pnpm cypress install

- name: Cypress run
uses: cypress-io/github-action@v2
uses: cypress-io/github-action@v6
env:
NODE_ENV: test
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/reusable-worker-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,7 @@ jobs:
fi
- uses: actions/checkout@v3
# checkout with submodules if token is provided
- uses: ./.github/actions/checkout-submodules
with:
enabled: ${{ steps.setup.outputs.has_token == 'true' }}
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: ${{ inputs.submodule_branch }}

- uses: ./.github/actions/setup-project

- uses: ./.github/actions/setup-redis-cluster
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/reusable-ws-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ jobs:
echo "has_token=false" >> $GITHUB_OUTPUT
fi
- uses: actions/checkout@v3
# checkout with submodules if token is provided
- uses: ./.github/actions/checkout-submodules
with:
enabled: ${{ steps.setup.outputs.has_token == 'true' }}
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: ${{ inputs.submodule_branch }}
- uses: ./.github/actions/setup-project
- uses: mansagroup/nrwl-nx-action@v3
with:
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ jobs:
else
echo "::set-output name=has_token::false"
fi
test_e2e_ee:
name: Test E2E EE
runs-on: ubuntu-latest
Expand All @@ -260,10 +260,6 @@ jobs:
steps:
- run: echo ${{ matrix.projectName }}
- uses: actions/checkout@v3
- uses: ./.github/actions/checkout-submodules
with:
submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
submodule_branch: "next"
- uses: ./.github/actions/setup-project
- uses: ./.github/actions/setup-redis-cluster
- uses: mansagroup/nrwl-nx-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gitpod/workspace-mongodb

RUN sudo apt-get update && sudo apt-get install -y redis-server && sudo rm -rf /var/lib/apt/lists/*
RUN npm install -g pnpm@7.33.4
RUN npm install -g pnpm@8.9.0
3 changes: 1 addition & 2 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ diverse, inclusive, and healthy community.
## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:
community includes:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
Expand All @@ -33,7 +33,7 @@ Examples of unacceptable behavior include:
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
* Other conduct that could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities
Expand Down
Loading

0 comments on commit d0cf9a8

Please sign in to comment.