Skip to content

Commit 95b1ffd

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/jspdf-3.0.3
2 parents 4c825ae + 6b7b60f commit 95b1ffd

File tree

6 files changed

+10667
-16592
lines changed

6 files changed

+10667
-16592
lines changed

.config/jest-setup.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,13 @@ Object.defineProperty(global, 'matchMedia', {
2222
})),
2323
});
2424

25+
Object.defineProperty(global, 'ResizeObserver', {
26+
writable: true,
27+
value: jest.fn().mockImplementation((query) => ({
28+
observe: jest.fn(),
29+
unobserve: jest.fn(),
30+
disconnect: jest.fn(),
31+
})),
32+
});
33+
2534
HTMLCanvasElement.prototype.getContext = () => {};

.config/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ module.exports = {
3939
},
4040
// Jest will throw `Cannot use import statement outside module` if it tries to load an
4141
// ES module without it being transformed first. ./config/README.md#esm-errors-with-jest
42-
transformIgnorePatterns: [nodeModulesToTransform(grafanaESModules)],
42+
transformIgnorePatterns: [nodeModulesToTransform([...grafanaESModules, 'geotiff', 'quick-lru'])],
4343
};

.config/webpack/webpack.config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ const config = async (env): Promise<Configuration> => ({
8181
loader: 'swc-loader',
8282
options: {
8383
jsc: {
84-
baseUrl: './src',
84+
// baseUrl: './src',
85+
baseUrl: path.resolve(process.cwd(), "src"),
8586
target: 'es2015',
8687
loose: false,
8788
parser: {

0 commit comments

Comments
 (0)