chore(release): plugin-cloud-storage/1.2.0 [skip ci]

feat(plugin-cloud-storage): add credentials to connect to azure (#7781 )
Co-authored-by: Elliot DeNolf <denolfe@gmail.com>
2024-10-08 10:54:04 -04:00 · 2024-10-08 10:43:59 -04:00 · 2024-10-07 12:24:49 -04:00 · 2024-10-07 12:07:15 -04:00 · 2024-10-06 23:17:24 -03:00 · 2024-10-06 21:32:51 -04:00
20 changed files with 786 additions and 716 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -31,17 +31,44 @@ updates:
    labels:
      - dependencies
    groups:
-      production:
+      production-deps:
        dependency-type: production
        update-types:
          - minor
          - patch
        patterns:
          - '*'
-      dev:
+        exclude-patterns:
+          - 'drizzle*'
+      dev-deps:
        dependency-type: development
        update-types:
          - minor
          - patch
        patterns:
          - '*'
+        exclude-patterns:
+          - 'drizzle*'
+
+  # Only bump patch versions for 2.x
+  - package-ecosystem: npm
+    directory: /
+    target-branch: main
+    schedule:
+      interval: weekly
+      day: sunday
+      timezone: America/Detroit
+      time: '06:00'
+    commit-message:
+      prefix: 'chore(deps)'
+    labels:
+      - dependencies
+    groups:
+      production-deps:
+        dependency-type: production
+        update-types:
+          - patch
+        patterns:
+          - '*'
+        exclude-patterns:
+          - 'drizzle*'
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [2.30.1](https://github.com/payloadcms/payload/compare/v2.30.0...v2.30.1) (2024-10-02)
+
+
+### Bug Fixes
+
+* **db-mongodb:** properly filters out `number` field values with the `exists` operator filter ([#8415](https://github.com/payloadcms/payload/issues/8415)) ([0586f23](https://github.com/payloadcms/payload/commit/0586f236bbf04163a0d9b226772849cb3d977864)), closes [#8181](https://github.com/payloadcms/payload/issues/8181)
+* sorting by id incorrectly orders by version.id ([#8450](https://github.com/payloadcms/payload/issues/8450)) ([1d38e6d](https://github.com/payloadcms/payload/commit/1d38e6d5d5b56a91aa8f59a461d40f28b1750f8c))
+
 ## [2.30.0](https://github.com/payloadcms/payload/compare/v2.29.0...v2.30.0) (2024-09-27)

 * export toast from react toastify in payload ([#8438](https://github.com/payloadcms/payload/issues/8438)) ([17fc2d1](https://github.com/payloadcms/payload/commit/17fc2d13d06b6de01f839c27fd706bc0d6a185eb))
--- a/docs/configuration/localization.mdx
+++ b/docs/configuration/localization.mdx
@@ -24,8 +24,8 @@ export default buildConfig({
    // collections go here
  ],
  localization: {
-    locales: ['en', 'es', 'de'],
-    defaultLocale: 'en',
+    locales: ['en', 'es', 'de'], // required
+    defaultLocale: 'en', // required
    fallback: true,
  },
 })
@@ -54,7 +54,7 @@ export default buildConfig({
        rtl: true,
      },
    ],
-    defaultLocale: 'en',
+    defaultLocale: 'en', // required
    fallback: true,
  },
 })
@@ -87,7 +87,7 @@ export default buildConfig({
        code: 'nb',
      },
    ],
-    defaultLocale: 'en',
+    defaultLocale: 'en', // required
    fallback: true,
  },
 })
--- a/docs/plugins/overview.mdx
+++ b/docs/plugins/overview.mdx
@@ -144,6 +144,10 @@ export default addLastModified

 ### Available Plugins

-You can discover existing plugins by browsing the `payload-plugin` topic on [GitHub](https://github.com/topics/payload-plugin).
+Payload supports both official plugins, maintained by the Payload team, and community plugins, developed by external contributors.
+
+You can discover existing plugins by browsing the `payload-plugin` topic on [GitHub](https://github.com/topics/payload-plugin). These plugins offer a wide range of functionality. Some are maintained by the Payload team, while others are community-built. While we encourage users to explore them, please note that only official plugins are maintained and supported by the Payload team. For community plugins, support may vary as they are developed and maintained independently.

 For maintainers building plugins for others to use, please add the topic to help others find it. If you would like one to be built by the core Payload team, [open a Feature Request](https://github.com/payloadcms/payload/discussions) in our GitHub Discussions board. We would be happy to review your code and maybe feature you and your plugin where appropriate.
+
+For a list of official plugins, check the [Payload monorepo](https://github.com/payloadcms/payload/tree/main/packages).
--- a/packages/bundler-webpack/package.json
+++ b/packages/bundler-webpack/package.json
@@ -33,15 +33,15 @@
    "md5": "2.3.0",
    "mini-css-extract-plugin": "1.6.2",
    "path-browserify": "1.0.1",
-    "postcss": "8.4.31",
+    "postcss": "8.4.47",
    "postcss-loader": "6.2.1",
    "postcss-preset-env": "9.0.0",
    "process": "0.11.10",
    "sass-loader": "12.6.0",
    "style-loader": "^2.0.0",
-    "swc-loader": "^0.2.3",
-    "swc-minify-webpack-plugin": "^2.1.0",
-    "terser-webpack-plugin": "^5.3.6",
+    "swc-loader": "^0.2.6",
+    "swc-minify-webpack-plugin": "^2.1.3",
+    "terser-webpack-plugin": "^5.3.10",
    "url-loader": "4.1.1",
    "webpack": "^5.78.0",
    "webpack-bundle-analyzer": "^4.8.0",
--- a/packages/db-mongodb/package.json
+++ b/packages/db-mongodb/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/db-mongodb",
-  "version": "1.7.2",
+  "version": "1.7.3",
  "description": "The officially supported MongoDB database adapter for Payload",
  "repository": {
    "type": "git",
--- a/packages/db-mongodb/src/queries/sanitizeQueryValue.ts
+++ b/packages/db-mongodb/src/queries/sanitizeQueryValue.ts
@@ -55,6 +55,30 @@ const handleNonHasManyValues = (formattedValue, operator, path) => {
  }
 }

+const buildExistsQuery = (formattedValue, path) => {
+  if (formattedValue) {
+    return {
+      rawQuery: {
+        $and: [
+          { [path]: { $exists: true } },
+          { [path]: { $ne: null } },
+          { [path]: { $ne: '' } }, // Exclude null and empty string
+        ],
+      },
+    }
+  } else {
+    return {
+      rawQuery: {
+        $or: [
+          { [path]: { $exists: false } },
+          { [path]: { $eq: null } },
+          { [path]: { $eq: '' } }, // Treat empty string as null / undefined
+        ],
+      },
+    }
+  }
+}
+
 export const sanitizeQueryValue = ({
  field,
  hasCustomID,
@@ -102,8 +126,16 @@ export const sanitizeQueryValue = ({
    }
  }

-  if (field.type === 'number' && typeof formattedValue === 'string') {
-    formattedValue = Number(val)
+  if (field.type === 'number') {
+    if (typeof formattedValue === 'string' && operator !== 'exists') {
+      formattedValue = Number(val)
+    }
+
+    if (operator === 'exists') {
+      formattedValue = val === 'true' ? true : val === 'false' ? false : Boolean(val)
+
+      return buildExistsQuery(formattedValue, path)
+    }
  }

  if (field.type === 'date' && typeof val === 'string' && operator !== 'exists') {
@@ -193,27 +225,7 @@ export const sanitizeQueryValue = ({
    if (operator === 'exists') {
      formattedValue = formattedValue === 'true' || formattedValue === true

-      if (formattedValue) {
-        return {
-          rawQuery: {
-            $and: [
-              { [path]: { $exists: true } },
-              { [path]: { $ne: null } },
-              { [path]: { $ne: '' } },
-            ],
-          },
-        }
-      } else {
-        return {
-          rawQuery: {
-            $or: [
-              { [path]: { $exists: false } },
-              { [path]: { $eq: null } },
-              { [path]: { $eq: '' } }, // Treat empty string as null / undefined
-            ],
-          },
-        }
-      }
+      return buildExistsQuery(formattedValue, path)
    }
  }

--- a/packages/eslint-config-payload/package.json
+++ b/packages/eslint-config-payload/package.json
@@ -32,7 +32,7 @@
    "eslint-plugin-perfectionist": "2.0.0",
    "eslint-plugin-playwright": "0.16.0",
    "eslint-plugin-react": "7.33.2",
-    "eslint-plugin-react-hooks": "4.6.0",
+    "eslint-plugin-react-hooks": "4.6.2",
    "eslint-plugin-regexp": "1.15.0"
  },
  "keywords": []
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -1,6 +1,6 @@
 {
  "name": "payload",
-  "version": "2.30.0",
+  "version": "2.30.1",
  "description": "Node, React and MongoDB Headless CMS and Application Framework",
  "license": "MIT",
  "main": "./dist/index.js",
@@ -55,13 +55,13 @@
    "@date-io/date-fns": "2.16.0",
    "@dnd-kit/core": "6.0.8",
    "@dnd-kit/sortable": "7.0.2",
-    "@faceless-ui/modal": "2.0.1",
+    "@faceless-ui/modal": "2.0.2",
    "@faceless-ui/scroll-info": "1.3.0",
-    "@faceless-ui/window-info": "2.1.1",
+    "@faceless-ui/window-info": "2.1.2",
    "@monaco-editor/react": "4.5.1",
    "@swc/core": "1.6.1",
    "@swc/register": "0.1.10",
-    "body-parser": "1.20.2",
+    "body-parser": "1.20.3",
    "body-scroll-lock": "4.0.0-beta.0",
    "bson-objectid": "2.0.4",
    "compression": "1.7.4",
@@ -70,7 +70,7 @@
    "console-table-printer": "2.11.2",
    "dataloader": "2.2.2",
    "date-fns": "2.30.0",
-    "deep-equal": "2.2.2",
+    "deep-equal": "2.2.3",
    "deepmerge": "4.3.1",
    "dotenv": "8.6.0",
    "express": "4.21.0",
@@ -97,14 +97,14 @@
    "isomorphic-fetch": "3.0.0",
    "joi": "17.9.2",
    "json-schema-to-typescript": "14.0.5",
-    "jsonwebtoken": "9.0.1",
+    "jsonwebtoken": "9.0.2",
    "jwt-decode": "3.1.2",
    "md5": "2.3.0",
    "method-override": "3.0.0",
    "minimist": "1.2.8",
    "mkdirp": "1.0.4",
    "monaco-editor": "0.38.0",
-    "nodemailer": "6.9.8",
+    "nodemailer": "6.9.15",
    "object-to-formdata": "4.5.1",
    "passport": "0.6.0",
    "passport-anonymous": "1.0.1",
@@ -132,11 +132,11 @@
    "react-toastify": "10.0.5",
    "sanitize-filename": "1.6.3",
    "sass": "1.69.4",
-    "scheduler": "0.23.0",
+    "scheduler": "0.23.2",
    "scmp": "2.1.0",
    "sharp": "0.32.6",
-    "swc-loader": "0.2.3",
-    "terser-webpack-plugin": "5.3.9",
+    "swc-loader": "0.2.6",
+    "terser-webpack-plugin": "5.3.10",
    "ts-essentials": "7.0.3",
    "use-context-selector": "1.4.1",
    "uuid": "9.0.1"
@@ -145,7 +145,7 @@
    "@payloadcms/eslint-config": "workspace:*",
    "@release-it/conventional-changelog": "7.0.0",
    "@types/asap": "2.0.0",
-    "@types/body-parser": "1.19.2",
+    "@types/body-parser": "1.19.5",
    "@types/body-scroll-lock": "^3.1.0",
    "@types/compression": "1.7.2",
    "@types/express": "4.17.17",
@@ -158,14 +158,14 @@
    "@types/isomorphic-fetch": "0.0.36",
    "@types/joi": "14.3.4",
    "@types/json-schema": "7.0.12",
-    "@types/jsonwebtoken": "8.5.9",
+    "@types/jsonwebtoken": "9.0.7",
    "@types/method-override": "0.0.32",
    "@types/mime": "2.0.3",
    "@types/mini-css-extract-plugin": "^1.4.3",
    "@types/minimist": "1.2.2",
    "@types/mkdirp": "1.0.2",
    "@types/node-fetch": "2.6.4",
-    "@types/nodemailer": "6.4.14",
+    "@types/nodemailer": "6.4.16",
    "@types/passport": "1.0.12",
    "@types/passport-anonymous": "1.0.3",
    "@types/passport-jwt": "3.0.9",
@@ -202,9 +202,9 @@
    "rimraf": "4.4.1",
    "sass-loader": "12.6.0",
    "serve-static": "1.15.0",
-    "swc-loader": "^0.2.3",
+    "swc-loader": "^0.2.6",
    "terser": "5.19.2",
-    "terser-webpack-plugin": "^5.3.6",
+    "terser-webpack-plugin": "^5.3.10",
    "url-loader": "4.1.1",
    "vite": "^4.4.9",
    "webpack": "^5.78.0"
--- a/packages/payload/src/versions/drafts/getQueryDraftsSort.ts
+++ b/packages/payload/src/versions/drafts/getQueryDraftsSort.ts
@@ -13,5 +13,9 @@ export const getQueryDraftsSort = (sort: string): string => {
    orderBy = sort.substring(1)
  }

+  if (orderBy === 'id') {
+    return `${direction}parent`
+  }
+
  return `${direction}version.${orderBy}`
 }
--- a/packages/plugin-cloud-storage/README.md
+++ b/packages/plugin-cloud-storage/README.md
@@ -96,11 +96,19 @@ From there, create the adapter, passing in all of its required properties:
 ```js
 import { azureBlobStorageAdapter } from '@payloadcms/plugin-cloud-storage/azure'

+// if you need to obtain credentials you may do so by following the instructions here: https://docs.microsoft.com/en-us/azure/storage/common/storage-auth-aad-app?tabs=javascript
+// or you can use the connection string directly.
+
 const adapter = azureBlobStorageAdapter({
  connectionString: process.env.AZURE_STORAGE_CONNECTION_STRING,
  containerName: process.env.AZURE_STORAGE_CONTAINER_NAME,
  allowContainerCreate: process.env.AZURE_STORAGE_ALLOW_CONTAINER_CREATE === 'true',
  baseURL: process.env.AZURE_STORAGE_ACCOUNT_BASEURL,
+  /**
+   * Optional: You may wish to obtain credentials that cannot be passed through in the connectionString connection option. In that case the connectionString will only be the URL to the storage account.
+   * Can be one of AnonymousCredential | StorageSharedKeyCredential | TokenCredential
+   **/
+  credentials: new StorageSharedKeyCredential(process.env.AZURE_STORAGE_ACCOUNT_NAME, process.env.AZURE_STORAGE_ACCOUNT_KEY),
 })

 // Now you can pass this adapter to the plugin
--- a/packages/plugin-cloud-storage/package.json
+++ b/packages/plugin-cloud-storage/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@payloadcms/plugin-cloud-storage",
  "description": "The official cloud storage plugin for Payload CMS",
-  "version": "1.1.3",
+  "version": "1.2.0",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "license": "MIT",
@@ -53,6 +53,7 @@
    "@aws-sdk/client-s3": "^3.142.0",
    "@aws-sdk/lib-storage": "^3.267.0",
    "@azure/storage-blob": "^12.11.0",
+    "@azure/core-http": "^3.0.0",
    "@google-cloud/storage": "^6.4.1",
    "@types/express": "^4.17.9",
    "@types/find-node-modules": "^2.1.2",
--- a/packages/plugin-cloud-storage/src/adapters/azure/index.ts
+++ b/packages/plugin-cloud-storage/src/adapters/azure/index.ts
@@ -1,4 +1,9 @@
-import type { ContainerClient } from '@azure/storage-blob'
+import type { TokenCredential } from '@azure/core-http'
+import type {
+  AnonymousCredential,
+  ContainerClient,
+  StorageSharedKeyCredential,
+} from '@azure/storage-blob'

 import { BlobServiceClient } from '@azure/storage-blob'

@@ -15,6 +20,7 @@ export interface Args {
  baseURL: string
  connectionString: string
  containerName: string
+  credential?: AnonymousCredential | StorageSharedKeyCredential | TokenCredential
 }

 export const azureBlobStorageAdapter = ({
@@ -22,11 +28,14 @@ export const azureBlobStorageAdapter = ({
  baseURL,
  connectionString,
  containerName,
+  credential,
 }: Args): Adapter => {
  let storageClient: ContainerClient | null = null
  const getStorageClient = () => {
    if (storageClient) return storageClient
-    const blobServiceClient = BlobServiceClient.fromConnectionString(connectionString)
+    const blobServiceClient = credential
+      ? new BlobServiceClient(connectionString, credential)
+      : BlobServiceClient.fromConnectionString(connectionString)
    return (storageClient = blobServiceClient.getContainerClient(containerName))
  }

--- a/packages/plugin-cloud/package.json
+++ b/packages/plugin-cloud/package.json
@@ -28,12 +28,12 @@
    "@aws-sdk/credential-providers": "^3.289.0",
    "@aws-sdk/lib-storage": "^3.267.0",
    "amazon-cognito-identity-js": "^6.1.2",
-    "nodemailer": "6.9.9"
+    "nodemailer": "6.9.15"
  },
  "devDependencies": {
    "@types/express": "^4.17.9",
    "@types/jest": "^29.5.1",
-    "@types/nodemailer": "6.4.14",
+    "@types/nodemailer": "6.4.16",
    "payload": "workspace:*",
    "ts-jest": "^29.1.0",
    "webpack": "^5.78.0"
--- a/packages/richtext-lexical/package.json
+++ b/packages/richtext-lexical/package.json
@@ -22,7 +22,7 @@
    "prepublishOnly": "pnpm clean && pnpm build"
  },
  "dependencies": {
-    "@faceless-ui/modal": "2.0.1",
+    "@faceless-ui/modal": "2.0.2",
    "@lexical/headless": "0.13.1",
    "@lexical/link": "0.13.1",
    "@lexical/list": "0.13.1",
@@ -39,7 +39,7 @@
    "json-schema": "^0.4.0",
    "lexical": "0.13.1",
    "lodash": "4.17.21",
-    "react-error-boundary": "4.0.12",
+    "react-error-boundary": "4.0.13",
    "react-i18next": "11.18.6",
    "ts-essentials": "7.0.3"
  },
--- a/packages/richtext-lexical/src/field/features/Link/index.ts
+++ b/packages/richtext-lexical/src/field/features/Link/index.ts
@@ -118,13 +118,14 @@ export const LinkFeature = (props: LinkFeatureProps): FeatureProvider => {
                  })

                  const rel: string = node.fields.newTab ? ' rel="noopener noreferrer"' : ''
+                  const target: string = node.fields.newTab ? ' target="_blank"' : ''

                  const href: string =
                    node.fields.linkType === 'custom'
                      ? node.fields.url
                      : (node.fields.doc?.value as string)

-                  return `<a href="${href}"${rel}>${childrenText}</a>`
+                  return `<a href="${href}"${target}${rel}>${childrenText}</a>`
                },
                nodeTypes: [LinkNode.getType()],
              } as HTMLConverter<SerializedLinkNode>,
--- a/packages/richtext-slate/package.json
+++ b/packages/richtext-slate/package.json
@@ -21,7 +21,7 @@
    "prepublishOnly": "pnpm clean && pnpm build"
  },
  "dependencies": {
-    "@faceless-ui/modal": "2.0.1",
+    "@faceless-ui/modal": "2.0.2",
    "i18next": "22.5.1",
    "is-hotkey": "0.2.0",
    "react-i18next": "11.18.6",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/templates/website/README.md
+++ b/templates/website/README.md
@@ -177,7 +177,7 @@ If you are migrating an existing site or moving content to a new URL, you can us

 ## Website

-This template includes a beautifully designed, production-ready front-end built with the [Next.js App Router](https://nextjs.org), served right alongside your Payload app in a single Express server. This makes is so that you can deploy both apps simultaneously and host them together. If you prefer a different front-end framework, this pattern works for any framework that supports a custom server. If you prefer to host your website separately from Payload, you can easily [Eject](#eject) the front-end out from this template to swap in your own, or to use it as a standalone CMS. For more details, see the official [Custom Server Example](https://github.com/payloadcms/payload/tree/main/examples/custom-server).
+This template includes a beautifully designed, production-ready front-end built with the [Next.js App Router](https://nextjs.org), served right alongside your Payload app in a single Express server. This makes it so that you can deploy both apps simultaneously and host them together. If you prefer a different front-end framework, this pattern works for any framework that supports a custom server. If you prefer to host your website separately from Payload, you can easily [Eject](#eject) the front-end out from this template to swap in your own, or to use it as a standalone CMS. For more details, see the official [Custom Server Example](https://github.com/payloadcms/payload/tree/main/examples/custom-server).

 Core features:

--- a/test/fields/int.spec.ts
+++ b/test/fields/int.spec.ts
@@ -842,6 +842,37 @@ describe('Fields', () => {

      expect(resInSecond.totalDocs).toBe(1)
    })
+
+    it('should properly query numbers with exists operator', async () => {
+      await payload.create({
+        collection: 'number-fields',
+        data: {
+          number: null,
+        },
+      })
+
+      const numbersExist = await payload.find({
+        collection: 'number-fields',
+        where: {
+          number: {
+            exists: true,
+          },
+        },
+      })
+
+      expect(numbersExist.totalDocs).toBe(4)
+
+      const numbersNotExists = await payload.find({
+        collection: 'number-fields',
+        where: {
+          number: {
+            exists: false,
+          },
+        },
+      })
+
+      expect(numbersNotExists.docs).toHaveLength(1)
+    })
  })

  if (isMongoose(payload)) {