resolve conflicts

medusajs · Jan 9, 2024 · 9523b91 · 9523b91
2 parents 86c29d8 + d91ac3a
commit 9523b91
Show file tree

Hide file tree

Showing 697 changed files with 15,766 additions and 1,317 deletions.
diff --git a/.changeset/angry-pigs-shop.md b/.changeset/angry-pigs-shop.md
diff --git a/.changeset/breezy-horses-destroy.md b/.changeset/breezy-horses-destroy.md
diff --git a/.changeset/bright-coins-kneel.md b/.changeset/bright-coins-kneel.md
diff --git a/.changeset/chilled-deers-prove.md b/.changeset/chilled-deers-prove.md
diff --git a/.changeset/clean-timers-hunt.md b/.changeset/clean-timers-hunt.md
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -7,12 +7,19 @@
   "access": "public",
   "baseBranch": "develop",
   "updateInternalDependencies": "patch",
-  "ignore": ["integration-tests-api", "integration-tests-plugins", "integration-tests-repositories"],
+  "ignore": [
+    "integration-tests-api",
+    "integration-tests-plugins",
+    "integration-tests-repositories",
+    "@medusajs/dashboard",
+    "@medusajs/admin-shared",
+    "@medusajs/admin-bundler",
+    "@medusajs/vite-plugin-extension"
+  ],
   "snapshot": {
     "useCalculatedVersion": true
   },
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true
   }
-
 }
diff --git a/.changeset/cyan-chicken-roll.md b/.changeset/cyan-chicken-roll.md
diff --git a/.changeset/eighty-mails-behave.md b/.changeset/eighty-mails-behave.md
diff --git a/.changeset/eleven-jokes-tan.md b/.changeset/eleven-jokes-tan.md
diff --git a/.changeset/forty-rules-fix.md b/.changeset/forty-rules-fix.md
diff --git a/.changeset/fresh-boxes-scream.md b/.changeset/fresh-boxes-scream.md
diff --git a/.changeset/funny-rocks-brake.md b/.changeset/funny-rocks-brake.md
@@ -0,0 +1,6 @@
+---
+"@medusajs/product": patch
+"@medusajs/utils": patch
+---
+
+chore(utils, product): Attempt to simplify module scripts export
diff --git a/.changeset/fuzzy-ears-look.md b/.changeset/fuzzy-ears-look.md
diff --git a/.changeset/great-cameras-stare.md b/.changeset/great-cameras-stare.md
diff --git a/.changeset/hip-turtles-smell.md b/.changeset/hip-turtles-smell.md
diff --git a/.changeset/hot-dingos-pay.md b/.changeset/hot-dingos-pay.md
diff --git a/.changeset/hungry-bikes-give.md b/.changeset/hungry-bikes-give.md
diff --git a/.changeset/itchy-knives-stare.md b/.changeset/itchy-knives-stare.md
diff --git a/.changeset/lovely-otters-draw.md b/.changeset/lovely-otters-draw.md
diff --git a/.changeset/metal-pans-beg.md b/.changeset/metal-pans-beg.md
diff --git a/.changeset/mighty-jokes-prove.md b/.changeset/mighty-jokes-prove.md
diff --git a/.changeset/neat-suits-attack.md b/.changeset/neat-suits-attack.md
diff --git a/.changeset/nine-shrimps-reply.md b/.changeset/nine-shrimps-reply.md
diff --git a/.changeset/old-meals-run.md b/.changeset/old-meals-run.md
diff --git a/.changeset/perfect-pugs-brake.md b/.changeset/perfect-pugs-brake.md
diff --git a/.changeset/pretty-shoes-sing.md b/.changeset/pretty-shoes-sing.md
diff --git a/.changeset/rotten-lobsters-move.md b/.changeset/rotten-lobsters-move.md
diff --git a/.changeset/rude-boats-ring.md b/.changeset/rude-boats-ring.md
diff --git a/.changeset/seven-moose-scream.md b/.changeset/seven-moose-scream.md
diff --git a/.changeset/small-kangaroos-camp.md b/.changeset/small-kangaroos-camp.md
diff --git a/.changeset/smart-zoos-nail.md b/.changeset/smart-zoos-nail.md
diff --git a/.changeset/smooth-days-dress.md b/.changeset/smooth-days-dress.md
diff --git a/.changeset/sour-birds-build.md b/.changeset/sour-birds-build.md
diff --git a/.changeset/sour-donuts-fail.md b/.changeset/sour-donuts-fail.md
diff --git a/.changeset/swift-carpets-count.md b/.changeset/swift-carpets-count.md
diff --git a/.changeset/two-chefs-complain.md b/.changeset/two-chefs-complain.md
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -224,6 +224,27 @@ module.exports = {
         ],
       },
     },
+    {
+      files: ["packages/admin-next/dashboard/**/*"],
+      env: { browser: true, es2020: true, node: true },
+      extends: [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:react-hooks/recommended",
+      ],
+      ignorePatterns: ["dist"],
+      parser: "@typescript-eslint/parser",
+      parserOptions: {
+        project: "./packages/admin-next/dashboard/tsconfig.json",
+      },
+      plugins: ["react-refresh"],
+      rules: {
+        "react-refresh/only-export-components": [
+          "warn",
+          { allowConstantExport: true },
+        ],
+      },
+    },
     {
       files: ["packages/admin-ui/lib/**/*.ts"],
       parser: "@typescript-eslint/parser",

diff --git a/docs-util/packages/react-docs-generator/package.json b/docs-util/packages/react-docs-generator/package.json
@@ -22,7 +22,7 @@
     "react-docgen": "^7.0.1",
     "resolve": "^1.22.8",
     "ts-node": "^10.9.1",
-    "typedoc": "^0.25.4",
+    "typedoc": "^0.25.7",
     "typedoc-plugin-custom": "*",
     "typescript": "5.2",
     "utils": "*"