Merge branch 'master' of github.com:coveo/plasma into next

coveo · Feb 25, 2025 · 97265bb · 97265bb
2 parents 84080a1 + 8ebc188
commit 97265bb
Show file tree

Hide file tree

Showing 32 changed files with 1,597 additions and 1,664 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -3,7 +3,7 @@ description: Install Node, PNPM, and dependencies using cache
 runs:
     using: composite
     steps:
-        - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
           with:
               registry-url: 'https://registry.npmjs.org'
               node-version: 20.9.0

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -21,7 +21,7 @@ jobs:
             statuses: write
         steps:
             - name: Harden Runner
-              uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+              uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
               with:
                   egress-policy: audit
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Harden Runner
-              uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+              uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
               with:
                   egress-policy: audit
 
@@ -26,7 +26,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Harden Runner
-              uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+              uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
               with:
                   egress-policy: audit
 
@@ -42,7 +42,7 @@ jobs:
             contents: read
         steps:
             - name: Harden Runner
-              uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+              uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
               with:
                   egress-policy: audit
 

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -38,7 +38,7 @@ jobs:
 
         steps:
             - name: Harden Runner
-              uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+              uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
               with:
                   egress-policy: audit
 

diff --git a/.github/workflows/demo-cleaner.yml b/.github/workflows/demo-cleaner.yml
@@ -10,7 +10,7 @@ jobs:
             id-token: write
         steps:
             - name: Harden Runner
-              uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+              uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
               with:
                   egress-policy: audit
 

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -41,7 +41,7 @@ jobs:
 
         steps:
             - name: Harden Runner
-              uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+              uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
               with:
                   egress-policy: audit
 
@@ -73,7 +73,7 @@ jobs:
             # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
             # format to the repository Actions tab.
             - name: 'Upload artifact'
