From cf41c3ad54d058a20f06ca51bd7b018ad2b5dae7 Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Fri, 5 May 2023 10:48:16 +0200 Subject: [PATCH] Removed final declaration of `oembed-parser` refs https://github.com/TryGhost/Ghost/commit/27e4523aec3790d2280fbc267d178e145f8b9079 - we no longer use `oembed-parser`, so we can remove it from package.json - also pins the `@extractus/oembed-extractor` package and adds it into `@tryghost/oembed-service` where it was missing --- ghost/core/package.json | 2 +- ghost/oembed-service/package.json | 2 +- yarn.lock | 11 ++--------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/ghost/core/package.json b/ghost/core/package.json index 145e30224d..04510a659f 100644 --- a/ghost/core/package.json +++ b/ghost/core/package.json @@ -60,7 +60,7 @@ "dependencies": { "@sentry/node": "7.50.0", "@tryghost/adapter-base-cache": "0.1.5", - "@extractus/oembed-extractor": "^3.1.8", + "@extractus/oembed-extractor": "3.1.8", "@tryghost/adapter-cache-redis": "0.0.0", "@tryghost/adapter-manager": "0.0.0", "@tryghost/admin-api-schema": "4.3.0", diff --git a/ghost/oembed-service/package.json b/ghost/oembed-service/package.json index 26c4584a42..ff98513cb3 100644 --- a/ghost/oembed-service/package.json +++ b/ghost/oembed-service/package.json @@ -22,6 +22,7 @@ "mocha": "10.2.0" }, "dependencies": { + "@extractus/oembed-extractor": "3.1.8", "@tryghost/errors": "1.2.24", "@tryghost/logging": "2.4.4", "@tryghost/tpl": "0.1.24", @@ -38,7 +39,6 @@ "metascraper-publisher": "5.34.2", "metascraper-title": "5.34.2", "metascraper-url": "5.34.2", - "oembed-parser": "1.4.9", "tough-cookie": "4.1.2" } } diff --git a/yarn.lock b/yarn.lock index 362477f3d8..42dedce6f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2589,7 +2589,7 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.37.0.tgz#cf1b5fa24217fe007f6487a26d765274925efa7d" integrity sha512-x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A== -"@extractus/oembed-extractor@^3.1.8": +"@extractus/oembed-extractor@3.1.8": version "3.1.8" resolved "https://registry.yarnpkg.com/@extractus/oembed-extractor/-/oembed-extractor-3.1.8.tgz#79ea7ed65c7688bdf9ee673a0ac5aa122cef5e4e" integrity sha512-k6p8des8ISJY2fuuQDyiUOTlcuPOzWETM2ewF1aywFNSS3EvgGWRwoMsvBKhCrLuvb8NyEKDAJB0SWgt0L793w== @@ -11761,7 +11761,7 @@ cron-validate@1.4.5, cron-validate@^1.4.1: dependencies: yup "0.32.9" -cross-fetch@3.1.5, cross-fetch@^3.1.4, cross-fetch@^3.1.5: +cross-fetch@3.1.5, cross-fetch@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== @@ -23397,13 +23397,6 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -oembed-parser@1.4.9: - version "1.4.9" - resolved "https://registry.yarnpkg.com/oembed-parser/-/oembed-parser-1.4.9.tgz#d23127c96185dfa2d998b8567e6c7df164f3d824" - integrity sha512-RCOjuv20IMm9XekZB1ZefdYPc+x5qe8IyCeY/xcN71I2z70vQl+L420eI5Mjyy/NQFLv+QPEgj/aYh1vptO83w== - dependencies: - cross-fetch "^3.1.4" - on-finished@2.4.1, on-finished@^2.3.0: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"