Skip to content

Commit

Permalink
Fixed Mage
Browse files Browse the repository at this point in the history
  • Loading branch information
iberdinsky-skilld committed Jul 28, 2024
1 parent 40fa101 commit 5ed6c31
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 37 deletions.
11 changes: 6 additions & 5 deletions Magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,23 +135,24 @@ func (Frontend) Build() error {
if err != nil {
return err
}
return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:build")
return runToolboxCmd("yarn", "build")
// return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:build", "--preserveConsole")
}

// Test runs frontend tests
func (Frontend) Test() error {
return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:test")
return runToolboxCmd("yarn", "test")
}

// Dev runs frontend in development mode
func (Frontend) Dev() error {
return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:dev")
return runToolboxCmd("yarn", "dev")
}

// Watch runs frontend in development mode + autoreload on changes
// Watch runs frontend in development mode + autoreload on changes.
// Same as dev. Probably remove it?
func (Frontend) Watch() error {
return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:dev", "--watch")
return runToolboxCmd("yarn", "dev")
}

type Backend mg.Namespace
Expand Down
30 changes: 0 additions & 30 deletions docker-compose.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions docker/toolbox/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM node:16-alpine3.16
FROM node:22-alpine3.19
WORKDIR /workspace
ENV CGO_ENABLED=0
RUN apk add --no-cache git go python3 && git config --global --add safe.directory /workspace && npm install -g npm@8.19.2
RUN apk add --no-cache git go python3 && git config --global --add safe.directory /workspace
ENTRYPOINT ["tail", "-f"]
Binary file modified mage
Binary file not shown.
Binary file removed mage-macos
Binary file not shown.

0 comments on commit 5ed6c31

Please sign in to comment.