resolve conflicts

.changeset/little-books-reply.md

@@ -54,6 +54,7 @@
 "@medusajs/workflow-engine-inmemory": patch
 "@medusajs/workflow-engine-redis": patch
 "@medusajs/dashboard": patch
+"@medusajs/admin-bundler": patch
 "@medusajs/admin-sdk": patch
 "@medusajs/admin-shared": patch
 "@medusajs/admin-vite-plugin": patch

.changeset/pink-dolls-kiss.md

@@ -0,0 +1,8 @@
+---
+"@medusajs/auth-github": patch
+"@medusajs/auth-google": patch
+"@medusajs/auth": patch
+"@medusajs/types": patch
+---
+
+Add github auth provider

.eslintrc.js

@@ -81,10 +81,11 @@ module.exports = {
         project: [
           "./packages/medusa/tsconfig.json",
 
-          "./packages/admin-next/dashboard/tsconfig.json",
-          "./packages/admin-next/admin-sdk/tsconfig.json",
-          "./packages/admin-next/admin-shared/tsconfig.json",
-          "./packages/admin-next/admin-vite-plugin/tsconfig.json",
+          "./packages/admin/dashboard/tsconfig.json",
+          "./packages/admin/admin-sdk/tsconfig.json",
+          "./packages/admin/admin-shared/tsconfig.json",
+          "./packages/admin/admin-bundler/tsconfig.json",
+          "./packages/admin/admin-vite-plugin/tsconfig.json",
 
           "./packages/cli/create-medusa-app/tsconfig.json",
           "./packages/cli/medusa-cli/tsconfig.spec.json",
@@ -218,8 +219,8 @@ module.exports = {
     },
     {
       files: [
-        "packages/admin-next/dashboard/**/*.ts",
-        "packages/admin-next/dashboard/**/*.tsx",
+        "packages/admin/dashboard/**/*.ts",
+        "packages/admin/dashboard/**/*.tsx",
       ],
       plugins: ["unused-imports", "react-refresh"],
       extends: [
@@ -234,56 +235,7 @@ module.exports = {
         },
         ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
         sourceType: "module", // Allows for the use of imports
-        project: "./packages/admin-next/dashboard/tsconfig.json",
-      },
-      globals: {
-        __BASE__: "readonly",
-      },
-      env: {
-        browser: true,
-      },
-      rules: {
-        "prettier/prettier": "error",
-        "react/prop-types": "off",
-        "new-cap": "off",
-        "require-jsdoc": "off",
-        "valid-jsdoc": "off",
-        "react-refresh/only-export-components": [
-          "warn",
-          { allowConstantExport: true },
-        ],
-        "no-unused-expressions": "off",
-        "unused-imports/no-unused-imports": "error",
-        "unused-imports/no-unused-vars": [
-          "warn",
-          {
-            vars: "all",
-            varsIgnorePattern: "^_",
-            args: "after-used",
-            argsIgnorePattern: "^_",
-          },
-        ],
-      },
-    },
-    {
-      files: [
-        "packages/admin-next/app/**/*.ts",
-        "packages/admin-next/app/**/*.tsx",
-      ],
-      plugins: ["unused-imports", "react-refresh"],
-      extends: [
-        "plugin:react/recommended",
-        "plugin:react/jsx-runtime",
-        "plugin:react-hooks/recommended",
-      ],
-      parser: "@typescript-eslint/parser",
-      parserOptions: {
-        ecmaFeatures: {
-          jsx: true,
-        },
-        ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
-        sourceType: "module", // Allows for the use of imports
-        project: "./packages/admin-next/app/tsconfig.json",
+        project: "./packages/admin/dashboard/tsconfig.json",
       },
       globals: {
         __BASE__: "readonly",

CODEOWNERS

@@ -7,6 +7,4 @@ yarn.lock                                       @medusajs/engineering
 /integration-tests/                             @medusajs/engineering
 /docs-util/                                     @medusajs/docs
 /www/                                           @medusajs/docs
-/packages/admin                                 @medusajs/ui
-/packages/admin-ui                              @medusajs/ui
 /packages/design-system/                        @medusajs/ui

integration-tests/http/__tests__/auth/admin/auth.spec.ts

@@ -141,15 +141,15 @@ medusaIntegrationTestRunner({
         expect(response.status).toEqual(201)
       })
 
-      it("should fails to generate token for non-existing user, but still respond with 201", async () => {
+      it("should fail to generate token for non-existing user, but still respond with 201", async () => {
         const response = await api.post("/auth/user/emailpass/reset-password", {
           email: "non-existing-user@medusa.js",
         })
 
         expect(response.status).toEqual(201)
       })
 
-      it("should fails to generate token for existing user but no provider, but still respond with 201", async () => {
+      it("should fail to generate token for existing user but no provider, but still respond with 201", async () => {
         const response = await api.post(
           "/auth/user/non-existing-provider/reset-password",
           { email: "admin@medusa.js" }
@@ -158,7 +158,7 @@ medusaIntegrationTestRunner({
         expect(response.status).toEqual(201)
       })
 
-      it("should fails to generate token for existing user but no provider, but still respond with 201", async () => {
+      it("should fail to generate token for existing user but no provider, but still respond with 201", async () => {
         const response = await api.post(
           "/auth/user/non-existing-provider/reset-password",
           { email: "admin@medusa.js" }