TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-24 03:14:03 +03:00
Code Issues Projects Releases Wiki Activity

Added '@' internal link shortcut to editor (#20272)

Browse Source 
closes https://linear.app/tryghost/issue/MOM-83

- added additional labs flag to allow internal testing prior to private beta release
- bumped Koenig packages containing support for @-link feature
This commit is contained in:
Kevin Ansfield 2024-05-29 18:13:52 +01:00 committed by GitHub
parent acac7801f4
commit 55015ccbcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 71 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/admin-x-settings/package.json
View File

@ -39,7 +39,7 @@
"dependencies": { "dependencies": {
"@codemirror/lang-html": "6.4.9", "@codemirror/lang-html": "6.4.9",
"@tryghost/color-utils": "0.2.2", "@tryghost/color-utils": "0.2.2",
"@tryghost/kg-unsplash-selector": "0.1.17", "@tryghost/kg-unsplash-selector": "0.2.0",
"@tryghost/limit-service": "1.2.14", "@tryghost/limit-service": "1.2.14",
"@tryghost/nql": "0.12.3", "@tryghost/nql": "0.12.3",
"@tryghost/timezone-data": "0.4.3", "@tryghost/timezone-data": "0.4.3",

4
apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx
View File

@ -63,6 +63,10 @@ const features = [{
title: 'Internal Linking (private beta)', title: 'Internal Linking (private beta)',
description: 'Adds internal URL search to editor link inputs', description: 'Adds internal URL search to editor link inputs',
flag: 'internalLinking' flag: 'internalLinking'
},{
title: 'Internal Linking @-links (internal alpha)',
description: 'Adds internal URL search when typing @ in the editor',
flag: 'internalLinkingAtLinks'
},{ },{
title: 'ActivityPub', title: 'ActivityPub',
description: '(Highly) Experimental support for ActivityPub.', description: '(Highly) Experimental support for ActivityPub.',

3
ghost/admin/app/components/koenig-lexical-editor.js
View File

@ -417,7 +417,8 @@ export default class KoenigLexicalEditor extends Component {
feature: { feature: {
collectionsCard: this.feature.collectionsCard, collectionsCard: this.feature.collectionsCard,
collections: this.feature.collections, collections: this.feature.collections,
internalLinking: this.feature.internalLinking internalLinking: this.feature.internalLinking,
internalLinkingAtLinks: this.feature.internalLinkingAtLinks
}, },
deprecated: { deprecated: {
headerV1: true // if false, shows header v1 in the menu headerV1: true // if false, shows header v1 in the menu

1
ghost/admin/app/services/feature.js
View File

@ -83,6 +83,7 @@ export default class FeatureService extends Service {
@feature('onboardingChecklist') onboardingChecklist; @feature('onboardingChecklist') onboardingChecklist;
@feature('ActivityPub') ActivityPub; @feature('ActivityPub') ActivityPub;
@feature('internalLinking') internalLinking; @feature('internalLinking') internalLinking;
@feature('internalLinkingAtLinks') internalLinkingAtLinks;
@feature('editorSubtitle') editorSubtitle; @feature('editorSubtitle') editorSubtitle;
@feature('newsletterSubtitle') newsletterSubtitle; @feature('newsletterSubtitle') newsletterSubtitle;

4
ghost/admin/package.json
View File

@ -45,9 +45,9 @@
"@tryghost/color-utils": "0.2.2", "@tryghost/color-utils": "0.2.2",
"@tryghost/ember-promise-modals": "2.0.1", "@tryghost/ember-promise-modals": "2.0.1",
"@tryghost/helpers": "1.1.90", "@tryghost/helpers": "1.1.90",
"@tryghost/kg-clean-basic-html": "4.0.9", "@tryghost/kg-clean-basic-html": "4.1.0",
"@tryghost/kg-converters": "1.0.4", "@tryghost/kg-converters": "1.0.4",
"@tryghost/koenig-lexical": "1.1.16", "@tryghost/koenig-lexical": "1.2.0",
"@tryghost/limit-service": "1.2.14", "@tryghost/limit-service": "1.2.14",
"@tryghost/members-csv": "0.0.0", "@tryghost/members-csv": "0.0.0",
"@tryghost/nql": "0.12.3", "@tryghost/nql": "0.12.3",

3
ghost/core/core/shared/labs.js
View File

@ -53,7 +53,8 @@ const ALPHA_FEATURES = [
'lexicalIndicators', 'lexicalIndicators',
'adminXDemo', 'adminXDemo',
'editorSubtitle', 'editorSubtitle',
'newsletterSubtitle' 'newsletterSubtitle',
'internalLinkingAtLinks'
]; ];
module.exports.GA_KEYS = [...GA_FEATURES]; module.exports.GA_KEYS = [...GA_FEATURES];

8
ghost/core/package.json
View File

@ -102,9 +102,9 @@
"@tryghost/kg-converters": "1.0.4", "@tryghost/kg-converters": "1.0.4",
"@tryghost/kg-default-atoms": "5.0.3", "@tryghost/kg-default-atoms": "5.0.3",
"@tryghost/kg-default-cards": "10.0.5", "@tryghost/kg-default-cards": "10.0.5",
"@tryghost/kg-default-nodes": "1.0.16", "@tryghost/kg-default-nodes": "1.1.0",
"@tryghost/kg-html-to-lexical": "1.0.17", "@tryghost/kg-html-to-lexical": "1.1.0",
"@tryghost/kg-lexical-html-renderer": "1.0.16", "@tryghost/kg-lexical-html-renderer": "1.1.0",
"@tryghost/kg-mobiledoc-html-renderer": "7.0.4", "@tryghost/kg-mobiledoc-html-renderer": "7.0.4",
"@tryghost/limit-service": "1.2.14", "@tryghost/limit-service": "1.2.14",
"@tryghost/link-redirects": "0.0.0", "@tryghost/link-redirects": "0.0.0",
@ -225,7 +225,7 @@
}, },
"optionalDependencies": { "optionalDependencies": {
"@sentry/profiling-node": "7.116.0", "@sentry/profiling-node": "7.116.0",
"@tryghost/html-to-mobiledoc": "3.0.10", "@tryghost/html-to-mobiledoc": "3.1.0",
"sqlite3": "5.1.7" "sqlite3": "5.1.7"
}, },
"devDependencies": { "devDependencies": {

6
ghost/core/test/integration/services/email-service/cards.test.js
View File

@ -169,7 +169,11 @@ describe('Can send cards via email', function () {
'extended-text', // not a card 'extended-text', // not a card
'extended-quote', // not a card 'extended-quote', // not a card
'extended-heading', // not a card 'extended-heading', // not a card
'tk' // shouldn't be present in published posts / emails // not a card and shouldn't be present in published posts / emails
'tk',
'at-link',
'at-link-search',
'zwnj'
]; ];
const cardsInDefaultNodes = DEFAULT_NODES.map((node) => { const cardsInDefaultNodes = DEFAULT_NODES.map((node) => {

99
yarn.lock
View File

@ -6967,12 +6967,12 @@
dependencies: dependencies:
lodash-es "^4.17.11" lodash-es "^4.17.11"
"@tryghost/html-to-mobiledoc@3.0.10": "@tryghost/html-to-mobiledoc@3.1.0":
version "3.0.10" version "3.1.0"
resolved "https://registry.yarnpkg.com/@tryghost/html-to-mobiledoc/-/html-to-mobiledoc-3.0.10.tgz#981a50a9bcdbe14d30beaf6a132921238fb9fa57" resolved "https://registry.yarnpkg.com/@tryghost/html-to-mobiledoc/-/html-to-mobiledoc-3.1.0.tgz#64cb333c8f0b857f53edf289867a39d6113ccefb"
integrity sha512-ThK2wFyH/6J01clhumR8BFILwDpbY3Epr0GYMP3RMhw2/hk1mf5xj0y9acdgFACBoTYzclOcqUt67CZY0/Lt3Q== integrity sha512-CL1IAL3mRrWPs2LcDcPptN2O2w9EY0mb/ofkOycQYaHoPPt0JgPOPeJdmIwRfddzGkEK1WA1yWnqKa4zSyIGRw==
dependencies: dependencies:
"@tryghost/kg-parser-plugins" "4.0.9" "@tryghost/kg-parser-plugins" "4.1.0"
"@tryghost/mobiledoc-kit" "^0.12.4-ghost.1" "@tryghost/mobiledoc-kit" "^0.12.4-ghost.1"
jsdom "^24.0.0" jsdom "^24.0.0"
@ -7014,10 +7014,10 @@
resolved "https://registry.yarnpkg.com/@tryghost/kg-card-factory/-/kg-card-factory-5.0.4.tgz#b2de98eaf01edbd5629fb1f4b06eca3a5f95d0ad" resolved "https://registry.yarnpkg.com/@tryghost/kg-card-factory/-/kg-card-factory-5.0.4.tgz#b2de98eaf01edbd5629fb1f4b06eca3a5f95d0ad"
integrity sha512-KcNM4QJONSSOJeQlv9no5wFx+uV2mESX3bYBL2y3c0DqB26NlMaUx0QIAFSbCSinUlCvRFOwEEBQyaACtCOvzQ== integrity sha512-KcNM4QJONSSOJeQlv9no5wFx+uV2mESX3bYBL2y3c0DqB26NlMaUx0QIAFSbCSinUlCvRFOwEEBQyaACtCOvzQ==
"@tryghost/kg-clean-basic-html@4.0.9": "@tryghost/kg-clean-basic-html@4.1.0":
version "4.0.9" version "4.1.0"
resolved "https://registry.yarnpkg.com/@tryghost/kg-clean-basic-html/-/kg-clean-basic-html-4.0.9.tgz#6ac4119a7f2fb1000d00a1559a6fe39e61f14848" resolved "https://registry.yarnpkg.com/@tryghost/kg-clean-basic-html/-/kg-clean-basic-html-4.1.0.tgz#f4979d99e65a9202e3d3376f90ff08de8ac56578"
integrity sha512-VwVpFwlf/mVghbCQksVSuQRnixunJZMRvHb1Mi73MuQdff9RQSvpaADWxShb4Z3lnJTtF65E63OUP8rPeEYwYA== integrity sha512-exXUpTA1z0zyk3F3ZXcT7oy8b3acbpuHWMqiowdb2HI0/6LTGaBdmm866fhBKedgB59lIWRt511djUnUIILh+A==
"@tryghost/kg-converters@1.0.4": "@tryghost/kg-converters@1.0.4":
version "1.0.4" version "1.0.4"
@ -7044,16 +7044,16 @@
lodash "^4.17.21" lodash "^4.17.21"
luxon "^3.0.0" luxon "^3.0.0"
"@tryghost/kg-default-nodes@1.0.16": "@tryghost/kg-default-nodes@1.1.0":
version "1.0.16" version "1.1.0"
resolved "https://registry.yarnpkg.com/@tryghost/kg-default-nodes/-/kg-default-nodes-1.0.16.tgz#b9d3fafb549ee2f858d09a15b6b962a1b2e7a68d" resolved "https://registry.yarnpkg.com/@tryghost/kg-default-nodes/-/kg-default-nodes-1.1.0.tgz#e8902b5b8f7ac77614110c17fc0f0e1aa8daec13"
integrity sha512-obohpcnvNFXwFmtLViEHwcEA/tFZQm2CdzOT5vUaheq9LX/RXQN7/FVFQKhJ/Djv4ixHOufCp598X+Z3Ffnrqw== integrity sha512-Mx+c7q85SzDVZM/WFg+KKHOspOng0lG83i+YKaayAE0lU4yGzcFb1qV+TRIgn//4bMkMmjeKt8/0kp1GTfV0Ng==
dependencies: dependencies:
"@lexical/clipboard" "0.13.1" "@lexical/clipboard" "0.13.1"
"@lexical/rich-text" "0.13.1" "@lexical/rich-text" "0.13.1"
"@lexical/selection" "0.13.1" "@lexical/selection" "0.13.1"
"@lexical/utils" "0.13.1" "@lexical/utils" "0.13.1"
"@tryghost/kg-clean-basic-html" "4.0.9" "@tryghost/kg-clean-basic-html" "4.1.0"
"@tryghost/kg-markdown-html-renderer" "7.0.5" "@tryghost/kg-markdown-html-renderer" "7.0.5"
html-minifier "^4.0.0" html-minifier "^4.0.0"
jsdom "^24.0.0" jsdom "^24.0.0"
@ -7061,21 +7061,21 @@
lodash "^4.17.21" lodash "^4.17.21"
luxon "^3.3.0" luxon "^3.3.0"
"@tryghost/kg-default-transforms@1.0.17": "@tryghost/kg-default-transforms@1.1.0":
version "1.0.17" version "1.1.0"
resolved "https://registry.yarnpkg.com/@tryghost/kg-default-transforms/-/kg-default-transforms-1.0.17.tgz#7383428b91b2cd389f655a876a5ed8e3c5c73679" resolved "https://registry.yarnpkg.com/@tryghost/kg-default-transforms/-/kg-default-transforms-1.1.0.tgz#9c9a0c88d2ff8ccf377371a496aded289ffcfccc"
integrity sha512-l7Z6Hv81c+OTCtpzkMmdBoFZoF5rdc2Sqws635F6+GaTVzxPsxR9lf6lG7jnTmtDM/YKCgPFQiGu+CBOaDUNPw== integrity sha512-5MXcf6jBZpPg+QwwRQh3eJn87GMcvStZ0WCZwejJpwT3VZ+fXD0LiceaK4YEec+rTYJih+1M1VaGjJfbz+r5LA==
dependencies: dependencies:
"@lexical/list" "0.13.1" "@lexical/list" "0.13.1"
"@lexical/rich-text" "0.13.1" "@lexical/rich-text" "0.13.1"
"@lexical/utils" "0.13.1" "@lexical/utils" "0.13.1"
"@tryghost/kg-default-nodes" "1.0.16" "@tryghost/kg-default-nodes" "1.1.0"
lexical "0.13.1" lexical "0.13.1"
"@tryghost/kg-html-to-lexical@1.0.17": "@tryghost/kg-html-to-lexical@1.1.0":
version "1.0.17" version "1.1.0"
resolved "https://registry.yarnpkg.com/@tryghost/kg-html-to-lexical/-/kg-html-to-lexical-1.0.17.tgz#b89c68ba6120601f01454a439356c5232c1e4e2c" resolved "https://registry.yarnpkg.com/@tryghost/kg-html-to-lexical/-/kg-html-to-lexical-1.1.0.tgz#9e281fcc3e119ce34d4cd2892150b6c2a00e805c"
integrity sha512-8SPXl02D0tmiUCo5tQ4IG511HixNlfdbeQCs7HAM+6gFUmkPCCByBtxeVQ2KkiUBcfe33/+D+JoGgZTvrBD16A== integrity sha512-YrcFDI+TMGFispZeHpcaYIhqdudxNIdgyONkCzozyUMUG2K4B6/WdclTFLtcqBjpdRBWCnxhMApQYZKDBic/1A==
dependencies: dependencies:
"@lexical/clipboard" "0.13.1" "@lexical/clipboard" "0.13.1"
"@lexical/headless" "0.13.1" "@lexical/headless" "0.13.1"
@ -7083,15 +7083,15 @@
"@lexical/link" "0.13.1" "@lexical/link" "0.13.1"
"@lexical/list" "0.13.1" "@lexical/list" "0.13.1"
"@lexical/rich-text" "0.13.1" "@lexical/rich-text" "0.13.1"
"@tryghost/kg-default-nodes" "1.0.16" "@tryghost/kg-default-nodes" "1.1.0"
"@tryghost/kg-default-transforms" "1.0.17" "@tryghost/kg-default-transforms" "1.1.0"
jsdom "^24.0.0" jsdom "^24.0.0"
lexical "0.13.1" lexical "0.13.1"
"@tryghost/kg-lexical-html-renderer@1.0.16": "@tryghost/kg-lexical-html-renderer@1.1.0":
version "1.0.16" version "1.1.0"
resolved "https://registry.yarnpkg.com/@tryghost/kg-lexical-html-renderer/-/kg-lexical-html-renderer-1.0.16.tgz#166697108b0000f6055f2f6e4e3619cbec633266" resolved "https://registry.yarnpkg.com/@tryghost/kg-lexical-html-renderer/-/kg-lexical-html-renderer-1.1.0.tgz#97f4e66cf7e49dd41aca7b2815b8eae39e67fdee"
integrity sha512-Wkk295SmA+vyj0CguJmCmMqZsLblUGBdEE+RsfJCmUr1VzwHXmORbO7wfKOTn4arBL2D37rk7rj+8K2OCuicog== integrity sha512-+rSlko7oVqWjecco1cHKEbGJCBBXB4DegPuEnhsHubpahDtpjHdL6oTwZvR+DgwqQ/brEyHV/9HcO9PJOePC2g==
dependencies: dependencies:
"@lexical/clipboard" "0.13.1" "@lexical/clipboard" "0.13.1"
"@lexical/code" "0.13.1" "@lexical/code" "0.13.1"
@ -7099,10 +7099,11 @@
"@lexical/link" "0.13.1" "@lexical/link" "0.13.1"
"@lexical/list" "0.13.1" "@lexical/list" "0.13.1"
"@lexical/rich-text" "0.13.1" "@lexical/rich-text" "0.13.1"
"@tryghost/kg-default-nodes" "1.0.16" "@tryghost/kg-default-nodes" "1.1.0"
"@tryghost/kg-default-transforms" "1.1.0"
jsdom "^24.0.0" jsdom "^24.0.0"
lexical "0.13.1" lexical "0.13.1"
prettier "^3.0.0" prettier "3.2.5"
"@tryghost/kg-markdown-html-renderer@7.0.5": "@tryghost/kg-markdown-html-renderer@7.0.5":
version "7.0.5" version "7.0.5"
@ -7128,17 +7129,17 @@
mobiledoc-dom-renderer "^0.7.0" mobiledoc-dom-renderer "^0.7.0"
simple-dom "^1.4.0" simple-dom "^1.4.0"
"@tryghost/kg-parser-plugins@4.0.9": "@tryghost/kg-parser-plugins@4.1.0":
version "4.0.9" version "4.1.0"
resolved "https://registry.yarnpkg.com/@tryghost/kg-parser-plugins/-/kg-parser-plugins-4.0.9.tgz#66784a9df28b5cf105ceeff2fdf9245db09362b6" resolved "https://registry.yarnpkg.com/@tryghost/kg-parser-plugins/-/kg-parser-plugins-4.1.0.tgz#60f6492d1b0d71558c51f7b0c45d905ae5aa8b0a"
integrity sha512-3GiP9HsJT4dSdg/3ww7cpkgdZ2MNxKkmpZPOPLwixQeUbWJaR1a+1a6X0C1Woc8djd/pHLaBVQWcTDtpB/NaUA== integrity sha512-sHwOc+9ObNBFccgbSxnbdgygLTPLI0PpjUwGsVJ7NAPQBEISHsQzHMYpWTCGatgdB+B+KmwTtBeGcvn3DIXagw==
dependencies: dependencies:
"@tryghost/kg-clean-basic-html" "4.0.9" "@tryghost/kg-clean-basic-html" "4.1.0"
"@tryghost/kg-unsplash-selector@0.1.17": "@tryghost/kg-unsplash-selector@0.2.0":
version "0.1.17" version "0.2.0"
resolved "https://registry.yarnpkg.com/@tryghost/kg-unsplash-selector/-/kg-unsplash-selector-0.1.17.tgz#6caa4ae0afbd3989981cbc17e7c909d243cadfc6" resolved "https://registry.yarnpkg.com/@tryghost/kg-unsplash-selector/-/kg-unsplash-selector-0.2.0.tgz#e811612fd66f20182a1d7f06e48a86bf94896ce6"
integrity sha512-8cw4qtkczWBrAo7PpZ/kT78yzpm8B+cEwWW6McWkTzZRs3AuBUWWyCVi6plb1c+RhY110FoFkyMLBJnGeM+D3g== integrity sha512-oVMUiKFwOk5bUwNmW2DrICfs9lRtqHIOrV2hnJF8cBrhKLPnTSDrYTrrz04FTkq1ApISJ0y9pLZA6eepZpzTUQ==
"@tryghost/kg-utils@1.0.26": "@tryghost/kg-utils@1.0.26":
version "1.0.26" version "1.0.26"
@ -7147,10 +7148,10 @@
dependencies: dependencies:
semver "^7.3.5" semver "^7.3.5"
"@tryghost/koenig-lexical@1.1.16": "@tryghost/koenig-lexical@1.2.0":
version "1.1.16" version "1.2.0"
resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.1.16.tgz#cdaed36dc97bde8f53a08880fa5cee171641fd93" resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.2.0.tgz#794f5f43410d03f742bb0bcb607cdad41aef2e3c"
integrity sha512-u2dqnTA7AbA8GUPZVVVToSW91eqV0G42pbJeGTxmlzK91OIKa4fbrMO4Vp0HD3cMhCHYml9kWa976HowGS/NjQ== integrity sha512-/A5/zcqiuwYIcpQEroms9AYg4LmNjnLkGnAj4Mej/HgvTQEwKRLy+swzv/9uw3dmvlDw680AQfEeszuTq9aXpQ==
"@tryghost/limit-service@1.2.14": "@tryghost/limit-service@1.2.14":
version "1.2.14" version "1.2.14"
@ -25302,16 +25303,16 @@ pretender@3.4.7, pretender@^3.4.7:
fake-xml-http-request "^2.1.2" fake-xml-http-request "^2.1.2"
route-recognizer "^0.3.3" route-recognizer "^0.3.3"
prettier@3.2.5:
version "3.2.5"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
prettier@^2.8.0: prettier@^2.8.0:
version "2.8.8" version "2.8.8"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
prettier@^3.0.0:
version "3.0.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.2.tgz#78fcecd6d870551aa5547437cdae39d4701dca5b"
integrity sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==
pretty-format@^27.0.2: pretty-format@^27.0.2:
version "27.5.1" version "27.5.1"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"