Merge branch 'next' into fix-#5886/locale-links

vuestorefront · Aug 6, 2021 · 0e9dc38 · 0e9dc38
2 parents 0e0bdff + 1491a60
commit 0e9dc38
Show file tree

Hide file tree

Showing 127 changed files with 2,988 additions and 998 deletions.
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -13,6 +13,7 @@ jobs:
       - shell: bash
         run: |
           echo "1.0.`date +%s`" > version.txt
+          yarn && yarn build:ct:tools && yarn build:core:docs && yarn build:ct:docs
       - name: Upload version artifact
         uses: actions/upload-artifact@v2
         with:

diff --git a/README.md b/README.md
@@ -13,11 +13,11 @@ Vue Storefront is the most popular and most advanced Frontend Platform for eComm
 
 # Supported platforms
 
-- Commercetools
-- Shopify [Beta]
+- [Commercetools](https://github.com/vuestorefront/commercetools)
+- [Shopify](https://github.com/vuestorefront/shopify)
+- [Magento 2](https://github.com/vuestorefront/magento2) [Beta]
 - Spryker [Beta]
-- Salesforce Commerce Cloud [Beta]
-- Magento 2 [Beta]
+- [Salesforce Commerce Cloud](https://github.com/vuestorefront/salesforce-commerce-cloud) [Beta]
 
 
 [Learn more about available integrations](https://docs.vuestorefront.io/v2/integrations/)

diff --git a/package.json b/package.json
@@ -5,10 +5,11 @@
     "node": ">=10.x"
   },
   "scripts": {
+    "build:core:docs": "cd packages/core/docs && yarn build:core",
+    "build:ct:docs": "cd packages/core/docs && yarn build:ct",
     "build:docs": "cd packages/core/docs && yarn build",
     "dev:docs": "cd packages/core/docs && yarn dev",
-    "build:core": "cd packages/core/core && yarn build && cd - && yarn build:middleware",
-    "build:middleware": "cd packages/core/middleware && yarn build",
+    "build:core": "cd packages/core/core && yarn build && cd ../middleware && yarn build",
     "build:spr:api-client": "cd packages/spryker/api-client && yarn build",
     "build:spr:composables": "cd packages/spryker/composables && yarn build",
     "build:spr:tools": "yarn build:core && yarn build:spr:api-client && yarn build:spr:composables",
@@ -25,7 +26,8 @@
     "dev:bp": "cd packages/boilerplate/theme && yarn dev",
     "build:ct:api-client": "cd packages/commercetools/api-client && yarn build",
     "build:ct:composables": "cd packages/commercetools/composables && yarn build",
-    "build:ct:tools": "yarn build:core && yarn build:middleware && yarn build:ct:api-client && yarn build:ct:composables",
+    "build:middleware": "cd packages/core/middleware && yarn build",
+    "build:ct:tools": "yarn build:core && yarn build:ct:api-client && yarn build:ct:composables",
     "build:ct:theme": "cd packages/commercetools/theme && yarn build",
     "build:ct": "yarn build:core && yarn build:ct:tools && yarn build:ct:theme",
     "build:sp:tools": "yarn build:core && yarn build:sp:api-client && yarn build:sp:composables",

diff --git a/packages/api-extractor.base.json b/packages/api-extractor.base.json
@@ -0,0 +1,48 @@
+/**
+ * Config file for API Extractor.  For more info, please visit: https://api-extractor.com
+ */
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+  "projectFolder": ".",
+  "compiler": {
+    "tsconfigFilePath": "<projectFolder>/tsconfig.base.json"
+  },
+  "docModel": {
+    "enabled": true
+  },
+  "dtsRollup": {
+    "enabled": true
+  },
+  "tsdocMetadata": {
+    "enabled": false
+  },
+  "apiReport": {
+    "enabled": false
+  },
+  "messages": {
+    "compilerMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+      }
+    },
+    "extractorMessageReporting": {
+      "default": {
+        "logLevel": "none",
+        "addToApiReportFile": false
+      },
+      "ae-extra-release-tag": {
+        "logLevel": "none",
+        "addToApiReportFile": false
+      },
+      "ae-forgotten-export": {
+        "logLevel": "none"
+      }
+    },
+    "tsdocMessageReporting": {
+      "default": {
+        "logLevel": "none",
+        "addToApiReportFile": false
+      }
+    }
+  }
+}
diff --git a/packages/boilerplate/api-client/package.json b/packages/boilerplate/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/boilerplate-api",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "private": true,
   "sideEffects": false,
   "server": "server/index.js",
@@ -14,7 +14,11 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@vue-storefront/core": "^2.3.3"
+    "@vue-storefront/core": "^2.3.4"
+  },
+  "devDependencies": {
+    "rollup-plugin-typescript2": "^0.30.0",
+    "@rollup/plugin-node-resolve": "^13.0.0"
   },
   "files": [
     "lib/**/*"

diff --git a/packages/boilerplate/api-client/rollup.config.js b/packages/boilerplate/api-client/rollup.config.js
@@ -1,7 +1,10 @@
-import pkg from './package.json';
+import nodeResolve from '@rollup/plugin-node-resolve';
 import typescript from 'rollup-plugin-typescript2';
+import pkg from './package.json';
 import { generateBaseConfig } from '../../rollup.base.config';
 
+const extensions = ['.ts', '.js'];
+
 const server = {
   input: 'src/index.server.ts',
   output: [
@@ -16,9 +19,13 @@ const server = {
     ...Object.keys(pkg.peerDependencies || {})
   ],
   plugins: [
+    nodeResolve({
+      extensions
+    }),
     typescript({
       // eslint-disable-next-line global-require
-      typescript: require('typescript')
+      typescript: require('typescript'),
+      useTsconfigDeclarationDir: true
     })
   ]
 };

diff --git a/packages/boilerplate/api-client/tsconfig.json b/packages/boilerplate/api-client/tsconfig.json
@@ -1,5 +1,20 @@
 {
   "extends": "../tsconfig.base.json",
   "include": ["src"],
-  "exclude": ["node_modules", "lib"]
+  "exclude": ["node_modules", "lib"],
+  "compilerOptions": {
+    "outDir": "./lib",
+    "esModuleInterop": true,
+    "target": "ES2017",
+    "module": "ES2017",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "noEmitHelpers": true,
+    "sourceMap": true,
+    "declaration": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "baseUrl": "./",
+    "preserveSymlinks": true,
+  }
 }
diff --git a/packages/boilerplate/composables/package.json b/packages/boilerplate/composables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/boilerplate",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "private": true,
   "sideEffects": false,
   "main": "lib/index.cjs.js",
@@ -13,8 +13,12 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@vue-storefront/boilerplate-api": "^2.3.3",
-    "@vue-storefront/core": "^2.3.3"
+    "@vue-storefront/boilerplate-api": "^2.3.4",
+    "@vue-storefront/core": "^2.3.4"
+  },
+  "devDependencies": {
+    "rollup-plugin-typescript2": "^0.30.0",
+    "@rollup/plugin-node-resolve": "^13.0.0"
   },
   "peerDependencies": {
     "@vue/composition-api": "1.0.0-beta.21"

diff --git a/packages/boilerplate/composables/src/getters/orderGetters.ts b/packages/boilerplate/composables/src/getters/orderGetters.ts
@@ -51,6 +51,10 @@ function getFormattedPrice(price: number): string {
   return '';
 }
 
+function getOrdersTotal(orders: any): number {
+  return orders.total;
+}
+
 export const orderGetters: UserOrderGetters<Order, OrderItem> = {
   getDate,
   getId,
@@ -61,5 +65,6 @@ export const orderGetters: UserOrderGetters<Order, OrderItem> = {
   getItemName,
   getItemQty,
   getItemPrice,
-  getFormattedPrice
+  getFormattedPrice,
+  getOrdersTotal
 };
diff --git a/packages/boilerplate/composables/src/useCart/index.ts b/packages/boilerplate/composables/src/useCart/index.ts
@@ -6,11 +6,10 @@ import {
 import type {
   Cart,
   CartItem,
-  Coupon,
   Product
 } from '@vue-storefront/boilerplate-api';
 
-const params: UseCartFactoryParams<Cart, CartItem, Product, Coupon> = {
+const params: UseCartFactoryParams<Cart, CartItem, Product> = {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   load: async (context: Context, { customQuery }) => {
     console.log('Mocked: useCart.load');
@@ -51,7 +50,7 @@ const params: UseCartFactoryParams<Cart, CartItem, Product, Coupon> = {
   },
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  removeCoupon: async (context: Context, { currentCart, coupon, customQuery }) => {
+  removeCoupon: async (context: Context, { currentCart, couponCode, customQuery }) => {
     console.log('Mocked: useCart.removeCoupon');
     return {
       updatedCart: {}
@@ -65,4 +64,4 @@ const params: UseCartFactoryParams<Cart, CartItem, Product, Coupon> = {
   }
 };
 
-export const useCart = useCartFactory<Cart, CartItem, Product, Coupon>(params);
+export const useCart = useCartFactory<Cart, CartItem, Product>(params);
diff --git a/packages/boilerplate/rollup.base.config.js b/packages/boilerplate/rollup.base.config.js
@@ -1,6 +1,9 @@
+import nodeResolve from '@rollup/plugin-node-resolve';
 import typescript from 'rollup-plugin-typescript2';
 import { terser } from 'rollup-plugin-terser';
 
+const extensions = ['.ts', '.js'];
+
 export function generateBaseConfig(pkg) {
   return {
     input: 'src/index.ts',
@@ -15,10 +18,15 @@ export function generateBaseConfig(pkg) {
       }
     ],
     external: [
-      ...Object.keys(pkg.dependencies || {})
+      ...Object.keys(pkg.dependencies || {}),
+      ...Object.keys(pkg.peerDependencies || {})
     ],
     plugins: [
+      nodeResolve({
+        extensions
+      }),
       typescript({
+        useTsconfigDeclarationDir: true,
         // eslint-disable-next-line global-require
         typescript: require('typescript')
       }),

diff --git a/packages/boilerplate/theme/nuxt.config.js b/packages/boilerplate/theme/nuxt.config.js
@@ -154,7 +154,33 @@ export default {
           lastCommit: process.env.LAST_COMMIT || ''
         })
       })
-    ]
+    ],
+    extend (config, ctx) {
+      if (ctx && ctx.isClient) {
+        config.optimization = {
+          ...config.optimization,
+          mergeDuplicateChunks: true,
+          splitChunks: {
+            ...config.optimization.splitChunks,
+            chunks: 'all',
+            automaticNameDelimiter: '.',
+            maxSize: 128_000,
+            maxInitialRequests: Number.POSITIVE_INFINITY,
+            minSize: 0,
+            maxAsyncRequests: 10,
+            cacheGroups: {
+              vendor: {
+                test: /[/\\]node_modules[/\\]/,
+                name: (module) => `${module
+                  .context
+                  .match(/[/\\]node_modules[/\\](.*?)([/\\]|$)/)[1]
+                  .replace(/[.@_]/gm, '')}`
+              }
+            }
+          }
+        };
+      }
+    }
   },
 
   router: {

diff --git a/packages/boilerplate/theme/package.json b/packages/boilerplate/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/boilerplate-theme",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "private": true,
   "scripts": {
     "dev": "nuxt",
@@ -14,10 +14,11 @@
   },
   "dependencies": {
     "@storefront-ui/vue": "^0.10.3",
-    "@vue-storefront/boilerplate": "^2.3.3",
-    "@vue-storefront/middleware": "^2.3.3",
-    "@vue-storefront/nuxt": "^2.3.3",
-    "@vue-storefront/nuxt-theme": "^2.3.3",
+    "@vue-storefront/boilerplate": "^2.3.4",
+    "@vue-storefront/middleware": "^2.3.4",
+    "@vue-storefront/nuxt": "^2.3.4",
+    "@vue-storefront/nuxt-theme": "^2.3.4",
+    "@nuxtjs/style-resources": "^1.0.0",
     "cookie-universal-nuxt": "^2.1.3",
     "core-js": "^2.6.5",
     "nuxt": "^2.13.3",

diff --git a/packages/commercetools/api-client/package.json b/packages/commercetools/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/commercetools-api",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "sideEffects": false,
   "server": "server/index.js",
   "main": "lib/index.cjs.js",
@@ -13,8 +13,8 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@apollo/client": "^3.2.9",
-    "@commercetools/sdk-auth": "^3.0.1",
+    "@apollo/client": "^3.3.21",
+    "@commercetools/sdk-auth": "^3.0.12",
     "@vue-storefront/core": "^2.3.3",
     "apollo-cache-inmemory": "^1.6.6",
     "apollo-client": "^2.6.10",
@@ -23,15 +23,17 @@
     "apollo-link-error": "^1.1.13",
     "apollo-link-http": "^1.5.17",
     "apollo-link-retry": "^2.2.16",
-    "graphql": "^14.5.8",
-    "graphql-tag": "^2.10.1",
-    "isomorphic-fetch": "^2.2.1"
+    "graphql": "^15.5.1",
+    "graphql-tag": "^2.12.5",
+    "isomorphic-fetch": "^3.0.0"
   },
   "devDependencies": {
     "apollo-link-schema": "^1.2.5",
-    "graphql-tools": "^4.0.6",
+    "graphql-tools": "^7.0.5",
     "jest-transform-graphql": "^2.1.0",
-    "rollup-plugin-graphql": "^0.1.0"
+    "@rollup/plugin-graphql": "^1.0.0",
+    "rollup-plugin-typescript2": "^0.30.0",
+    "@rollup/plugin-node-resolve": "^13.0.0"
   },
   "publishConfig": {
     "access": "public"