Skip to content

Commit 1258902

Browse files
authored
fix(extension): fix code editor styles (#817)
1 parent d38a438 commit 1258902

File tree

14 files changed

+27
-16
lines changed

14 files changed

+27
-16
lines changed

extension/jest.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ module.exports = {
22
setupFilesAfterEnv: ['<rootDir>/test/setup.js'],
33
testPathIgnorePatterns: ['<rootDir>/examples'],
44
testEnvironment: 'jsdom',
5+
moduleNameMapper: {
6+
'\\.css$': '<rootDir>/test/__mocks__/styleMock.ts',
7+
},
58
};

extension/src/browser/extension/window/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import { StoreState } from '@redux-devtools/app/lib/reducers';
77
import App from '../../../app/containers/App';
88
import configureStore from '../../../app/stores/windowStore';
99
import getPreloadedState from '../background/getPreloadedState';
10+
import { MonitorMessage } from '../../../app/middlewares/api';
1011

1112
import '../../views/window.pug';
12-
import { MonitorMessage } from '../../../app/middlewares/api';
1313

1414
const position = location.hash;
1515
let preloadedState: PreloadedState<StoreState>;

extension/test/__mocks__/styleMock.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default {};

extension/webpack/base.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const baseConfig = (params) => ({
7777
]),
7878
{
7979
test: /\.css?$/,
80-
use: ['style-loader', 'raw-loader'],
80+
use: ['style-loader', 'css-loader'],
8181
},
8282
{
8383
test: /\.pug$/,

packages/devui/.storybook/preview.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
22
import { Container } from '../src';
33
import { listSchemes, listThemes } from '../src/utils/theme';
4-
import '../src/presets';
54

65
export const parameters = {
76
actions: { argTypesRegex: '^on[A-Z].*' },

packages/devui/jest.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ module.exports = {
22
preset: 'ts-jest',
33
setupFilesAfterEnv: ['<rootDir>/tests/setup.ts'],
44
testEnvironment: 'jsdom',
5+
moduleNameMapper: {
6+
'\\.css$': '<rootDir>/tests/__mocks__/styleMock.ts',
7+
},
58
};

packages/devui/src/Editor/Editor.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ import { Base16Theme } from 'base16';
66
import { defaultStyle, themedStyle } from './styles';
77
import { Theme } from '../themes/default';
88

9+
import 'codemirror/mode/javascript/javascript';
10+
import 'codemirror/addon/fold/foldgutter';
11+
import 'codemirror/addon/fold/foldcode';
12+
import 'codemirror/addon/fold/brace-fold';
13+
14+
import '../../fonts/index.css';
15+
import 'codemirror/lib/codemirror.css';
16+
import 'codemirror/addon/fold/foldgutter.css';
17+
918
const EditorContainer = styled.div(
1019
'' as unknown as TemplateStringsArray,
1120
({ theme }: { theme: Theme }) =>

packages/devui/src/presets.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default {};

packages/redux-devtools-app/jest.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ module.exports = {
22
preset: 'ts-jest',
33
setupFilesAfterEnv: ['<rootDir>/test/setup.ts'],
44
testEnvironment: 'jsdom',
5+
moduleNameMapper: {
6+
'\\.css$': '<rootDir>/test/__mocks__/styleMock.ts',
7+
},
58
};

packages/redux-devtools-app/src/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'devui/lib/presets';
21
import React, { Component } from 'react';
32
import { Provider } from 'react-redux';
43
import { Store } from 'redux';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default {};

packages/redux-devtools-inspector-monitor-test-tab/jest.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ module.exports = {
22
preset: 'ts-jest',
33
setupFilesAfterEnv: ['<rootDir>/test/setup.ts'],
44
testEnvironment: 'jsdom',
5+
moduleNameMapper: {
6+
'\\.css$': '<rootDir>/test/__mocks__/styleMock.ts',
7+
},
58
};
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default {};

0 commit comments

Comments
 (0)