Skip to content

Commit 96b066b

Browse files
committed
Configure path aliases (webpack, jest, ts)
1 parent 1054354 commit 96b066b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+99
-93
lines changed

.config/jest.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const { grafanaESModules, nodeModulesToTransform } = require('./jest/utils');
1010

1111
module.exports = {
1212
moduleNameMapper: {
13+
"^@/(.*)$": "<rootDir>/src/$1",
1314
'\\.(css|scss|sass)$': 'identity-obj-proxy',
1415
'react-inlinesvg': path.resolve(__dirname, 'jest', 'mocks', 'react-inlinesvg.tsx'),
1516
},

.config/tsconfig.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
"rootDir": "../src",
1212
"baseUrl": "../src",
1313
"typeRoots": ["../node_modules/@types"],
14-
"resolveJsonModule": true
14+
"resolveJsonModule": true,
15+
"paths": {
16+
"@/*": ["../src/*"]
17+
}
1518
},
1619
"ts-node": {
1720
"compilerOptions": {

.config/webpack/webpack.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@ const config = async (env): Promise<Configuration> => {
198198
],
199199

200200
resolve: {
201+
alias: {
202+
'@': path.resolve(process.cwd(), 'src'),
203+
},
201204
extensions: ['.js', '.jsx', '.ts', '.tsx'],
202205
// handle resolving "rootDir" paths
203206
modules: [path.resolve(process.cwd(), 'src'), 'node_modules'],

src/components/QueryEditor/AnnotationQueryEditor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { AnnotationQuery } from '@grafana/data';
44
import { EditorField, EditorRow } from '@grafana/experimental';
55
import { Input } from '@grafana/ui';
66

7-
import { ElasticsearchQuery } from '../../types';
7+
import { ElasticsearchQuery } from '@/types';
88

99
import { ElasticQueryEditorProps, ElasticSearchQueryField } from './index';
1010

src/components/QueryEditor/BucketAggregationsEditor/BucketAggregationEditor.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import React from 'react';
33
import { SelectableValue } from '@grafana/data';
44
import { InlineSegmentGroup, Segment, SegmentAsync } from '@grafana/ui';
55

6-
import { useFields } from '../../../hooks/useFields';
7-
import { useDispatch } from '../../../hooks/useStatelessReducer';
6+
import { useFields } from '@/hooks/useFields';
7+
import { useDispatch } from '@/hooks/useStatelessReducer';
88
import { segmentStyles } from '../styles';
99

10-
import { BucketAggregation, BucketAggregationType } from './../../../types';
10+
import { BucketAggregation, BucketAggregationType } from '@/types';
1111
import { SettingsEditor } from './SettingsEditor';
1212
import { isBucketAggregationWithField } from './aggregations';
1313
import { changeBucketAggregationField, changeBucketAggregationType } from './state/actions';

src/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { GroupBase, OptionsOrGroups } from 'react-select';
55
import { InternalTimeZones, SelectableValue } from '@grafana/data';
66
import { InlineField, Input, Select, TimeZonePicker } from '@grafana/ui';
77

8-
import { useDispatch } from '../../../../hooks/useStatelessReducer';
9-
import { DateHistogram } from '../../../../types';
10-
import { useCreatableSelectPersistedBehaviour } from '../../../hooks/useCreatableSelectPersistedBehaviour';
8+
import { useDispatch } from '@/hooks/useStatelessReducer';
9+
import { DateHistogram } from '@/types';
10+
import { useCreatableSelectPersistedBehaviour } from '@/components/hooks/useCreatableSelectPersistedBehaviour';
1111
import { changeBucketAggregationSetting } from '../state/actions';
1212
import { bucketAggregationConfig } from '../utils';
1313

src/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import React, { useEffect, useRef } from 'react';
44

55
import { InlineField, Input, QueryField } from '@grafana/ui';
66

7-
import { useDispatch, useStatelessReducer } from '../../../../../hooks/useStatelessReducer';
8-
import { Filters } from '../../../../../types';
9-
import { AddRemove } from '../../../../AddRemove';
7+
import { useDispatch, useStatelessReducer } from '@/hooks/useStatelessReducer';
8+
import { Filters } from '@/types';
9+
import { AddRemove } from '@/components/AddRemove';
1010
import { changeBucketAggregationSetting } from '../../state/actions';
1111

1212
import { addFilter, changeFilter, removeFilter } from './state/actions';

src/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/state/actions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createAction } from '@reduxjs/toolkit';
22

3-
import { Filter } from '../../../../../../types';
3+
import { Filter } from '@/types';
44

55
export const addFilter = createAction('@bucketAggregations/filter/add');
66
export const removeFilter = createAction<number>('@bucketAggregations/filter/remove');

src/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/state/reducer.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { reducerTester } from 'dependencies/reducerTester';
2-
import { Filter } from '../../../../../../types';
2+
import { Filter } from '@/types';
33

44
import { addFilter, changeFilter, removeFilter } from './actions';
55
import { reducer } from './reducer';

src/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/state/reducer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Action } from 'redux';
22

3-
import { Filter } from '../../../../../../types';
3+
import { Filter } from '@/types';
44
import { defaultFilter } from '../utils';
55

66
import { addFilter, changeFilter, removeFilter } from './actions';

0 commit comments

Comments
 (0)