diff --git a/LICENSE b/LICENSE index f1cc904..da9bfb5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,37 @@ -MIT License - -Copyright (c) 2024 Hyperse - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -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 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 -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +# License +Copyright (C) Hyperse (Yuantai Information Technology (Shanghai) Co., Ltd) + +This software is available under two different licenses: +* GNU General Public License version 3 (GPLv3) as Hyperse Community Edition +* Hyperse Commercial License (HCL) + +The default Hyperse license, without a valid Hyperse Commercial License agreement, is the Open-Source GPLv3 license. + +## GNU General Public License version 3 (GPLv3) + +If you decide to choose the GPLv3 license, you must comply with the following terms: + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . + +## Hyperse Commercial License (HCL) + +Alternatively, commercial and supported versions of the program - also known as +Commercial Distributions - must be used in accordance with the terms and conditions +contained in a separate written agreement between you and Hyperse GmbH. +For more information about the Hyperse Commercial License (HCL) please contact hi@hyperse.net. + +Please see also: + +- [Licensing FAQ - license-faq.md](https://github.com/hyperse-io/.github/blob/main/license/license-faq.md) +- [GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - gpl-3.0.txt](https://github.com/hyperse-io/.github/blob/main/license/gpl-3.0.txt) \ No newline at end of file diff --git a/README.md b/README.md index 7f7ca0e..0986e25 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Licence - + Discord diff --git a/examples/next-example/package.json b/examples/next-example/package.json index 3aff65c..b44917c 100644 --- a/examples/next-example/package.json +++ b/examples/next-example/package.json @@ -4,7 +4,7 @@ "private": true, "type": "module", "scripts": { - "dev": "next dev -p", + "dev": "next dev", "build": "next build", "start": "next start", "lint": "eslint .", @@ -33,7 +33,7 @@ "react": "18.2.0", "react-dom": "18.2.0", "tailwindcss": "3.3.3", - "typescript": "5.2.2" + "typescript": "5.5.4" }, "devDependencies": { "@hyperse/eslint-config-hyperse": "1.1.3", diff --git a/website/copyright.config.ts b/website/copyright.config.ts index ef09670..9c91c28 100644 --- a/website/copyright.config.ts +++ b/website/copyright.config.ts @@ -38,7 +38,7 @@ export const copyrightConfig = `
diff --git a/website/docs/community/contributing.md b/website/docs/community/contributing.md index 5251f1a..783ac86 100644 --- a/website/docs/community/contributing.md +++ b/website/docs/community/contributing.md @@ -89,16 +89,7 @@ Add any other context or screenshots about the feature request here. Contributing to projects through a pull request (PR) is a valuable way to improve existing documentation or code. This guide will walk you through the process step by step, ensuring clarity and ease of understanding, especially for those new to GitHub and git operations. -For complex operations, you can also check the [closed pull requests](https://github.com/hyperse-io/track/pulls?q=is%3Apr+is%3Aclosed) for grammar reference. For example, - -- [Added Ecosystem Page + Video](https://github.com/hyperse-io/track/pull/392) shows how to add an article with video reference. -- [feat: template example](https://github.com/hyperse-io/track/pull/410) shows how to make use of mdx's feature to create similar pages using template. - -:::note - -This process does not apply to [TRANSLATIONS](#provide-translation). - -::: +For complex operations, you can also check the [closed pull requests](https://github.com/hyperse-io/track/pulls?q=is%3Apr+is%3Aclosed) for grammar reference. ### Local Development for Substantial Changes diff --git a/website/docs/faq.md b/website/docs/faq.md index 525e937..32fa856 100644 --- a/website/docs/faq.md +++ b/website/docs/faq.md @@ -1 +1,35 @@ # FAQ's + +
+ Is there any plan for Track to support CommonJS (CJS)? + +Regardless of cjs for the time being. Track is a library based on esm implementation, so that developers do not have a historical burden in the use stage and avoid compatibility problems in the upgrade process + +
+ +
+ What are the key changes in Track’s new licensing model? + +Track has transitioned to a new licensing model, which impacts how the software can be used, particularly in commercial settings. The new license aims to balance the needs of open-source community use with the commercial sustainability of the project. + +This change includes specifics on usage rights, redistribution, and potential costs for commercial entities. More information please see [LICENSE](https://github.com/hyperse-io/track/blob/main/LICENSE) + +
+ +
+ Do I need to pay for Track now? + +Usually you can use the open source version, This version is for long-term maintenance, which is free of charge. + +However we also provide some highly packaged plugins to facilitate rapid business integration, If you use these plug-ins. A small fee is required. + +
+ +
+ What is Hyperse? + +Hyperse is an open source full stack development suites, front end, architecture, tech solutions, built with TypeScript, GraphQL and Node.js + +More information please see [Hyperse](https://www.hyperse.net/) + +
diff --git a/website/docusaurus.config.ts b/website/docusaurus.config.ts index c2b9cf7..d27cb2f 100644 --- a/website/docusaurus.config.ts +++ b/website/docusaurus.config.ts @@ -80,7 +80,7 @@ const config: Config = { position: 'right', }, { - href: 'https://discord.com/invite/tj3ahjXXzM', + href: 'https://www.hyperse.net/community', label: 'Discord', position: 'right', }, @@ -115,7 +115,7 @@ const config: Config = { items: [ { label: 'Discord', - href: 'https://discord.com/invite/tj3ahjXXzM', + href: 'https://www.hyperse.net/community', }, { label: 'Twitter', diff --git a/website/sidebars.ts b/website/sidebars.ts index 5dc1f32..2547064 100644 --- a/website/sidebars.ts +++ b/website/sidebars.ts @@ -108,6 +108,11 @@ const sidebars: SidebarsConfig = { }, ], }, + { + type: 'link', + label: 'LICENSE', + href: 'https://github.com/hyperse-io/track/blob/main/LICENSE', + }, { type: 'doc', id: 'faq', diff --git a/yarn.lock b/yarn.lock index 4d81688..d14dc96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3287,7 +3287,7 @@ __metadata: react: "npm:18.2.0" react-dom: "npm:18.2.0" tailwindcss: "npm:3.3.3" - typescript: "npm:5.2.2" + typescript: "npm:5.5.4" languageName: unknown linkType: soft @@ -17911,16 +17911,6 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.2.2": - version: 5.2.2 - resolution: "typescript@npm:5.2.2" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10/d65e50eb849bd21ff8677e5b9447f9c6e74777e346afd67754934264dcbf4bd59e7d2473f6062d9a015d66bd573311166357e3eb07fea0b52859cf9bb2b58555 - languageName: node - linkType: hard - "typescript@npm:5.5.4, typescript@npm:^5.5.4": version: 5.5.4 resolution: "typescript@npm:5.5.4" @@ -17931,16 +17921,6 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.2.2#optional!builtin": - version: 5.2.2 - resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin::version=5.2.2&hash=f3b441" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10/f79cc2ba802c94c2b78dbb00d767a10adb67368ae764709737dc277273ec148aa4558033a03ce901406b35fddf4eac46dabc94a1e1d12d2587e2b9cfe5707b4a - languageName: node - linkType: hard - "typescript@patch:typescript@npm%3A5.5.4#optional!builtin, typescript@patch:typescript@npm%3A^5.5.4#optional!builtin": version: 5.5.4 resolution: "typescript@patch:typescript@npm%3A5.5.4#optional!builtin::version=5.5.4&hash=379a07"