From 9e548747eb83eb96a2dda35a6b58f01e2669f73e Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Wed, 13 Jul 2022 11:24:29 +0300 Subject: [PATCH 1/8] These 3 files somehow were missing the import of customMediaQueries.css --- src/components/FieldReviewRating/FieldReviewRating.module.css | 2 ++ .../SearchFiltersSecondary/SearchFiltersSecondary.module.css | 2 ++ src/components/TopbarMobileMenu/TopbarMobileMenu.module.css | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/components/FieldReviewRating/FieldReviewRating.module.css b/src/components/FieldReviewRating/FieldReviewRating.module.css index 740c2550e..90ad531a1 100644 --- a/src/components/FieldReviewRating/FieldReviewRating.module.css +++ b/src/components/FieldReviewRating/FieldReviewRating.module.css @@ -1,3 +1,5 @@ +@import '../../styles/customMediaQueries.css'; + .ratingFieldSet { border: none; padding: 0; diff --git a/src/components/SearchFiltersSecondary/SearchFiltersSecondary.module.css b/src/components/SearchFiltersSecondary/SearchFiltersSecondary.module.css index 02c9f7950..6b2da1757 100644 --- a/src/components/SearchFiltersSecondary/SearchFiltersSecondary.module.css +++ b/src/components/SearchFiltersSecondary/SearchFiltersSecondary.module.css @@ -1,3 +1,5 @@ +@import '../../styles/customMediaQueries.css'; + .root { flex-grow: 1; display: flex; diff --git a/src/components/TopbarMobileMenu/TopbarMobileMenu.module.css b/src/components/TopbarMobileMenu/TopbarMobileMenu.module.css index 6c3f37978..e54d0aa86 100644 --- a/src/components/TopbarMobileMenu/TopbarMobileMenu.module.css +++ b/src/components/TopbarMobileMenu/TopbarMobileMenu.module.css @@ -1,3 +1,5 @@ +@import '../../styles/customMediaQueries.css'; + .root { flex-shrink: 0; display: flex; From b852f74d082e5f8d58a3bc27825693e71f5734c6 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Wed, 13 Jul 2022 11:27:35 +0300 Subject: [PATCH 2/8] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1df6fb53a..1549c4e3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2022-XX-XX +- [fix] the import of customMediaQueries.css was somehow missed with these components: + FieldReviewRating, SearchFiltersSecondary and TopbarMobileMenu. + [#1537](https://github.com/sharetribe/ftw-daily/pull/1537) + ## [v9.0.0] 2022-07-11 This is a major release since it includes a major update to sharetribe-scripts aka our fork of From 921dea020daafe546b08427e7c58e3e71b62cc45 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 19 Jul 2022 15:04:40 +0300 Subject: [PATCH 3/8] Add cookie_flags and relax google analytics domain --- server/csp.js | 2 +- server/renderer.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/csp.js b/server/csp.js index 1edf64077..334a91280 100644 --- a/server/csp.js +++ b/server/csp.js @@ -33,7 +33,7 @@ const defaultDirectives = { // Google Analytics 'www.googletagmanager.com', - 'www.google-analytics.com', + '*.google-analytics.com', 'stats.g.doubleclick.net', 'sentry.io', diff --git a/server/renderer.js b/server/renderer.js index 88681925e..79f02ba76 100644 --- a/server/renderer.js +++ b/server/renderer.js @@ -142,7 +142,9 @@ exports.render = function(requestUrl, context, data, renderApp, webExtractor) { function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); - gtag('config', '${googleAnalyticsId}'); + gtag('config', '${googleAnalyticsId}', { + cookie_flags: 'SameSite=None;Secure', + }); `; const googleAnalyticsScript = hasGoogleAnalyticsv4Id ? gtagScripts : ''; From 45adf2d0659ac433a11b4a94aac236c233313181 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 19 Jul 2022 16:02:30 +0300 Subject: [PATCH 4/8] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1549c4e3e..b2850cda8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2022-XX-XX +- [fix] Add cookie_flags and relax google analytics domain + [#1538](https://github.com/sharetribe/ftw-daily/pull/1538) - [fix] the import of customMediaQueries.css was somehow missed with these components: FieldReviewRating, SearchFiltersSecondary and TopbarMobileMenu. [#1537](https://github.com/sharetribe/ftw-daily/pull/1537) From 6d802c283aa30f18351dcd308adcd518626b7690 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Jul 2022 07:20:02 +0000 Subject: [PATCH 5/8] Bump terser from 5.14.1 to 5.14.2 Bumps [terser](https://github.com/terser/terser) from 5.14.1 to 5.14.2. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/yarn.lock b/yarn.lock index dbe86f31b..a617fa219 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4268,9 +4268,9 @@ buffer-crc32@~0.2.3: integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer@^5.5.0: version "5.7.1" @@ -4602,12 +4602,7 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@^2.19.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" - integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== - -commander@^2.20.0: +commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -11374,7 +11369,7 @@ source-map-loader@^3.0.0: iconv-lite "^0.6.3" source-map-js "^1.0.1" -source-map-support@^0.5.21, source-map-support@~0.5.20: +source-map-support@^0.5.21, source-map-support@^0.5.6, source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -11382,14 +11377,6 @@ source-map-support@^0.5.21, source-map-support@~0.5.20: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@^0.5.6: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -11918,9 +11905,9 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.5: terser "^5.7.2" terser@^5.0.0, terser@^5.10.0, terser@^5.7.2: - version "5.14.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz#7c95eec36436cb11cf1902cc79ac564741d19eca" - integrity sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ== + version "5.14.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" + integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== dependencies: "@jridgewell/source-map" "^0.3.2" acorn "^8.5.0" From 3fe2033b106ec8d76b1b558f7bd257bde3933887 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 29 Aug 2022 14:49:41 +0300 Subject: [PATCH 6/8] Use sharetribe-scripts v6.0.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fd53088ab..3d8a1c1f6 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "redux-thunk": "^2.4.1", "seedrandom": "^3.0.5", "sharetribe-flex-sdk": "^1.17.0", - "sharetribe-scripts": "6.0.0", + "sharetribe-scripts": "6.0.1", "smoothscroll-polyfill": "^0.4.0", "source-map-support": "^0.5.21", "url": "^0.11.0" diff --git a/yarn.lock b/yarn.lock index a617fa219..b9dc78163 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11222,10 +11222,10 @@ sharetribe-flex-sdk@^1.17.0: lodash "^4.17.10" transit-js "^0.8.861" -sharetribe-scripts@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/sharetribe-scripts/-/sharetribe-scripts-6.0.0.tgz#6b8ccb8c4742c0857305556c232af808979f65ee" - integrity sha512-y2gjfpco99f6z4JzupAys7KGE2Rd/BVeHP7TyBABrUvt4rmn/8XsB+u3iOVhx1uX/dpD+IWPyQjLrd1FD8iMEw== +sharetribe-scripts@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/sharetribe-scripts/-/sharetribe-scripts-6.0.1.tgz#0d7b3cc5b9f94945364c391a98e0846a88f89432" + integrity sha512-BRCs2PAyy6M4ZS03HEypvkX2r69i+eTnA3PJK1s02448rLtzbkZ7g8z5YRPgwVb8mhFxCKcEaNm1vFfWDd4kOg== dependencies: "@babel/core" "^7.16.0" "@babel/plugin-transform-runtime" "7.12.1" From c78c2cd840add1f5e4b54d24a300439c0a3057bf Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 29 Aug 2022 14:53:23 +0300 Subject: [PATCH 7/8] Update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2850cda8..54459b734 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,13 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2022-XX-XX +- [fix] Use sharetribe-scripts v6.0.1. Fixes for + + - GENERATE_SOURCEMAP = false + - async Redux Thunks + + [#1546](https://github.com/sharetribe/ftw-daily/pull/1546) + - [fix] Add cookie_flags and relax google analytics domain [#1538](https://github.com/sharetribe/ftw-daily/pull/1538) - [fix] the import of customMediaQueries.css was somehow missed with these components: From 76d5fe2b20c2d448b5a1101f5d9ee8c9a65cf5ce Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 29 Aug 2022 15:46:30 +0300 Subject: [PATCH 8/8] New patch release: v9.0.1 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54459b734..a882b29b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2022-XX-XX +## [v9.0.1] 2022-08-29 + - [fix] Use sharetribe-scripts v6.0.1. Fixes for - GENERATE_SOURCEMAP = false @@ -27,6 +29,8 @@ way to update this template, but currently, we follow a pattern: FieldReviewRating, SearchFiltersSecondary and TopbarMobileMenu. [#1537](https://github.com/sharetribe/ftw-daily/pull/1537) + [v9.0.1]: https://github.com/sharetribe/ftw-daily/compare/v9.0.0...v9.0.1 + ## [v9.0.0] 2022-07-11 This is a major release since it includes a major update to sharetribe-scripts aka our fork of @@ -48,6 +52,8 @@ Changes: touch swipes. [#1529](https://github.com/sharetribe/ftw-daily/pull/1529) - [fix] Fixing a small typo. [#1518](https://github.com/sharetribe/ftw-daily/pull/1518) + [v9.0.0]: https://github.com/sharetribe/ftw-daily/compare/v8.6.2...v9.0.0 + ## [v8.6.2] 2022-05-19 - [fix] There was also invalid characters (zero-width space) on added directive diff --git a/package.json b/package.json index 3d8a1c1f6..5753e2b29 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "9.0.0", + "version": "9.0.1", "private": true, "license": "Apache-2.0", "dependencies": {