From a3c2898ac4d210b2eed6b4e91fa5d7c2a8021d3e Mon Sep 17 00:00:00 2001 From: Tim Layton Date: Wed, 24 Oct 2018 13:27:33 -0700 Subject: [PATCH] Update license (#2489) * update license * Update package.json license per npm docs Co-Authored-By: tmlayton --- LICENSE.md | 10 +++++++++- README.md | 4 ++-- UNRELEASED.md | 4 ++++ package.json | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 630de859359..273a76b4819 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2017-present Shopify +Copyright (c) 2017-present Shopify Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -10,6 +10,14 @@ furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +The rights granted above may only be exercised to develop and distribute +applications that integrate or interoperate with Shopify software or services, +and in the case of external, stand-alone applications that do not embed +directly inside Shopify, the rights granted above may only be exercised to +develop and distribute applications that are dissimilar and visually distinct +from Shopify products and services (including the internal administration page +of a Shopify merchant store), as determined by Shopify in its sole discretion. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/README.md b/README.md index 69c8e216493..c62cac25bf9 100644 --- a/README.md +++ b/README.md @@ -156,5 +156,5 @@ Pull requests are welcome. See the [contribution guidelines](https://github.com/ ## Licenses -- Source code is licensed under [MIT](https://opensource.org/licenses/MIT) -- All icons and images are licensed under [Creative Commons Attribution-NoDerivatives 4.0](http://creativecommons.org/licenses/by-nd/4.0/) +- Source code is under a [custom license](https://github.com/Shopify/polaris-react/blob/master/LICENSE.md) based on MIT. The license restricts Polaris usage to applications that integrate or interoperate with Shopify software or services, with additional restrictions for external, stand-alone applications. +- All icons and images are licensed under the [Polaris Design Guidelines License Agreement](https://polaris.shopify.com/legal/license) diff --git a/UNRELEASED.md b/UNRELEASED.md index 148262144c8..1adc034ef46 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -78,6 +78,10 @@ The autocomplete component is an input field that provides selectable suggestion - Added new `resourceType`, `initialQuery`, and `showVariants` props to `ResourcePicker` which aligns with the Shopify App Bridge API - Added Shopify App Bridge support to new components `Toast` and `Loading` +#### License + +- Updated the license from MIT to a custom license based on MIT. The new license restricts Polaris usage to applications that integrate or interoperate with Shopify software or services, with additional restrictions for external, stand-alone applications. + ### Documentation - Updated banner guidelines to make it clearer when success banners should be used vs success toasts. ([#2046](https://github.com/Shopify/polaris-react/pull/2046)) diff --git a/package.json b/package.json index 5c3c7be12cf..d3f36b5e5e1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Shopify’s product component library", "version": "3.0.0-rc.3", "private": false, - "license": "MIT", + "license": "SEE LICENSE IN LICENSE.md", "author": "Shopify ", "homepage": "https://github.com/Shopify/polaris-react#readme", "repository": "https://github.com/Shopify/polaris-react",