Skip to content

Commit

Permalink
chore(root): Bump PNPM (novuhq#6587)
Browse files Browse the repository at this point in the history
  • Loading branch information
SokratisVidros authored Sep 30, 2024
1 parent bda2d7e commit 703a744
Show file tree
Hide file tree
Showing 19 changed files with 52 additions and 160 deletions.
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@9.1.4
RUN npm install -g pnpm@9.11.0
2 changes: 1 addition & 1 deletion apps/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apk add g++ make py3-pip
ENV NX_DAEMON=false

RUN npm i pm2 -g
RUN npm --no-update-notifier --no-fund --global install pnpm@9.1.4
RUN npm --no-update-notifier --no-fund --global install pnpm@9.11.0
RUN pnpm --version

USER 1000
Expand Down
2 changes: 1 addition & 1 deletion apps/inbound-mail/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apk add g++ make py3-pip
ENV NX_DAEMON=false

RUN npm i pm2 -g
RUN npm --no-update-notifier --no-fund --global install pnpm@9.1.4
RUN npm --no-update-notifier --no-fund --global install pnpm@9.11.0
RUN pnpm --version

USER 1000
Expand Down
4 changes: 2 additions & 2 deletions apps/web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ WORKDIR /usr/src/app


RUN apk add --no-cache bash
RUN npm install -g pnpm@9.1.4 --loglevel notice
RUN npm install -g pnpm@9.11.0 --loglevel notice

COPY .npmrc .
COPY package.json .
Expand Down Expand Up @@ -36,7 +36,7 @@ RUN NX_DAEMON=false pnpm build:web
FROM node:20-alpine

RUN apk add --no-cache bash
RUN npm install -g pnpm@9.1.4 http-server --loglevel notice
RUN npm install -g pnpm@9.11.0 http-server --loglevel notice

USER 1000
WORKDIR /app
Expand Down
8 changes: 4 additions & 4 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
"start:docker": "pnpm build && pnpm start:static:build",
"start:dev": "pnpm start",
"start:test": "http-server build -p 4200 --proxy http://127.0.0.1:4200?",
"test:e2e": "playwright test",
"test:e2e:ui": "playwright test --ui",
"test:e2e:debug": "playwright test --debug",
"start:test:e2e": "NOVU_ENTERPRISE=true REACT_APP_API_URL=http://127.0.0.1:1336 pnpm start",
"test:e2e": "NOVU_ENTERPRISE=true playwright test",
"test:e2e:ui": "NOVU_ENTERPRISE=true playwright test --ui",
"test:e2e:debug": "NOVU_ENTERPRISE=true playwright test --debug",
"test:e2e:install": "playwright install --with-deps",
"test:e2e:codegen": "playwright codegen",
"test:e2e:show-report": "npx playwright show-report",
"test:e2e:merge-report": "playwright merge-reports --reporter html",
"start:api": "cd ../../ && pnpm start:api:test",
"storybook": "storybook dev -p 6006 -s public",
"build-storybook": "storybook build -s public",
"lint": "eslint src",
Expand Down
6 changes: 5 additions & 1 deletion apps/web/tests/integrations-list-modal.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,10 @@ test('should update the mailjet integration', async ({ page }) => {

await expect(updateButton).toBeEnabled();
await updateButton.click();
await expect(updateButton).toBeDisabled();

// Test that the update button is enabled again when the form value changes
await senderName.fill('Novu edited');
await expect(updateButton).toBeEnabled();

const sidebarClose = page.getByTestId('sidebar-close');
Expand Down Expand Up @@ -545,7 +549,7 @@ test('should update the mailjet integration from the list', async ({ page }) =>

await expect(updateButton).toBeEnabled();
await updateButton.click();
await expect(updateButton).toBeEnabled();
await expect(updateButton).toBeDisabled();

sidebarClose = page.getByTestId('sidebar-close');
await sidebarClose.click();
Expand Down
2 changes: 1 addition & 1 deletion apps/web/tests/invites.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ test.describe('Invites', () => {
await signUpPage.fillUseCaseData();
await signUpPage.clickGetStartedButton();

await signUpPage.assertNavigationPath('/get-started**');
await signUpPage.assertNavigationPath('/workflows**');

const sidebarPage = await SidebarPage.goTo(pageForInvitedUser);
await expect(sidebarPage.getOrganizationSwitch()).toHaveValue(new RegExp(invitation.organization.name, 'i'));
Expand Down
2 changes: 1 addition & 1 deletion apps/webhook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ RUN apk add g++ make py3-pip
ENV NX_DAEMON=false

RUN npm i pm2 -g
RUN npm --no-update-notifier --no-fund --global install pnpm@9.1.4
RUN npm --no-update-notifier --no-fund --global install pnpm@9.11.0
RUN pnpm --version

USER 1000
Expand Down
2 changes: 1 addition & 1 deletion apps/widget/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM node:20-alpine3.19
ENV NX_DAEMON=false

RUN apk add --no-cache bash g++ make py3-pip
RUN npm install -g pnpm@9.1.4 --loglevel notice
RUN npm install -g pnpm@9.11.0 --loglevel notice

USER 1000
WORKDIR /usr/src/app
Expand Down
2 changes: 1 addition & 1 deletion apps/worker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ RUN apk --update --no-cache add curl g++ make py3-pip
ENV NX_DAEMON=false

RUN npm i pm2 -g
RUN npm --no-update-notifier --no-fund --global install pnpm@9.1.4
RUN npm --no-update-notifier --no-fund --global install pnpm@9.11.0
RUN pnpm --version

USER 1000
Expand Down
2 changes: 1 addition & 1 deletion apps/ws/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM node:20-alpine3.19

ENV NX_DAEMON=false

RUN npm install -g pnpm@9.1.4 --loglevel notice
RUN npm install -g pnpm@9.11.0 --loglevel notice
RUN npm i pm2 -g
RUN apk --no-cache add g++ make py3-pip

Expand Down
2 changes: 1 addition & 1 deletion libs/embed/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM node:20-alpine3.19

RUN npm install -g pnpm@9.1.4 --loglevel notice --force
RUN npm install -g pnpm@9.11.0 --loglevel notice --force
RUN apk --update --no-cache add curl g++ make py3-pip

USER 1000
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "root",
"private": true,
"packageManager": "pnpm@9.1.4",
"packageManager": "pnpm@9.11.0",
"scripts": {
"bootstrap": "npm run setup:dev",
"start": "npm run jarvis",
"preinstall": "npx only-allow pnpm",
"publish": "nx release version && git add . && git commit -m 'chore: release' && pnpm publish:npm",
"publish:npm": "lerna publish from-package",
"setup:project": "npx --yes pnpm@9.1.4 i && node scripts/setup-env-files.js && pnpm build",
"setup:project": "npx --yes pnpm@9.11.0 i && node scripts/setup-env-files.js && pnpm build",
"clean": "lerna clean --yes && rimraf node_modules",
"commit": "cz",
"nx": "nx",
Expand Down Expand Up @@ -173,9 +173,8 @@
"mississippi": "^4.0.0",
"ora": "~5.4.1",
"pkg-pr-new": "^0.0.24",
"pnpm": "9.1.4",
"pnpm": "9.11.0",
"prettier": "~3.3.3",
"prettier-plugin-tailwindcss": "^0.6.5",
"process": "^0.11.10",
"rimraf": "^3.0.2",
"shelljs": "^0.8.5",
Expand Down Expand Up @@ -218,7 +217,7 @@
},
"engines": {
"node": ">=20 <21",
"pnpm": "^9.1.4"
"pnpm": "^9.11.0"
},
"dependencies": {
"nx": "19.8.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,15 @@ export const DefaultNotification = (props: DefaultNotificationProps) => {
<p
class={style(
'notificationDate',
`nt-transition nt-duration-100 nt-ease-out nt-text-foreground-alpha-400 nt-shrink-0
nt-float-right nt-text-right group-hover:nt-opacity-0`
'nt-transition nt-duration-100 nt-ease-out nt-text-foreground-alpha-400 nt-shrink-0 nt-float-right nt-text-right group-hover:nt-opacity-0'
)}
>
{date()}
</p>
<div
class={style(
'notificationDefaultActions',
`nt-transition nt-duration-100 nt-ease-out nt-gap-2 nt-flex nt-shrink-0
nt-opacity-0 group-hover:nt-opacity-100 nt-justify-center nt-items-center
nt-absolute nt-top-0 nt-right-0 nt-bg-neutral-alpha-50 nt-py-0.5 nt-rounded`
'nt-transition nt-duration-100 nt-ease-out nt-gap-2 nt-flex nt-shrink-0 nt-opacity-0 group-hover:nt-opacity-100 nt-justify-center nt-items-center nt-absolute nt-top-0 nt-right-0 nt-bg-neutral-alpha-50 nt-py-0.5 nt-rounded'
)}
>
<Show when={status() !== NotificationStatus.ARCHIVED}>
Expand Down
6 changes: 4 additions & 2 deletions packages/js/src/ui/components/Renderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,10 @@ export const Renderer = (props: RendererProps) => {
const Component = novuComponents[novuComponent().name];

onMount(() => {
// return here if not `<Notifications /> or `<Preferences />` since we only want to override some styles for those to work properly
// due to the extra divs being introduces by the renderer/mounter
/*
* return here if not `<Notifications /> or `<Preferences />` since we only want to override some styles for those to work properly
* due to the extra divs being introduces by the renderer/mounter
*/
if (!['Notifications', 'Preferences'].includes(novuComponent().name)) return;

if (node instanceof HTMLElement) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ const PreferencesRow = (props: {
<div
class={style(
'workflowContainer',
`nt-p-4 nt-flex nt-flex-col nt-gap-1 nt-items-start nt-self-stretch
hover:nt-bg-neutral-alpha-50 nt-rounded-lg data-[disabled=true]:nt-bg-neutral-alpha-50`
`nt-p-4 nt-flex nt-flex-col nt-gap-1 nt-items-start nt-self-stretch hover:nt-bg-neutral-alpha-50 nt-rounded-lg data-[disabled=true]:nt-bg-neutral-alpha-50`
)}
data-disabled={props.isCritical}
data-open={isOpen()}
Expand Down
13 changes: 2 additions & 11 deletions packages/js/src/ui/components/elements/Preferences/Switch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ export const Switch = (props: SwitchProps) => {
<label
class={style(
'channelSwitch',
`nt-relative
nt-inline-flex nt-cursor-pointer nt-items-center data-[disabled=true]:nt-cursor-not-allowed`
`nt-relative nt-inline-flex nt-cursor-pointer nt-items-center data-[disabled=true]:nt-cursor-not-allowed`
)}
data-disabled={props.disabled}
>
Expand All @@ -31,15 +30,7 @@ export const Switch = (props: SwitchProps) => {
<div
class={style(
'channelSwitchThumb',
`nt-peer nt-h-6 nt-w-11 nt-rounded-full nt-border nt-border-neutral-alpha-200 peer-checked:nt-border-neutral-alpha-400 nt-bg-neutral-alpha-300
after:nt-absolute after:nt-left-[2px] after:nt-top-0.5 after:nt-h-5
after:nt-w-5 after:nt-rounded-full after:nt-border
after:nt-border-neutral-alpha-400
after:nt-bg-background after:nt-transition-all after:nt-content-['']
peer-checked:nt-bg-primary peer-checked:after:nt-translate-x-full
peer-checked:after:nt-border-background
nt-transition-all nt-duration-200 after:nt-duration-200
data-[disabled=true]:nt-opacity-40`
`nt-peer nt-h-6 nt-w-11 nt-rounded-full nt-border nt-border-neutral-alpha-200 peer-checked:nt-border-neutral-alpha-400 nt-bg-neutral-alpha-300 after:nt-absolute after:nt-left-[2px] after:nt-top-0.5 after:nt-h-5 after:nt-w-5 after:nt-rounded-full after:nt-border after:nt-border-neutral-alpha-400 after:nt-bg-background after:nt-transition-all after:nt-content-[''] peer-checked:nt-bg-primary peer-checked:after:nt-translate-x-full peer-checked:after:nt-border-background nt-transition-all nt-duration-200 after:nt-duration-200 data-[disabled=true]:nt-opacity-40`
)}
data-disabled={props.disabled}
data-checked={props.checked}
Expand Down
Loading

0 comments on commit 703a744

Please sign in to comment.