@payloadcms/plugin-cloud-storage 1.0.15 → 1.0.17-beta.0

package/dev/src/collections/Media.ts

@@ -1,56 +1,56 @@
-/* eslint-disable no-console */
-import type { CollectionConfig, Field } from 'payload/types'
-
-const urlField: Field = {
-  name: 'url',
-  type: 'text',
-  hooks: {
-    afterRead: [
-      ({ value }) => {
-        console.log('hello from hook')
-        return value
-      },
-    ],
-  },
-}
-
-export const Media: CollectionConfig = {
-  slug: 'media',
-  upload: {
-    imageSizes: [
-      {
-        height: 400,
-        width: 400,
-        crop: 'center',
-        name: 'square',
-      },
-      {
-        width: 900,
-        height: 450,
-        crop: 'center',
-        name: 'sixteenByNineMedium',
-      },
-    ],
-  },
-  fields: [
-    {
-      name: 'alt',
-      label: 'Alt Text',
-      type: 'text',
-    },
-
-    // The following fields should be able to be merged in to default upload fields
-    urlField,
-    {
-      name: 'sizes',
-      type: 'group',
-      fields: [
-        {
-          name: 'square',
-          type: 'group',
-          fields: [urlField],
-        },
-      ],
-    },
-  ],
-}
+/* eslint-disable no-console */
+import type { CollectionConfig, Field } from 'payload/types'
+
+const urlField: Field = {
+  name: 'url',
+  type: 'text',
+  hooks: {
+    afterRead: [
+      ({ value }) => {
+        console.log('hello from hook')
+        return value
+      },
+    ],
+  },
+}
+
+export const Media: CollectionConfig = {
+  slug: 'media',
+  upload: {
+    imageSizes: [
+      {
+        height: 400,
+        width: 400,
+        crop: 'center',
+        name: 'square',
+      },
+      {
+        width: 900,
+        height: 450,
+        crop: 'center',
+        name: 'sixteenByNineMedium',
+      },
+    ],
+  },
+  fields: [
+    {
+      name: 'alt',
+      label: 'Alt Text',
+      type: 'text',
+    },
+
+    // The following fields should be able to be merged in to default upload fields
+    urlField,
+    {
+      name: 'sizes',
+      type: 'group',
+      fields: [
+        {
+          name: 'square',
+          type: 'group',
+          fields: [urlField],
+        },
+      ],
+    },
+  ],
+}

package/dev/src/collections/Users.ts

@@ -1,23 +1,23 @@
-import type { CollectionConfig } from 'payload/types'
-
-const Users: CollectionConfig = {
-  slug: 'users',
-  auth: true,
-  access: {
-    read: () => true,
-  },
-  fields: [
-    {
-      name: 'avatar',
-      type: 'upload',
-      relationTo: 'media',
-    },
-    {
-      name: 'background',
-      type: 'upload',
-      relationTo: 'media',
-    },
-  ],
-}
-
-export default Users
+import type { CollectionConfig } from 'payload/types'
+
+const Users: CollectionConfig = {
+  slug: 'users',
+  auth: true,
+  access: {
+    read: () => true,
+  },
+  fields: [
+    {
+      name: 'avatar',
+      type: 'upload',
+      relationTo: 'media',
+    },
+    {
+      name: 'background',
+      type: 'upload',
+      relationTo: 'media',
+    },
+  ],
+}
+
+export default Users

package/dev/src/mocks/fsMock.js

@@ -1 +1 @@
-module.exports = { fs: { createReadStream: () => null } }
+module.exports = { fs: { createReadStream: () => null } }

package/dev/src/mocks/promisifyMock.js

@@ -1 +1 @@
-export const promisify = () => {}
+export const promisify = () => {}

package/dev/src/payload.config.ts

