refactor(theme): updated structure to 2.3rc

Author: bloodf

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{js,jsx,ts,tsx}]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 150

.eslintrc.js

@@ -1,9 +1,13 @@
 const { resolve } = require('path');
 const airBnb = require('./eslint/airBnB/extends');
 const eslintExtends = require('./eslint/extends');
-const eslintRules = require('./eslint/airBnB/rules');
+const eslintRules = require('./eslint/rules');
 const jest = require('./eslint/jest/extends');
 const jestRules = require('./eslint/jest/rules');
+const importEsLint = require('./eslint/import/plugin');
+const importEsLintExtends = require('./eslint/import/extends');
+const importEsLintRules = require('./eslint/import/rules');
+const importEsLintSettings = require('./eslint/import/settings');
 const typescript = require('./eslint/typescript/plugin');
 const typescriptExtends = require('./eslint/typescript/extends');
 const typescriptRules = require('./eslint/typescript/rules');
@@ -35,18 +39,23 @@ module.exports = {
   plugins: [
     ...typescript,
     ...vue,
+    ...importEsLint,
   ],
   extends: [
     ...eslintExtends,
     ...airBnb,
     ...typescriptExtends,
     ...vueExtends,
+    ...importEsLintExtends,
     ...jest,
   ],
   rules: {
     ...eslintRules,
     ...typescriptRules,
+    ...importEsLintRules,
     ...jestRules,
   },
-  settings: {},
+  settings: {
+    ...importEsLintSettings,
+  }
 }

packages/theme/.editorconfig

@@ -1,13 +1,15 @@
-# editorconfig.org
-root = true
-
 [*]
+charset = utf-8
 indent_style = space
 indent_size = 2
 end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
 insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.md]
-trim_trailing_whitespace = false
+[*.{js,jsx,ts,tsx}]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 150

packages/theme/.lintstagedrc

@@ -0,0 +1,5 @@
+{
+  "*.{js,jsx,ts,tsx,vue}": [
+    "eslint --fix"
+  ],
+}

packages/theme/README.md

@@ -1,6 +1,6 @@
-# theme
+# Vue-Storefront@Next Magento 2.x Theme
 
-> Boilerplate theme
+> Magento 2.x theme
 
 ## Build Setup
 

packages/theme/composables/useUiHelpers/index.ts

@@ -1,4 +1,5 @@
 import { getCurrentInstance } from '@vue/composition-api';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { Category } from '@vue-storefront/magento-api';
 import { AgnosticFacet } from '@vue-storefront/core';
 
@@ -14,15 +15,15 @@ const reduceFilters = (query) => (prev, curr) => {
 
   return {
     ...prev,
-    [curr]: makeArray ? query[curr] : [query[curr]]
+    [curr]: makeArray ? query[curr] : [query[curr]],
   };
 };
 
 const getFiltersDataFromUrl = (context, onlyFilters) => {
   const { query } = context.$router.history.current;
 
   return Object.keys(query)
-    .filter(f => onlyFilters ? !nonFilters.includes(f) : nonFilters.includes(f))
+    .filter((f) => (onlyFilters ? !nonFilters.includes(f) : nonFilters.includes(f)))
     .reduce(reduceFilters(query), {});
 };
 
@@ -39,13 +40,11 @@ const useUiHelpers = () => {
       sort: query.sort || 'latest',
       filters: getFiltersDataFromUrl(instance, true),
       itemsPerPage: parseInt(query.itemsPerPage, 10) || 20,
-      term: query.term
+      term: query.term,
     };
   };
 
-  const changeSearchTerm = (term: string) => {
-    return term;
-  };
+  const changeSearchTerm = (term: string) => term;
 
   const getSearchTermFromUrl = () => {
     const { query, params } = instance.$router.history.current;
@@ -59,13 +58,11 @@ const useUiHelpers = () => {
       sort: query.sort || 'latest',
       filters: getFiltersDataFromUrl(instance, true),
       itemsPerPage: parseInt(query.itemsPerPage, 10) || 20,
-      term: query.term
+      term: query.term,
     };
   };
 
-  const getCatLink = (category: Category): string => {
-    return `/c/${category.url_path}`;
-  };
+  const getCatLink = (category: Category): string => `/c/${category.url_path}`;
 
   const changeSorting = (sort: string) => {
     const { query } = instance.$router.history.current;
@@ -76,26 +73,26 @@ const useUiHelpers = () => {
     instance.$router.push({
       query: {
         ...getFiltersDataFromUrl(instance, false),
-        ...filters
-      }
+        ...filters,
+      },
     });
   };
 
   const changeItemsPerPage = (itemsPerPage: number) => {
     instance.$router.push({
       query: {
         ...getFiltersDataFromUrl(instance, false),
-        itemsPerPage
-      }
+        itemsPerPage,
+      },
     });
   };
 
   const setTermForUrl = (term: string) => {
     instance.$router.push({
       query: {
         ...getFiltersDataFromUrl(instance, false),
-        term: term || undefined
-      }
+        term: term || undefined,
+      },
     });
   };
 
@@ -113,7 +110,7 @@ const useUiHelpers = () => {
     isFacetColor,
     isFacetCheckbox,
     getSearchTermFromUrl,
-    changeSearchTerm
+    changeSearchTerm,
   };
 };
 

packages/theme/middleware.config.js

@@ -0,0 +1,31 @@
+module.exports = {
+  integrations: {
+    ma: {
+      location: '@vue-storefront/magento-api/server',
+      configuration: {
+        api: 'https://vsf-m2.site-builder.app/graphql',
+        tax: {
+          displayCartSubtotalIncludingTax: true,
+        },
+        websites: {
+          base: {
+            code: 'base',
+            defaultStoreGroup: 'main_website_store',
+            storeGroups: {
+              main_website_store: {
+                code: 'main_website_store',
+                defaultStore: 'default',
+                stores: {
+                  default: { code: 'default' },
+                  de: { code: 'de' },
+                  fr: { code: 'fr' },
+                },
+              },
+            },
+          },
+        },
+        defaultStore: 'default',
+      },
+    },
+  },
+};