Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions .devcontainer/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,11 @@ MARIADB_ROOT_PASSWORD="${MARIADB_ROOT_PASSWORD:-123}"
# ---------------------------------------------------------------------------
if [ "${CI:-false}" = "true" ]; then
echo "CI mode detected – skipping full bench setup."
echo "Installing pnpm..."
npm install -g pnpm
echo ""
echo "Tool versions:"
bench --version
python --version
node --version
pnpm --version
echo ""
echo "Container environment verified successfully."
exit 0
Expand All @@ -31,14 +28,6 @@ if [ -d "$BENCH_DIR/apps/frappe" ]; then
exit 0
fi

# ---------------------------------------------------------------------------
# Install pnpm (the frappe/bench image ships with npm but not pnpm)
# ---------------------------------------------------------------------------
if ! command -v pnpm &>/dev/null; then
echo "Installing pnpm..."
npm install -g pnpm
fi

# ---------------------------------------------------------------------------
# Wait for MariaDB to be ready
# ---------------------------------------------------------------------------
Expand Down Expand Up @@ -99,14 +88,14 @@ bench use gameplan.localhost
echo "Setting up frontend..."
cd "$WORKSPACE"
git submodule update --init
pnpm install
cd frontend && yarn install && cd ..

echo ""
echo "============================================================"
echo " Gameplan dev environment is ready!"
echo ""
echo " Start the backend: cd ~/frappe-bench && bench start"
echo " Start the frontend: cd /workspace && pnpm dev"
echo " Start the frontend: cd /workspace/frontend && yarn dev"
echo ""
echo " Backend → http://localhost:8000"
echo " Frontend → http://localhost:8080/g"
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/ui-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ jobs:
node-version: 24
check-latest: true

- uses: pnpm/action-setup@v2
with:
version: latest

- name: Add to Hosts
run: |
echo "127.0.0.1 gameplan.test" | sudo tee -a /etc/hosts
Expand All @@ -67,19 +63,6 @@ jobs:
${{ runner.os }}-pip-
${{ runner.os }}-

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-

- name: Cache cypress binary
uses: actions/cache@v3
with:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ This app depends on the `develop` branch of [frappe](https://github.com/frappe/f

#### Prerequisites
- Frappe-bench set up locally ([installation guide](https://frappeframework.com/docs/v14/user/en/installation))
- Node.js and pnpm
- Node.js and yarn
- The local frappe-ui copy is included in `./frappe-ui/` for development

#### Step 1: Set up the Backend
Expand Down Expand Up @@ -123,7 +123,7 @@ This app depends on the `develop` branch of [frappe](https://github.com/frappe/f

3. Install frontend dependencies:
```sh
pnpm install
yarn install
```

4. **Optional: For local frappe-ui development**, install frappe-ui dependencies (use `yarn` in frappe-ui):
Expand All @@ -135,7 +135,7 @@ This app depends on the `develop` branch of [frappe](https://github.com/frappe/f

5. Start the Vite development server:
```sh
pnpm dev
yarn dev
```

6. Access the application at `http://gameplan.test:8080/g`
Expand Down Expand Up @@ -169,7 +169,7 @@ const localFrappeUIAliases = useLocalFrappeUI ? {

**When to Install frappe-ui Dependencies**:
- Only needed if you're modifying frappe-ui components or contributing to frappe-ui development
- Use `yarn install` in the `frappe-ui` directory (not `pnpm`)
- Use `yarn install` in the `frappe-ui` directory
- For normal Gameplan development, the npm package version will be used automatically
- If you see a warning about frappe-ui dependencies not being installed, run `cd frappe-ui && yarn install` only if you need local development

Expand Down
2 changes: 1 addition & 1 deletion frappe-ui
Submodule frappe-ui updated 490 files
14 changes: 7 additions & 7 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"dependencies": {
"@headlessui/vue": "^1.7.14",
"@sentry/vue": "^8.37.1",
"@tiptap/core": "^2.26.1",
"@tiptap/pm": "^2.26.1",
"@tiptap/vue-3": "^2.26.1",
"@tiptap/core": "^3.11.0",
"@tiptap/pm": "^3.11.0",
"@tiptap/vue-3": "^3.11.0",
"@vueuse/core": "^10.1.2",
"feather-icons": "^4.28.0",
"frappe-ui": "^0.1.261",
"frappe-ui": "^0.1.269",
"fuzzysort": "^2.0.4",
"gemoji": "^7.1.0",
"htmldiff-js": "^1.0.5",
Expand All @@ -33,8 +33,8 @@
"devDependencies": {
"@tailwindcss/container-queries": "^0.1.1",
"@types/node": "^20.19.4",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.0.1",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
"autoprefixer": "^10.4.2",
"cypress": "14.5.1",
"lucide-static": "^0.469.0",
Expand All @@ -44,7 +44,7 @@
"rollup-plugin-visualizer": "^5.8.2",
"tailwindcss": "^3.4.15",
"typescript": "^5.8.3",
"vite": "^4.4.9",
"vite": "^8.0.1",
"vue-template-compiler": "^2.7.14"
}
}
Loading
Loading