5 files changed, 11 insertions, 50 deletions

diff --git a/packages/theme/package-lock.json b/packages/theme/package-lock.json
index 3da6e2b7f..e03ce42e3 100644
--- a/packages/theme/package-lock.json
+++ b/packages/theme/package-lock.json
@@ -1,33 +1,9 @@
 {
   "name": "@meetfranz/theme",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@types/color": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/color/-/color-3.0.0.tgz",
-      "integrity": "sha512-5qqtNia+m2I0/85+pd2YzAXaTyKO8j+svirO5aN+XaQJ5+eZ8nx0jPtEWZLxCi50xwYsX10xUHetFzfb1WEs4Q==",
-      "dev": true,
-      "requires": {
-        "@types/color-convert": "*"
-      }
-    },
-    "@types/color-convert": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@types/color-convert/-/color-convert-1.9.0.tgz",
-      "integrity": "sha512-OKGEfULrvSL2VRbkl/gnjjgbbF7ycIlpSsX7Nkab4MOWi5XxmgBYvuiQ7lcCFY5cPDz7MUNaKgxte2VRmtr4Fg==",
-      "dev": true,
-      "requires": {
-        "@types/color-name": "*"
-      }
-    },
-    "@types/color-name": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.0.tgz",
-      "integrity": "sha512-gZ/Rb+MFXF0pXSEQxdRoPMm5jeO3TycjOdvbpbcpHX/B+n9AqaHFe5q6Ga9CsZ7ir/UgIWPfrBzUzn3F19VH/w==",
-      "dev": true
-    },
     "color": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/color/-/color-3.1.0.tgz",
diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts
index ce077e817..423fa0385 100644
--- a/packages/theme/src/index.ts
+++ b/packages/theme/src/index.ts
@@ -1,17 +1,17 @@
+import * as darkThemeConfig from './themes/dark';
+import * as defaultThemeConfig from './themes/default';
+
 export enum ThemeType {
   default = 'default',
   dark = 'dark',
 }
 
-import * as darkThemeConfig from './themes/dark';
-import * as defaultThemeConfig from './themes/default';
-
-export default (themeId: ThemeType) => {
+export function theme(themeId: ThemeType) {
   if (themeId === ThemeType.dark) {
     return Object.assign({}, defaultThemeConfig, darkThemeConfig);
   }
 
   return Object.assign({}, defaultThemeConfig);
-};
+}
 
 export type Theme = typeof defaultThemeConfig;
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts
index 3c17d03ae..7eac5a3c3 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/packages/theme/src/themes/dark/index.ts
@@ -1,4 +1,4 @@
-import * as color from 'color';
+import color from 'color';
 
 import * as legacyStyles from '../legacy';
 
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts
index f7d58a375..b22730413 100644
--- a/packages/theme/src/themes/default/index.ts
+++ b/packages/theme/src/themes/default/index.ts
@@ -1,4 +1,4 @@
-import * as color from 'color';
+import color from 'color';
 
 import * as legacyStyles from '../legacy';
 
diff --git a/packages/theme/webpack.config.js b/packages/theme/webpack.config.js
index f7311109d..8ad7ee3b6 100644
--- a/packages/theme/webpack.config.js
+++ b/packages/theme/webpack.config.js
@@ -1,25 +1,10 @@
 const path = require('path');
+const baseConfig = require('../../webpack.config.base')(__dirname);
 
-console.log(__dirname);
-
-module.exports = {
-  context: __dirname,
-  entry: path.join(__dirname, '/src/index.ts'),
+module.exports = Object.assign({}, baseConfig, {
   output: {
     filename: 'index.js',
     path: path.join(__dirname, 'lib'),
     libraryTarget: 'commonjs2',
   },
-  module: {
-    rules: [{
-      test: /\.tsx?$/,
-      loader: 'ts-loader',
-      exclude: /node_modules/,
-    }],
-  },
-  resolve: {
-    extensions: ['.tsx', '.ts', '.js'],
-  },
-  devtool: 'inline-source-map',
-  mode: process.env.NODE_ENV === 'development' ? 'development' : 'production',
-};
+});