From a9df2b3c2de3608d4c26b1dc10e4d3de990bf308 Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Mon, 6 Nov 2023 14:25:51 +0100 Subject: [PATCH 1/3] no-inheritance-in-docs --- package-lock.json | 17 +++++++++++++++++ package.json | 1 + src/shapes/Polyline.ts | 3 +++ src/shapes/Rect.ts | 3 +++ typedoc.json | 3 ++- 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 294ff19c61d..58006588a59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,6 +58,7 @@ "tslib": "^2.4.1", "typedoc": "^0.25.3", "typedoc-plugin-markdown": "^3.17.0", + "typedoc-plugin-no-inherit": "^1.4.0", "typescript": "^4.9.4", "v8-to-istanbul": "^9.1.0" }, @@ -11793,6 +11794,15 @@ "typedoc": ">=0.24.0" } }, + "node_modules/typedoc-plugin-no-inherit": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/typedoc-plugin-no-inherit/-/typedoc-plugin-no-inherit-1.4.0.tgz", + "integrity": "sha512-cAvqQ8X9xh1xztVoDKtF4nYRSBx9XwttN3OBbNNpA0YaJSRM8XvpVVhugq8FoO1HdWjF3aizS0JzdUOMDt0y9g==", + "dev": true, + "peerDependencies": { + "typedoc": ">=0.23.0" + } + }, "node_modules/typedoc/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -20369,6 +20379,13 @@ "handlebars": "^4.7.7" } }, + "typedoc-plugin-no-inherit": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/typedoc-plugin-no-inherit/-/typedoc-plugin-no-inherit-1.4.0.tgz", + "integrity": "sha512-cAvqQ8X9xh1xztVoDKtF4nYRSBx9XwttN3OBbNNpA0YaJSRM8XvpVVhugq8FoO1HdWjF3aizS0JzdUOMDt0y9g==", + "dev": true, + "requires": {} + }, "typescript": { "version": "4.9.4", "dev": true diff --git a/package.json b/package.json index f8f7b1b8237..66e2687fb3d 100644 --- a/package.json +++ b/package.json @@ -124,6 +124,7 @@ "tslib": "^2.4.1", "typedoc": "^0.25.3", "typedoc-plugin-markdown": "^3.17.0", + "typedoc-plugin-no-inherit": "^1.4.0", "typescript": "^4.9.4", "v8-to-istanbul": "^9.1.0" }, diff --git a/src/shapes/Polyline.ts b/src/shapes/Polyline.ts index 7efeed755a3..e33769adf1a 100644 --- a/src/shapes/Polyline.ts +++ b/src/shapes/Polyline.ts @@ -27,6 +27,9 @@ export interface SerializedPolylineProps extends SerializedObjectProps { points: XY[]; } +/** + * @noInheritDoc + */ export class Polyline< Props extends TOptions = Partial, SProps extends SerializedPolylineProps = SerializedPolylineProps, diff --git a/src/shapes/Rect.ts b/src/shapes/Rect.ts index 711f69cde3a..65d54a76a4d 100644 --- a/src/shapes/Rect.ts +++ b/src/shapes/Rect.ts @@ -26,6 +26,9 @@ export interface RectProps extends FabricObjectProps, UniqueRectProps {} const RECT_PROPS = ['rx', 'ry'] as const; +/** + * @noInheritDoc + */ export class Rect< Props extends TOptions = Partial, SProps extends SerializedRectProps = SerializedRectProps, diff --git a/typedoc.json b/typedoc.json index a108f5a67c8..9f3d9088c88 100644 --- a/typedoc.json +++ b/typedoc.json @@ -7,6 +7,7 @@ "tsconfig": "typedoc.config.json", "hideBreadcrumbs": "true", "hideInPageTOC": "true", + "hideMembersSymbol": "true", "publicPath": "/apidocs/", - "plugin": ["typedoc-plugin-markdown"] + "plugin": ["typedoc-plugin-no-inherit", "typedoc-plugin-markdown"] } From 0cbb213827707a2f28d2f5e0d9afbaded261e7af Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 6 Nov 2023 13:31:01 +0000 Subject: [PATCH 2/3] update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cd0653d453..4088248e3c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [next] +- docs(): DRAFT: Remove inheritance from docs [#9486](https://github.com/fabricjs/fabric.js/pull/9486) - chore(): expose `sendVectorToPlane` [#9479](https://github.com/fabricjs/fabric.js/pull/9479) - BREAKING: remove absolute true/false from the api. [#9395](https://github.com/fabricjs/fabric.js/pull/9395) - refactor(Canvas): BREAKING deprecate `getPointer`, add new getScenePoint and getViewportPoint methods, removed `restorePointerVpt`, extended mouse events data [#9175](https://github.com/fabricjs/fabric.js/pull/9175) From b24e8cbdfe1c7817d8fa2c696126d7781250d62b Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Sun, 7 Jan 2024 15:59:16 +0100 Subject: [PATCH 3/3] updated deps --- package-lock.json | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58006588a59..f7bc302d57e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "fabric", - "version": "6.0.0-beta15", + "version": "6.0.0-beta17", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "fabric", - "version": "6.0.0-beta15", + "version": "6.0.0-beta17", "license": "MIT", "devDependencies": { "@babel/cli": "^7.22.9", @@ -11061,9 +11061,9 @@ "license": "MIT" }, "node_modules/shiki": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.3.tgz", - "integrity": "sha512-U3S/a+b0KS+UkTyMjoNojvTgrBHjgp7L6ovhFVZsXmBGnVdQ4K4U9oK0z63w538S91ATngv1vXigHCSWOwnr+g==", + "version": "0.14.7", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.7.tgz", + "integrity": "sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg==", "dev": true, "dependencies": { "ansi-sequence-parser": "^1.1.0", @@ -11762,15 +11762,15 @@ } }, "node_modules/typedoc": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.25.3.tgz", - "integrity": "sha512-Ow8Bo7uY1Lwy7GTmphRIMEo6IOZ+yYUyrc8n5KXIZg1svpqhZSWgni2ZrDhe+wLosFS8yswowUzljTAV/3jmWw==", + "version": "0.25.6", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.25.6.tgz", + "integrity": "sha512-1rdionQMpOkpA58qfym1J+YD+ukyA1IEIa4VZahQI2ZORez7dhOvEyUotQL/8rSoMBopdzOS+vAIsORpQO4cTA==", "dev": true, "dependencies": { "lunr": "^2.3.9", "marked": "^4.3.0", "minimatch": "^9.0.3", - "shiki": "^0.14.1" + "shiki": "^0.14.7" }, "bin": { "typedoc": "bin/typedoc" @@ -11779,13 +11779,13 @@ "node": ">= 16" }, "peerDependencies": { - "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x" + "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x" } }, "node_modules/typedoc-plugin-markdown": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.17.0.tgz", - "integrity": "sha512-+uh5fHNfNSGdUxae0FWOuJ8Xu9Sl08jkdshOg6dilAqN/ZXmYsUFFDKw70fYfiGxdCLvpUuyr9FYO+WAa2lHeA==", + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.17.1.tgz", + "integrity": "sha512-QzdU3fj0Kzw2XSdoL15ExLASt2WPqD7FbLeaqwT70+XjKyTshBnUlQA5nNREO1C2P8Uen0CDjsBLMsCQ+zd0lw==", "dev": true, "dependencies": { "handlebars": "^4.7.7" @@ -19850,9 +19850,9 @@ "dev": true }, "shiki": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.3.tgz", - "integrity": "sha512-U3S/a+b0KS+UkTyMjoNojvTgrBHjgp7L6ovhFVZsXmBGnVdQ4K4U9oK0z63w538S91ATngv1vXigHCSWOwnr+g==", + "version": "0.14.7", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.7.tgz", + "integrity": "sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg==", "dev": true, "requires": { "ansi-sequence-parser": "^1.1.0", @@ -20339,15 +20339,15 @@ } }, "typedoc": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.25.3.tgz", - "integrity": "sha512-Ow8Bo7uY1Lwy7GTmphRIMEo6IOZ+yYUyrc8n5KXIZg1svpqhZSWgni2ZrDhe+wLosFS8yswowUzljTAV/3jmWw==", + "version": "0.25.6", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.25.6.tgz", + "integrity": "sha512-1rdionQMpOkpA58qfym1J+YD+ukyA1IEIa4VZahQI2ZORez7dhOvEyUotQL/8rSoMBopdzOS+vAIsORpQO4cTA==", "dev": true, "requires": { "lunr": "^2.3.9", "marked": "^4.3.0", "minimatch": "^9.0.3", - "shiki": "^0.14.1" + "shiki": "^0.14.7" }, "dependencies": { "brace-expansion": { @@ -20371,9 +20371,9 @@ } }, "typedoc-plugin-markdown": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.17.0.tgz", - "integrity": "sha512-+uh5fHNfNSGdUxae0FWOuJ8Xu9Sl08jkdshOg6dilAqN/ZXmYsUFFDKw70fYfiGxdCLvpUuyr9FYO+WAa2lHeA==", + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.17.1.tgz", + "integrity": "sha512-QzdU3fj0Kzw2XSdoL15ExLASt2WPqD7FbLeaqwT70+XjKyTshBnUlQA5nNREO1C2P8Uen0CDjsBLMsCQ+zd0lw==", "dev": true, "requires": { "handlebars": "^4.7.7"