From 2f1d1d9f0d81ca34d350ae4f5da8ba5fbaf23581 Mon Sep 17 00:00:00 2001 From: Danya H Date: Wed, 30 Oct 2024 16:59:33 +0000 Subject: [PATCH] hotfix - licenses - package.json consistency - links bump --- license.md => LICENSE | 0 browser/LICENSE | 15 +++++++ browser/package.json | 71 +++++++++++++++++++-------------- browser/readme.md | 4 +- cli/LICENSE | 21 ++++++++++ cli/package.json | 25 +++++++----- client/LICENSE | 15 +++++++ client/package.json | 24 +++++++----- client/readme.md | 2 +- package.json | 18 ++++++++- rpc/package.json | 82 ++++++++++++++++++++------------------- rpc/readme.md | 6 +-- server/LICENSE | 15 +++++++ server/package.json | 24 +++++++----- server/readme.md | 2 +- shared-types/LICENSE | 13 +++++++ shared-types/package.json | 22 +++++++++-- shared-types/readme.md | 2 +- 18 files changed, 251 insertions(+), 110 deletions(-) rename license.md => LICENSE (100%) create mode 100644 browser/LICENSE create mode 100644 cli/LICENSE create mode 100644 client/LICENSE create mode 100644 server/LICENSE create mode 100644 shared-types/LICENSE diff --git a/license.md b/LICENSE similarity index 100% rename from license.md rename to LICENSE diff --git a/browser/LICENSE b/browser/LICENSE new file mode 100644 index 0000000..431db9d --- /dev/null +++ b/browser/LICENSE @@ -0,0 +1,15 @@ +Custom Attribution-NoDerivs Software License + +Copyright (c) 2024 Entity Seven Group + +This license allows you to use, copy, and distribute the RageFW (the "Software"), including for commercial purposes, provided that the following conditions are met: + +1. **Attribution:** You must give appropriate credit to the original author of the Software, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. + +2. **No Derivative Works:** You may not modify, transform, or build upon the Software. + +3. **Usage and Commercial Use:** You are allowed to use, sell, and gain income from projects that utilize the Software, as long as you comply with the terms of this license. + +4. **No Additional Restrictions:** You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. + +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. diff --git a/browser/package.json b/browser/package.json index e734040..5869e84 100644 --- a/browser/package.json +++ b/browser/package.json @@ -1,32 +1,45 @@ { - "name": "@entityseven/rage-fw-browser", - "version": "0.2.0", - "main": "dist/index.js", - "types": "dist/src/index.d.ts", - "files": [ - "dist/**/*", - "readme.md" - ], - "scripts": { - "build": "tsup" + "name": "@entityseven/rage-fw-browser", + "version": "0.2.0", + "main": "dist/index.js", + "types": "dist/src/index.d.ts", + "files": [ + "dist/**/*", + "readme.md", + "LICENSE" + ], + "scripts": { + "build": "tsup" + }, + "dependencies": { + "@entityseven/rage-fw-rpc": "0.2.5" + }, + "peerDependencies": { + "@entityseven/rage-fw-shared-types": "0.2.0", + "@ragempcommunity/types-cef": "^2.1.8" + }, + "description": "Package used on a browser-side of your Rage:MP Server", + "keywords": [ + "ragefw", + "rage-fw", + "ragemp", + "rage:mp", + "rage", + "gta5" + ], + "author": "Entity Seven Group", + "contributors": [ + { + "name": "Danya H", + "email": "dev.rilaxik@gmail.com", + "url": "https://github.com/rilaxik/" }, - "dependencies": { - "@entityseven/rage-fw-rpc": "latest" - }, - "peerDependencies": { - "@entityseven/rage-fw-shared-types": "workspace:^", - "@ragempcommunity/types-cef": "^2.1.8" - }, - "description": "RageFW CEF side", - "keywords": [], - "author": "SashaGoncharov19", - "contributors": [ - { - "name": "rilaxik", - "email": "dev.rilaxik@gmail.com", - "url": "https://github.com/rilaxik" - } - ], - "license": "MIT", - "gitHead": "ffd542c1deddb3033e16e0dae7557313ae09b05f" + { + "name": "Oleksandr Honcharov", + "email": "0976053529@ukr.net", + "url": "https://github.com/SashaGoncharov19/" + } + ], + "license": "Custom-Attribution-NoDerivs", + "gitHead": "ffd542c1deddb3033e16e0dae7557313ae09b05f" } diff --git a/browser/readme.md b/browser/readme.md index 6b33d7e..7efd787 100644 --- a/browser/readme.md +++ b/browser/readme.md @@ -1,2 +1,2 @@ -# RageFW CEF -[Read docs for details](https://git.entityseven.com/entityseven/rage-framework/wiki/Docs) \ No newline at end of file +# RageFW Browser +[Read docs for details](https://git.entityseven.com/entityseven/rage-framework/wiki) \ No newline at end of file diff --git a/cli/LICENSE b/cli/LICENSE new file mode 100644 index 0000000..cfc9628 --- /dev/null +++ b/cli/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 Entity Seven Group + +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. diff --git a/cli/package.json b/cli/package.json index 513c245..d701fe8 100644 --- a/cli/package.json +++ b/cli/package.json @@ -5,15 +5,16 @@ "rage-fw": "dist/index.js" }, "main": "dist/index.js", + "files": [ + "dist/**/*", + "readme.md", + "LICENSE" + ], "scripts": { "watch": "tsc -w", "build": "tsup", "start": "npx ./dist create" }, - "files": [ - "dist/**/*", - "readme.md" - ], "dependencies": { "@inquirer/prompts": "^5.0.5", "ky": "^1.7.2", @@ -26,11 +27,15 @@ "prettier": "^3.3.2", "typescript": "^5.4.5" }, - "description": "CLI to scaffold a template project for RageFW", - "keywords": [], - "author": "rilaxik", - "contributors": [{ - "name": "SashaGoncharov19" - }], + "description": "CLI to scaffold a preview for Rage-FW", + "keywords": ["create-rage-fw","ragefw-cli", "ragefw", "rage-fw", "ragemp", "rage:mp", "rage", "gta5"], + "author": "Entity Seven Group", + "contributors": [ + { + "name": "Danya H", + "email": "dev.rilaxik@gmail.com", + "url": "https://github.com/rilaxik/" + } + ], "license": "MIT" } diff --git a/client/LICENSE b/client/LICENSE new file mode 100644 index 0000000..431db9d --- /dev/null +++ b/client/LICENSE @@ -0,0 +1,15 @@ +Custom Attribution-NoDerivs Software License + +Copyright (c) 2024 Entity Seven Group + +This license allows you to use, copy, and distribute the RageFW (the "Software"), including for commercial purposes, provided that the following conditions are met: + +1. **Attribution:** You must give appropriate credit to the original author of the Software, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. + +2. **No Derivative Works:** You may not modify, transform, or build upon the Software. + +3. **Usage and Commercial Use:** You are allowed to use, sell, and gain income from projects that utilize the Software, as long as you comply with the terms of this license. + +4. **No Additional Restrictions:** You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. + +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. diff --git a/client/package.json b/client/package.json index a1fc592..d6ab5cc 100644 --- a/client/package.json +++ b/client/package.json @@ -5,28 +5,34 @@ "types": "dist/src/index.d.ts", "files": [ "dist/**/*", - "readme.md" + "readme.md", + "LICENSE" ], "scripts": { "build": "tsup" }, "dependencies": { - "@entityseven/rage-fw-rpc": "latest" + "@entityseven/rage-fw-rpc": "0.2.5" }, "peerDependencies": { - "@entityseven/rage-fw-shared-types": "workspace:^", + "@entityseven/rage-fw-shared-types": "0.2.0", "@ragempcommunity/types-client": "^2.1.8" }, - "description": "RageFW Client side", - "keywords": [], - "author": "SashaGoncharov19", + "description": "Package used on a client-side of your Rage:MP Server", + "keywords": ["rage-fw-client", "ragefw", "rage-fw", "ragemp", "rage:mp", "rage", "gta5"], + "author": "Entity Seven Group", "contributors": [ { - "name": "rilaxik", + "name": "Danya H", "email": "dev.rilaxik@gmail.com", - "url": "https://github.com/rilaxik" + "url": "https://github.com/rilaxik/" + }, + { + "name": "Oleksandr Honcharov", + "email": "0976053529@ukr.net", + "url": "https://github.com/SashaGoncharov19/" } ], - "license": "MIT", + "license": "Custom-Attribution-NoDerivs", "gitHead": "ffd542c1deddb3033e16e0dae7557313ae09b05f" } diff --git a/client/readme.md b/client/readme.md index 0b76af4..5bc6325 100644 --- a/client/readme.md +++ b/client/readme.md @@ -1,2 +1,2 @@ # RageFW Client -[Read docs for details](https://git.entityseven.com/entityseven/rage-framework/wiki/Docs) \ No newline at end of file +[Read docs for details](https://git.entityseven.com/entityseven/rage-framework/wiki) \ No newline at end of file diff --git a/package.json b/package.json index cc3b99f..d454239 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,4 @@ { - "private": true, "scripts": { "publish": "lerna publish --force-publish", "build": "lerna run build", @@ -26,5 +25,20 @@ "typescript": "^5.4.5", "winston": "^3.13.0" }, - "type": "module" + "private": true, + "type": "module", + "license": "SEE INDIVIDUALLY FOR EACH PACKAGE", + "author": "Entity Seven Group", + "contributors": [ + { + "name": "Danya H", + "email": "dev.rilaxik@gmail.com", + "url": "https://github.com/rilaxik/" + }, + { + "name": "Oleksandr Honcharov", + "email": "0976053529@ukr.net", + "url": "https://github.com/SashaGoncharov19/" + } + ] } diff --git a/rpc/package.json b/rpc/package.json index 5850e57..3c6e0ba 100644 --- a/rpc/package.json +++ b/rpc/package.json @@ -1,42 +1,44 @@ { - "name": "@entityseven/rage-fw-rpc", - "description": "Rage FW RPC", - "version": "0.2.5", - "scripts": { - "build": "tsup", - "start": "npx ./dist create" - }, - "files": [ - "dist/**/*" - ], - "devDependencies": { - "@microsoft/api-extractor": "^7.47.9", - "prettier": "^3.3.2", - "tsup": "^8.3.0" - }, - "peerDependencies": { - "typescript": "^5" - }, - "keywords": [ - "ragemp", - "rage", - "rpc", - "rage-rpc", - "ragerpc" - ], - "main": "dist/index.js", - "types": "dist/src/index.d.ts", - "author": { - "name": "rilaxik", - "email": "dev.rilaxik@gmail.com", - "url": "https://github.com/rilaxik" - }, - "contributors": [ - { - "name": "SashaGoncharov19", - "url": "https://github.com/SashaGoncharov19" - } - ], - "license": "MIT", - "gitHead": "04eb7240735c4a0e4855ebabbe8d5b326819fa76" + "name": "@entityseven/rage-fw-rpc", + "version": "0.2.5", + "main": "dist/index.js", + "types": "dist/src/index.d.ts", + "scripts": { + "build": "tsup", + "start": "npx ./dist create" + }, + "files": [ + "dist/**/*", + "readme.md", + "LICENSE" + ], + "devDependencies": { + "@microsoft/api-extractor": "^7.47.9", + "prettier": "^3.3.2", + "tsup": "^8.3.0" + }, + "peerDependencies": { + "typescript": "^5" + }, + "description": "Rage-FW RPC (Remote procedure caller) for Rage:MP", + "keywords": [ + "ragefw", + "rage-fw", + "ragemp", + "rage", + "rpc", + "rage-rpc", + "ragerpc", + "gta5" + ], + "author": "Entity Seven Group", + "contributors": [ + { + "name": "Danya H", + "email": "dev.rilaxik@gmail.com", + "url": "https://github.com/rilaxik/" + } + ], + "license": "MIT", + "gitHead": "04eb7240735c4a0e4855ebabbe8d5b326819fa76" } diff --git a/rpc/readme.md b/rpc/readme.md index d6960be..c627baa 100644 --- a/rpc/readme.md +++ b/rpc/readme.md @@ -3,13 +3,13 @@ is an all-in package with asynchronous RPC implementation for RageMP servers in # Installation ``` shell -npm i rage-fw-rpc +npm i @entityseven/rage-fw-rpc ``` ```shell -pnpm i rage-fw-rpc +pnpm i @entityseven/rage-fw-rpc ``` ```shell -yarn add rage-fw-rpc +yarn add @entityseven/rage-fw-rpc ``` Import installed package and initialize rpc: diff --git a/server/LICENSE b/server/LICENSE new file mode 100644 index 0000000..431db9d --- /dev/null +++ b/server/LICENSE @@ -0,0 +1,15 @@ +Custom Attribution-NoDerivs Software License + +Copyright (c) 2024 Entity Seven Group + +This license allows you to use, copy, and distribute the RageFW (the "Software"), including for commercial purposes, provided that the following conditions are met: + +1. **Attribution:** You must give appropriate credit to the original author of the Software, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. + +2. **No Derivative Works:** You may not modify, transform, or build upon the Software. + +3. **Usage and Commercial Use:** You are allowed to use, sell, and gain income from projects that utilize the Software, as long as you comply with the terms of this license. + +4. **No Additional Restrictions:** You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. + +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. diff --git a/server/package.json b/server/package.json index 7adee13..965c904 100644 --- a/server/package.json +++ b/server/package.json @@ -5,28 +5,34 @@ "types": "dist/src/index.d.ts", "files": [ "dist/**/*", - "readme.md" + "readme.md", + "LICENSE" ], "scripts": { "build": "tsup" }, "dependencies": { - "@entityseven/rage-fw-rpc": "latest" + "@entityseven/rage-fw-rpc": "0.2.5" }, "peerDependencies": { - "@entityseven/rage-fw-shared-types": "workspace:^", + "@entityseven/rage-fw-shared-types": "0.2.0", "@ragempcommunity/types-server": "^2.1.8" }, - "description": "RageFW Server side", - "keywords": [], - "author": "SashaGoncharov19", + "description": "Package used on a server-side of your Rage:MP Server", + "keywords": ["rage-fw-server", "ragefw", "rage-fw", "ragemp", "rage:mp", "rage", "gta5"], + "author": "Entity Seven Group", "contributors": [ { - "name": "rilaxik", + "name": "Danya H", "email": "dev.rilaxik@gmail.com", - "url": "https://github.com/rilaxik" + "url": "https://github.com/rilaxik/" + }, + { + "name": "Oleksandr Honcharov", + "email": "0976053529@ukr.net", + "url": "https://github.com/SashaGoncharov19/" } ], - "license": "MIT", + "license": "Custom-Attribution-NoDerivs", "gitHead": "ffd542c1deddb3033e16e0dae7557313ae09b05f" } diff --git a/server/readme.md b/server/readme.md index 66f12cb..4a3bb22 100644 --- a/server/readme.md +++ b/server/readme.md @@ -1,2 +1,2 @@ # RageFW Server -[Read docs for details](https://git.entityseven.com/entityseven/rage-framework/wiki/Docs) \ No newline at end of file +[Read docs for details](https://git.entityseven.com/entityseven/rage-framework/wiki) \ No newline at end of file diff --git a/shared-types/LICENSE b/shared-types/LICENSE new file mode 100644 index 0000000..8aca84b --- /dev/null +++ b/shared-types/LICENSE @@ -0,0 +1,13 @@ +# Custom Attribution-NoDerivs Software License + +This license allows you to use, copy, and distribute the RageFW (the "Software"), including for commercial purposes, provided that the following conditions are met: + +1. **Attribution:** You must give appropriate credit to the original author of the Software, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. + +2. **No Derivative Works:** You may not modify, transform, or build upon the Software. + +3. **Usage and Commercial Use:** You are allowed to use, sell, and gain income from projects that utilize the Software, as long as you comply with the terms of this license. + +4. **No Additional Restrictions:** You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. + +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. diff --git a/shared-types/package.json b/shared-types/package.json index 88e0d0b..c4ee135 100644 --- a/shared-types/package.json +++ b/shared-types/package.json @@ -3,10 +3,26 @@ "version": "0.2.0", "types": "types/types/index.d.ts", "files": [ - "types/**/*" + "types/**/*", + "readme.md", + "LICENSE" ], - "author": "SashaGoncharov19", - "license": "MIT", + "description": "Package used among all environments of your Rage-FW based server", + "keywords": ["rage-fw-shared-types", "rage-fw-shared","ragefw", "rage-fw", "ragemp", "rage:mp", "rage", "gta5"], "type": "module", + "author": "Entity Seven Group", + "contributors": [ + { + "name": "Danya H", + "email": "dev.rilaxik@gmail.com", + "url": "https://github.com/rilaxik/" + }, + { + "name": "Oleksandr Honcharov", + "email": "0976053529@ukr.net", + "url": "https://github.com/SashaGoncharov19/" + } + ], + "license": "Custom-Attribution-NoDerivs", "gitHead": "ffd542c1deddb3033e16e0dae7557313ae09b05f" } diff --git a/shared-types/readme.md b/shared-types/readme.md index 44c7ed5..34c0718 100644 --- a/shared-types/readme.md +++ b/shared-types/readme.md @@ -1,2 +1,2 @@ # RageFW Shared types -[Read docs for details](https://git.entityseven.com/entityseven/rage-framework/wiki/Docs) \ No newline at end of file +[Read docs for details](https://git.entityseven.com/entityseven/rage-framework/wiki) \ No newline at end of file