Jimbo/uniq by

README.md

@@ -79,36 +79,33 @@ The following members are the community maintainers for this project:
 ### Top Community Contributors
 
 The PWA Studio project welcomes all codebase and documentation contributions.
-We would like to recognize the following community members for their efforts on improving the PWA Studio project in 2020.
-
-| Author               | Commits | Added Lines | Removed Lines | Avg. Files |
-| -------------------- | ------- | ----------- | ------------- | ---------- |
-| Lars Roettig         | 17      | 1430        | 1101          | 5.824      |
-| Ross McHugh          | 12      | 1089        | 11            | 2          |
-| Lucas Calazans       | 5       | 378         | 194           | 3.2        |
-| Luke Denton          | 5       | 85          | 39            | 1.4        |
-| Jordan Eisenburger   | 4       | 334         | 39            | 3          |
-| Kristof, Fooman      | 4       | 103         | 74            | 3          |
-| Adam                 | 3       | 328         | 16            | 2.667      |
-| Harald Deiser        | 3       | 150         | 123           | 12.667     |
-| Brendan Falkowski    | 2       | 1168        | 416           | 12.5       |
-| Huy Kon              | 2       | 991         | 39            | 10         |
-| Miguel Balparda      | 2       | 8           | 6             | 1          |
-| Shikha Mishra        | 2       | 16          | 12            | 2          |
-| christopher daniel   | 2       | 163         | 106           | 6.5        |
-| sivakumarkoduru      | 2       | 7           | 4             | 1.5        |
-| Alexander Taranovsky | 1       | 4           | 1             | 2          |
-| Andrii Beziazychnyi  | 1       | 4           | 0             | 1          |
-| Cody Nguyễn          | 1       | 1           | 1             | 1          |
-| Davide               | 1       | 9           | 7             | 1          |
-| Dominic Fernando     | 1       | 0           | 1             | 1          |
-| Evan Burrell         | 1       | 92          | 29            | 11         |
-
-<small>_Last Updated: September 3, 2020_</small>
+We would like to recognize the following community members for their efforts on improving the PWA Studio project in our latest release.
+
+| Author              | Commits | Added Lines | Removed Lines | Avg. Files |
+| ------------------- | ------- | ----------- | ------------- | ---------- |
+| Huy Kon             | 11      | 2939        | 848           | 9.091      |
+| Brendan Falkowski   | 2       | 3           | 13            | 1          |
+| Abrar Pathan        | 1       | 7           | 0             | 1          |
+| Adam                | 1       | 12          | 6             | 3          |
+| Ankur Raiyani       | 1       | 89          | 30            | 5          |
+| Hiren Patel         | 1       | 1           | 1             | 1          |
+| James Murphy        | 1       | 53          | 0             | 1          |
+| Jon Vaughan         | 1       | 1           | 1             | 1          |
+| Kristof, Fooman     | 1       | 4           | 4             | 3          |
+| Lars Roettig        | 1       | 211         | 16            | 7          |
+| Marcin Kwiatkowski  | 1       | 985         | 689           | 17         |
+| Max Chadwick        | 1       | 3           | 1             | 1          |
+| Papilion Dániel     | 1       | 68          | 2             | 2          |
+| Sathiya Prakash     | 1       | 2           | 2             | 1          |
+| Sergey Kolodyazhnyy | 1       | 4           | 1             | 2          |
+| Shankar Konar       | 1       | 6           | 0             | 2          |
+| Treiberg, Artur     | 1       | 202         | 79            | 25         |
+
+<small>_Last Updated: January 11, 2021_</small>
 
 **Source:** [statistic.magento.engineering][]
 