@@ -1,111 +1,111 @@
-import { buildConfig } from 'payload/config'
-import path from 'path'
-import Users from './collections/Users'
-import { cloudStorage } from '../../src'
-import { s3Adapter } from '../../src/adapters/s3'
-import { gcsAdapter } from '../../src/adapters/gcs'
-import { azureBlobStorageAdapter } from '../../src/adapters/azure'
-import type { Adapter } from '../../src/types'
-import { Media } from './collections/Media'
-
-let adapter: Adapter
-let uploadOptions
-
-if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 'azure') {
-  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,
-  })
-  // uploadOptions = {
-  //   useTempFiles: true,
-  // }
-}
-
-if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 's3') {
-  // The s3 adapter supports using temp files for uploads
-  uploadOptions = {
-    useTempFiles: true,
-  }
-
-  adapter = s3Adapter({
-    config: {
-      endpoint: process.env.S3_ENDPOINT,
-      forcePathStyle: process.env.S3_FORCE_PATH_STYLE === 'true',
-      region: process.env.S3_REGION,
-      credentials: {
-        accessKeyId: process.env.S3_ACCESS_KEY_ID,
-        secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
-      },
-    },
-    bucket: process.env.S3_BUCKET,
-  })
-}
-
-if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 'gcs') {
-  adapter = gcsAdapter({
-    options: {
-      apiEndpoint: process.env.GCS_ENDPOINT,
-      projectId: process.env.GCS_PROJECT_ID,
-    },
-    bucket: process.env.GCS_BUCKET,
-  })
-}
-
-export default buildConfig({
-  serverURL: 'http://localhost:3000',
-  collections: [Media, Users],
-  upload: uploadOptions,
-  admin: {
-    // NOTE - these webpack extensions are only required
-    // for development of this plugin.
-    // No need to use these aliases within your own projects.
-    webpack: config => {
-      const newConfig = {
-        ...config,
-        resolve: {
-          ...(config.resolve || {}),
-          alias: {
-            ...(config.resolve.alias || {}),
-            react: path.resolve(__dirname, '../node_modules/react'),
-            '@azure/storage-blob': path.resolve(__dirname, '../../src/adapters/azure/mock.js'),
-            '@aws-sdk/client-s3': path.resolve(__dirname, '../../src/adapters/s3/mock.js'),
-            '@google-cloud/storage': path.resolve(__dirname, '../../src/adapters/gcs/mock.js'),
-            fs: path.resolve(__dirname, './mocks/fsMock.js'),
-          },
-        },
-      }
-      return newConfig
-    },
-  },
-  typescript: {
-    outputFile: path.resolve(__dirname, 'payload-types.ts'),
-  },
-  plugins: [
-    // @ts-expect-error
-    cloudStorage({
-      collections: {
-        media: {
-          adapter,
-        },
-      },
-    }),
-  ],
-  onInit: async payload => {
-    const users = await payload.find({
-      collection: 'users',
-      limit: 1,
-    })
-
-    if (!users.docs.length) {
-      await payload.create({
-        collection: 'users',
-        data: {
-          email: 'dev@payloadcms.com',
-          password: 'test',
-        },
-      })
-    }
-  },
-})
+import { buildConfig } from 'payload/config'
+import path from 'path'
+import Users from './collections/Users'
+import { cloudStorage } from '../../src'
+import { s3Adapter } from '../../src/adapters/s3'
+import { gcsAdapter } from '../../src/adapters/gcs'
+import { azureBlobStorageAdapter } from '../../src/adapters/azure'
+import type { Adapter } from '../../src/types'
+import { Media } from './collections/Media'
+
+let adapter: Adapter
+let uploadOptions
+
+if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 'azure') {
+  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,
+  })
+  // uploadOptions = {
+  //   useTempFiles: true,
+  // }
+}
+
+if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 's3') {
+  // The s3 adapter supports using temp files for uploads
+  uploadOptions = {
+    useTempFiles: true,
+  }
+
+  adapter = s3Adapter({
+    config: {
+      endpoint: process.env.S3_ENDPOINT,
+      forcePathStyle: process.env.S3_FORCE_PATH_STYLE === 'true',
+      region: process.env.S3_REGION,
+      credentials: {
+        accessKeyId: process.env.S3_ACCESS_KEY_ID,
+        secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
+      },
+    },
+    bucket: process.env.S3_BUCKET,
+  })
+}
+
+if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 'gcs') {
+  adapter = gcsAdapter({
+    options: {
+      apiEndpoint: process.env.GCS_ENDPOINT,
+      projectId: process.env.GCS_PROJECT_ID,
+    },
+    bucket: process.env.GCS_BUCKET,
+  })
+}
+
+export default buildConfig({
+  serverURL: 'http://localhost:3000',
+  collections: [Media, Users],
+  upload: uploadOptions,
+  admin: {
+    // NOTE - these webpack extensions are only required
+    // for development of this plugin.
+    // No need to use these aliases within your own projects.
+    webpack: config => {
+      const newConfig = {
+        ...config,
+        resolve: {
+          ...(config.resolve || {}),
+          alias: {
+            ...(config.resolve.alias || {}),
+            react: path.resolve(__dirname, '../node_modules/react'),
+            '@azure/storage-blob': path.resolve(__dirname, '../../src/adapters/azure/mock.js'),
+            '@aws-sdk/client-s3': path.resolve(__dirname, '../../src/adapters/s3/mock.js'),
+            '@google-cloud/storage': path.resolve(__dirname, '../../src/adapters/gcs/mock.js'),
+            fs: path.resolve(__dirname, './mocks/fsMock.js'),
+          },
+        },
+      }
+      return newConfig
+    },
+  },
+  typescript: {
+    outputFile: path.resolve(__dirname, 'payload-types.ts'),
+  },
+  plugins: [
+    // @ts-expect-error Conflicting types for relative package
+    cloudStorage({
+      collections: {
+        media: {
+          adapter,
+        },
+      },
+    }),
+  ],
+  onInit: async payload => {
+    const users = await payload.find({
+      collection: 'users',
+      limit: 1,
+    })
+
+    if (!users.docs.length) {
+      await payload.create({
+        collection: 'users',
+        data: {
+          email: 'dev@payloadcms.com',
+          password: 'test',
+        },
+      })
+    }
+  },
+})

