Merge branch 'master' into develop

This commit is contained in:
olivermrbl committed 2023-02-09 17:52:41 +01:00
commit d3feb62b85
1014 files changed
+13993 -9513

No files matched your search

-37
View File
@@ -1,37 +0,0 @@
# Logs
logs
*.log
# Runtime data
pids
*.pid
*.seed
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
# Coverage directory used by tools like istanbul
coverage
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# node-waf configuration
.lock-wscript
# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules
*.un~
yarn.lock
src
flow-typed
coverage
decls
examples
# tests
__tests__
+4 -1
View File
@@ -3,4 +3,7 @@ src
.env
.babelrc.js
.eslintrc
.gitignore
.gitignore
.yarn
.turbo
-10
View File
@@ -1,10 +0,0 @@
src
.turbo
.prettierrc
.env
.babelrc.js
.eslintrc
.gitignore
ormconfig.json
tsconfig.json
jest.config.md
+1
View File
@@ -11,6 +11,7 @@
"publishConfig": {
"access": "public"
},
"files": ["dist"],
"author": "Medusa",
"license": "MIT",
"devDependencies": {
-6
View File
@@ -1,6 +0,0 @@
src
.babelrc
.eslintrc
.gitignore
.prettierrc
.env
+1
View File
@@ -14,6 +14,7 @@
"publishConfig": {
"access": "public"
},
"files": ["dist", "cli.js"],
"scripts": {
"test": "jest --passWithNoTests src",
"build": "babel src --out-dir dist/ --ignore '**/__tests__','**/__mocks__'",
+1
View File
@@ -14,6 +14,7 @@
"prepare": "cross-env NODE_ENV=production yarn run build",
"watch": "tsc --watch"
},
"files": ["dist"],
"author": "Sebastian Rindom",
"license": "MIT",
"devDependencies": {
+1
View File
@@ -6,6 +6,7 @@
"bin": {
"medusa-dev": "./dist/index.js"
},
"files": ["dist"],
"dependencies": {
"@babel/runtime": "^7.12.5",
"chokidar": "^3.5.3",
+5 -6
View File
@@ -1,9 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
.turbo
.yarn
+5 -6
View File
@@ -1,9 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
.turbo
.yarn
+5 -6
View File
@@ -1,9 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
.turbo
.yarn
@@ -1,9 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
.turbo
.yarn
@@ -1,10 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
/src
.babelrc
.turbo
.yarn
+1
View File
@@ -14,6 +14,7 @@
"build": "babel src --out-dir dist --ignore '**/__tests__','**/__mocks__'",
"watch": "babel -w src --out-dir dist --ignore '**/__tests__','**/__mocks__'"
},
"files": ["dist"],
"author": "Sebastian Rindom",
"license": "MIT",
"devDependencies": {
+1
View File
@@ -5,6 +5,7 @@
"main": "dist/index.js",
"module": "dist/index.mjs",
"types": "dist/index.d.ts",
"files": ["dist"],
"exports": {
".": {
"import": "./dist/index.mjs",
+5 -6
View File
@@ -1,9 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
.turbo
.yarn
+5 -6
View File
@@ -1,9 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
.turbo
.yarn
+4 -9
View File
@@ -1,13 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
yarn.lock
src
.gitignore
.eslintrc
dist
yarn.lock
.babelrc
.prettierrc
.turbo
.yarn
+4 -9
View File
@@ -1,13 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
yarn.lock
src
.gitignore
.eslintrc
dist
yarn.lock
.babelrc
.prettierrc
.turbo
.yarn
+4 -9
View File
@@ -1,13 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
yarn.lock
src
.gitignore
.eslintrc
dist
yarn.lock
.babelrc
.prettierrc
.turbo
.yarn
+5 -9
View File
@@ -1,13 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
yarn.lock
src
.gitignore
.eslintrc
dist
yarn.lock
.babelrc
.prettierrc
jest.config.js
.turbo
.yarn
@@ -1,10 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
src
!index.js
dist
yarn.lock
.babelrc
.turbo
.yarn
+4 -9
View File
@@ -1,13 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
yarn.lock
src
.gitignore
.eslintrc
dist
yarn.lock
.babelrc
.prettierrc
.turbo
.yarn
@@ -1,9 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
jest.config.js
.turbo
.yarn
+6 -6
View File
@@ -1,9 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
jest.config.js
.turbo
.yarn
+4 -9
View File
@@ -1,13 +1,8 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
yarn.lock
src
.gitignore
.eslintrc
dist
yarn.lock
.babelrc
.prettierrc
.turbo
.yarn
+6 -6
View File
@@ -1,9 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
jest.config.js
.turbo
.yarn
@@ -1,13 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
yarn.lock
src
.gitignore
.eslintrc
dist
yarn.lock
.babelrc
.prettierrc
jest.config.js
.turbo
.yarn
@@ -1,9 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
jest.config.js
.turbo
.yarn
+6 -6
View File
@@ -1,9 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
jest.config.js
.turbo
.yarn
+5 -9
View File
@@ -1,13 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
yarn.lock
src
.gitignore
.eslintrc
dist
yarn.lock
.babelrc
.prettierrc
jest.config.js
.turbo
.yarn
@@ -1,11 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
yarn.lock
src
dist
yarn.lock
.babelrc
jest.config.js
.turbo
.yarn
+6 -6
View File
@@ -1,9 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
jest.config.js
.turbo
.yarn
+6 -6
View File
@@ -1,9 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
src
dist
yarn.lock
.babelrc
jest.config.js
.turbo
.yarn
-12
View File
@@ -1,12 +0,0 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
test/
public/
.storybook/
mocks/
stories/
yarn.lock
+1
View File
@@ -11,6 +11,7 @@
},
"./package.json": "./package.json"
},
"files": ["dist"],
"engines": {
"node": ">=10"
},
+8 -6
View File
@@ -1,7 +1,9 @@
/lib
node_modules
.DS_store
.env*
/*.js
!index.js
yarn.lock
src
dist
yarn.lock
.babelrc
jest.config.js
.turbo
.yarn
-9
View File
@@ -1,9 +0,0 @@
src
.prettierrc
.env
.babelrc.js
.eslintrc
.gitignore
ormconfig.json
tsconfig.json
jest.config.md
+1
View File
@@ -11,6 +11,7 @@
"publishConfig": {
"access": "public"
},
"files": ["dist"],
"author": "Sebastian Rindom",
"license": "MIT",
"devDependencies": {
+1
View File
@@ -14,6 +14,7 @@
"build": "babel src --out-dir dist/ --ignore '**/__tests__','**/__mocks__'",
"watch": "babel -w src --out-dir dist/ --ignore '**/__tests__','**/__mocks__'"
},
"files": ["dist"],
"author": "Sebastian Rindom",
"license": "MIT",
"devDependencies": {
-9
View File
@@ -1,9 +0,0 @@
src
.prettierrc
.env
.babelrc.js
.eslintrc
.gitignore
ormconfig.json
tsconfig.json
jest.config.md
+1
View File
@@ -12,6 +12,7 @@
"publishConfig": {
"access": "public"
},
"files": ["dist"],
"author": "Sebastian Rindom",
"license": "MIT",
"devDependencies": {
@@ -53,10 +53,7 @@ export default async (req, res) => {
const { id } = req.params
const orderService: OrderService = req.scope.resolve("orderService")
const order = await orderService.retrieveWithTotals(id, {
select: defaultStoreOrdersFields,
relations: defaultStoreOrdersRelations,
})
const order = await orderService.retrieveWithTotals(id, req.retrieveConfig)
res.json({
order: cleanResponseData(order, req.allowedProperties || []),
@@ -92,10 +92,7 @@ export default async (req, res) => {
display_id: validated.display_id,
email: validated.email,
},
{
select: defaultStoreOrdersFields,
relations: defaultStoreOrdersRelations,
}
req.listConfig
)
if (orders.length !== 1) {
@@ -1,5 +1,5 @@
import { IdMap } from "medusa-test-utils"
import { defaultStoreProductsRelations } from ".."
import { defaultStoreProductsFields, defaultStoreProductsRelations } from ".."
import { request } from "../../../../../helpers/test-request"
import { ProductServiceMock } from "../../../../../services/__mocks__/product"
@@ -22,6 +22,7 @@ describe("Get product by id", () => {
expect(ProductServiceMock.retrieve).toHaveBeenCalledWith(
IdMap.getId("product1"),
{
select: defaultStoreProductsFields,
relations: defaultStoreProductsRelations,
}
)
@@ -54,6 +55,7 @@ describe("Get product by id", () => {
expect(ProductServiceMock.retrieve).toHaveBeenCalledWith(
IdMap.getId("variantsWithPrices"),
{
select: defaultStoreProductsFields,
relations: defaultStoreProductsRelations,
}
)
@@ -84,9 +84,7 @@ export default async (req, res) => {
const pricingService: PricingService = req.scope.resolve("pricingService")
const cartService: CartService = req.scope.resolve("cartService")
const regionService: RegionService = req.scope.resolve("regionService")
const rawProduct = await productService.retrieve(id, {
relations: defaultStoreProductsRelations,
})
const rawProduct = await productService.retrieve(id, req.retrieveConfig)
let sales_channel_id = validated.sales_channel_id
const featureFlagRouter: FlagRouter = req.scope.resolve("featureFlagRouter")
-10
View File
@@ -1,10 +0,0 @@
src
.turbo
.prettierrc
.env
.babelrc.js
.eslintrc
.gitignore
ormconfig.json
tsconfig.json
jest.config.md
+1
View File
@@ -11,6 +11,7 @@
"publishConfig": {
"access": "public"
},
"files": ["dist"],
"author": "Medusa",
"license": "MIT",
"devDependencies": {