-[statistic.magento.engineering]: <https://statistic.magento.engineering/app/kibana#/dashboard/fe6a4960-8adf-11ea-b035-e1712195ddd1?_g=(refreshInterval:(pause:!t,value:0),time:(from:now%2Fy,mode:quick,to:now))&_a=(description:'Custom%20Overview%20Panel%20by%20Magento',filters:!(('$state':(store:appState),meta:(alias:'Empty%20Commits',disabled:!f,index:git,key:files,negate:!t,params:(query:'0',type:phrase),type:phrase,value:'0'),query:(match:(files:(query:'0',type:phrase)))),('$state':(store:appState),meta:(alias:Bots,disabled:!f,index:github_issues,key:author_bot,negate:!t,params:(query:!t,type:phrase),type:phrase,value:true),query:(match:(author_bot:(query:!t,type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:git,key:author_name,negate:!t,params:!('Revanth%20Kumar%20Annavarapu','Revanth%20Kumar',Devagouda,dependabot%5Bbot%5D),type:phrases,value:'Revanth%20Kumar%20Annavarapu,%20Revanth%20Kumar,%20Devagouda,%20dependabot%5Bbot%5D'),query:(bool:(minimum_should_match:1,should:!((match_phrase:(author_name:'Revanth%20Kumar%20Annavarapu')),(match_phrase:(author_name:'Revanth%20Kumar')),(match_phrase:(author_name:Devagouda)),(match_phrase:(author_name:dependabot%5Bbot%5D)))))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:git,key:author_org_name,negate:!t,params:(query:Employee,type:phrase),type:phrase,value:Employee),query:(match:(author_org_name:(query:Employee,type:phrase))))),fullScreenMode:!f,options:(darkTheme:!f,useMargins:!t),panels:!((embeddableConfig:(title:Commits,vis:(legendOpen:!f)),gridData:(h:8,i:'2',w:16,x:0,y:36),id:git_evolution_commits,panelIndex:'2',title:'Git%20Commits',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'Github%20Issues'),gridData:(h:8,i:'31',w:24,x:0,y:28),id:github_issues_main_metrics,panelIndex:'31',title:'Github%20Issues',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'GitHub%20Issues',vis:(legendOpen:!f)),gridData:(h:8,i:'32',w:24,x:0,y:20),id:github_issues_evolutionary,panelIndex:'32',title:'GitHub%20Issues',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'GitHub%20Issues%20Submitters'),gridData:(h:8,i:'33',w:16,x:32,y:36),id:github_issues_evolutionary_submitters,panelIndex:'33',title:'GitHub%20Issues%20Submitters',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'GitHub%20Pull%20Requests'),gridData:(h:8,i:'34',w:24,x:24,y:28),id:github_pullrequests_main_metrics,panelIndex:'34',title:'GitHub%20Pull%20Requests',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'Pull%20Requests',vis:(legendOpen:!f)),gridData:(h:8,i:'35',w:24,x:24,y:20),id:github_pullrequests_pullrequests,panelIndex:'35',title:'GitHub%20Pull%20Requests',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'Pull%20Request%20Submitters',vis:(legendOpen:!f)),gridData:(h:8,i:'36',w:16,x:16,y:36),id:github_pullrequests_submitters_evolutionary,panelIndex:'36',title:'GitHub%20Pull%20Request%20Submitters',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'Git%20Top%20Authors',vis:(params:(config:(searchKeyword:''),sort:(columnIndex:!n,direction:!n)))),gridData:(h:20,i:'111',w:24,x:0,y:0),id:git_overview_top_authors,panelIndex:'111',title:'Top%20Code%20Contributors',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'-',vis:(params:(config:(searchKeyword:''),sort:(columnIndex:1,direction:desc)))),gridData:(h:20,i:'114',w:24,x:24,y:0),id:f747c010-9041-11ea-b035-e1712195ddd1,panelIndex:'114',title:'Magento%20Projects',type:visualization,version:'6.8.6')),query:(language:lucene,query:'*pwa-studio'),timeRestore:!f,title:Overview,viewMode:view)>
+[statistic.magento.engineering]: <https://statistic.magento.engineering/app/kibana#/dashboard/fe6a4960-8adf-11ea-b035-e1712195ddd1?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'2020-09-15T05:00:00.000Z',mode:absolute,to:'2021-01-06T05:59:59.999Z'))&_a=(description:'Custom%20Overview%20Panel%20by%20Magento',filters:!(('$state':(store:appState),meta:(alias:'Empty%20Commits',disabled:!f,index:git,key:files,negate:!t,params:(query:'0',type:phrase),type:phrase,value:'0'),query:(match:(files:(query:'0',type:phrase)))),('$state':(store:appState),meta:(alias:Bots,disabled:!f,index:github_issues,key:author_bot,negate:!t,params:(query:!t,type:phrase),type:phrase,value:true),query:(match:(author_bot:(query:!t,type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:'0211efb0-14ca-11e9-8aac-ef7fd4d8cbad',key:Author_domain,negate:!t,params:!(magento.com,adobe.com),type:phrases,value:'magento.com,%20adobe.com'),query:(bool:(minimum_should_match:1,should:!((match_phrase:(Author_domain:magento.com)),(match_phrase:(Author_domain:adobe.com)))))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:git,key:author_name,negate:!t,params:!('Revanth%20Kumar%20Annavarapu','Revanth%20Kumar',Devagouda,dependabot%5Bbot%5D,jimbo,'Tommy%20Wiebell','Stephen%20Rugh','Anthoula%20Wojczak','James%20Calcaben','Andy%20Terranova'),type:phrases,value:'Revanth%20Kumar%20Annavarapu,%20Revanth%20Kumar,%20Devagouda,%20dependabot%5Bbot%5D,%20jimbo,%20Tommy%20Wiebell,%20Stephen%20Rugh,%20Anthoula%20Wojczak,%20James%20Calcaben,%20Andy%20Terranova'),query:(bool:(minimum_should_match:1,should:!((match_phrase:(author_name:'Revanth%20Kumar%20Annavarapu')),(match_phrase:(author_name:'Revanth%20Kumar')),(match_phrase:(author_name:Devagouda)),(match_phrase:(author_name:dependabot%5Bbot%5D)),(match_phrase:(author_name:jimbo)),(match_phrase:(author_name:'Tommy%20Wiebell')),(match_phrase:(author_name:'Stephen%20Rugh')),(match_phrase:(author_name:'Anthoula%20Wojczak')),(match_phrase:(author_name:'James%20Calcaben')),(match_phrase:(author_name:'Andy%20Terranova'))))))),fullScreenMode:!f,options:(darkTheme:!f,useMargins:!t),panels:!((embeddableConfig:(title:Commits,vis:(legendOpen:!f)),gridData:(h:8,i:'2',w:16,x:0,y:36),id:git_evolution_commits,panelIndex:'2',title:'Git%20Commits',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'Github%20Issues'),gridData:(h:8,i:'31',w:24,x:0,y:28),id:github_issues_main_metrics,panelIndex:'31',title:'Github%20Issues',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'GitHub%20Issues',vis:(legendOpen:!f)),gridData:(h:8,i:'32',w:24,x:0,y:20),id:github_issues_evolutionary,panelIndex:'32',title:'GitHub%20Issues',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'GitHub%20Issues%20Submitters'),gridData:(h:8,i:'33',w:16,x:32,y:36),id:github_issues_evolutionary_submitters,panelIndex:'33',title:'GitHub%20Issues%20Submitters',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'GitHub%20Pull%20Requests'),gridData:(h:8,i:'34',w:24,x:24,y:28),id:github_pullrequests_main_metrics,panelIndex:'34',title:'GitHub%20Pull%20Requests',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'Pull%20Requests',vis:(legendOpen:!f)),gridData:(h:8,i:'35',w:24,x:24,y:20),id:github_pullrequests_pullrequests,panelIndex:'35',title:'GitHub%20Pull%20Requests',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'Pull%20Request%20Submitters',vis:(legendOpen:!f)),gridData:(h:8,i:'36',w:16,x:16,y:36),id:github_pullrequests_submitters_evolutionary,panelIndex:'36',title:'GitHub%20Pull%20Request%20Submitters',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'Git%20Top%20Authors',vis:(params:(config:(searchKeyword:''),sort:(columnIndex:!n,direction:!n)))),gridData:(h:20,i:'111',w:24,x:0,y:0),id:git_overview_top_authors,panelIndex:'111',title:'Top%20Code%20Contributors',type:visualization,version:'6.8.6'),(embeddableConfig:(title:'-',vis:(params:(config:(searchKeyword:''),sort:(columnIndex:1,direction:desc)))),gridData:(h:20,i:'114',w:24,x:24,y:0),id:f747c010-9041-11ea-b035-e1712195ddd1,panelIndex:'114',title:'Magento%20Projects',type:visualization,version:'6.8.6')),query:(language:lucene,query:'*pwa-studio'),timeRestore:!f,title:Overview,viewMode:view)>
 
 [Contribution guide]: .github/CONTRIBUTING.md
 [Coverage Status]: https://coveralls.io/repos/github/magento/pwa-studio/badge.svg?branch=master

