Merge branch 'nightly' into release

7 files changed, 25 insertions, 36 deletions

diff --git a/packages/theme/package.json b/packages/theme/package.json
index 7e3c4722d..7f3226bd8 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -15,15 +15,15 @@
   },
   "scripts": {
     "dev": "tsc -w",
-    "prepare": "tsc",
+    "build": "tsc",
     "preprepare": "npm run test",
-    "test": "npx mocha"
+    "test": "ts-mocha 'test/**/*.test.ts'"
   },
   "bugs": {
     "url": "https://github.com/meetfranz/franz/issues"
   },
   "dependencies": {
-    "color": "3.1.2"
+    "color": "4.0.1"
   },
   "gitHead": "9f2ab40b7602bc3df26ebb093b484b9917768f69"
 }
diff --git a/packages/theme/src/themes/IStyleTypes.ts b/packages/theme/src/themes/IStyleTypes.ts
index cf8bdea33..48f52daf2 100644
--- a/packages/theme/src/themes/IStyleTypes.ts
+++ b/packages/theme/src/themes/IStyleTypes.ts
@@ -1,4 +1,4 @@
-export default interface IStyleTypes {
+export interface IStyleTypes {
   [index: string]: {
     accent: string;
     contrast: string;
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts
index 7d7bab399..87a68cb5d 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/packages/theme/src/themes/dark/index.ts
@@ -153,13 +153,6 @@ export default (brandPrimary: string) => {
       },
     }),
 
-    // Announcements
-    announcements: merge({}, defaultStyles.announcements, {
-      spotlight: {
-        background: legacyStyles.darkThemeGrayDark,
-      },
-    }),
-
     // Todos
     todos: merge({}, defaultStyles.todos, {
       todosLayer: {
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts
index 21017bbe0..80bcba766 100644
--- a/packages/theme/src/themes/default/index.ts
+++ b/packages/theme/src/themes/default/index.ts
@@ -2,7 +2,7 @@ import color from 'color';
 import { cloneDeep } from 'lodash';
 
 import * as legacyStyles from '../legacy';
-import IStyleTypes from '../IStyleTypes';
+import type { IStyleTypes } from '../IStyleTypes';
 
 export default (brandPrimary: string) => {
   const brandSuccess = '#5cb85c';
@@ -228,13 +228,6 @@ export default (brandPrimary: string) => {
       },
     },
 
-    // Announcements
-    announcements: {
-      spotlight: {
-        background: legacyStyles.themeGrayLightest,
-      },
-    },
-
     // Todos
     todos: {
       todosLayer: {
diff --git a/packages/theme/test/index.test.js b/packages/theme/test/index.test.js
deleted file mode 100644
index 3906433c1..000000000
--- a/packages/theme/test/index.test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const expect = require('expect.js');
-
-const { colorBackground: colorBackgroundDefault } = require('../lib/themes/default');
-const { colorBackground: colorBackgroundDark } = require('../lib/themes/dark');
-const { default: theme } = require('../lib');
-
-describe('Load theme', () => {
-  it('Should load default theme', () => {
-    const { colorBackground } = theme('default');
-    expect(colorBackground).to.be(colorBackgroundDefault);
-  });
-
-  it('Should load dark theme', () => {
-    const { colorBackground } = theme('dark');
-    expect(colorBackground).to.be(colorBackgroundDark);
-  });
-});
diff --git a/packages/theme/test/index.test.ts b/packages/theme/test/index.test.ts
new file mode 100644
index 000000000..7eda4e359
--- /dev/null
+++ b/packages/theme/test/index.test.ts
@@ -0,0 +1,19 @@
+import expect from 'expect.js';
+
+import makeDefaultThemeConfig from '../src/themes/default';
+import makeDarkThemeConfig from '../src/themes/dark';
+import { theme, ThemeType } from '../src';
+
+describe('Load theme', () => {
+  it('Should load default theme', () => {
+    const { colorBackground } = theme('default' as ThemeType);
+    expect(colorBackground).to.be(
+      makeDefaultThemeConfig('default').colorBackground,
+    );
+  });
+
+  it('Should load dark theme', () => {
+    const { colorBackground } = theme('dark' as ThemeType);
+    expect(colorBackground).to.be(makeDarkThemeConfig('dark').colorBackground);
+  });
+});
diff --git a/packages/theme/tsconfig.json b/packages/theme/tsconfig.json
index d80ee9ee7..4deaa5dd7 100644
--- a/packages/theme/tsconfig.json
+++ b/packages/theme/tsconfig.json
@@ -4,4 +4,5 @@
     "outDir": "lib",
     "rootDir": "src"
   },
+  "exclude": ["node_modules", "lib", "test"]
 }