Skip to content

Commit

Permalink
Merge d382966 into 1445e47
Browse files Browse the repository at this point in the history
  • Loading branch information
@filipsobol
filipsobol committed Jan 14, 2021
2 parents 1445e47 + d382966 commit 361b4c2
Show file tree
Hide file tree
Showing 17 changed files with 491 additions and 451 deletions.
2 changes: 1 addition & 1 deletion packages/boilerplate/api-client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"prepublish": "yarn build"
},
"dependencies": {
"@vue-storefront/core": "^2.2.0"
"@vue-storefront/core": "^2.2.1"
},
"files": [
"lib/**/*"
Expand Down
14 changes: 7 additions & 7 deletions packages/boilerplate/api-client/src/types.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export type Cart = {}
export type Wishlist = {}
export type Cart = Record<string, unknown>;
export type Wishlist = Record<string, unknown>;
export type ProductVariant = {
_id: number;
_description: string;
Expand All @@ -11,13 +11,13 @@ export type ProductVariant = {
original: number;
current: number;
};
}
};
export type Category = {
id: number;
name: string;
slug: string;
items: Category[];
}
export type CategoryFilter = {}
export type ShippingMethod = {}
export type LineItem = {};
};
export type CategoryFilter = Record<string, unknown>;
export type ShippingMethod = Record<string, unknown>;
export type LineItem = Record<string, unknown>;
5 changes: 4 additions & 1 deletion packages/boilerplate/composables/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
},
"dependencies": {
"@vue-storefront/boilerplate-api": "0.0.1",
"@vue-storefront/core": "^2.2.0"
"@vue-storefront/core": "^2.2.1"
},
"peerDependencies": {
"@vue/composition-api": "1.0.0-beta.21"
},
"files": [
"lib/**/*"
Expand Down
48 changes: 24 additions & 24 deletions packages/boilerplate/composables/src/types/index.ts
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
export { UseCategory, UseProduct } from '@vue-storefront/core';

export type ProductsResponse = {
data: Product[];
total: number;
};

export type OrdersResponse = {
data: any[];
total: number;
};

export type OrderSearchParams = Record<string, any>;

export type Category = {};
export type Category = Record<string, unknown>;

export type User = {
firstName?: string;
lastName?: string;
email?: string;
};

export type UserAddress = {};
export type UserAddress = Record<string, unknown>;

export type Cart = {};
export type Cart = Record<string, unknown>;

export type CartItem = {};
export type CartItem = Record<string, unknown>;

export type Coupon = {};
export type Coupon = Record<string, unknown>;

export type Order = {};
export type Order = Record<string, unknown>;

export type OrderItem = {};
export type OrderItem = Record<string, unknown>;

export type Product = {};
export type Product = Record<string, unknown>;

export type Review = {};
export type Review = Record<string, unknown>;

export type ShippingMethod = {};
export type ShippingMethod = Record<string, unknown>;

export type WishlistProduct = {};
export type WishlistProduct = Record<string, unknown>;

export type Wishlist = {};
export type Wishlist = Record<string, unknown>;

export type ProductsResponse = {
data: Product[];
total: number;
};

export type OrderSearchParams = Record<string, any>;

export type OrdersResponse = {
data: any[];
total: number;
};
4 changes: 2 additions & 2 deletions packages/boilerplate/theme/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"dependencies": {
"@storefront-ui/vue": "^0.9.1",
"@vue-storefront/boilerplate": "0.0.1",
"@vue-storefront/nuxt": "^2.2.0",
"@vue-storefront/nuxt-theme": "^2.2.0",
"@vue-storefront/nuxt": "^2.2.1",
"@vue-storefront/nuxt-theme": "^2.2.1",
"@nuxtjs/style-resources": "^1.0.0",
"cookie-universal-nuxt": "^2.1.3",
"core-js": "^2.6.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/commercetools/api-client/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/commercetools-api",
"version": "1.1.0",
"version": "1.1.1",
"sideEffects": false,
"main": "lib/index.cjs.js",
"module": "lib/index.es.js",
Expand All @@ -14,7 +14,7 @@
"dependencies": {
"@apollo/client": "^3.2.9",
"@commercetools/sdk-auth": "^3.0.1",
"@vue-storefront/core": "^2.2.0",
"@vue-storefront/core": "^2.2.1",
"apollo-cache-inmemory": "^1.6.6",
"apollo-client": "^2.6.10",
"apollo-link": "^1.2.14",
Expand Down
6 changes: 3 additions & 3 deletions packages/commercetools/composables/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/commercetools",
"version": "1.1.0",
"version": "1.1.1",
"sideEffects": false,
"main": "lib/index.cjs.js",
"module": "lib/index.es.js",
Expand All @@ -13,8 +13,8 @@
"prepublish": "yarn build"
},
"dependencies": {
"@vue-storefront/commercetools-api": "^1.1.0",
"@vue-storefront/core": "^2.2.0",
"@vue-storefront/commercetools-api": "^1.1.1",
"@vue-storefront/core": "^2.2.1",
"js-cookie": "^2.2.1",
"vue": "^2.6.x"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/commercetools/theme/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@vue-storefront/commercetools-theme",
"description": "My breathtaking Nuxt.js project",
"author": "Filip Rakowski",
"version": "1.1.0",
"version": "1.1.1",
"publishConfig": {
"access": "public"
},
Expand All @@ -17,9 +17,9 @@
"dependencies": {
"@nuxtjs/pwa": "^3.2.2",
"@storefront-ui/vue": "0.9.2",
"@vue-storefront/commercetools": "^1.1.0",
"@vue-storefront/nuxt": "^2.2.0",
"@vue-storefront/nuxt-theme": "^2.2.0",
"@vue-storefront/commercetools": "^1.1.1",
"@vue-storefront/nuxt": "^2.2.1",
"@vue-storefront/nuxt-theme": "^2.2.1",
"cookie-universal-nuxt": "^2.1.3",
"core-js": "^2.6.5",
"nuxt": "^2.13.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/cache/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/cache",
"version": "2.2.0",
"version": "2.2.1",
"main": "lib/index.cjs.js",
"module": "lib/index.es.js",
"types": "lib/index.d.ts",
Expand Down
6 changes: 3 additions & 3 deletions packages/core/cli/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/cli",
"version": "2.2.0",
"version": "2.2.1",
"description": "",
"main": "./lib/index.js",
"bin": {
Expand All @@ -17,10 +17,10 @@
"inquirer": "^7.3.3",
"chokidar": "^3.3.1",
"consola": "^2.10.1",
"@vue-storefront/nuxt-theme": "^2.2.0"
"@vue-storefront/nuxt-theme": "^2.2.1"
},
"devDependencies": {
"@vue-storefront/commercetools-theme": "^1.1.0"
"@vue-storefront/commercetools-theme": "^1.1.1"
},
"author": "Filip Jędrasik",
"license": "MIT"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/core",
"version": "2.2.0",
"version": "2.2.1",
"sideEffects": false,
"main": "lib/index.cjs.js",
"module": "lib/index.es.js",
Expand Down
3 changes: 3 additions & 0 deletions packages/core/docs/commercetools/changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 1.1.1
- bumped Vue Storefront core dependencies to 2.2.1 ([#5406](https://github.com/DivanteLtd/vue-storefront/issues/5406))

## 1.1.0
- fix getOrders api ([#5328](https://github.com/DivanteLtd/vue-storefront/issues/5328))
- added bottom margin to fix visibility of last footer category ([#5253](https://github.com/DivanteLtd/vue-storefront/issues/5253))
Expand Down
3 changes: 3 additions & 0 deletions packages/core/docs/contributing/changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

# 2.2.1
- fixed `vue-lazy-hydration` dependency in `nuxt-theme-module` and improved typings in Boilerplate ([#5403](https://github.com/DivanteLtd/vue-storefront/issues/5403))

## 2.2.0
- added bottom margin to fix visibility of last footer category ([#5253](https://github.com/DivanteLtd/vue-storefront/issues/5253))
- [BREAKING] refactored names of many factory methods and composable methods, details in linked PR ([#5299](https://github.com/DivanteLtd/vue-storefront/pull/5299))
Expand Down
2 changes: 1 addition & 1 deletion packages/core/nuxt-module/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/nuxt",
"version": "2.2.0",
"version": "2.2.1",
"description": "",
"main": "lib/module.js",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions packages/core/nuxt-theme-module/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/nuxt-theme",
"version": "2.2.0",
"version": "2.2.1",
"description": "",
"main": "lib/module.js",
"scripts": {
Expand All @@ -16,13 +16,13 @@
"ejs": "^3.0.2",
"loglevel": "^1.6.7",
"ts-loader": "^8.0.3",
"vue": "^2.6.11",
"vue-lazy-hydration": "^2.0.0-beta.4"
"vue": "^2.6.11"
},
"publishConfig": {
"access": "public"
},
"dependencies": {
"lodash.merge": "^4.6.2"
"lodash.merge": "^4.6.2",
"vue-lazy-hydration": "^2.0.0-beta.4"
}
}
3 changes: 2 additions & 1 deletion packages/rollup.base.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ export function generateBaseConfig(pkg) {
}
],
external: [
...Object.keys(pkg.dependencies || {})
...Object.keys(pkg.dependencies || {}),
...Object.keys(pkg.peerDependencies || {})
],
plugins: [
typescript({
Expand Down
Loading

0 comments on commit 361b4c2

Please sign in to comment.