@magento/venia-ui 9.1.0-beta.1 → 9.2.0-alpha.3

package/lib/util/formValidators.js

@@ -11,7 +11,7 @@ const SUCCESS = undefined;
 export const hasLengthAtLeast = (value, values, minimumLength) => {
     const message = {
         id: 'validation.hasLengthAtLeast',
-        defaultMessage: 'Must contain more characters',
+        defaultMessage: 'Must contain at least {value} character(s).',
         value: minimumLength
     };
     if (!value || value.length < minimumLength) {
@@ -25,7 +25,7 @@ export const hasLengthAtMost = (value, values, maximumLength) => {
     if (value && value.length > maximumLength) {
         const message = {
             id: 'validation.hasLengthAtMost',
-            defaultMessage: 'Must have less characters',
+            defaultMessage: 'Must not exceed {value} character(s).',
             value: maximumLength
         };
         return message;
@@ -38,7 +38,7 @@ export const hasLengthExactly = (value, values, length) => {
     if (value && value.length !== length) {
         const message = {
             id: 'validation.hasLengthExactly',
-            defaultMessage: 'Does not have exact number of characters',
+            defaultMessage: 'Must contain exactly {value} character(s).',
             value: length
         };
         return message;
@@ -86,7 +86,7 @@ export const validateRegionCode = (value, values, countries) => {
     if (!country) {
         const invalidCountry = {
             id: 'validation.invalidCountry',
-            defaultMessage: `Country "${countryCode}" is not an available country.`,
+            defaultMessage: 'Country "{value}" is not an available country.',
             value: countryCode
         };
         return invalidCountry;
@@ -96,7 +96,8 @@ export const validateRegionCode = (value, values, countries) => {
     if (!(Array.isArray(regions) && regions.length)) {
         const invalidRegions = {
             id: 'validation.invalidRegions',
-            defaultMessage: `Country "${countryCode}" does not contain any available regions.`,
+            defaultMessage:
+                'Country "{value}" does not contain any available regions.',
             value: countryCode
         };
         return invalidRegions;
@@ -106,7 +107,8 @@ export const validateRegionCode = (value, values, countries) => {
     if (!region) {
         const invalidAbbrev = {
             id: 'validation.invalidAbbreviation',
-            defaultMessage: 'That is not a valid state abbreviation.',
+            defaultMessage:
+                'State "{value}" is not a valid state abbreviation.',
             value: value
         };
         return invalidAbbrev;
@@ -145,7 +147,7 @@ export const validatePassword = value => {
 export const isEqualToField = (value, values, fieldKey) => {
     const message = {
         id: 'validation.isEqualToField',
-        defaultMessage: 'Fields must match',
+        defaultMessage: '{value} must match.',
         value: fieldKey
     };
     return value === values[fieldKey] ? SUCCESS : message;
@@ -154,7 +156,7 @@ export const isEqualToField = (value, values, fieldKey) => {
 export const isNotEqualToField = (value, values, fieldKey) => {
     const message = {
         id: 'validation.isNotEqualToField',
-        defaultMessage: 'Fields must be different',
+        defaultMessage: '{value} must be different',
         value: fieldKey
     };
     return value !== values[fieldKey] ? SUCCESS : message;

package/lib/util/toCamelCase.js

@@ -0,0 +1,3 @@
+export const toCamelCase = str => {
+    return str.replace(/[-_ ]([a-zA-Z])/g, str => str.substr(1).toUpperCase());
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-ui",
-  "version": "9.1.0-beta.1",
+  "version": "9.2.0-alpha.3",
   "publishConfig": {
     "access": "public"
   },
@@ -31,7 +31,7 @@
   "bugs": {
     "url": "https://github.com/magento/pwa-studio/issues"
   },
-  "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/venia-ui#readme",
+  "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/venia-ui#readme",
   "dependencies": {
     "informed": "~3.29.0",
     "jarallax": "~1.11.1",
@@ -50,23 +50,26 @@
     "uuid": "~8.3.2"
   },
   "devDependencies": {
+    "@apollo/client": "~3.4.0",
     "@babel/cli": "~7.2.3",
-    "@babel/core": "~7.3.4",
-    "@babel/plugin-proposal-class-properties": "~7.3.4",
-    "@babel/plugin-proposal-object-rest-spread": "~7.3.4",
-    "@babel/plugin-syntax-dynamic-import": "~7.2.0",
+    "@babel/core": "~7.15.0",
+    "@babel/plugin-proposal-class-properties": "~7.14.5",
+    "@babel/plugin-proposal-object-rest-spread": "~7.14.7",
+    "@babel/plugin-proposal-optional-chaining": "~7.16.0",
+    "@babel/plugin-syntax-dynamic-import": "~7.8.3",
     "@babel/plugin-syntax-jsx": "~7.2.0",
-    "@babel/plugin-transform-react-jsx": "~7.3.0",
+    "@babel/plugin-transform-react-jsx": "~7.14.9",
     "@babel/plugin-transform-runtime": "~7.4.4",
-    "@babel/preset-env": "~7.3.4",
+    "@babel/preset-env": "~7.16.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.4.1",
     "@storybook/react": "~6.3.7",
     "@testing-library/react-hooks": "~5.0.3",
     "babel-core": "~7.0.0-bridge.0",
     "babel-jest": "~24.1.0",
     "babel-loader": "~8.0.5",
-    "babel-plugin-dynamic-import-node": "~2.2.0",
+    "babel-plugin-dynamic-import-node": "~2.3.3",
     "babel-plugin-graphql-tag": "~2.0.0",
+    "babel-plugin-react-remove-properties": "~0.3.0",
     "identity-obj-proxy": "~3.0.0",
     "react": "~17.0.1",
     "react-intl": "~5.20.0",
@@ -74,13 +77,13 @@
     "redux": "~4.0.1"
   },
   "peerDependencies": {
-    "@apollo/client": "~3.1.2",
-    "@magento/babel-preset-peregrine": "~1.1.0",
-    "@magento/peregrine": "12.1.0-beta.1",
-    "@magento/pwa-buildpack": "~11.0.0",
+    "@apollo/client": "~3.4.0",
+    "@magento/babel-preset-peregrine": "1.2.0-alpha.3",
+    "@magento/peregrine": "12.2.0-alpha.3",
+    "@magento/pwa-buildpack": "11.1.0-alpha.3",
     "apollo-cache-persist": "~0.1.1",
     "braintree-web-drop-in": "~1.16.0",
-    "graphql": "~15.3.0",
+    "graphql": "~15.5.0",
     "react": "~17.0.1",
     "react-intl": "~5.20.0",
     "react-redux": "~7.2.2",

package/upward.yml

@@ -105,58 +105,37 @@ veniaPageType:
   resolver: inline
   inline:
     data:
-      resolver: conditional
-      when:
-        - matches: env.SCRIPT_NAME
-          pattern: '.*\.php$'
-          use:
-            resolver: computed
-            type:
-              resolver: inline
-              inline: pageType
-            additional:
-              - type: product
-                fetch: '__typename,id'
-              - type: cms_page
-                fetch: 'identifier'
-              - type: category
-                fetch: 'id'
-      default:
-        inline: ''
+      resolver: computed
+      type:
+        resolver: inline
+        inline: pageType
+      additional:
+        - type: product
+          fetch: '__typename,id'
+        - type: cms_page
+          fetch: 'identifier'
+        - type: category
+          fetch: 'uid'
 
 # Nonce for page type inline script
 veniaPageTypeNonce:
   resolver: inline
   inline:
     nonce:
-      resolver: conditional
-      when:
-        - matches: env.SCRIPT_NAME
-          pattern: '.*\.php$'
-          use:
-            resolver: computed
-            type:
-              resolver: inline
-              inline: pageTypeNonce
-      default:
-        inline: ''
+      resolver: computed
+      type:
+        resolver: inline
+        inline: pageTypeNonce
 
 # Webpack chunks to preload on page based on page type
 veniaWebpackChunks:
   resolver: inline
   inline:
     scripts:
-      resolver: conditional
-      when:
-        - matches: env.SCRIPT_NAME
-          pattern: '.*\.php$'
-          use:
-            resolver: computed
-            type:
-              resolver: inline
-              inline: webpackChunks
-      default:
-        inline: ''
+      resolver: computed
+      type:
+        resolver: inline
+        inline: webpackChunks
 
 # The veniaAppShell object resolves to a response that returns server-side
 # rendered HTML containing the PWA application shell.