forked from decaporg/decap-cms
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'official/master' into feature/rollup
* official/master: update release ticker Publish feat: add cloudinary support (decaporg#1932) fix(netlify-cms-core): duplicate key warning (decaporg#1930) Update image.md (decaporg#1923) chore(netlify-cms-core): upgrade react-frame-component to 4.x (decaporg#1925) chore(netlify-cms-core): upgrade gray-matter to 4.x (decaporg#1924) feat(netlify-cms-widget-select): add support for multiple selection (decaporg#1901) # Conflicts: # packages/netlify-cms-widget-select/package.json # packages/netlify-cms/src/media-libraries.js
- Loading branch information
Showing
38 changed files
with
733 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
packages/netlify-cms-media-library-cloudinary/CHANGELOG.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| # Change Log | ||
|
|
||
| All notable changes to this project will be documented in this file. | ||
| See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. | ||
|
|
||
| # 1.1.0 (2018-12-04) | ||
|
|
||
|
|
||
| ### Features | ||
|
|
||
| * add cloudinary support ([#1932](https://github.com/netlify/netlify-cms/tree/master/packages/netlify-cms-media-library-cloudinary/issues/1932)) ([1fc2f50](https://github.com/netlify/netlify-cms/tree/master/packages/netlify-cms-media-library-cloudinary/commit/1fc2f50)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| # Docs coming soon! | ||
|
|
||
| Netlify CMS was recently converted from a single npm package to a "monorepo" of over 20 packages. | ||
| That's over 20 Readme's! We haven't created one for this package yet, but we will soon. | ||
|
|
||
| In the meantime, you can: | ||
|
|
||
| 1. Check out the [main readme](https://github.com/netlify/netlify-cms/#readme) or the [documentation | ||
| site](https://www.netlifycms.org) for more info. | ||
| 2. Reach out to the [community chat](https://gitter.im/netlify/netlifycms/) if you need help. | ||
| 3. Help out and [write the readme yourself](https://github.com/netlify/netlify-cms/edit/master/packages/netlify-cms-media-library-cloudinary/README.md)! |
34 changes: 34 additions & 0 deletions
34
packages/netlify-cms-media-library-cloudinary/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "name": "netlify-cms-media-library-cloudinary", | ||
| "description": "Cloudinary integration for Netlify CMS", | ||
| "version": "1.1.0", | ||
| "repository": "https://github.com/netlify/netlify-cms/tree/master/packages/netlify-cms-media-library-cloudinary", | ||
| "bugs": "https://github.com/netlify/netlify-cms/issues", | ||
| "main": "dist/netlify-cms-media-library-cloudinary.js", | ||
| "license": "MIT", | ||
| "keywords": [ | ||
| "netlify", | ||
| "netlify-cms", | ||
| "cloudinary", | ||
| "image", | ||
| "images", | ||
| "media", | ||
| "assets", | ||
| "files", | ||
| "uploads" | ||
| ], | ||
| "sideEffects": false, | ||
| "scripts": { | ||
| "watch": "webpack -w", | ||
| "develop": "npm run watch", | ||
| "build": "cross-env NODE_ENV=production webpack" | ||
| }, | ||
| "devDependencies": { | ||
| "cross-env": "^5.2.0", | ||
| "webpack": "^4.16.1", | ||
| "webpack-cli": "^3.1.0" | ||
| }, | ||
| "peerDependencies": { | ||
| "netlify-cms-lib-util": "^2.0.4" | ||
| } | ||
| } |
82 changes: 82 additions & 0 deletions
82
packages/netlify-cms-media-library-cloudinary/src/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| import { pick } from 'lodash'; | ||
| import { loadScript } from 'netlify-cms-lib-util'; | ||
|
|
||
| const defaultOptions = { | ||
| use_secure_url: true, | ||
| use_transformations: true, | ||
| output_filename_only: false, | ||
| }; | ||
| /** | ||
| * This configuration hash cannot be overriden, as the values here are required | ||
| * for the integration to work properly. | ||
| */ | ||
| const enforcedConfig = { | ||
| button_class: undefined, | ||
| inline_container: undefined, | ||
| insert_transformation: false, | ||
| z_index: '99999', | ||
| }; | ||
|
|
||
| const defaultConfig = { | ||
| multiple: false, | ||
| }; | ||
|
|
||
| function getAssetUrl(asset, { use_secure_url, use_transformations, output_filename_only }) { | ||
| /** | ||
| * Allow output of the file name only, in which case the rest of the url (including) | ||
| * transformations) can be handled by the static site generator. | ||
| */ | ||
| if (output_filename_only) { | ||
| return `${asset.public_id}.${asset.format}`; | ||
| } | ||
|
|
||
| /** | ||
| * Get url from `derived` property if it exists. This property contains the | ||
| * transformed version of image if transformations have been applied. | ||
| */ | ||
| const urlObject = asset.derived && use_transformations ? asset.derived[0] : asset; | ||
|
|
||
| /** | ||
| * Retrieve the `https` variant of the image url if the `useSecureUrl` option | ||
| * is set to `true` (this is the default setting). | ||
| */ | ||
| const urlKey = use_secure_url ? 'secure_url' : 'url'; | ||
|
|
||
| return urlObject[urlKey]; | ||
| } | ||
|
|
||
| async function init({ options, handleInsert }) { | ||
| const { config: providedConfig = {}, ...integrationOptions } = options; | ||
| const resolvedOptions = { ...defaultOptions, ...integrationOptions }; | ||
| const cloudinaryConfig = { ...defaultConfig, ...providedConfig, ...enforcedConfig }; | ||
| const cloudinaryBehaviorConfigKeys = ['default_transformations', 'max_files', 'multiple']; | ||
| const cloudinaryBehaviorConfig = pick(cloudinaryConfig, cloudinaryBehaviorConfigKeys); | ||
|
|
||
| await loadScript('https://media-library.cloudinary.com/global/all.js'); | ||
|
|
||
| const insertHandler = data => { | ||
| const assets = data.assets.map(asset => getAssetUrl(asset, resolvedOptions)); | ||
| handleInsert(cloudinaryConfig.multiple ? assets : assets[0]); | ||
| }; | ||
|
|
||
| const mediaLibrary = window.cloudinary.createMediaLibrary(cloudinaryConfig, { insertHandler }); | ||
|
|
||
| return { | ||
| show: ({ config: instanceConfig = {}, allowMultiple }) => { | ||
| /** | ||
| * Ensure multiple selection is not available if the field is configured | ||
| * to disallow it. | ||
| */ | ||
| if (allowMultiple === false) { | ||
| instanceConfig.multiple = false; | ||
| } | ||
| return mediaLibrary.show({ config: { ...cloudinaryBehaviorConfig, instanceConfig } }); | ||
| }, | ||
| hide: () => mediaLibrary.hide(), | ||
| enableStandalone: () => true, | ||
| }; | ||
| } | ||
|
|
||
| const cloudinaryMediaLibrary = { name: 'cloudinary', init }; | ||
|
|
||
| export default cloudinaryMediaLibrary; |
3 changes: 3 additions & 0 deletions
3
packages/netlify-cms-media-library-cloudinary/webpack.config.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| const { getConfig } = require('../../scripts/webpack.js'); | ||
|
|
||
| module.exports = getConfig(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.