package/dev/src/server.ts

@@ -1,26 +1,26 @@
-import express from 'express'
-import payload from 'payload'
-
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-require('dotenv').config()
-
-const app = express()
-
-// Redirect root to Admin panel
-app.get('/', (_, res) => {
-  res.redirect('/admin')
-})
-
-// Initialize Payload
-payload.init({
-  secret: process.env.PAYLOAD_SECRET,
-  mongoURL: process.env.MONGODB_URI,
-  express: app,
-  onInit: () => {
-    payload.logger.info(`Payload Admin URL: ${payload.getAdminURL()}`)
-  },
-})
-
-// Add your own express routes here
-
-app.listen(3000)
+import express from 'express'
+import payload from 'payload'
+
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+require('dotenv').config()
+
+const app = express()
+
+// Redirect root to Admin panel
+app.get('/', (_, res) => {
+  res.redirect('/admin')
+})
+
+// Initialize Payload
+payload.init({
+  secret: process.env.PAYLOAD_SECRET,
+  mongoURL: process.env.MONGODB_URI,
+  express: app,
+  onInit: () => {
+    payload.logger.info(`Payload Admin URL: ${payload.getAdminURL()}`)
+  },
+})
+
+// Add your own express routes here
+
+app.listen(3000)

package/dev/tsconfig.json

@@ -1,20 +1,20 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "strict": false,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "outDir": "./dist",
-    "rootDir": "../",
-    "jsx": "react",
-    "sourceMap": true
-  },
-  "ts-node": {
-    "transpileOnly": true
-  }
-}
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "strict": false,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "outDir": "./dist",
+    "rootDir": "../",
+    "jsx": "react",
+    "sourceMap": true
+  },
+  "ts-node": {
+    "transpileOnly": true
+  }
+}

package/dist/adapters/azure/fileStub.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "file-stub";
-export default _default;
+declare const _default: "file-stub";
+export default _default;

package/dist/adapters/azure/fileStub.js

@@ -1,4 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 'file-stub';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = 'file-stub';
 //# sourceMappingURL=fileStub.js.map

package/dist/adapters/azure/generateURL.d.ts

@@ -1,7 +1,7 @@
-import type { GenerateURL } from '../../types';
-interface Args {
-    containerName: string;
-    baseURL: string;
-}
-export declare const getGenerateURL: ({ containerName, baseURL }: Args) => GenerateURL;
-export {};
+import type { GenerateURL } from '../../types';
+interface Args {
+    containerName: string;
+    baseURL: string;
+}
+export declare const getGenerateURL: ({ containerName, baseURL }: Args) => GenerateURL;
+export {};

package/dist/adapters/azure/generateURL.js

@@ -1,16 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGenerateURL = void 0;
-var path_1 = __importDefault(require("path"));
-var getGenerateURL = function (_a) {
-    var containerName = _a.containerName, baseURL = _a.baseURL;
-    return function (_a) {
-        var filename = _a.filename, _b = _a.prefix, prefix = _b === void 0 ? '' : _b;
-        return "".concat(baseURL, "/").concat(containerName, "/").concat(path_1.default.posix.join(prefix, filename));
-    };
-};
-exports.getGenerateURL = getGenerateURL;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGenerateURL = void 0;
+var path_1 = __importDefault(require("path"));
+var getGenerateURL = function (_a) {
+    var containerName = _a.containerName, baseURL = _a.baseURL;
+    return function (_a) {
+        var filename = _a.filename, _b = _a.prefix, prefix = _b === void 0 ? '' : _b;
+        return "".concat(baseURL, "/").concat(containerName, "/").concat(path_1.default.posix.join(prefix, filename));
+    };
+};
+exports.getGenerateURL = getGenerateURL;
 //# sourceMappingURL=generateURL.js.map

package/dist/adapters/azure/handleDelete.d.ts

@@ -1,9 +1,9 @@
-import type { CollectionConfig } from 'payload/types';
-import type { ContainerClient } from '@azure/storage-blob';
-import type { HandleDelete } from '../../types';
-interface Args {
-    collection: CollectionConfig;
-    getStorageClient: () => ContainerClient;
-}
-export declare const getHandleDelete: ({ getStorageClient }: Args) => HandleDelete;
-export {};
+import type { CollectionConfig } from 'payload/types';
+import type { ContainerClient } from '@azure/storage-blob';
+import type { HandleDelete } from '../../types';
+interface Args {
+    collection: CollectionConfig;
+    getStorageClient: () => ContainerClient;
+}
+export declare const getHandleDelete: ({ getStorageClient }: Args) => HandleDelete;
+export {};