Skip to content
This repository was archived by the owner on Aug 11, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
module.exports = {
presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-typescript'],
plugins: [
'@babel/plugin-proposal-object-rest-spread',
'@babel/plugin-transform-runtime',
'transform-require-context'
]
};
// eslint-disable-next-line @typescript-eslint/no-var-requires
const baseConfig = require('proton-shared/configs/babel.config.base');

module.exports = baseConfig;
6 changes: 4 additions & 2 deletions containers/themes/ThemesSection.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ import {
} from 'react-components';
import { updateTheme } from 'proton-shared/lib/api/mailSettings';
import { getThemeIdentifier, stripThemeIdentifier } from 'proton-shared/lib/themes/helpers';
import { DEFAULT_THEME, CUSTOM_THEME } from 'proton-shared/lib/themes/themes.js';
import { DEFAULT_THEME, PROTON_THEMES, CUSTOM_THEME } from 'proton-shared/lib/themes/themes.js';

import CustomThemeModal from './CustomThemeModal.js';

const availableThemes = [DEFAULT_THEME, CUSTOM_THEME];
const availableThemes = [DEFAULT_THEME, FEATURE_FLAGS.includes('darkmode') && PROTON_THEMES.DARK, CUSTOM_THEME].filter(
Boolean
);

const ThemesSection = () => {
const api = useApi();
Expand Down
13 changes: 5 additions & 8 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
// eslint-disable-next-line @typescript-eslint/no-var-requires
const baseConfig = require('proton-shared/configs/jest.config.base');

module.exports = {
setupFilesAfterEnv: ['./rtl.setup.js'],
verbose: true,
moduleDirectories: ['node_modules'],
transform: {
'^.+\\.(js|tsx?)$': 'babel-jest'
},
...baseConfig,
moduleNameMapper: {
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)$': '<rootDir>/__mocks__/fileMock.js',
'\\.(css|scss|less)$': '<rootDir>/__mocks__/styleMock.js',
pmcrypto: '<rootDir>/__mocks__/pmcrypto.js',
'sieve.js': '<rootDir>/__mocks__/sieve.js'
},
transformIgnorePatterns: ['node_modules/(?!(proton-shared)/)']
}
};
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "proton-shared/tsconfig.base.json"
"extends": "proton-shared/configs/tsconfig.base.json"
}