Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
… into v4-merge-v3
  • Loading branch information
SpencerTorres committed Nov 16, 2023
2 parents f3fd7dd + ca487d4 commit e0e79a9
Show file tree
Hide file tree
Showing 50 changed files with 3,094 additions and 4,969 deletions.
4 changes: 2 additions & 2 deletions .config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ A common issue found with the current jest config involves importing an npm pack

```javascript
process.env.TZ = 'UTC';
const { grafanaESModules, nodeModulesToTransform } = require('./jest/utils');
const { grafanaESModules, nodeModulesToTransform } = require('./config/jest/utils');

module.exports = {
// Jest configuration provided by Grafana
Expand Down Expand Up @@ -161,4 +161,4 @@ services:
In this example we are assigning the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will give you the possibility to set the value while running the docker-compose commands which might be convinent in some scenarios.

---
---
2 changes: 1 addition & 1 deletion .config/jest/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ const grafanaESModules = [
module.exports = {
nodeModulesToTransform,
grafanaESModules,
};
};
Loading

0 comments on commit e0e79a9

Please sign in to comment.