public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[release-11 5.8] backport build fixes (#109465)

Browse Source 
* [release-11.6.5] Update npm build in daggerbuild & revert some script changes (#109352)

* update daggerbuild/frontend/npm.go

* combine lerna commands

* revert scripts changes

(cherry picked from commit 2d2d6d1ad5)

* [release-11.6.5] update nx (#109400)

* update nx

(cherry picked from commit b065bf1fd9bd355614a2d3acd1eba3864267d042)

* set some NX env variables

* add make to cypress container

* update cypress image

* also install gcc

* Also add g++

* upgrade lerna too

(cherry picked from commit 7d067d343a)
This commit is contained in:
Kevin Minehart
2025-08-11 13:45:38 -05:00
committed by GitHub
parent 71e1a8486f
commit 2c8059d2a2
22 changed files with 460 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/cli/generateSassVariableFiles.ts
+3 -4
View File
@@ -2,10 +2,9 @@ import { writeFile } from 'node:fs/promises';
import { resolve } from 'path';
import { createTheme } from '@grafana/data';
import { darkThemeVarsTemplate } from './themeTemplates/_variables.dark.scss.tmpl';
import { lightThemeVarsTemplate } from './themeTemplates/_variables.light.scss.tmpl';
import { commonThemeVarsTemplate } from './themeTemplates/_variables.scss.tmpl';
import { darkThemeVarsTemplate } from '@grafana/ui/src/themes/_variables.dark.scss.tmpl';
import { lightThemeVarsTemplate } from '@grafana/ui/src/themes/_variables.light.scss.tmpl';
import { commonThemeVarsTemplate } from '@grafana/ui/src/themes/_variables.scss.tmpl';
const darkThemeVariablesPath = resolve(__dirname, 'public', 'sass', '_variables.dark.generated.scss');
const lightThemeVariablesPath = resolve(__dirname, 'public', 'sass', '_variables.light.generated.scss');