mercur-cli 0.1.5 → 0.1.7

package/cli/backend-setup.js

@@ -11,9 +11,9 @@ export async function backendSetup(options) {
   await fs.writeFile(
     path.join(targetDir, "backend/.env"),
     `STORE_CORS=http://localhost:3000
-ADMIN_CORS=http://localhost:9000
+ADMIN_CORS=http://localhost:9000,http://localhost:9001
 VENDOR_CORS=http://localhost:5173
-AUTH_CORS=http://localhost:9000,http://localhost:5173,http://localhost:3000
+AUTH_CORS=http://localhost:9000,http://localhost:9001,http://localhost:5173,http://localhost:3000
 REDIS_URL=redis://localhost:6379
 JWT_SECRET=supersecret
 COOKIE_SECRET=supersecret

package/cli/data.js

@@ -16,6 +16,9 @@ module.exports = defineConfig({
       cookieSecret: process.env.COOKIE_SECRET || 'supersecret'
     }
   },
+  admin: {
+    disable: true,
+  },
   plugins: [
     {
       resolve: '@mercurjs/b2c-core',

package/cli/frontend-setup.js

@@ -23,6 +23,23 @@ NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=`
   spinner.succeed("Storefront ready!");
 }
 
+export async function adminPanelSetup(options) {
+  const targetDir = options.directory;
+  const spinner = ora("Setting up Mercur admin panel...").start();
+
+  await fs.writeFile(
+    path.join(targetDir, "admin-panel/.env"),
+    `
+    VITE_MEDUSA_BASE='/'
+VITE_MEDUSA_STOREFRONT_URL=http://localhost:3000
+VITE_MEDUSA_BACKEND_URL=http://localhost:9000
+VITE_MEDUSA_B2B_PANEL=true
+    `
+  );
+
+  spinner.succeed("Admin panel ready!");
+}
+
 export async function vendorPanelSetup(options) {
   const targetDir = options.directory;
   const spinner = ora("Setting up Mercur vendor panel...").start();

package/cli/full-install.js

@@ -2,7 +2,11 @@ import chalk from "chalk";
 import inquirer from "inquirer";
 import { pullAndInstall } from "./pull-and-install.js";
 import { backendSetup } from "./backend-setup.js";
-import { storefrontSetup, vendorPanelSetup } from "./frontend-setup.js";
+import {
+  storefrontSetup,
+  vendorPanelSetup,
+  adminPanelSetup,
+} from "./frontend-setup.js";
 
 export async function fullInstall() {
   const { project_name } = await inquirer.prompt({
@@ -77,6 +81,8 @@ export async function fullInstall() {
     directory: project_name,
   });
 
+  await adminPanelSetup({ directory: project_name });
+
   if (install_storefront) {
     await storefrontSetup({ directory: project_name, publishableKey });
   }

package/cli/pull-and-install.js

@@ -17,7 +17,7 @@ export async function pullAndInstall(options) {
   spinner.text = "Installing Mercur backend...";
   await execa(
     "git",
-    ["clone", "https://github.com/medusajs/medusa-starter-default", "backend"],
+    ["clone", "https://github.com/mercurjs/clean-medusa-starter", "backend"],
     {
       cwd: targetDir,
     }
@@ -56,6 +56,18 @@ export async function pullAndInstall(options) {
 
   await execa("yarn", ["install"], { cwd: path.join(targetDir, "backend") });
 
+  spinner.text = "Installing Mercur admin panel...";
+  await execa(
+    "git",
+    ["clone", "https://github.com/mercurjs/admin-panel.git", "admin-panel"],
+    {
+      cwd: targetDir,
+    }
+  );
+  await execa("yarn", ["install"], {
+    cwd: path.join(targetDir, "admin-panel"),
+  });
+
   if (options.install_storefront) {
     spinner.text = "Installing Mercur storefront...";
     await execa(

package/cli/start.js

@@ -10,6 +10,7 @@ export async function startAll() {
   const backendExists = fs.existsSync("backend");
   const storefrontExists = fs.existsSync("storefront");
   const vendorExists = fs.existsSync("vendor-panel");
+  const adminPanelExists = fs.existsSync("admin-panel");
 
   if (!backendExists) {
     spinner.fail("Mercur backend not detected!");
@@ -24,6 +25,13 @@ export async function startAll() {
   });
   servicesToRun.push(backend);
 
+  if (adminPanelExists) {
+    const adminPanel = execa("yarn", ["dev", "--port", "9001"], {
+      cwd: path.join(process.cwd(), "admin-panel"),
+    });
+    servicesToRun.push(adminPanel);
+  }
+
   if (storefrontExists) {
     spinner.text = "Starting Mercur storefront...";
     const storefront = execa("npm", ["run", "dev"], {
@@ -42,7 +50,12 @@ export async function startAll() {
 
   spinner.succeed(chalk.green("Development environment started!"));
   console.log(chalk.blue("\nServices:"));
-  console.log("- Backend: http://localhost:9000");
+  console.log("- API: http://localhost:9000");
+
+  if (adminPanelExists) {
+    console.log("- Admin Panel: http://localhost:9001");
+  }
+
   if (storefrontExists) {
     console.log("- B2C Storefront: http://localhost:3000");
   }

package/index.js

@@ -15,6 +15,11 @@ console.log(
 `)
 );
 
+program.option("-v, --version", "Show version").action(() => {
+  console.log(chalk.blue(`Mercur CLI v0.1.7`));
+  process.exit(0);
+});
+
 program
   .command("install")
   .version("1.1.0")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mercur-cli",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "CLI for Mercur - Open Source Marketplace Platform",
   "author": "MercurJS <hello@mercurjs.com> (https://mercurjs.com)",
   "repository": {

package/mercur/backend/.env.template

@@ -1,8 +0,0 @@
-STORE_CORS=http://localhost:8000,https://docs.medusajs.com
-ADMIN_CORS=http://localhost:5173,http://localhost:9000,https://docs.medusajs.com
-AUTH_CORS=http://localhost:5173,http://localhost:9000,https://docs.medusajs.com
-REDIS_URL=redis://localhost:6379
-JWT_SECRET=supersecret
-COOKIE_SECRET=supersecret
-DATABASE_URL=
-DB_NAME=merctestcli

package/mercur/backend/.github/dependabot.yml

@@ -1,21 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    allow:
-      - dependency-type: production
-    groups:
-      medusa:
-        patterns:
-        - "@medusajs*"
-        - "medusa*"
-        update-types:
-        - "minor"
-        - "patch"
-    ignore:
-      - dependency-name: "@medusajs*"
-        update-types: ["version-update:semver-major"]
-      - dependency-name: "medusa*"
-        update-types: ["version-update:semver-major"]

package/mercur/backend/.github/scripts/wait-for-server-live.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-for i in {1..6}
-do
-  echo $i
-  status_code=$(curl \
-    -X GET \
-    --write-out %{http_code} \
-    --silent\
-    --output /dev/null\
-    http://localhost:9000/store/products)
-
-echo $status_code
-  if [[ "$status_code" -ne 000 ]] ; then
-    echo "exiting"
-    exit 0
-  else
-    sleep 5
-  fi
-done
-
-echo $status_code
-
-if [[ "$status_code" =  000 ]] ; then
-  echo "Site status changed to $status_code"
-  exit 1
-else
-  exit 0
-fi

package/mercur/backend/.github/workflows/test-cli.yml

@@ -1,222 +0,0 @@
-name: Test CLI
-on:
- pull_request:
-  branches:
-    - 'master'
-    - 'ci'
-
-jobs:
-  test-cli-yarn:
-    name: "Test CLI (Yarn)"
-    env:
-      NODE_ENV: CI
-      REDIS_URL: redis://localhost:6379
-      DATABASE_URL: "postgres://postgres:postgres@localhost/cli-test"
-      POSTGRES_URL: "postgres://postgres:postgres@localhost/cli-test"
-    services:
-      redis:
-        image: redis
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 6379:6379
- 
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_USER: postgres
-          POSTGRES_DB: cli-test
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
- 
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-          access_token: ${{ github.token }}
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-  
-      - name: Install Dependencies
-        run: yarn install
-
-      - name: Check CLI tool is installed
-        run: ./node_modules/.bin/medusa -v
-
-      - name: run build
-        run: yarn build
-
-      - name: Run migrations
-        run: npx medusa db:migrate
-
-      - name: Run seed
-        run: yarn seed
-
-      - name: Run development server
-        run: yarn dev &
-
-      - name: Wait for live server response
-        shell: "bash"
-        run: ./.github/scripts/wait-for-server-live.sh
-
-      - name: Kill server
-        shell: "bash"
-        run: kill -9 $(lsof -t -i :9000)
-          
-  test-cli-npm:
-    name: "Test CLI (npm)"
-    env:
-      NODE_ENV: CI
-      REDIS_URL: redis://localhost:6379
-      DATABASE_URL: "postgres://postgres:postgres@localhost/cli-test"
-      POSTGRES_URL: "postgres://postgres:postgres@localhost/cli-test"
-    services: 
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_USER: postgres
-          POSTGRES_DB: cli-test
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
- 
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-          access_token: ${{ github.token }}
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          cache: "npm"
-  
-      - name: Install Dependencies
-        run: npm install
-
-      - name: Check CLI tool is installed
-        run: ./node_modules/.bin/medusa -v
-
-      - name: run medusa build
-        run: npm run build
-
-      - name: Run migrations
-        run: npx medusa db:migrate
-
-      - name: Run seed
-        run: npm run seed
-
-      - name: Run development server
-        run: npm run dev -- &
-
-      - name: Wait for live server response
-        shell: "bash"
-        run: ./.github/scripts/wait-for-server-live.sh
-
-      - name: Kill server
-        shell: "bash"
-        run: kill -9 $(lsof -t -i :9000)
-          
-  test-cli-pnpm:
-    name: "Test CLI (pnpm)"
-    env:
-      NODE_ENV: CI
-      REDIS_URL: redis://localhost:6379
-      DATABASE_URL: "postgres://postgres:postgres@localhost/cli-test"
-      POSTGRES_URL: "postgres://postgres:postgres@localhost/cli-test"
-    services: 
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_USER: postgres
-          POSTGRES_DB: cli-test
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
- 
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-          access_token: ${{ github.token }}
-
-      - name: Create pnpm-lock.yaml
-        run: touch pnpm-lock.yaml
-
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 9
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          cache: "pnpm"
-  
-      - name: Install Dependencies
-        run: pnpm install
-
-      - name: Check CLI tool is installed
-        run: ./node_modules/.bin/medusa -v
-
-      - name: run medusa build
-        run: pnpm run build
-
-      - name: Run migrations
-        run: npx medusa db:migrate
-
-      - name: Run seed
-        run: pnpm run seed
-
-      - name: Run development server
-        run: pnpm run dev -- &
-
-      - name: Wait for live server response
-        shell: "bash"
-        run: ./.github/scripts/wait-for-server-live.sh
-
-      - name: Kill server
-        shell: "bash"
-        run: kill -9 $(lsof -t -i :9000)
-          

package/mercur/backend/.github/workflows/update-preview-deps-ci.yml

@@ -1,69 +0,0 @@
-name: "Update Preview Dependencies (feat/ci)"
-on:
-  workflow_dispatch:
-
-jobs:
-  update:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          access_token: ${{ github.token }}
-
-      - name: Checkout
-        uses: actions/checkout@v2.3.5
-        with:
-          ref: 'ci'
-
-      - name: Setup Node.js 20
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - name: Remove yarn.lock
-        run: rm yarn.lock
-
-      - name: Install Dependencies
-        run: yarn
-
-      - name: Close Previous PRs
-        shell: "bash"
-        run: |
-
-          PR_LIST=$(gh pr list --base ci --json number,headRefName)
-
-          # Filter out PRs where headRefName starts with 'chore/update-preview'
-          FILTERED_PR_LIST=$(echo "$PR_LIST" | jq '[.[] | select(.headRefName | test("^chore/update-preview"))]')
-
-          echo "$FILTERED_PR_LIST"
-
-          # Check if any pull requests were found after filtering
-          if [ -z "$FILTERED_PR_LIST" ] || [ "$FILTERED_PR_LIST" = "[]" ]; then
-            echo "No pull requests found on branch ci after filtering"
-            exit 0
-          fi
-
-          # Close each filtered pull request
-          echo "$FILTERED_PR_LIST" | jq -r '.[].number' | while read -r PR_NUMBER; do
-            echo "Closing pull request #$PR_NUMBER"
-            gh pr close "$PR_NUMBER" -d
-          done
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          OWNER: ${{ github.repository_owner }}
-          REPO: ${{ github.event.repository.name }}
-
-      - name: Open PR with changes
-        uses: peter-evans/create-pull-request@v5
-        with:
-          title: "chore(ci): updated preview dependencies [automated]"
-          commit-message: "chore(ci): updated preview dependencies [automated]"
-          body: "This PR updates preview dependencies to the latest versions."
-          branch: "chore/update-preview"
-          branch-suffix: "timestamp"
-          token: ${{ secrets.PAT_TOKEN }}
-          base: "ci"
-          add-paths: yarn.lock
-          committer: "GitHub <noreply@github.com>"
-          author: "GitHub <github-actions[bot]@users.noreply.github.com>"

package/mercur/backend/.github/workflows/update-preview-deps.yml

@@ -1,67 +0,0 @@
-name: "Update Preview Dependencies (master)"
-on:
-  workflow_dispatch:
-
-jobs:
-  update:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          access_token: ${{ github.token }}
-
-      - name: Checkout
-        uses: actions/checkout@v2.3.5
-
-      - name: Setup Node.js 20
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - name: Remove yarn.lock
-        run: rm yarn.lock
-
-      - name: Install Dependencies
-        run: yarn
-
-      - name: Close Previous PRs
-        shell: "bash"
-        run: |
-
-          PR_LIST=$(gh pr list --base master --json number,headRefName)
-
-          # Filter out PRs where headRefName starts with 'chore/update-preview'
-          FILTERED_PR_LIST=$(echo "$PR_LIST" | jq '[.[] | select(.headRefName | test("^chore/update-preview"))]')
-
-          echo "$FILTERED_PR_LIST"
-
-          # Check if any pull requests were found after filtering
-          if [ -z "$FILTERED_PR_LIST" ] || [ "$FILTERED_PR_LIST" = "[]" ]; then
-            echo "No pull requests found on branch master after filtering"
-            exit 0
-          fi
-
-          # Close each filtered pull request
-          echo "$FILTERED_PR_LIST" | jq -r '.[].number' | while read -r PR_NUMBER; do
-            echo "Closing pull request #$PR_NUMBER"
-            gh pr close "$PR_NUMBER" -d
-          done
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          OWNER: ${{ github.repository_owner }}
-          REPO: ${{ github.event.repository.name }}
-
-      - name: Open PR with changes
-        uses: peter-evans/create-pull-request@v5
-        with:
-          title: "chore(master): updated preview dependencies [automated]"
-          body: "This PR updates preview dependencies to the latest versions."
-          commit-message: "chore(master): updated preview dependencies [automated]"
-          branch: "chore/update-preview"
-          branch-suffix: "timestamp"
-          token: ${{ secrets.PAT_TOKEN }}
-          base: "master"
-          add-paths: yarn.lock
-          committer: "GitHub <noreply@github.com>"
-          author: "GitHub <github-actions[bot]@users.noreply.github.com>"

package/mercur/backend/.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

package/mercur/backend/.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

package/mercur/backend/README.md

@@ -1,62 +0,0 @@
-<p align="center">
-  <a href="https://www.medusajs.com">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/59018053/229103275-b5e482bb-4601-46e6-8142-244f531cebdb.svg">
-    <source media="(prefers-color-scheme: light)" srcset="https://user-images.githubusercontent.com/59018053/229103726-e5b529a3-9b3f-4970-8a1f-c6af37f087bf.svg">
-    <img alt="Medusa logo" src="https://user-images.githubusercontent.com/59018053/229103726-e5b529a3-9b3f-4970-8a1f-c6af37f087bf.svg">
-    </picture>
-  </a>
-</p>
-<h1 align="center">
-  Medusa
-</h1>
-
-<h4 align="center">
-  <a href="https://docs.medusajs.com">Documentation</a> |
-  <a href="https://www.medusajs.com">Website</a>
-</h4>
-
-<p align="center">
-  Building blocks for digital commerce
-</p>
-<p align="center">
-  <a href="https://github.com/medusajs/medusa/blob/master/CONTRIBUTING.md">
-    <img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat" alt="PRs welcome!" />
-  </a>
-    <a href="https://www.producthunt.com/posts/medusa"><img src="https://img.shields.io/badge/Product%20Hunt-%231%20Product%20of%20the%20Day-%23DA552E" alt="Product Hunt"></a>
-  <a href="https://discord.gg/xpCwq3Kfn8">
-    <img src="https://img.shields.io/badge/chat-on%20discord-7289DA.svg" alt="Discord Chat" />
-  </a>
-  <a href="https://twitter.com/intent/follow?screen_name=medusajs">
-    <img src="https://img.shields.io/twitter/follow/medusajs.svg?label=Follow%20@medusajs" alt="Follow @medusajs" />
-  </a>
-</p>
-
-## Compatibility
-
-This starter is compatible with versions >= 2 of `@medusajs/medusa`. 
-
-## Getting Started
-
-Visit the [Quickstart Guide](https://docs.medusajs.com/learn/installation) to set up a server.
-
-Visit the [Docs](https://docs.medusajs.com/learn/installation#get-started) to learn more about our system requirements.
-
-## What is Medusa
-
-Medusa is a set of commerce modules and tools that allow you to build rich, reliable, and performant commerce applications without reinventing core commerce logic. The modules can be customized and used to build advanced ecommerce stores, marketplaces, or any product that needs foundational commerce primitives. All modules are open-source and freely available on npm.
-
-Learn more about [Medusa’s architecture](https://docs.medusajs.com/learn/introduction/architecture) and [commerce modules](https://docs.medusajs.com/learn/fundamentals/modules/commerce-modules) in the Docs.
-
-## Community & Contributions
-
-The community and core team are available in [GitHub Discussions](https://github.com/medusajs/medusa/discussions), where you can ask for support, discuss roadmap, and share ideas.
-
-Join our [Discord server](https://discord.com/invite/medusajs) to meet other community members.
-
-## Other channels
-
-- [GitHub Issues](https://github.com/medusajs/medusa/issues)
-- [Twitter](https://twitter.com/medusajs)
-- [LinkedIn](https://www.linkedin.com/company/medusajs)
-- [Medusa Blog](https://medusajs.com/blog/)

package/mercur/backend/instrumentation.ts

@@ -1,24 +0,0 @@
-// Uncomment this file to enable instrumentation and observability using OpenTelemetry
-// Refer to the docs for installation instructions: https://docs.medusajs.com/learn/debugging-and-testing/instrumentation
-
-// import { registerOtel } from "@medusajs/medusa"
-// // If using an exporter other than Zipkin, require it here.
-// import { ZipkinExporter } from "@opentelemetry/exporter-zipkin"
-
-// // If using an exporter other than Zipkin, initialize it here.
-// const exporter = new ZipkinExporter({
-//   serviceName: 'my-medusa-project',
-// })
-
-// export function register() {
-//   registerOtel({
-//     serviceName: 'medusajs',
-//     // pass exporter
-//     exporter,
-//     instrument: {
-//       http: true,
-//       workflows: true,
-//       query: true
-//     },
-//   })
-// }