mercur-cli 0.1.2 → 0.1.5

package/cli/backend-setup.js

@@ -6,17 +6,10 @@ import ora from "ora";
 export async function backendSetup(options) {
   const targetDir = options.directory;
   const spinner = ora("Setting up Mercur backend...").start();
-
-  await execa("yarn", ["generate:oas"], {
-    cwd: path.join(targetDir, "backend/apps/backend"),
-  });
-  await execa("yarn", ["codegen"], {
-    cwd: path.join(targetDir, "backend"),
-  });
   const DB_URL = `postgres://${options.db_user}:${options.db_pass}@${options.db_url}:${options.db_port}/${options.db_name}`;
 
   await fs.writeFile(
-    path.join(targetDir, "backend/apps/backend/.env"),
+    path.join(targetDir, "backend/.env"),
     `STORE_CORS=http://localhost:3000
 ADMIN_CORS=http://localhost:9000
 VENDOR_CORS=http://localhost:5173
@@ -34,17 +27,20 @@ STRIPE_CONNECTED_ACCOUNTS_WEBHOOK_SECRET=supersecret
 
 RESEND_API_KEY=supersecret
 RESEND_FROM_EMAIL=onboarding@resend.dev
+
+VITE_TALK_JS_APP_ID=xxx
+VITE_TALK_JS_SECRET_API_KEY=xxx
     `
   );
 
   spinner.text = "Setting up database...";
   await execa("npx", ["medusa", "db:create", "--db", options.db_name], {
-    cwd: path.join(targetDir, "backend/apps/backend"),
+    cwd: path.join(targetDir, "backend"),
   });
 
   spinner.text = "Running migrations...";
-  await execa("yarn", ["db:migrate"], {
-    cwd: path.join(targetDir, "backend/apps/backend"),
+  await execa("npx", ["medusa", "db:migrate"], {
+    cwd: path.join(targetDir, "backend"),
   });
 
   spinner.text = "Seeding data...";
@@ -53,12 +49,12 @@ RESEND_FROM_EMAIL=onboarding@resend.dev
     "npx",
     ["medusa", "user", "--email", "admin@mercurjs.com", "--password", "admin"],
     {
-      cwd: path.join(targetDir, "backend/apps/backend"),
+      cwd: path.join(targetDir, "backend"),
     }
   );
 
   const result = await execa("yarn", ["seed"], {
-    cwd: path.join(targetDir, "backend/apps/backend"),
+    cwd: path.join(targetDir, "backend"),
   });
 
   const pkstart = result.stdout.indexOf("pk_");

package/cli/data.js

@@ -0,0 +1,121 @@
+export const b2cMedusaConfigTemplate = `
+import { defineConfig, loadEnv } from '@medusajs/framework/utils'
+
+loadEnv(process.env.NODE_ENV || 'development', process.cwd())
+
+module.exports = defineConfig({
+  projectConfig: {
+    databaseUrl: process.env.DATABASE_URL,
+    http: {
+      storeCors: process.env.STORE_CORS!,
+      adminCors: process.env.ADMIN_CORS!,
+      // @ts-expect-error: vendorCors is not a valid config
+      vendorCors: process.env.VENDOR_CORS!,
+      authCors: process.env.AUTH_CORS!,
+      jwtSecret: process.env.JWT_SECRET || 'supersecret',
+      cookieSecret: process.env.COOKIE_SECRET || 'supersecret'
+    }
+  },
+  plugins: [
+    {
+      resolve: '@mercurjs/b2c-core',
+      options: {}
+    },
+    {
+      resolve: '@mercurjs/commission',
+      options: {}
+    },
+    {
+      resolve: '@mercurjs/algolia',
+      options: {
+        apiKey: process.env.ALGOLIA_API_KEY,
+        appId: process.env.ALGOLIA_APP_ID
+      }
+    },
+    {
+      resolve: '@mercurjs/reviews',
+      options: {}
+    },
+    {
+      resolve: '@mercurjs/requests',
+      options: {}
+    },
+    {
+      resolve: '@mercurjs/resend',
+      options: {}
+    }
+  ],
+  modules: [
+    {
+      resolve: '@medusajs/medusa/payment',
+      options: {
+        providers: [
+          {
+            resolve:
+              '@mercurjs/payment-stripe-connect/providers/stripe-connect',
+            id: 'stripe-connect',
+            options: {
+              apiKey: process.env.STRIPE_SECRET_API_KEY
+            }
+          }
+        ]
+      }
+    },
+    {
+      resolve: '@medusajs/medusa/notification',
+      options: {
+        providers: [
+          {
+            resolve: '@mercurjs/resend/providers/resend',
+            id: 'resend',
+            options: {
+              channels: ['email'],
+              api_key: process.env.RESEND_API_KEY,
+              from: process.env.RESEND_FROM_EMAIL
+            }
+          },
+          {
+            resolve: '@medusajs/medusa/notification-local',
+            id: 'local',
+            options: {
+              channels: ['feed', 'seller_feed']
+            }
+          }
+        ]
+      }
+    }
+  ]
+})
+`;
+
+export const b2cDependencies = [
+  "@mercurjs/b2c-core",
+  "@mercurjs/framework",
+  "@mercurjs/commission",
+  "@mercurjs/payment-stripe-connect",
+  "@mercurjs/resend",
+  "@mercurjs/requests",
+  "@mercurjs/algolia",
+  "@mercurjs/reviews",
+];
+
+export async function getSeedScript() {
+  const seedScript = await fetch(
+    "https://raw.githubusercontent.com/mercurjs/mercur/refs/heads/main/apps/backend/src/scripts/seed.ts"
+  );
+
+  const seedFunctions = await fetch(
+    "https://raw.githubusercontent.com/mercurjs/mercur/refs/heads/main/apps/backend/src/scripts/seed/seed-functions.ts"
+  );
+
+  const seedProducts = await fetch(
+    "https://raw.githubusercontent.com/mercurjs/mercur/refs/heads/main/apps/backend/src/scripts/seed/seed-products.ts"
+  );
+
+  const seeds = {
+    seedScript: await seedScript.text(),
+    seedFunctions: await seedFunctions.text(),
+    seedProducts: await seedProducts.text(),
+  };
+  return seeds;
+}

package/cli/pull-and-install.js

@@ -2,6 +2,11 @@ import { execa } from "execa";
 import fs from "fs-extra";
 import path from "path";
 import ora from "ora";
+import {
+  b2cDependencies,
+  b2cMedusaConfigTemplate,
+  getSeedScript,
+} from "./data.js";
 
 export async function pullAndInstall(options) {
   const targetDir = path.resolve(process.cwd(), options.directory);
@@ -12,11 +17,43 @@ export async function pullAndInstall(options) {
   spinner.text = "Installing Mercur backend...";
   await execa(
     "git",
-    ["clone", "https://github.com/mercurjs/mercur.git", "backend"],
+    ["clone", "https://github.com/medusajs/medusa-starter-default", "backend"],
     {
       cwd: targetDir,
     }
   );
+
+  for (const dependency of b2cDependencies) {
+    await execa("yarn", ["add", dependency], {
+      cwd: path.join(targetDir, "backend"),
+    });
+  }
+
+  await fs.remove(path.join(targetDir, "backend/medusa-config.ts"));
+
+  await fs.writeFile(
+    path.join(targetDir, "backend/medusa-config.ts"),
+    b2cMedusaConfigTemplate
+  );
+
+  const seedScript = await getSeedScript();
+
+  await fs.writeFile(
+    path.join(targetDir, "backend/src/scripts/seed.ts"),
+    seedScript.seedScript
+  );
+
+  await fs.mkdir(path.join(targetDir, "backend/src/scripts/seed"));
+  await fs.writeFile(
+    path.join(targetDir, "backend/src/scripts/seed/seed-functions.ts"),
+    seedScript.seedFunctions
+  );
+
+  await fs.writeFile(
+    path.join(targetDir, "backend/src/scripts/seed/seed-products.ts"),
+    seedScript.seedProducts
+  );
+
   await execa("yarn", ["install"], { cwd: path.join(targetDir, "backend") });
 
   if (options.install_storefront) {

package/cli/start.js

@@ -20,7 +20,7 @@ export async function startAll() {
 
   spinner.text = "Starting Mercur backend...";
   const backend = execa("yarn", ["dev"], {
-    cwd: path.join(process.cwd(), "backend/apps/backend"),
+    cwd: path.join(process.cwd(), "backend"),
   });
   servicesToRun.push(backend);
 

package/index.js

@@ -17,7 +17,7 @@ console.log(
 
 program
   .command("install")
-  .version("1.0.0")
+  .version("1.1.0")
   .description("Perform full installation of Mercur")
   .action(fullInstall);
 

package/mercur/backend/.env.template

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,29 @@
+#!/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

@@ -0,0 +1,222 @@
+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

@@ -0,0 +1,69 @@
+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

@@ -0,0 +1,67 @@
+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

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

package/mercur/backend/.yarnrc.yml

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