Merge branch 'develop' into docs/experimental-features

.changeset/angry-ghosts-taste.md

@@ -0,0 +1,7 @@
+---
+"@medusajs/workflows": patch
+"@medusajs/pricing": patch
+"@medusajs/medusa": patch
+---
+
+fix(workflows, pricing, medusa): update region variants fix + pricing module migration scripts

.changeset/breezy-readers-shout.md

@@ -0,0 +1,7 @@
+---
+"@medusajs/workflows": patch
+"@medusajs/product": patch
+"@medusajs/types": patch
+---
+
+fix(workflows, product, types): Fix issues relating to update-variant workflow and options

.changeset/khaki-eyes-fetch.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/admin-ui": patch
+---
+
+fix(admin-ui): delete edit variant prices in favor of bulk editor

.changeset/kind-dolphins-speak.md

@@ -0,0 +1,6 @@
+---
+"@medusajs/pricing": patch
+"@medusajs/types": patch
+---
+
+fix(pricing,types): remove is_dynamic from model + types

.changeset/small-apes-own.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/workflows": patch
+---
+
+Fix(workflows): compensation handling

.changeset/wet-crews-sneeze.md

@@ -0,0 +1,8 @@
+---
+"@medusajs/orchestration": minor
+"@medusajs/workflows": minor
+"@medusajs/link-modules": patch
+"@medusajs/medusa": patch
+---
+
+Workflows composer api

.changeset/witty-waves-rhyme.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/ui": patch
+---
+
+fix(ui): Update the styling of CodeBlock

.changeset/young-items-drop.md

@@ -0,0 +1,10 @@
+---
+"@medusajs/workflows": patch
+"@medusajs/product": patch
+"@medusajs/pricing": patch
+"@medusajs/medusa": patch
+"@medusajs/types": patch
+"@medusajs/utils": patch
+---
+
+feat(medusa,types,workflows,utils,product,pricing): PricingModule Integration of PriceLists into Core

.eslintignore

