Skip to content

Commit

Permalink
Merge branch 'develop' into fix/bulk-editor-default-fields
Browse files Browse the repository at this point in the history
  • Loading branch information
kasperkristensen committed Dec 8, 2023
2 parents 2f679d0 + 591ba23 commit 89faaac
Show file tree
Hide file tree
Showing 4,467 changed files with 951,361 additions and 535,177 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 6 additions & 0 deletions .changeset/angry-eels-guess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@medusajs/admin-ui": patch
"@medusajs/admin": patch
---

feat(admin): Add Korean language support
5 changes: 5 additions & 0 deletions .changeset/early-monkeys-rush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"medusa-payment-klarna": minor
---

Add language support
6 changes: 6 additions & 0 deletions .changeset/grumpy-bees-laugh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@medusajs/medusa": patch
"@medusajs/admin": patch
---

feat(medusa): add monorepo support command develop
5 changes: 5 additions & 0 deletions .changeset/heavy-moles-check.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": minor
---

feat(medusa): Respond with order when cart is already completed
7 changes: 7 additions & 0 deletions .changeset/tasty-ants-visit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@medusajs/medusa": patch
"@medusajs/medusa-cli": patch
"@medusajs/admin-ui": patch
---

feat(medusa, medusa-cli): Improve add line item + cluster starting with medusa cli
6 changes: 6 additions & 0 deletions .changeset/unlucky-snails-drive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@medusajs/medusa": patch
"@medusajs/core-flows": patch
---

slightly improve create cart workflow
5 changes: 5 additions & 0 deletions .changeset/wicked-crews-joke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": minor
---

Replaced Node Redis with ioredis
5 changes: 5 additions & 0 deletions .changeset/yellow-games-reflect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

fix(medusa): Product option values in CSV Export
24 changes: 22 additions & 2 deletions docs-util/packages/scripts/generate-reference.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ const require = createRequire(import.meta.url)

const referenceNames = process.argv.slice(2) || ["all"]
const basePath = path.join(require.resolve("typedoc-config"), "..")
let generatedCount = 0
let totalCount = 0
let ranMerger = false

if (!referenceNames.length) {
console.error(
Expand All @@ -27,15 +30,19 @@ referenceNames.forEach((name) => {
// `typedoc-config` directory, except for files starting
// with `_`
const files = globSync("[^_]**.js", {
cwd: path.join(basePath),
cwd: basePath,
})
totalCount = files.length
files.forEach((file) => generateReference(file))
} else if (name === "merge") {
runMerger()
} else {
totalCount = 1
generateReference(`${name}.js`)
}
})

function generateReference(referenceName: string) {
export function generateReference(referenceName: string) {
const configPathName = path.join(basePath, referenceName)

// check if the config file exists
Expand All @@ -54,6 +61,12 @@ function generateReference(referenceName: string) {
typedocProcess.stdout?.on("data", (chunk: string) => {
formatColoredLog(colorLog, referenceName, chunk.trim())
})
typedocProcess.on("exit", (code) => {
generatedCount++
if (generatedCount >= totalCount && !ranMerger && code !== 1) {
runMerger()
}
})
typedocProcess.stderr?.on("data", (chunk: string) => {
// split multiline outputs
const split: string[] = chunk.split("\n")
Expand All @@ -79,3 +92,10 @@ function formatColoredLog(
) {
console.log(`${chalkInstance(title)} -> ${message}`)
}

function runMerger() {
// run merger
console.log(chalk.bgBlueBright("\n\nRunning Merger\n\n"))
ranMerger = true
generateReference("_merger.js")
}
1 change: 1 addition & 0 deletions docs-util/packages/scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"scripts": {
"generate:announcement": "ts-node ./doc-change-release.ts",
"generate:reference": "ts-node ./generate-reference.ts",
"merge:references": "yarn generate:reference merge",
"check:freshness": "ts-node ./freshness-check.ts",
"generate:message": "ts-node ./get-generate-diff-message.ts"
},
Expand Down
2 changes: 2 additions & 0 deletions docs-util/packages/scripts/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@
"include": ["*.ts"],
"ts-node": {
"esm": true,
"experimentalSpecifierResolution": "node",
"transpileOnly": true
},
}
11 changes: 9 additions & 2 deletions docs-util/packages/typedoc-config/_base.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ const pathPrefix = path.join(__dirname, "..", "..", "..")

/** @type {import('typedoc').TypeDocOptions} */
module.exports = {
// extends: [typedocConfig],
plugin: ["typedoc-plugin-markdown-medusa", "typedoc-plugin-custom"],
plugin: ["typedoc-plugin-custom"],
readme: "none",
eslintPathName: path.join(
pathPrefix,
Expand All @@ -15,6 +14,14 @@ module.exports = {
pluginsResolvePath: path.join(pathPrefix, "www"),
exclude: [path.join(pathPrefix, "node_modules/**")],
excludeInternal: true,
excludeExternals: true,
excludeReferences: true,
disableSources: true,
validation: {
notExported: false,
// invalidLink: false,
},
// logLevel: "Error",
// Uncomment this when debugging
// showConfig: true,
}
Loading

0 comments on commit 89faaac

Please sign in to comment.