From 34da31ce8838084f1f14ebef6d256446ad46e258 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Wed, 24 Nov 2021 10:27:00 +0000 Subject: [PATCH 1/4] Update x-podcast-launchers to use the merged version of x-follow-button instead of a pre-release version --- components/x-podcast-launchers/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/x-podcast-launchers/package.json b/components/x-podcast-launchers/package.json index 90c3cf84e..d30a57294 100644 --- a/components/x-podcast-launchers/package.json +++ b/components/x-podcast-launchers/package.json @@ -19,7 +19,7 @@ "dependencies": { "@financial-times/n-concept-ids": "^1.4.0", "@financial-times/x-engine": "file:../../packages/x-engine", - "@financial-times/x-follow-button": "0.0.12", + "@financial-times/x-follow-button": "file:../x-follow-button", "nanoid": "^2.0.3" }, "devDependencies": { From f41fcf441566ae59d76b1e7da63cacf77aa05069 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Wed, 24 Nov 2021 10:28:23 +0000 Subject: [PATCH 2/4] Update x-teaser-timeline to use a new prerelease version of x-article-save-button which updates to recent package, component, and tooling use --- components/x-teaser-timeline/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/x-teaser-timeline/package.json b/components/x-teaser-timeline/package.json index 4df7346fc..66b19c5e2 100644 --- a/components/x-teaser-timeline/package.json +++ b/components/x-teaser-timeline/package.json @@ -17,7 +17,7 @@ "author": "", "license": "ISC", "dependencies": { - "@financial-times/x-article-save-button": "0.0.11", + "@financial-times/x-article-save-button": "0.0.13", "@financial-times/x-engine": "file:../../packages/x-engine", "@financial-times/x-teaser": "file:../x-teaser", "classnames": "^2.2.6", From 8b8d61f919b5da68f6fe8edf4989e20a926192b0 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Wed, 24 Nov 2021 10:35:03 +0000 Subject: [PATCH 3/4] Unpin x-privacy-manager dependencies to match the setup in other components --- components/x-privacy-manager/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/x-privacy-manager/package.json b/components/x-privacy-manager/package.json index 4c382d606..daee1083f 100644 --- a/components/x-privacy-manager/package.json +++ b/components/x-privacy-manager/package.json @@ -26,14 +26,14 @@ "dependencies": { "@financial-times/x-engine": "file:../../packages/x-engine", "@financial-times/x-interaction": "file:../x-interaction", - "classnames": "2.2.6" + "classnames": "^2.2.6" }, "devDependencies": { "@financial-times/x-rollup": "file:../../packages/x-rollup", "@financial-times/x-test-utils": "file:../../packages/x-test-utils", - "bower": "1.8.8", - "fetch-mock-jest": "1.3.0", - "sass": "1.26.5" + "bower": "^1.8.8", + "fetch-mock-jest": "^1.3.0", + "sass": "^1.26.5" }, "scripts": { "prepare": "bower install && npm run build", From 6277242ff039cb0bece6b983ae8fe14fc968ee2f Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Wed, 24 Nov 2021 10:36:38 +0000 Subject: [PATCH 4/4] Exclude node_modules contents when looking for storybooks, to avoid storybooks being included for dependencies (such as x-article-save-button) which then fail due to being excluded from transpilation --- .storybook/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.storybook/main.js b/.storybook/main.js index df6cdb76b..af94389c4 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -1,4 +1,4 @@ module.exports = { - stories: ['../components/**/storybook/index.jsx'], + stories: ['../components/**!(node_modules)/storybook/index.jsx'], addons: ['@storybook/addon-essentials'] }