asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
olivermrbl
2021-03-17 14:50:07 +01:00
parent 8fc6b26cb8 9ac68615a0
commit 7872d37c04
65 changed files with 3527 additions and 2619 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/api/__tests__/store/gift-cards.js
+1
View File
@@ -59,6 +59,7 @@ describe("/store/gift-cards", () => {
code: "GC_TEST",
value: 200,
balance: 120,
region: expect.any(Object),
});
});
});
integration-tests/api/package.json
+3 -3
View File
@@ -8,15 +8,15 @@
"build": "babel src -d dist --extensions \".ts,.js\""
},
"dependencies": {
"@medusajs/medusa": "1.1.11-dev-1615882960610",
"medusa-interfaces": "1.1.1-dev-1615882960610",
"@medusajs/medusa": "1.1.13-dev-1615987548667",
"medusa-interfaces": "1.1.3-dev-1615987548667",
"typeorm": "^0.2.31"
},
"devDependencies": {
"@babel/cli": "^7.12.10",
"@babel/core": "^7.12.10",
"@babel/node": "^7.12.10",
"babel-preset-medusa-package": "1.1.0-dev-1615882960610",
"babel-preset-medusa-package": "1.1.0-dev-1615987548667",
"jest": "^26.6.3"
}
}
integration-tests/api/yarn.lock
+23 -32
View File
@@ -1173,10 +1173,10 @@
"@types/yargs" "^15.0.0"
chalk "^4.0.0"
"@medusajs/medusa@1.1.11-dev-1615882960610":
version "1.1.11"
resolved "https://registry.yarnpkg.com/@medusajs/medusa/-/medusa-1.1.11.tgz#4852880a461ef641ae50f35ddc8a28a8a0905f9c"
integrity sha512-yXeJ7NpeRzHIo1TNQpKpQoIT/4SGsteaHgnDKt5OUqM3rT8Y0ikZ8ezH9wnOqB7P0NR7V2buYXGlUnP3juvfFQ==
"@medusajs/medusa@1.1.13-dev-1615987548667":
version "1.1.13"
resolved "https://registry.yarnpkg.com/@medusajs/medusa/-/medusa-1.1.13.tgz#1aad18445c062e298bfea2ac362ad2740a53fde6"
integrity sha512-yPQ+uA9qQsJiqME7nR8ggeg/qi2Kypqi6iNsFrdXbA99djjm3Cpkl3kmkTorRvzQ6jbKZ1QMLS+Dx5FwbKuiTw==
dependencies:
"@babel/plugin-transform-classes" "^7.9.5"
"@hapi/joi" "^16.1.8"
@@ -1198,8 +1198,8 @@
joi "^17.3.0"
joi-objectid "^3.0.1"
jsonwebtoken "^8.5.1"
medusa-core-utils "^1.1.0"
medusa-test-utils "^1.1.3"
medusa-core-utils "^1.1.2"
medusa-test-utils "^1.1.5"
morgan "^1.9.1"
multer "^1.4.2"
passport "^0.4.0"
@@ -1213,7 +1213,6 @@
request-ip "^2.1.3"
resolve-cwd "^3.0.0"
scrypt-kdf "^2.0.1"
typeorm "^0.2.29"
ulid "^2.3.0"
uuid "^8.3.1"
winston "^3.2.1"
@@ -1713,7 +1712,7 @@ babel-preset-jest@^26.6.2:
babel-plugin-jest-hoist "^26.6.2"
babel-preset-current-node-syntax "^1.0.0"
babel-preset-medusa-package@1.1.0-dev-1615882960610:
babel-preset-medusa-package@1.1.0-dev-1615987548667:
version "1.1.1-alpha.57"
resolved "https://registry.yarnpkg.com/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.1-alpha.57.tgz#3e19607f963febea2d24c5f44468e2903af2d9da"
integrity sha512-OzXPNscchkBVLRdBGqY64uGktgktol5zR0LA8tbpKxv38Fa3FR9dJLF6gqjOQQIgUnrZkgk5p6HZ2OmNXF7FcQ==
@@ -4315,36 +4314,28 @@ media-typer@0.3.0:
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
medusa-core-utils@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/medusa-core-utils/-/medusa-core-utils-1.1.0.tgz#0641b365b769dbf99856025d935eef5cf5d81f2c"
integrity sha512-zocRthKhLK3eSjrXbAhZZkIMBRxyvU7GcAMFh5UCEgfe7f935vjE7r5lGTr5jTEwgwaoTUk9ep0VBekz0SEdyw==
medusa-core-utils@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/medusa-core-utils/-/medusa-core-utils-1.1.2.tgz#3d9ccd37b052bc4701040fbf0618210f075f459a"
integrity sha512-YAGkLkS5DqCSHWlMz2Bfh0nKJQ8n35IfH/39q6J9DXfFUPYU+d5i8lSvIS8PNsXuSs9Es0dzY2ZS/sOIFKWzxw==
dependencies:
joi "^17.3.0"
joi-objectid "^3.0.1"
medusa-core-utils@^1.1.1-next.64+6ad2b0e6:
version "1.1.1-next.64"
resolved "https://registry.yarnpkg.com/medusa-core-utils/-/medusa-core-utils-1.1.1-next.64.tgz#62174fcc6a73394b75a5206470585ee2d73aefb7"
integrity sha512-Vi2NHf25hwaIABPanvq81QJxmsBHt/Y1NHzriSaq50D3tsiDjTrR9DdYe0aLfep5/MaTClCm1cjXSI/tYZgOjQ==
dependencies:
joi "^17.3.0"
joi-objectid "^3.0.1"
medusa-interfaces@1.1.1-dev-1615882960610:
version "1.1.2-next.23"
resolved "https://registry.yarnpkg.com/medusa-interfaces/-/medusa-interfaces-1.1.2-next.23.tgz#57ba339bd7f72e111d9307a4fd9acdc503c94bd0"
integrity sha512-rjObAO2j2TpuOvjgx5y1twz78yyAlEL/ZB4ulbMqvSSxoxvTiqAiOeCVuFdcYTvq3GD32GWNz5oeJxQgo54Tbw==
dependencies:
medusa-core-utils "^1.1.1-next.64+6ad2b0e6"
medusa-test-utils@^1.1.3:
medusa-interfaces@1.1.3-dev-1615987548667:
version "1.1.3"
resolved "https://registry.yarnpkg.com/medusa-test-utils/-/medusa-test-utils-1.1.3.tgz#c2b45d44b9567fa2255e936d7bed73a31dfb42dd"
integrity sha512-0saYG5BhEjc4BZP76/2IJL7CyqIdbCasAci+EYXzwnwgS+nCUhKDjzzNAnC+PZMK/teD3M7x4n7isFtjgNSIDQ==
resolved "https://registry.yarnpkg.com/medusa-interfaces/-/medusa-interfaces-1.1.3.tgz#b1fb889c321433d31e6d998dbd7d47eb71a27589"
integrity sha512-6WNzOfcHDM7CaRFOerZBt5eRqje97gMbTcoEiFOxJy8a5B7OIq/wt7UBI1Et3C9lYFKpb5fSUwfDwRWY/yO3UA==
dependencies:
medusa-core-utils "^1.1.2"
medusa-test-utils@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/medusa-test-utils/-/medusa-test-utils-1.1.5.tgz#5a93c52117c7a8659058512abf939e2aaed619b7"
integrity sha512-oM6lIRdnq6T3VRi702hYOQ9m3T9Zy2IwZAp2nBnJRlXpXbWlNnIS3y0E638m5wsGbFzSKKxrDNdGtEpujxwzyQ==
dependencies:
"@babel/plugin-transform-classes" "^7.9.5"
medusa-core-utils "^1.1.0"
medusa-core-utils "^1.1.2"
randomatic "^3.1.1"
merge-descriptors@1.0.1:
@@ -6112,7 +6103,7 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
typeorm@^0.2.29, typeorm@^0.2.31:
typeorm@^0.2.31:
version "0.2.31"
resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.31.tgz#82b8a1b233224f81c738f53b0380386ccf360917"
integrity sha512-dVvCEVHH48DG0QPXAKfo0l6ecQrl3A8ucGP4Yw4myz4YEDMProebTQo8as83uyES+nrwCbu3qdkL4ncC2+qcMA==