-              uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+              uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
               with:
                   name: SARIF file
                   path: results.sarif

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,28 @@
-## <small>55.5.2-next.0 (2025-01-22)</small>
+## <small>55.7.1 (2025-02-21)</small>
+
+* feat(mantine, code-editor): support custom tabSize (#4014) a4483fa, closes #4014
+* fix(modal): optimize import (#4009) b204340, closes #4009
+* fix(table): correct useUrlSyncedState serialization logic (#4011) 26d6336, closes #4011
+* chore(deps): update actions/setup-node digest to 1d0ff46 (#4006) 43eaf2c, closes #4006
+* chore(deps): update all non-major dependencies (#4005) b73ecfa, closes #4005
+* chore(deps): update dependency eslint-config-prettier to v10 (#3998) 1511c68, closes #3998
+* chore(deps): update dependency vitest to v3 (#4004) 62f90af, closes #4004
+* chore(deps): update dependency vitest to v3.0.5 [security] (#4010) 414fd96, closes #4010
+
+
+
+## 55.7.0 (2025-01-23)
+
+* fix(prompt): filter footer children in one pass (#4002) a753fd3, closes #4002
+* feat(modal): implement "@coveord/plasma-mantine/Modal" (#4001) 85d2568, closes #4001
+* chore(deps): update all non-major dependencies (#3981) 056f015, closes #3981
+
+
+
+## 55.6.0 (2025-01-22)
 
-* Merge branch 'master' of github.com:coveo/plasma into next 09ce65d
-* Merge branch 'master' of github.com:coveo/plasma into next 7e4c32c
-* feat(mantine): remove a lot of custom style to get a vanilla style (#3986) 354db73, closes #3986
 * feat(useUrlSyncedState): allow always emitting values (#3996) a61cb13, closes #3996
 * chore(deps): update dependency vite to v6.0.9 [security] (#4003) f36defe, closes #4003
-* chore(release): publish version v55.3.4-next.0 [skip ci] c9ab861
 
 
 

diff --git a/package.json b/package.json
@@ -44,43 +44,43 @@
         "not dead"
     ],
     "devDependencies": {
-        "@commitlint/cli": "19.6.0",
+        "@commitlint/cli": "19.6.1",
         "@commitlint/config-conventional": "19.6.0",
-        "@coveo/semantic-monorepo-tools": "2.5.9",
+        "@coveo/semantic-monorepo-tools": "2.6.2",
         "@sindresorhus/slugify": "2.2.1",
-        "@types/node": "22.10.1",
-        "@vitest/eslint-plugin": "1.1.14",
+        "@types/node": "22.10.7",
+        "@vitest/eslint-plugin": "1.1.25",
         "aws-sdk": "2.1692.0",
-        "chokidar": "4.0.1",
+        "chokidar": "4.0.3",
         "commitizen": "4.3.1",
         "conventional-changelog-angular": "8.0.0",
         "cz-conventional-changelog": "3.3.0",
-        "eslint": "9.16.0",
-        "eslint-config-prettier": "9.1.0",
-        "eslint-plugin-import-x": "4.5.0",
-        "eslint-plugin-jsdoc": "50.6.0",
+        "eslint": "9.18.0",
+        "eslint-config-prettier": "10.0.1",
+        "eslint-plugin-import-x": "4.6.1",
+        "eslint-plugin-jsdoc": "50.6.2",
         "eslint-plugin-prefer-arrow": "1.2.3",
-        "eslint-plugin-react": "7.37.2",
-        "eslint-plugin-react-hooks": "5.0.0",
-        "eslint-plugin-react-refresh": "0.4.16",
-        "eslint-plugin-testing-library": "7.0.0",
+        "eslint-plugin-react": "7.37.4",
+        "eslint-plugin-react-hooks": "5.1.0",
+        "eslint-plugin-react-refresh": "0.4.18",
+        "eslint-plugin-testing-library": "7.1.1",
         "eslint-plugin-unused-imports": "4.1.4",
-        "globals": "15.13.0",
+        "globals": "15.14.0",
         "husky": "9.1.7",
-        "lint-staged": "15.2.10",
+        "lint-staged": "15.4.1",
         "mime-types": "2.1.35",
-        "postcss": "8.4.49",
-        "prettier": "3.4.1",
-        "sort-package-json": "2.12.0",
-        "stylelint": "16.11.0",
+        "postcss": "8.5.1",
+        "prettier": "3.4.2",
+        "sort-package-json": "2.14.0",
+        "stylelint": "16.13.2",
         "stylelint-config-standard-scss": "14.0.0",
         "turbo": "2.3.3",
-        "typescript": "5.7.2",
-        "typescript-eslint": "8.17.0",
+        "typescript": "5.7.3",
+        "typescript-eslint": "8.20.0",
         "underscore": "1.13.7",
         "walkdir": "0.4.1"
     },
-    "packageManager": "pnpm@9.14.4",
+    "packageManager": "pnpm@9.15.4",
     "pnpm": {
         "peerDependencyRules": {
             "ignoreMissing": [

diff --git a/packages/components-props-analyzer/package.json b/packages/components-props-analyzer/package.json
@@ -27,22 +27,22 @@
         "@coveord/plasma-mantine": "workspace:*"
     },
     "devDependencies": {
-        "@swc/cli": "0.5.2",
-        "@swc/core": "1.9.3",
+        "@swc/cli": "0.6.0",
+        "@swc/core": "1.10.8",
         "@types/fs-extra": "11.0.4",
-        "@types/node": "22.10.1",
-        "@types/react": "18.3.12",
-        "@types/react-dom": "18.3.1",
+        "@types/node": "22.10.7",
+        "@types/react": "18.3.18",
+        "@types/react-dom": "18.3.5",
         "@typescript/twoslash": "3.2.8",
         "@typescript/vfs": "1.6.0",
-        "cross-fetch": "4.0.0",
-        "fs-extra": "11.2.0",
-        "nodemon": "3.1.7",
+        "cross-fetch": "4.1.0",
+        "fs-extra": "11.3.0",
+        "nodemon": "3.1.9",
         "react": "18.3.1",
         "react-dom": "18.3.1",
         "rimraf": "6.0.1",
         "ts-node": "10.9.2",
         "tslib": "2.8.1",
-        "typescript": "5.7.2"
+        "typescript": "5.7.3"
     }
 }
diff --git a/packages/components-props-analyzer/src/ComponentsList.ts b/packages/components-props-analyzer/src/ComponentsList.ts
@@ -57,10 +57,6 @@ const components: Component[] = [
         name: 'Modal',
         packageName: '@coveord/plasma-mantine',
     },
-    {
-        name: 'ModalWizard',
-        packageName: '@coveord/plasma-mantine',
-    },
     {
         name: 'StickyFooter',
         packageName: '@coveord/plasma-mantine',

diff --git a/packages/mantine/package.json b/packages/mantine/package.json
@@ -38,55 +38,55 @@
     "dependencies": {
         "@coveord/plasma-react-icons": "workspace:*",
         "@coveord/plasma-tokens": "workspace:*",
-        "@dnd-kit/core": "6.2.0",
+        "@dnd-kit/core": "6.3.1",
         "@dnd-kit/modifiers": "9.0.0",
         "@dnd-kit/sortable": "10.0.0",
         "@dnd-kit/utilities": "3.2.2",
         "@mantine/utils": "6.0.22",
         "@monaco-editor/react": "4.6.0",
         "@swc/helpers": "0.5.15",
-        "@tanstack/react-table": "8.20.5",
+        "@tanstack/react-table": "8.20.6",
         "@tanstack/table-core": "8.20.5",
         "clsx": "2.1.1",
         "dayjs": "1.11.13",
         "fast-deep-equal": "3.1.3",
         "lodash.debounce": "4.0.8",
         "lodash.defaultsdeep": "4.6.1",
-        "monaco-editor": "0.52.0"
+        "monaco-editor": "0.52.2"
     },
     "devDependencies": {
-        "@mantine/carousel": "7.14.3",
-        "@mantine/code-highlight": "7.14.3",
-        "@mantine/core": "7.14.3",
-        "@mantine/dates": "7.14.3",
-        "@mantine/form": "7.14.3",
-        "@mantine/hooks": "7.14.3",
-        "@mantine/modals": "7.14.3",
-        "@mantine/notifications": "7.14.3",
-        "@swc/cli": "0.5.2",
-        "@swc/core": "1.9.3",
+        "@mantine/carousel": "7.16.1",
+        "@mantine/code-highlight": "7.16.1",
+        "@mantine/core": "7.16.1",
+        "@mantine/dates": "7.16.1",
+        "@mantine/form": "7.16.1",
+        "@mantine/hooks": "7.16.1",
+        "@mantine/modals": "7.16.1",
+        "@mantine/notifications": "7.16.1",
+        "@swc/cli": "0.6.0",
+        "@swc/core": "1.10.8",
         "@testing-library/dom": "10.4.0",
         "@testing-library/jest-dom": "6.6.3",
-        "@testing-library/react": "16.0.1",
-        "@testing-library/user-event": "14.5.2",
+        "@testing-library/react": "16.2.0",
+        "@testing-library/user-event": "14.6.0",
         "@types/lodash.debounce": "4.0.9",
         "@types/lodash.defaultsdeep": "4.6.9",
-        "@types/react": "18.3.12",
-        "@types/react-dom": "18.3.1",
+        "@types/react": "18.3.18",
+        "@types/react-dom": "18.3.5",
         "embla-carousel-react": "7.1.0",
         "identity-obj-proxy": "3.0.0",
         "jsdom": "26.0.0",
-        "postcss": "8.4.49",
+        "postcss": "8.5.1",
         "postcss-preset-mantine": "^1.11.0",
         "postcss-simple-vars": "^7.0.1",
-        "publint": "0.2.12",
+        "publint": "0.3.2",
         "react": "18.3.1",
         "react-dom": "18.3.1",
         "rimraf": "6.0.1",
-        "sass": "1.81.1",
+        "sass": "1.83.4",
         "tslib": "2.8.1",
-        "typescript": "5.7.2",
-        "vitest": "2.1.8"
+        "typescript": "5.7.3",
+        "vitest": "3.0.5"
     },
     "peerDependencies": {
         "@mantine/carousel": "^7.6.1",

diff --git a/packages/mantine/src/components/code-editor/CodeEditor.tsx b/packages/mantine/src/components/code-editor/CodeEditor.tsx
@@ -72,6 +72,12 @@ interface CodeEditorProps
      * @default 'local'
      */
     monacoLoader?: 'cdn' | 'local';
+    /**
+     * Options to pass to the monaco editor.
+     * Currently only supporting [`tabSize`](https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html#tabSize).
+     *
+     */
+    options?: Pick<monacoEditor.IStandaloneEditorConstructionOptions, 'tabSize'>;
 }
 
 const defaultProps: Partial<CodeEditorProps> = {
@@ -101,6 +107,7 @@ export const CodeEditor: FunctionComponent<CodeEditorProps> = (props) => {
         maxHeight,
         disabled,
         monacoLoader,
+        options: {tabSize} = {tabSize: 2},
         ...others
     } = useProps('CodeEditor', defaultProps, props);
     const [loaded, setLoaded] = useState(false);
@@ -230,7 +237,7 @@ export const CodeEditor: FunctionComponent<CodeEditorProps> = (props) => {
                     formatOnPaste: true,
                     fontSize: px(theme.fontSizes.xs) as number,
                     readOnly: disabled,
-                    tabSize: 2,
+                    tabSize,
                 }}
                 value={_value}
                 onChange={handleChange}

diff --git a/packages/mantine/src/components/index.ts b/packages/mantine/src/components/index.ts
@@ -12,6 +12,7 @@ export * from './ellipsis-text';
 export * from './header';
 export * from './inline-confirm';
 export * from './menu';
+export * from './modal';
 export * from './prompt';
 export * from './read-only';
 export * from './sticky-footer';

diff --git a/packages/mantine/src/components/modal/Modal.module.css b/packages/mantine/src/components/modal/Modal.module.css
@@ -0,0 +1,9 @@
+.footer {
+    border-top: 1px solid var(--mantine-color-gray-3);
+}
+
+.modalFooterSticky {
+    padding-bottom: 0;
+    margin: var(--mb-padding) calc(-1 * var(--mb-padding)) calc(var(--mantine-spacing-md) - var(--mb-padding))
+        calc(-1 * var(--mb-padding));
+}
diff --git a/packages/mantine/src/components/modal/Modal.tsx b/packages/mantine/src/components/modal/Modal.tsx
@@ -0,0 +1,33 @@
+import {
+    factory,
+    Modal as MantineModal,
+    ModalFactory as MantineModalFactory,
+    ModalProps as MantineModalProps,
+} from '@mantine/core';
+import {ModalFooter as PlasmaModalFooter} from './ModalFooter';
+
+// Need to redeclare the factory to override and add footer to the props type
+type PlasmaModalFactory = Omit<MantineModalFactory, 'staticComponents'> & {
+    staticComponents: MantineModalFactory['staticComponents'] & {
+        Footer: typeof PlasmaModalFooter;
+    };
+};
+
+const PlasmaModal = factory<PlasmaModalFactory>((props: MantineModalProps, ref) => (
+    <MantineModal ref={ref} {...props} />
+));
+
+PlasmaModal.displayName = '@coveord/plasma-mantine/Modal';
+PlasmaModal.Root = MantineModal.Root;
+PlasmaModal.Body = MantineModal.Body;
+PlasmaModal.Overlay = MantineModal.Overlay;
+PlasmaModal.Content = MantineModal.Content;
+PlasmaModal.Header = MantineModal.Header;
+PlasmaModal.Title = MantineModal.Title;
+PlasmaModal.CloseButton = MantineModal.CloseButton;
+PlasmaModal.Stack = MantineModal.Stack;
+PlasmaModal.Footer = PlasmaModalFooter;
+
+export const Modal = PlasmaModal;
+
+export type ModalFactory = PlasmaModalFactory;