@@ -21,6 +21,8 @@ packages/*
 !packages/cache-inmemory
 !packages/create-medusa-app
 !packages/product
+!packages/orchestration
+!packages/workflows
 
 
 **/models/*

.eslintrc.js

@@ -90,14 +90,14 @@ module.exports = {
           "./packages/event-bus-redis/tsconfig.spec.json",
           "./packages/medusa-plugin-meilisearch/tsconfig.spec.json",
           "./packages/medusa-plugin-algolia/tsconfig.spec.json",
-          "./packages/admin-ui/tsconfig.json",
           "./packages/inventory/tsconfig.spec.json",
           "./packages/stock-location/tsconfig.spec.json",
           "./packages/cache-redis/tsconfig.spec.json",
           "./packages/cache-inmemory/tsconfig.spec.json",
-          "./packages/admin-ui/tsconfig.json",
           "./packages/create-medusa-app/tsconfig.json",
           "./packages/product/tsconfig.json",
+          "./packages/orchestration/tsconfig.json",
+          "./packages/workflows/tsconfig.spec.json",
         ],
       },
       rules: {

.github/workflows/action.yml

@@ -125,7 +125,6 @@ jobs:
         env:
           DB_PASSWORD: postgres
           DB_USERNAME: postgres
-          SPLIT: ${{ steps['split-tests'].outputs['split'] }}
 
   integration-tests-api:
     needs: setup
@@ -186,7 +185,8 @@ jobs:
         run: yarn test:integration:api
         env:
           DB_PASSWORD: postgres
-          SPLIT: ${{ steps['split-tests'].outputs['split'] }}
+          DB_USERNAME: postgres
+
 
   integration-tests-plugins:
     needs: setup
@@ -237,6 +237,7 @@ jobs:
       - name: Run plugin integration tests
         run: yarn test:integration:plugins
         env:
+          DB_USERNAME: postgres
           DB_PASSWORD: postgres
           NODE_OPTIONS: "--max_old_space_size=4096"
 
@@ -286,4 +287,5 @@ jobs:
       - name: Run repository integration tests
         run: yarn test:integration:repositories
         env:
+          DB_USERNAME: postgres
           DB_PASSWORD: postgres

docs-util/packages/typedoc-config/_base.js

@@ -14,6 +14,7 @@ module.exports = {
   ),
   pluginsResolvePath: path.join(pathPrefix, "www"),
   exclude: [path.join(pathPrefix, "node_modules/**")],
+  excludeInternal: true,
   // Uncomment this when debugging
   // showConfig: true,
 }

docs-util/packages/typedoc-config/extended-tsconfig/tsdoc.json

@@ -17,6 +17,14 @@
     {
       "tagName": "@apiIgnore",
       "syntaxKind": "modifier"
+    },
+    {
+      "tagName": "@mainSignature",
+      "syntaxKind": "modifier"
+    },
+    {
+      "tagName": "@docHideSignature",
+      "syntaxKind": "modifier"
     }
   ]
 }

docs-util/packages/typedoc-config/extended-tsconfig/workflows.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "http://json.schemastore.org/tsconfig",
+  "extends": [
+    "../../../../packages/workflows/tsconfig.json"
+  ]
+}

docs-util/packages/typedoc-config/workflows.js

@@ -0,0 +1,75 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const path = require("path")
+const globalTypedocOptions = require("./_base")
+
+const pathPrefix = path.join(__dirname, "..", "..", "..")
+
+module.exports = {
+  ...globalTypedocOptions,
+  entryPoints: [
+    path.join(pathPrefix, "packages/workflows/src/utils/composer/index.ts"),
+  ],
+  out: [path.join(pathPrefix, "www/apps/docs/content/references/workflows")],
+  tsconfig: path.join(__dirname, "extended-tsconfig", "workflows.json"),
+  name: "Workflows Reference",
+  indexTitle: "Workflows Reference",
+  entryDocument: "index.mdx",
+  hideInPageTOC: true,
+  hideBreadcrumbs: true,
+  formatting: {
+    "*": {
+      expandMembers: true,
+      showCommentsAsHeader: true,
+      sections: {
+        member_sources_definedIn: false,
+        reflection_hierarchy: false,
+        member_sources_inheritedFrom: false,
+        member_sources_implementationOf: false,
+        reflection_implementedBy: false,
+        member_signature_sources: false,
+        reflection_callable: false,
+        reflection_indexable: false,
+        member_signature_title: false,
+        member_signature_returns: false,
+        member_getterSetter: false,
+      },
+      parameterStyle: "component",
+      parameterComponent: "ParameterTypes",
+      mdxImports: [
+        `import ParameterTypes from "@site/src/components/ParameterTypes"`,
+      ],
+      frontmatterData: {
+        displayed_sidebar: "workflowsSidebar",
+      },
+    },
+    "index\\.mdx": {
+      reflectionGroups: {
+        Namespaces: false,
+        Enumerations: false,
+        Classes: false,
+        Interfaces: false,
+        "Type Aliases": false,
+        Variables: false,
+        "Enumeration Members": false,
+      },
+    },
+    functions: {
+      maxLevel: 1,
+    },
+    "classes/StepResponse": {
+      reflectionGroups: {
+        Properties: false,
+      },
+    },
+    transform: {
+      reflectionGroups: {
+        "Type Parameters": false,
+      },
+    },
+  },
+  objectLiteralTypeDeclarationStyle: "component",
+  mdxOutput: true,
+  maxLevel: 2,
+  allReflectionsHaveOwnDocument: true,
+  excludeExternals: true,
+}

docs-util/packages/typedoc-plugin-custom/src/index.ts

@@ -4,11 +4,13 @@ import { load as frontmatterPlugin } from "./frontmatter-plugin"
 import { load as parseOasSchemaPlugin } from "./parse-oas-schema-plugin"
 import { load as apiIgnorePlugin } from "./api-ignore"
 import { load as eslintExamplePlugin } from "./eslint-example"
+import { load as signatureModifierPlugin } from "./signature-modifier"
 
 export function load(app: Application) {
   resolveReferencesPluginLoad(app)
   frontmatterPlugin(app)
   parseOasSchemaPlugin(app)
   apiIgnorePlugin(app)
   eslintExamplePlugin(app)
+  signatureModifierPlugin(app)
 }

docs-util/packages/typedoc-plugin-custom/src/signature-modifier.ts

@@ -0,0 +1,21 @@
+import {
+  Application,
+  Context,
+  Converter,
+  ProjectReflection,
+  SignatureReflection,
+} from "typedoc"
+
+export function load(app: Application) {
+  app.converter.on(
+    Converter.EVENT_CREATE_SIGNATURE,
+    (
+      context: Context,
+      signature: SignatureReflection | ProjectReflection | undefined
+    ) => {
+      if (signature?.comment?.hasModifier("@hideSignature")) {
+        context.project.removeReflection(signature)
+      }
+    }
+  )
+}

docs-util/packages/typedoc-plugin-markdown-medusa/src/resources/helpers/returns.ts

@@ -31,13 +31,13 @@ function getReturnFromType(
     return ""
   }
 
-  const componentItems = returnReflectionComponentFormatter(
-    reflection.type,
-    reflection.project || theme.project,
-    reflection.comment,
-    1,
-    maxLevel
-  )
+  const componentItems = returnReflectionComponentFormatter({
+    reflectionType: reflection.type,
+    project: reflection.project || theme.project,
+    comment: reflection.comment,
+    level: 1,
+    maxLevel,
+  })
 
   if (parameterStyle === "component") {
     return `<${parameterComponent} parameters={${JSON.stringify(

docs-util/packages/typedoc-plugin-markdown-medusa/src/resources/helpers/signature-title.ts

@@ -15,7 +15,7 @@ export default function (theme: MarkdownTheme) {
         theme.getFormattingOptionsForLocation()
       if (sections && sections.member_signature_title === false) {
         // only show title if there are more than one signatures
-        if (!this.parent.signatures || this.parent.signatures?.length <= 1) {
+        if (!this.parent.signatures || this.parent.signatures.length <= 1) {
           return ""
         }
       }

docs-util/packages/typedoc-plugin-markdown-medusa/src/resources/partials/member.declaration.hbs

@@ -12,15 +12,15 @@
 
 {{#if (sectionEnabled "member_declaration_example")}}
 
-{{{example this 3}}}
+{{{example this 4}}}
 
 {{/if}}
 
 {{#if (sectionEnabled "member_declaration_typeParameters")}}
 
 {{#if typeParameters}}
 
-{{titleLevel 3}} Type parameters
+{{{titleLevel 4}}} Type Parameters
 
 {{#with typeParameters}}
 
@@ -40,7 +40,7 @@
 
 {{#with type.declaration.indexSignature}}
 
-{{titleLevel 3}} Index signature
+{{titleLevel 4}} Index signature
 
 {{{indexSignatureTitle}}}
 
@@ -58,17 +58,17 @@
 
 {{#if type.declaration.children}}
 
-{{titleLevel 3}} Call signature
+{{{titleLevel 4}}} Call signature
 
 {{else}}
 
-{{titleLevel 3}} Type declaration
+{{{titleLevel 4}}} Type declaration
 
 {{/if}}
 
 {{#each type.declaration.signatures}}
 
-{{> member.signature showSources=false }}
+{{> member.signature showSources=false commentLevel=5 }}
 
 {{/each}}
 
@@ -82,7 +82,7 @@
 
 {{#with type.declaration}}
 
-{{titleLevel 3}} Type declaration
+{{{titleLevel 4}}} Type declaration
 
 {{/with}}
 

docs-util/packages/typedoc-plugin-markdown-medusa/src/resources/partials/member.getterSetter.hbs

@@ -4,7 +4,7 @@
 
 {{#with getSignature}}
 
-{{> member.signature accessor="get" showSources=true }}
+{{> member.signature accessor="get" showSources=true commentLevel=4 }}
 
 {{/with}}
 
@@ -18,7 +18,7 @@
 
 {{#with setSignature}}
 
-{{> member.signature accessor="set" showSources=true }}
+{{> member.signature accessor="set" showSources=true commentLevel=4 }}
 
 {{/with}}
 

docs-util/packages/typedoc-plugin-markdown-medusa/src/resources/partials/member.hbs

@@ -2,7 +2,7 @@
 
 {{#if name}}
 
-{{titleLevel 3}} {{#ifNamedAnchors}}<a id="{{anchor}}" name="{{this.anchor}}"></a> {{/ifNamedAnchors}}{{ escape name }}
+{{titleLevel 4}} {{#ifNamedAnchors}}<a id="{{anchor}}" name="{{this.anchor}}"></a> {{/ifNamedAnchors}}{{ escape name }}
 
 {{/if}}
 
@@ -14,7 +14,7 @@
 
 {{#each signatures}}
 
-{{> member.signature showSources=true }}
+{{> member.signature showSources=true commentLevel=../commentLevel }}
 
 {{/each}}