From 1cbd20315ee4f2f93e258df1cd4d12f43af96eb2 Mon Sep 17 00:00:00 2001 From: Jeremy Lenz Date: Mon, 14 Jul 2025 16:42:03 -0400 Subject: [PATCH 1/2] Fixes #38577 - Fix snapshots --- .../__tests__/__snapshots__/ContentDetails.test.js.snap | 4 ++-- .../__tests__/__snapshots__/SubscriptionDetails.test.js.snap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap b/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap index 3704a0b23bc..7a2b559b405 100644 --- a/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap +++ b/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap @@ -7,7 +7,7 @@ exports[`Content Details Info should render and contain appropriate components 1 loadingText="Loading" timeout={300} > - - + `; diff --git a/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap b/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap index c96ac34cd78..d8683ee1e47 100644 --- a/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap +++ b/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap @@ -27,7 +27,7 @@ exports[`subscriptions details page should render and contain appropiate compone } } /> - @@ -531,6 +531,6 @@ exports[`subscriptions details page should render and contain appropiate compone - + `; From 6d8a01e8d7cf5605b1d9b78107d6091003f8fdb6 Mon Sep 17 00:00:00 2001 From: Jeremy Lenz Date: Wed, 16 Jul 2025 13:55:23 -0400 Subject: [PATCH 2/2] Refs #38577 - Remove references to theforeman/vendor --- jest.config.js | 1 - package.json | 1 - webpack/.eslintrc.js | 4 +--- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/jest.config.js b/jest.config.js index c78244e4ffc..338d1703201 100644 --- a/jest.config.js +++ b/jest.config.js @@ -24,7 +24,6 @@ module.exports = { ], moduleDirectories: [ `${foremanFull}/node_modules`, - `${foremanFull}/node_modules/@theforeman/vendor-core/node_modules`, 'node_modules', 'webpack/test-utils', ], diff --git a/package.json b/package.json index 1dfad9cf01e..ebcf8f36595 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "nock": "^12.0.3", "react-test-renderer": "^16.0.0" }, - "_comment": "We don't include @theforeman/vendor because it's assumed to be present in Foreman", "dependencies": { "angular": "1.8.2", "bootstrap-select": "1.13.18", diff --git a/webpack/.eslintrc.js b/webpack/.eslintrc.js index d72480412c9..a270d5d4615 100644 --- a/webpack/.eslintrc.js +++ b/webpack/.eslintrc.js @@ -1,8 +1,6 @@ const path = require('path'); const { foremanLocation, foremanRelativePath } = require('@theforeman/find-foreman'); const foremanFull = foremanLocation(); -const foremanVendorRelative = './node_modules/@theforeman/vendor-core/'; -const foremanVendorDir = foremanRelativePath(foremanVendorRelative); module.exports = { env: { @@ -39,7 +37,7 @@ module.exports = { "error", { // Need to check Katello, Foreman, and Foreman's meta package for dependencies - "packageDir": [path.join(__dirname, '../../katello'), foremanFull, foremanVendorDir] + "packageDir": [path.join(__dirname, '../../katello'), foremanFull] } ], 'jsx-a11y/anchor-is-valid': [