jest.config.js

@@ -153,6 +153,14 @@ const testReactComponents = inPackage => ({
                 id: 1,
                 locale: 'en_US',
                 store_name: 'Default Store View'
+            },
+            {
+                base_currency_code: 'EUR',
+                code: 'fr',
+                default_display_currency_code: 'EUR',
+                id: 2,
+                locale: 'fr_FR',
+                store_name: 'French Store View'
             }
         ]
     }

magento-compatibility.js

@@ -4,6 +4,7 @@
 
 // PWA Studio version -> Magento version.
 module.exports = {
+    '9.0.0': '2.4.2',
     '8.0.0': '2.4.0 - 2.4.1',
     '7.0.0': '2.3.5 - 2.4.0',
     '6.0.1': '2.3.4 - 2.3.5',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/pwa-studio",
-  "version": "8.0.0",
+  "version": "9.0.0",
   "private": true,
   "workspaces": [
     "packages/babel-preset-peregrine",

packages/create-pwa/lib/index.js

@@ -1,5 +1,6 @@
 const { basename, resolve } = require('path');
 const os = require('os');
+const fetch = require('node-fetch');
 const changeCase = require('change-case');
 const inquirer = require('inquirer');
 const execa = require('execa');
@@ -9,9 +10,37 @@ const isInvalidPath = require('is-invalid-path');
 const isValidNpmName = require('is-valid-npm-name');
 const pkg = require('../package.json');
 const {
-    sampleBackends
+    sampleBackends: defaultSampleBackends
 } = require('@magento/pwa-buildpack/lib/cli/create-project');
 
+const uniqBy = (array, property) => {
+    const map = new Map();
+
+    for (const element of array) {
+        if (element && element.hasOwnProperty(property)) {
+            map.set(element[property], element);
+        }
+    }
+
+    return Array.from(map.values());
+};
+
+const removeDuplicateBackends = backendEnvironments =>
+    uniqBy(backendEnvironments, 'url');
+
+const fetchSampleBackends = async () => {
+    try {
+        const res = await fetch(
+            'https://fvp0esmt8f.execute-api.us-east-1.amazonaws.com/default/getSampleBackends'
+        );
+        const { sampleBackends } = await res.json();
+
+        return sampleBackends.environments;
+    } catch {
+        return [];
+    }
+};
+
 module.exports = async () => {
     console.log(chalk.greenBright(`${pkg.name} v${pkg.version}`));
     console.log(
@@ -20,6 +49,16 @@ module.exports = async () => {
     const userAgent = process.env.npm_config_user_agent || '';
     const isYarn = userAgent.includes('yarn');
 
+    const sampleBackendEnvironments = await fetchSampleBackends();
+    const filteredBackendEnvironments = removeDuplicateBackends([
+        ...sampleBackendEnvironments,
+        ...defaultSampleBackends.environments
+    ]);
+    const sampleBackends = {
+        ...defaultSampleBackends,
+        environments: filteredBackendEnvironments
+    };
+
     const questions = [
         {
             name: 'directory',

packages/create-pwa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/create-pwa",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "publishConfig": {
     "access": "public"
   },
@@ -29,14 +29,15 @@
   },
   "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/create-pwa#readme",
   "dependencies": {
-    "@magento/pwa-buildpack": "~7.0.0",
+    "@magento/pwa-buildpack": "~8.0.0",
     "chalk": "^2.4.2",
     "change-case": "^3.1.0",
     "execa": "^1.0.0",
     "git-user-info": "^1.0.1",
     "inquirer": "^6.3.1",
     "is-invalid-path": "^1.0.2",
     "is-valid-npm-name": "^0.0.4",
+    "node-fetch": "~2.3.0",
     "webpack": "^4.29.5"
   }
 }

packages/extensions/upward-security-headers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/upward-security-headers",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "publishConfig": {
     "access": "public"
   },
@@ -13,8 +13,8 @@
   "author": "Magento Commerce",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/pwa-buildpack": "~7.0.0",
-    "@magento/venia-ui": "~5.0.0",
+    "@magento/pwa-buildpack": "~8.0.0",
+    "@magento/venia-ui": "~6.0.0",
     "webpack": "~4.38.0"
   },
   "pwa-studio": {

packages/extensions/venia-adobe-data-layer/index.js

@@ -0,0 +1,16 @@
+const { useEffect } = require('react');
+
+module.exports = original => props => {
+    useEffect(() => {
+        // define the global as soon as possible
+        globalThis.adobeDataLayer = globalThis.adobeDataLayer || [];
+
+        // import the library as late as possible
+        import(/* webpackChunkName: "acdl" */
+        /* webpackMode: "lazy" */
+        /* webpackPrefetch: true */
+        '@adobe/adobe-client-data-layer');
+    }, []);
+
+    return original(props);
+};

packages/extensions/venia-adobe-data-layer/intercept.js

@@ -0,0 +1,7 @@
+module.exports = targets => {
+    const { talons } = targets.of('@magento/peregrine');
+
+    talons.tap(({ App }) => {
+        App.useApp.wrapWith('@magento/venia-adobe-data-layer');
+    });
+};

packages/extensions/venia-adobe-data-layer/package.json

@@ -0,0 +1,26 @@
+{
+  "name": "@magento/venia-adobe-data-layer",
+  "version": "0.0.1",
+  "publishConfig": {
+    "access": "public"
+  },
+  "description": "Provides Adobe Client Data Layer support in PWA Studio",
+  "main": "./index.js",
+  "scripts": {
+    "clean": " "
+  },
+  "repository": "github:magento/pwa-studio",
+  "license": "(OSL-3.0 OR AFL-3.0)",
+  "dependencies": {
+    "@adobe/adobe-client-data-layer": "~1.1.3"
+  },
+  "peerDependencies": {
+    "@magento/peregrine": "~9.0.0",
+    "react": "~16.9.0"
+  },
+  "pwa-studio": {
+    "targets": {
+      "intercept": "./intercept"
+    }
+  }
+}

packages/extensions/venia-sample-backends/__tests__/__snapshots__/intercept.spec.js.snap

@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should call onFail if backend is inactive 1`] = `
+"https://www.magento-backend-2.3.4.com/ is inactive. Please consider using one of these other backends: 
+
+ [{\\"name\\":\\"2.3.3-venia-cloud\\",\\"description\\":\\"Magento 2.3.3 with Venia sample data installed\\",\\"url\\":\\"https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/\\"}] 
+"
+`;
+
+exports[`should call onFail with a different error message if environments is empty 1`] = `
+"https://www.magento-backend-2.3.4.com/ is inactive. Please consider using one of these other backends: 
+
+ [{\\"name\\":\\"2.3.3-venia-cloud\\",\\"description\\":\\"Magento 2.3.3 with Venia sample data installed\\",\\"url\\":\\"https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/\\"}] 
+"
+`;
+
+exports[`should log warning message in the console 1`] = `
+"
+ venia-sample-backends is a \\"development-only\\" extension, please remove it from your project's package.json before going to production.
+"
+`;