Fix issue with lezer-metricsql dependency and public folder (#256)

update CHANGELOG.md
VictoriaMetrics · Jan 23, 2025 · 81039d0 · 81039d0
1 parent f46ae05
commit 81039d0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## tip
 
+* BUGFIX: fix issue with including the lezer-metricsql package to the build and fix public folder. See [this PR](https://github.com/VictoriaMetrics/victoriametrics-datasource/pull/256).
+
 ## v0.12.0
 
 ⚠️ **Breaking Change: Plugin ID Updated**  

diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ frontend-build: frontend-package-base-image
 		--user $(shell id -u):$(shell id -g) \
 		--env YARN_CACHE_FOLDER="/victoriametrics-datasource/.cache" \
 		--entrypoint=/bin/bash \
-		frontent-builder-image -c "yarn install --omit=dev && yarn build"
+		frontent-builder-image -c "yarn preinstall && yarn install --omit=dev && yarn build"
 
 app-via-docker-local:
 	$(eval OS := $(shell docker run $(GO_BUILDER_IMAGE) go env GOOS))

diff --git a/packages/lezer-metricsql/package.json b/packages/lezer-metricsql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lezer-metricsql",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "main": "index.cjs",
   "type": "module",
   "exports": {

diff --git a/webpack.config.ts b/webpack.config.ts
@@ -18,7 +18,7 @@ const config = (env) => {
       path: path.resolve(__dirname, 'plugins/victoriametrics-metrics-datasource'),
       filename: '[name].js',
       // Keep publicPath relative for host.com/grafana/ deployments
-      publicPath: '/public/plugins/plugins/victoriametrics-metrics-datasource/',
+      publicPath: '/public/plugins/victoriametrics-metrics-datasource/',
     },
     resolve: {
       alias: {

diff --git a/yarn.lock b/yarn.lock
@@ -7101,7 +7101,7 @@ levn@^0.4.1:
     type-check "~0.4.0"
 
 "lezer-metricsql@file:packages/lezer-metricsql":
-  version "0.1.4"
+  version "0.1.5"
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     ## tip
+    * BUGFIX: fix issue with including the lezer-metricsql package to the build and fix public folder. See [this PR](https://github.com/VictoriaMetrics/victoriametrics-datasource/pull/256).
     ## v0.12.0
     ⚠️ **Breaking Change: Plugin ID Updated**
@@ Expand Down @@