OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into membersAPIMaxLimit

Browse Source
This commit is contained in:
Princi Vershwal 2024-07-24 11:40:52 +05:30 committed by GitHub
commit ec39d3b928
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 89 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/admin-x-settings/src/components/settings/membership/stripe/StripeConnectModal.tsx
View File

@ -162,8 +162,7 @@ const Connected: React.FC<{onClose?: () => void}> = ({onClose}) => {
// this.ghostPaths.url.api('/members/') + '?filter=status:paid&limit=0'; // this.ghostPaths.url.api('/members/') + '?filter=status:paid&limit=0';
NiceModal.show(ConfirmationModal, { NiceModal.show(ConfirmationModal, {
title: 'Disconnect Stripe', title: 'Disconnect Stripe',
prompt: (hasActiveStripeSubscriptions ? 'Cannot disconnect while there are members with active Stripe subscriptions.' : <>You&lsquo;re about to disconnect your Stripe account {stripeConnectAccountName} prompt: (hasActiveStripeSubscriptions ? 'Cannot disconnect while there are members with active Stripe subscriptions.' : <>You&lsquo;re about to disconnect your Stripe account {stripeConnectAccountName} from this site. This will automatically turn off paid memberships on this site.</>),
from this site. This will automatically turn off paid memberships on this site.</>),
okLabel: hasActiveStripeSubscriptions ? '' : 'Disconnect', okLabel: hasActiveStripeSubscriptions ? '' : 'Disconnect',
onOk: async (modal) => { onOk: async (modal) => {
try { try {

20
apps/comments-ui/package.json
View File

@ -44,16 +44,16 @@
}, },
"dependencies": { "dependencies": {
"@headlessui/react": "1.7.19", "@headlessui/react": "1.7.19",
"@tiptap/core": "2.5.4", "@tiptap/core": "2.5.5",
"@tiptap/extension-blockquote": "2.5.4", "@tiptap/extension-blockquote": "2.5.5",
"@tiptap/extension-document": "2.5.4", "@tiptap/extension-document": "2.5.5",
"@tiptap/extension-hard-break": "2.5.4", "@tiptap/extension-hard-break": "2.5.5",
"@tiptap/extension-link": "2.5.4", "@tiptap/extension-link": "2.5.5",
"@tiptap/extension-paragraph": "2.5.4", "@tiptap/extension-paragraph": "2.5.5",
"@tiptap/extension-placeholder": "2.5.4", "@tiptap/extension-placeholder": "2.5.5",
"@tiptap/extension-text": "2.5.4", "@tiptap/extension-text": "2.5.5",
"@tiptap/pm": "2.5.4", "@tiptap/pm": "2.5.5",
"@tiptap/react": "2.5.4", "@tiptap/react": "2.5.5",
"react": "17.0.2", "react": "17.0.2",
"react-dom": "17.0.2", "react-dom": "17.0.2",
"react-string-replace": "1.1.1" "react-string-replace": "1.1.1"

2
ghost/admin/package.json
View File

@ -49,7 +49,7 @@
"@tryghost/helpers": "1.1.90", "@tryghost/helpers": "1.1.90",
"@tryghost/kg-clean-basic-html": "4.1.1", "@tryghost/kg-clean-basic-html": "4.1.1",
"@tryghost/kg-converters": "1.0.5", "@tryghost/kg-converters": "1.0.5",
"@tryghost/koenig-lexical": "1.3.11", "@tryghost/koenig-lexical": "1.3.12",
"@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",

28
ghost/core/monobundle.js
View File

@ -4,9 +4,8 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const util = require('util');
const exec = util.promisify(require('node:child_process').exec);
const concurrently = require('concurrently');
const detectIndent = require('detect-indent'); const detectIndent = require('detect-indent');
const detectNewline = require('detect-newline'); const detectNewline = require('detect-newline');
const findRoot = require('find-root'); const findRoot = require('find-root');
@ -111,6 +110,8 @@ function getWorkspaces(from) {
console.log('workspaces', workspaces); console.log('workspaces', workspaces);
console.log('\n-------------------------\n'); console.log('\n-------------------------\n');
const packagesToPack = [];
for (const w of workspaces) { for (const w of workspaces) {
const workspacePkgInfo = JSONFile.for(path.join(w, 'package.json')); const workspacePkgInfo = JSONFile.for(path.join(w, 'package.json'));
@ -118,7 +119,7 @@ function getWorkspaces(from) {
continue; continue;
} }
console.log(`packaging ${w}\n`); console.log(`packaging ${w}`);
workspacePkgInfo.pkg.version = pkgInfo.pkg.version; workspacePkgInfo.pkg.version = pkgInfo.pkg.version;
workspacePkgInfo.write(); workspacePkgInfo.write();
@ -144,17 +145,24 @@ function getWorkspaces(from) {
console.log(`- resolution override for ${workspacePkgInfo.pkg.name} to ${packedFilename}\n`); console.log(`- resolution override for ${workspacePkgInfo.pkg.name} to ${packedFilename}\n`);
pkgInfo.pkg.resolutions[workspacePkgInfo.pkg.name] = packedFilename; pkgInfo.pkg.resolutions[workspacePkgInfo.pkg.name] = packedFilename;
const command = `npm pack --pack-destination ../core/components`; packagesToPack.push(w);
console.log(`running '${command}' in ${w}\n`);
const {stdout, stderr} = await exec(command, {cwd: w});
console.log('stdout', stdout);
console.log('stderr', stderr);
console.log('\n-------------------------\n');
} }
pkgInfo.write(); pkgInfo.write();
const {result} = concurrently(packagesToPack.map(w => ({
name: w,
cwd: w,
command: 'npm pack --pack-destination ../core/components'
})));
try {
await result;
} catch (e) {
console.error(e);
throw e;
}
const filesToCopy = [ const filesToCopy = [
'README.md', 'README.md',
'LICENSE', 'LICENSE',

2
package.json
View File

@ -117,7 +117,7 @@
"husky": "8.0.3", "husky": "8.0.3",
"lint-staged": "15.2.7", "lint-staged": "15.2.7",
"nx": "16.8.1", "nx": "16.8.1",
"rimraf": "5.0.8", "rimraf": "5.0.9",
"ts-node": "10.9.2", "ts-node": "10.9.2",
"typescript": "5.4.5", "typescript": "5.4.5",
"inquirer": "8.2.6" "inquirer": "8.2.6"

116
yarn.lock
View File

@ -7563,66 +7563,66 @@
resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.1.tgz#27337d72046d5236b32fd977edee3f74c71d332f" resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.1.tgz#27337d72046d5236b32fd977edee3f74c71d332f"
integrity sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg== integrity sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==
"@tiptap/core@2.5.4": "@tiptap/core@2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.5.4.tgz#8b08113512dd8dc9d98268ad6f982d62c85433d2" resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.5.5.tgz#67301af399644a24a9f62b4309a9875794740a66"
integrity sha512-Zs/hShr4+W02+0nOlpmr5cS2YjDRLqd+XMt+jsiQH0QNr3s1Lc82pfF6C3CjgLEZtdUzImZrW2ABtLlpvbogaA== integrity sha512-VnAnyWnsqN65QijtUFHbe7EPSJCkhNEAwlatsG/HvrZvUv9KmoWWbMsHAU73wozKzPXR3nHRbCxN+LuxP5bADg==
"@tiptap/extension-blockquote@2.5.4": "@tiptap/extension-blockquote@2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.5.4.tgz#7b0bbf2bed91533a73887b0217bf8000681b8b5a" resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.5.5.tgz#71102d76eb859991d25c58ce54ab06001bc578ad"
integrity sha512-UqeJunZM3IiCQGZE0X5YNUOWYkuIieqrwPgOEghAIjnhDcQizQcouRQ5R7cwwv/scNr2JvZHncOTLrALV3Janw== integrity sha512-K+fc++ASlgDRHN6i3j3JBGzWiDhhoZv0jCUB/l7Jzut4UfjIoWqKhmJajnp95Qu9tmwQUy9LMzHqG4G5wUsIsQ==
"@tiptap/extension-bubble-menu@^2.5.4": "@tiptap/extension-bubble-menu@^2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.5.4.tgz#eaff01a21869a9d65b8fd6e29043008c8ad1b03c" resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.5.5.tgz#b6e72bba8e216ac48e0741a2af16733348567ad8"
integrity sha512-GHwef912K1yd75pp9JGDnKSp1DvdOHH8BcHQv0no+a3q2ePFPYcgaSwVRR59jHRX9WzdVfoLcqDSAeoNGOrISw== integrity sha512-7k0HqrnhQGVZk86MEc5vt8stNRxIY65AMjZfszY/mQw0Dza7EQig/9b/AEmi9n+TNW5/8Qu+OMJD9ln92d/Eog==
dependencies: dependencies:
tippy.js "^6.3.7" tippy.js "^6.3.7"
"@tiptap/extension-document@2.5.4": "@tiptap/extension-document@2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.5.4.tgz#99279433ddd1572bd8e92f43cb40aa72ab576574" resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.5.5.tgz#e69929f5d28e8ca659ab98075c5dd742ff805e5d"
integrity sha512-4RDrhASxCTOZETYhIhEW1TfZqx3Tm+LQxouvBMFyODmT1PSgsg5Xz1FYpDPr+J49bGAK0Pr9ae0XcGW011L3sA== integrity sha512-MIjYO63JepcJW37PQuKVmYuZFqkQOZ/12tV0YLU4o6gmGVdqJS0+3md9CdnyUFUDIo7x6TBh8r5i5L2xQpm3Sg==
"@tiptap/extension-floating-menu@^2.5.4": "@tiptap/extension-floating-menu@^2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.5.4.tgz#a80e54c685c24c320ef389b8d13f7382bc7e8f8f" resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.5.5.tgz#3685b3dad59408177720ae78fc069b6f138e67ec"
integrity sha512-EqD4rgi3UhnDcV3H1+ndAS4Ue2zpsU7hFKoevOIV6GS7xVnWN70AGt6swH24QzuHKKISFtWoLpKjrwRORNIxuA== integrity sha512-1mgpxZGfy1ziNSvWz6m1nGb9ZF9fVVz4X4XwrIqwGw1Vqt9oXflm6puglnzwVLDeaMDT014VUfczJ4My3wDZzA==
dependencies: dependencies:
tippy.js "^6.3.7" tippy.js "^6.3.7"
"@tiptap/extension-hard-break@2.5.4": "@tiptap/extension-hard-break@2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.5.4.tgz#df6e70930e6b426b527d1150ff0bde8118ea6d41" resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.5.5.tgz#1d85247c26bc8c90ba75516b710a98695707b408"
integrity sha512-nLn6HP9tqgdGGwbMORXVtcY30DTGctYFaWADRthvBjVgacYSeKlhUcsSu3YgaxtbxZp6BhfRvD2kKrxyQsSjnQ== integrity sha512-VtrwKU0LYS/0rfH5rGz8ztKwA0bsHRyBF53G7aP2FS4BiN8aOEu8t7VkvBZAewXDITDah9K6rqfXk+MNwoul2Q==
"@tiptap/extension-link@2.5.4": "@tiptap/extension-link@2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.5.4.tgz#a256652198cc0abb662608802c7bb98ee1914067" resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.5.5.tgz#a1de5308146a9be658b24c78be3dbce824917299"
integrity sha512-xTB/+T6SHHCXInJni8WdqOfF40a/MiFUf5OoWW9cPrApx3I7TzJ9j8/WDshM0BOnDDw80w1bl9F2zkUQjC0Y2A== integrity sha512-zVpNvMD8R9uW1SX1PJoj3fLyOHwuFWqiqEHN2KWfLbEnbL/KXNnpIyKdpHnI9lqFrsMf2dmyZCS3R6xIrynviQ==
dependencies: dependencies:
linkifyjs "^4.1.0" linkifyjs "^4.1.0"
"@tiptap/extension-paragraph@2.5.4": "@tiptap/extension-paragraph@2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.5.4.tgz#6aa8da578161ecedfb12e37cc515147d4bd5b476" resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.5.5.tgz#13e73750ff78b7206e0eb31d7d5b31f8f0e76dd5"
integrity sha512-pC1YIkkRPXoU0eDrhfAf8ZrFJQzvw2ftP6KRhLnnSw/Ot1DOjT1r95l7zsFefS9oCDMT/L4HghTAiPZ4rcpPbg== integrity sha512-XZO1rqsU1vlt9qeG2pVVAt2gXjD0twl2D+uxy4Nw6gxqbhSgfbNq3RP72mmtcS4KyFJi7ETANpcRpb8ZNvXfmg==
"@tiptap/extension-placeholder@2.5.4": "@tiptap/extension-placeholder@2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-2.5.4.tgz#6841b137011d7873725c99ff07074b0f21af847b" resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-2.5.5.tgz#1883994be2e4dfb5b7a271dd39bbdd3e680b6521"
integrity sha512-mcj4j2Z/L1H5dzWHbbWChuAdJK9F2p06fcjqL4iyJtVx38QQFzCdVmGaTAim8CLp/EynbAOYJ5gk9w2PTdv7+w== integrity sha512-SwWLYdyrMeoVUQdivkIJ4kkAcb38pykxSetlrXitfUmnkwv0/fi+p76Rickf+roudWPsfzqvgvJ4gT6OAOJrGA==
"@tiptap/extension-text@2.5.4": "@tiptap/extension-text@2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.5.4.tgz#235638ad08975a321dae4f2a2c1e495f38bd3adb" resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.5.5.tgz#3675a1ace24869c3664137054a3b2bc2d25ac2c7"
integrity sha512-+3x/hYqhmCYbvedCcQzQHFtZ5MAcMOlKuczomZtygf8AfDfuQVrG1m4GoJyNzJdqxjN80/xq4e2vDVvqQxYTCw== integrity sha512-8c/hxcw7t/S3iKGSFwGNxC2I6AkKpRiySQJ95ML2miwSOAxWhnltoYYV7gobWCRgm25lnvzX/Z6BdpFzXBrBKA==
"@tiptap/pm@2.5.4": "@tiptap/pm@2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.5.4.tgz#6d66cd8ab3bd696958a4a62f34d2032a82a28910" resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.5.5.tgz#3c67224f9aa7460f05c4979aa0faab60b97dd503"
integrity sha512-oFIsuniptdUXn93x4aM2sVN3hYKo9Fj55zAkYrWhwxFYUYcPxd5ibra2we+wRK5TaiPu098wpC+yMSTZ/KKMpA== integrity sha512-ppePiLaeG6IKkm8Yq+mRENT4LIAS4qQyLT8EnKadznaTL6SNj/72mm0MjD44URkM38ySzIyvt/vqHDapNK0Hww==
dependencies: dependencies:
prosemirror-changeset "^2.2.1" prosemirror-changeset "^2.2.1"
prosemirror-collab "^1.3.1" prosemirror-collab "^1.3.1"
@ -7643,13 +7643,13 @@
prosemirror-transform "^1.9.0" prosemirror-transform "^1.9.0"
prosemirror-view "^1.33.8" prosemirror-view "^1.33.8"
"@tiptap/react@2.5.4": "@tiptap/react@2.5.5":
version "2.5.4" version "2.5.5"
resolved "https://registry.yarnpkg.com/@tiptap/react/-/react-2.5.4.tgz#8007a33e23557743bbaeb96dc89a180261718adf" resolved "https://registry.yarnpkg.com/@tiptap/react/-/react-2.5.5.tgz#6a20dfac2e80bcd314dd628621f73760826d25c6"
integrity sha512-2HPHt2lEK6Z4jOV3HHVTee8hD4NS6eEj0zRZWSFjt1zDzXtFqX8VIv7qC1iDYsQgyiFnFnOucOQtAlDewBb23A== integrity sha512-V3cfrDWMtOViheMkIQ3qRnKLs0CZaouoB6LBtw96vo8G7IFKAvtgvmau0fjdJKRtHJp5xYiecP6RHt3lHulu+g==
dependencies: dependencies:
"@tiptap/extension-bubble-menu" "^2.5.4" "@tiptap/extension-bubble-menu" "^2.5.5"
"@tiptap/extension-floating-menu" "^2.5.4" "@tiptap/extension-floating-menu" "^2.5.5"
"@types/use-sync-external-store" "^0.0.6" "@types/use-sync-external-store" "^0.0.6"
use-sync-external-store "^1.2.2" use-sync-external-store "^1.2.2"
@ -8062,10 +8062,10 @@
dependencies: dependencies:
semver "^7.3.5" semver "^7.3.5"
"@tryghost/koenig-lexical@1.3.11": "@tryghost/koenig-lexical@1.3.12":
version "1.3.11" version "1.3.12"
resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.3.11.tgz#fe7f5add77303f8e884d120f606d0228e6e731ff" resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.3.12.tgz#2a398f66b48e03cab5aaf58edd03c6d3294940cb"
integrity sha512-h6uVmcPCGMbmVmh+TuORMnYcN5U/1RCAL/LgeizphufPUVD6bXi+icxJQ5qpY1yIH1iNABSc6lPcwFgajM4COA== integrity sha512-taAz1XOQTrQKvviiBLfO/bIyDM/B+3ghH+EUITWOY+5JRDhbk2TnVrFD8VABsKnRWgdzSFXE/ToiXlIW8np4pg==
"@tryghost/limit-service@1.2.14": "@tryghost/limit-service@1.2.14":
version "1.2.14" version "1.2.14"
@ -28194,10 +28194,10 @@ rgba-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
integrity sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg== integrity sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==
rimraf@5.0.8: rimraf@5.0.9:
version "5.0.8" version "5.0.9"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.8.tgz#9d4d0ef5106817102b14fdbbf01cf29545e99a6c" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.9.tgz#c3baa1b886eadc2ec7981a06a593c3d01134ffe9"
integrity sha512-XSh0V2/yNhDEi8HwdIefD8MLgs4LQXPag/nEJWs3YUc3Upn+UHa1GyIkEg9xSSNt7HnkO5FjTvmcRzgf+8UZuw== integrity sha512-3i7b8OcswU6CpU8Ej89quJD4O98id7TtVM5U4Mybh84zQXdrFmDLouWBEEaD/QfO3gDDfH+AGFCGsR7kngzQnA==
dependencies: dependencies:
glob "^10.3.7" glob "^10.3.7"