Skip to content

Commit 6b60c47

Browse files
authored
Merge pull request #26 from tclxshunquan-wang/feat/docs
refactor: update licensing structure and enhance website documentation
2 parents 2ca0a3d + 6e9dc9d commit 6b60c47

File tree

112 files changed

+2690
-6977
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+2690
-6977
lines changed

.github/workflows/gh-pages.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
contents: write
1717
concurrency:
1818
group: ${{ github.workflow }}-${{ github.ref }}
19-
defaults:
20-
run:
21-
working-directory: website
19+
# defaults:
20+
# run:
21+
# working-directory: website
2222
strategy:
2323
matrix:
2424
node-version: [20.x]
@@ -32,13 +32,13 @@ jobs:
3232
- name: 📥 Install Dependencies
3333
run: yarn --frozen-lockfile
3434

35-
- name: Unit tests
35+
- name: Build packages
3636
run: |
37-
yarn test
37+
yarn g:build
3838
39-
- name: Build
39+
- name: Build website
4040
run: |
41-
yarn build:ghpage
41+
yarn g:build-website
4242
4343
- name: Deploy
4444
uses: peaceiris/actions-gh-pages@v4

LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

LICENSE.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# License
2+
3+
Copyright (C) Hyperse (Yuantai Information Technology (Shanghai) Co., Ltd)
4+
5+
This software is available under two different licenses:
6+
7+
- GNU General Public License version 3 (GPLv3) as Hyperse Community Edition
8+
- Hyperse Commercial License (HCL)
9+
10+
The default Hyperse license, without a valid Hyperse Commercial License agreement, is the Open-Source GPLv3 license.
11+
12+
## GNU General Public License version 3 (GPLv3)
13+
14+
If you decide to choose the GPLv3 license, you must comply with the following terms:
15+
16+
This program is free software: you can redistribute it and/or modify
17+
it under the terms of the GNU General Public License as published by
18+
the Free Software Foundation, either version 3 of the License, or
19+
(at your option) any later version.
20+
21+
This program is distributed in the hope that it will be useful,
22+
but WITHOUT ANY WARRANTY; without even the implied warranty of
23+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24+
GNU General Public License for more details.
25+
26+
You should have received a copy of the GNU General Public License
27+
along with this program. If not, see <http://www.gnu.org/licenses/>.
28+
29+
## Hyperse Commercial License (HCL)
30+
31+
Alternatively, commercial and supported versions of the program - also known as
32+
Commercial Distributions - must be used in accordance with the terms and conditions
33+
contained in a separate written agreement between you and (Hyperse Co., Ltd)
34+
For more information about the Hyperse Commercial License (HCL) please contact hi@hyperse.net.
35+
36+
For more details about licensing, please [visit here](https://raw.githubusercontent.com/hyperse-io/.github/refs/heads/main/LICENSE.md).

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<a aria-label="Top language" href="https://github.com/hyperse-io/logger/search?l=typescript">
1212
<img alt="GitHub top language" src="https://img.shields.io/github/languages/top/hyperse-io/logger?style=flat-square&labelColor=000&color=blue">
1313
</a>
14-
<a aria-label="Licence" href="https://github.com/hyperse-io/logger/blob/main/LICENSE">
14+
<a aria-label="Licence" href="https://github.com/hyperse-io/logger/blob/main/LICENSE.md">
1515
<img alt="Licence" src="https://img.shields.io/github/license/hyperse-io/logger?style=flat-square&labelColor=000000" />
1616
</a>
1717

@@ -332,4 +332,4 @@ Hyperse Logger is designed for high-performance applications:
332332

333333
## License
334334

335-
This project is licensed under the [MIT LICENSE](./LICENSE).
335+
This project is licensed under the [MIT LICENSE](./LICENSE.md).

constraints.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
% reference for other constraints: https://github.com/babel/babel/blob/main/constraints.pro
44

55
% Enforces the license in all public workspaces while removing it from private workspaces
6-
gen_enforced_field(WorkspaceCwd, 'license', 'SEE LICENSE IN FILE \'LICENSE\'') :-
6+
gen_enforced_field(WorkspaceCwd, 'license', 'SEE LICENSE IN FILE \'LICENSE.md\'') :-
77
\+ workspace_field(WorkspaceCwd, 'private', true).
88

99
% Enforces that a dependency doesn't appear in both `dependencies` and `devDependencies`

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"url": "https://github.com/hyperse-io"
2424
},
2525
"type": "module",
26-
"license": "SEE LICENSE IN FILE 'LICENSE'",
26+
"license": "SEE LICENSE IN FILE 'LICENSE.md'",
2727
"workspaces": [
2828
"website",
2929
"packages/*",
@@ -36,6 +36,7 @@
3636
"?build-release": "When https://github.com/atlassian/changesets/issues/432 has a solution we can remove this trick",
3737
"g:build-release": "yarn workspaces foreach -At run build-release",
3838
"g:build-local": "yarn workspaces foreach -At run build",
39+
"g:build-website": "yarn workspace @hyperse/logger-website run build:ghpage",
3940
"g:test": "yarn workspaces foreach -At run test",
4041
"g:test-unit": "yarn workspaces foreach --all -ptv run test-unit",
4142
"g:test-e2e": "yarn workspaces foreach -At run test-e2e",
@@ -65,7 +66,7 @@
6566
"@hyperse/ts-node": "^1.0.3",
6667
"commitizen": "^4.3.1",
6768
"cz-conventional-changelog": "^3.3.0",
68-
"eslint": "^9.30.1",
69+
"eslint": "^9.32.0",
6970
"husky": "^9.1.7",
7071
"lint-staged": "^16.1.2",
7172
"npm-run-all": "^4.1.5",

packages/logger-plugin-console/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"url": "https://github.com/hyperse-io"
1313
},
1414
"type": "module",
15-
"license": "SEE LICENSE IN FILE 'LICENSE'",
15+
"license": "SEE LICENSE IN FILE 'LICENSE.md'",
1616
"exports": {
1717
".": {
1818
"types": "./dist/index.d.ts",
@@ -52,7 +52,7 @@
5252
"@types/node": "^24.0.10",
5353
"@vitest/coverage-istanbul": "^3.2.4",
5454
"@vitest/ui": "^3.2.4",
55-
"eslint": "^9.30.1",
55+
"eslint": "^9.32.0",
5656
"jsdom": "26.1.0",
5757
"npm-run-all": "4.1.5",
5858
"rimraf": "^6.0.1",

packages/logger-plugin-console/src/create-console-plugin.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ import { mergeConsoleOptions } from './helpers/helper-merge-options.js';
66
import type { ConsoleOptions } from './types/type-options.js';
77
import type { ConsolePluginContext } from './types/type-plugin.js';
88

9+
/**
10+
* Creates a new logger plugin that outputs formatted log messages to the console.
11+
*
12+
* @param options - Optional configuration options for the plugin.
13+
* @returns A new logger plugin that outputs formatted log messages to the console.
14+
*/
915
export const createConsolePlugin = (
1016
options?: ConsoleOptions
1117
): LoggerPlugin<ConsolePluginContext> => {

packages/logger-plugin-console/src/types/type-options.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ export type ConsoleOptions = {
7171
/**
7272
* If true, the timestamp on each message logged to the console will be displayed using the 24 hour clock instead of the 12 hour clock. Keep in mind that the timestamp of when a log was logged to the console is only displayed when `showTimestamp` is also true.
7373
*
74-
* ### **24 hour clock:**
74+
* **24 hour clock:**
7575
*
7676
* `[ 13:27:55.33 ] pow`
7777
*
78-
* ### **12 hour clock:**
78+
* **12 hour clock:**
7979
*
8080
* `[ 1:27:55.33 PM ] pow`
8181
* @default true

packages/logger-plugin-sentry/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"url": "https://github.com/hyperse-io"
1313
},
1414
"type": "module",
15-
"license": "SEE LICENSE IN FILE 'LICENSE'",
15+
"license": "SEE LICENSE IN FILE 'LICENSE.md'",
1616
"exports": {
1717
".": {
1818
"types": "./dist/index.d.ts",
@@ -50,7 +50,7 @@
5050
"@types/node": "^24.0.10",
5151
"@vitest/coverage-istanbul": "^3.2.4",
5252
"@vitest/ui": "^3.2.4",
53-
"eslint": "^9.30.1",
53+
"eslint": "^9.32.0",
5454
"jsdom": "26.1.0",
5555
"npm-run-all": "4.1.5",
5656
"rimraf": "^6.0.1",

0 commit comments

Comments
 (0)