Merge pull request #203 from sharetribe/update-v9.0.1-from-upstream

Release v11.0.1 (update from upstream FTW-daily v9.0.1)
sharetribe · Aug 30, 2022 · 3df91b9 · 3df91b9
2 parents a9cf8ce + 6d769e7
commit 3df91b9
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,24 @@ https://github.com/sharetribe/flex-template-web/
 
 ## Upcoming version 2022-XX-XX
 
+## [v11.0.1] 2022-08-29
+
+### Updates from upstream (FTW-daily v9.0.1)
+- [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:
+  FieldReviewRating, SearchFiltersSecondary and TopbarMobileMenu.
+  [#1537](https://github.com/sharetribe/ftw-daily/pull/1537)
+
+  [v11.0.1]: https://github.com/sharetribe/ftw-hourly/compare/v11.0.0...v11.0.1
+
 ## [v11.0.0] 2022-07-11
 
 This is a major release since it includes a major update to sharetribe-scripts aka our fork of
@@ -38,7 +56,7 @@ Read more from PR: https://github.com/sharetribe/ftw-daily/pull/1531
   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)
 
-[v11.0.0]: https://github.com/sharetribe/ftw-hourly/compare/v10.6.1...v11.0.0
+  [v11.0.0]: https://github.com/sharetribe/ftw-hourly/compare/v10.6.1...v11.0.0
 
 ## [v10.6.1] 2022-05-19
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "private": true,
   "license": "Apache-2.0",
   "dependencies": {
@@ -61,7 +61,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/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
@@ -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',
+        });
       </script>
     `;
   const googleAnalyticsScript = hasGoogleAnalyticsv4Id ? gtagScripts : '';

diff --git a/yarn.lock b/yarn.lock
@@ -11234,10 +11234,10 @@ sharetribe-flex-sdk@^1.17.0:
     lodash "^4.17.10"
     transit-js "^0.8.861"
 
-[email protected].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==
+[email protected].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"